Changeset 4484 for trunk

Timestamp:

08/04/04 16:38:55 (20 years ago)

Author:

merck

Message:

MMerck: No real modifications.
CVc: Committing in .

Location:

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol

Files:

• amcserialport.cpp (modified) (4 diffs)
• amcserialport.h (modified) (1 diff)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcserialport.cpp

@@ -73 +73 @@
     newtio.c_iflag = IGNPAR | ICRNL;
     newtio.c_oflag = 0;
+//    newtio.c_oflag = OCRNL;
 
     /* set input mode (non-canonical, no echo, ...) */
@@ -88 +89 @@
     }
 
+    fcntl( m_fd, F_SETFL, 0);
     return;
 }
@@ -100 +102 @@
 int AMCSerialPort::readBlock( char* p_pBuffer, int p_iMaxLen )
 {
+//  usleep(1000);
   int num, iTot = 0;
   char* pBuf = p_pBuffer;
@@ -105 +108 @@
 //      {
                 num = read( m_fd, pBuf, p_iMaxLen );
-//    qDebug("Read %d Bytes", num);
-//    usleep(1000);
-//              if( num == 0)
-//                      num = read( m_fd, p_pBuffer, p_iMaxLen );
-//      break;
     pBuf += num;
     iTot += num;
+//    qDebug("Read %d Bytes", num);
+//              if( num == 0) {
+//                      num = read( m_fd, pBuf, p_iMaxLen );
+//                  usleep(100);
+//                              break;
+//                  continue;
+//              }
+//              if( iTot == p_iMaxLen) {
+//        break;
+//    }
+//      }
 
-//      }
 //  qDebug("Total read %d Bytes", iTot);
         return iTot;
 }
+
+/** No descriptions */
+void AMCSerialPort::flush()
+{
+    tcflush( m_fd, TCIOFLUSH );
+}

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcserialport.h

@@ -37 +37 @@
   /** No descriptions */
   int readBlock( char* p_pBuffer, int p_iMaxLen );
+  /** No descriptions */
+  void flush();
 
 private: // Private attributes