More build fixes

nasa · Apr 30, 2024 · 71569b1 · 71569b1
1 parent c00d354
commit 71569b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Drv/LinuxGpioDriver/LinuxGpioDriverComponentImplStub.cpp b/Drv/LinuxGpioDriver/LinuxGpioDriverComponentImplStub.cpp
@@ -43,9 +43,9 @@ namespace Drv {
       return false;
   }
 
-  Os::Task::TaskStatus LinuxGpioDriverComponentImpl ::
-    startIntTask(NATIVE_UINT_TYPE priority, NATIVE_UINT_TYPE stackSize, NATIVE_UINT_TYPE cpuAffinity) {
-     return Os::Task::TASK_OK;
+  Os::Task::Status LinuxGpioDriverComponentImpl ::
+    startIntTask(Os::Task::ParamType priority, Os::Task::ParamType stackSize, Os::Task::ParamType cpuAffinity) {
+     return Os::Task::OP_OK;
    }
 
   LinuxGpioDriverComponentImpl ::

diff --git a/Drv/LinuxUartDriver/LinuxUartDriver.cpp b/Drv/LinuxUartDriver/LinuxUartDriver.cpp
@@ -355,7 +355,7 @@ void LinuxUartDriver ::serialReadTaskEntry(void* ptr) {
             status = RecvStatus::RECV_ERROR;
             comp->recv_out(0, buff, status);
             // to avoid spinning, wait 50 ms
-            Os::Task::delay(50);
+            Os::Task::delay(Fw::Time(0, 50));
             continue;
         }
 
@@ -392,16 +392,16 @@ void LinuxUartDriver ::serialReadTaskEntry(void* ptr) {
 void LinuxUartDriver ::start(Os::Task::ParamType priority, Os::Task::ParamType stackSize, Os::Task::ParamType cpuAffinity) {
     Os::TaskString task("SerReader");
     Os::Task::Arguments arguments(task, serialReadTaskEntry, this, priority, stackSize, cpuAffinity);
-    Os::Task::TaskStatus stat = this->m_readTask.start(arguments);
+    Os::Task::Status stat = this->m_readTask.start(arguments);
     FW_ASSERT(stat == Os::Task::OP_OK, stat);
 }
 
 void LinuxUartDriver ::quitReadThread() {
     this->m_quitReadThread = true;
 }
 
-Os::Task::TaskStatus LinuxUartDriver ::join(void** value_ptr) {
-    return m_readTask.join(value_ptr);
+Os::Task::Status LinuxUartDriver ::join() {
+    return m_readTask.join();
 }
 
 }  // end namespace Drv
diff --git a/Drv/LinuxUartDriver/LinuxUartDriver.hpp b/Drv/LinuxUartDriver/LinuxUartDriver.hpp
@@ -85,7 +85,7 @@ class LinuxUartDriver : public LinuxUartDriverComponentBase {
     void quitReadThread();
 
     //! Join thread
-    Os::Task::TaskStatus join(void** value_ptr);
+    Os::Task::Status join();
 
     //! Destroy object LinuxUartDriver
     //!