continued scex uart reader, some bugs

linux/devices/ScexUartReader.cpp

@@ -26,16 +26,15 @@ ScexUartReader::ScexUartReader(object_id_t objectId)
   lock = MutexFactory::instance()->createMutex();
 }
 
-// void ScexUartRead::start() { /* semaphore->give(); */ }
 ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
   lock->lockMutex();
   state = States::IDLE;
   lock->unlockMutex();
   while (true) {
     semaphore->acquire();
-    std::cout << "task was started" << std::endl;
+    sif::info << "task was started" << std::endl;
     int bytesRead = 0;
-    do {
+    while(true) {
       bytesRead = read(serialPort, reinterpret_cast<void *>(recBuf.data()),
                        static_cast<unsigned int>(recBuf.size()));
       if (bytesRead == 0) {
@@ -52,21 +51,17 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
       } else if (bytesRead >= static_cast<int>(recBuf.size())) {
         sif::error << "ScexUartReader::performOperation: Receive buffer too small" << std::endl;
       } else if (bytesRead > 0) {
-        MutexGuard mg(lock);
-        ipcQueue.insert(bytesRead);
         ReturnValue_t result = dleParser.passData(recBuf.data(), bytesRead);
+        if (debugMode) {
+          sif::info << "Received " << bytesRead
+                    << " bytes from the Solar Cell Experiment:" << std::endl;
+        }
         if (result != HasReturnvaluesIF::RETURN_OK) {
           sif::warning << "ScexUartReader::performOperation: Passing data to DLE parser failed"
                        << std::endl;
         }
-        if (debugMode) {
-          sif::info << "Received " << bytesRead
-                    << " bytes from the Solar Cell Experiment:" << std::endl;
-          arrayprinter::print(recBuf.data(), bytesRead, OutputType::HEX, false);
-        }
-        break;
       }
-    } while (bytesRead > 0);
+    };
     // task block comes here
     std::cout << "done" << std::endl;
   }
@@ -75,10 +70,11 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
 
 ReturnValue_t ScexUartReader::initializeInterface(CookieIF *cookie) {
   UartCookie *uartCookie = dynamic_cast<UartCookie *>(cookie);
-  if (uartCookie) {
+  if (uartCookie == nullptr) {
     return RETURN_FAILED;
   }
   std::string devname = uartCookie->getDeviceFile();
+  sif::info  << devname << std::endl;
   /* Get file descriptor */
   serialPort = open(devname.c_str(), O_RDWR);
   if (serialPort < 0) {
@@ -98,8 +94,8 @@ ReturnValue_t ScexUartReader::initializeInterface(CookieIF *cookie) {
   tty.c_lflag &= ~(ICANON | ECHO);
 
   // Non-blocking mode, use polling
-  tty.c_cc[VTIME] = 0;  // Read for up to 2 seconds
-  tty.c_cc[VMIN] = 0;   // Read as much as there is available
+  tty.c_cc[VTIME] = 10;  // Read for up to 1 seconds
+  tty.c_cc[VMIN] = 255;   // Read as much as there is available
 
   // Q7S UART Lite has fixed baud rate. For other linux systems, set baud rate here.
 #if !defined(XIPHOS_Q7S)
@@ -174,11 +170,21 @@ void ScexUartReader::foundDlePacketHandler(const DleParser::Context &ctx) {
 void ScexUartReader::handleFoundDlePacket(uint8_t *packet, size_t len) {
   // TODO: insert data into IPC ring buffer here
   sif::info << "Detected DLE encoded packet with decoded size " << len << std::endl;
+  //MutexGuard mg(lock);
+  ReturnValue_t result = ipcQueue.insert(len);
+  if(result != RETURN_OK){
+	  sif::warning<< "IPCQueue error" << std::endl;
+  }
+  result = ipcRingBuf.writeData(packet, len);
+  if(result != RETURN_OK){
+  	  sif::warning<< "IPCRingBuf error" << std::endl;
+    }
+  sif::info << "DLE handler done" << std::endl;
 }
 
 ReturnValue_t ScexUartReader::readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
                                                   size_t *size) {
-  MutexGuard mg(lock);
+  //MutexGuard mg(lock);
   if (ipcQueue.empty()) {
     *size = 0;
     return RETURN_OK;