Skip to content

Fix LinuxGpioDriver build w/ disabled object names #3103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Fix LinuxGpioDriver build w/ disabled object names #3103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Drv/LinuxGpioDriver/LinuxGpioDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Os::File::Status LinuxGpioDriver ::setupLineHandle(const PlatformIntType chip_de
struct gpiohandle_request request;
(void) ::memset(&request, 0, sizeof request);
request.lineoffsets[0] = gpio;
Fw::StringUtils::string_copy(request.consumer_label, this->getObjName(),
Fw::StringUtils::string_copy(request.consumer_label, FW_OPTIONAL_NAME(this->getObjName()),
static_cast<FwSizeType>(sizeof request.consumer_label));
request.default_values[0] = (default_state == Fw::Logic::HIGH) ? 1 : 0;
request.fd = -1;
Expand All @@ -165,7 +165,7 @@ Os::File::Status LinuxGpioDriver ::setupLineEvent(const PlatformIntType chip_des
struct gpioevent_request event;
(void) ::memset(&event, 0, sizeof event);
event.lineoffset = gpio;
Fw::StringUtils::string_copy(event.consumer_label, this->getObjName(),
Fw::StringUtils::string_copy(event.consumer_label, FW_OPTIONAL_NAME(this->getObjName()),
static_cast<FwSizeType>(sizeof event.consumer_label));
event.fd = -1;
event.handleflags = configuration_to_handler_flags(configuration);
Expand Down
2 changes: 1 addition & 1 deletion Drv/LinuxGpioDriver/LinuxGpioDriverCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Drv::GpioStatus LinuxGpioDriver ::start(const FwSizeType priority,
this->m_running = true;
}
Fw::String name;
name.format("%s.interrupt", this->getObjName());
name.format("%s.interrupt", FW_OPTIONAL_NAME(this->getObjName()));
Os::Task::Arguments arguments(name, &this->interruptFunction, this, priority, stackSize, cpuAffinity,
identifier);
this->m_poller.start(arguments);
Expand Down