X8: fix xtrx subdevice initialization due to gateware not having rese…

…t command
myriadrf · Sep 10, 2024 · bf6642a · bf6642a
1 parent 0f1007f
commit bf6642a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/boards/LimeSDR_XTRX/LimeSDR_XTRX.cpp b/src/boards/LimeSDR_XTRX/LimeSDR_XTRX.cpp
@@ -363,7 +363,8 @@ OpStatus LimeSDR_XTRX::Init()
     // CustomParameterWrite(&paramId,&dacVal,1,"");
 
     OpStatus status = LMS64CProtocol::DeviceReset(*mSerialPort, 0);
-    if (status != OpStatus::Success)
+    // XTRX on X8 board don't have Reset command, returns Unknown
+    if (status != OpStatus::Success && status != OpStatus::NotImplemented)
         return status;
 
     const bool skipTune = true;

diff --git a/src/protocols/LMS64CProtocol.cpp b/src/protocols/LMS64CProtocol.cpp
@@ -159,10 +159,26 @@ static OpStatus RunControlCommand(ISerialPort& port, uint8_t* request, uint8_t*
     if (status != OpStatus::Success)
         return status;
 
-    if (reinterpret_cast<LMS64CPacket*>(response)->status != CommandStatus::Completed)
-        return OpStatus::IOFailure;
-
-    return OpStatus::Success;
+    switch (reinterpret_cast<LMS64CPacket*>(response)->status)
+    {
+    case CommandStatus::Completed:
+        return OpStatus::Success;
+    case CommandStatus::Busy:
+        return OpStatus::Busy;
+    case CommandStatus::Unknown:
+        return OpStatus::NotImplemented;
+    case CommandStatus::TooManyBlocks:
+        return OpStatus::OutOfRange;
+    case CommandStatus::Error:
+        return OpStatus::Error;
+    case CommandStatus::WrongOrder:
+        return OpStatus::InvalidValue;
+    case CommandStatus::ResourceDenied:
+        return OpStatus::PermissionDenied;
+    case CommandStatus::Undefined:
+    default:
+        return OpStatus::Error;
+    }
 }
 
 static OpStatus RunControlCommand(ISerialPort& port, uint8_t* data, size_t length, int timeout_ms = 100)