Changeset 12236 for trunk

Timestamp:

10/23/11 13:33:16 (13 years ago)

Author:

tbretz

Message:

Changed signed char to unsigned in output queue.

Location:

trunk/FACT++/src

Files:

• ConnectionUSB.cc (modified) (2 diffs)
• ConnectionUSB.h (modified) (2 diffs)
• biasctrl.cc (modified) (1 diff)

trunk/FACT++/src/ConnectionUSB.cc

@@ -221 +221 @@
 // It is important that when SendMessageImp is called, or to be more
 // precise boost::bind is called, teh data is copied!
-void ConnectionUSB::SendMessageImp(const vector<char> msg)
+void ConnectionUSB::SendMessageImp(const vector<uint8_t> msg)
 {
     /*
@@ -256 +256 @@
 void ConnectionUSB::PostMessage(const void *ptr, size_t max)
 {
-    const vector<char> msg(reinterpret_cast<const char*>(ptr),
-                           reinterpret_cast<const char*>(ptr)+max);
+    const vector<uint8_t> msg(reinterpret_cast<const uint8_t*>(ptr),
+                              reinterpret_cast<const uint8_t*>(ptr)+max);
 
     get_io_service().post(boost::bind(&ConnectionUSB::SendMessageImp, this, msg));

trunk/FACT++/src/ConnectionUSB.h

@@ -36 +36 @@
 private:
     boost::asio::deadline_timer   fOutTimeout;
-    std::deque<std::vector<char>> fOutQueue;
+    std::deque<std::vector<uint8_t>> fOutQueue;
 
     ConnectionStatus_t fConnectionStatus;
@@ -78 +78 @@
 
     // ------------------------ write --------------------------
-    void SendMessageImp(const std::vector<char> msg);
+    void SendMessageImp(const std::vector<uint8_t> msg);
     void PostMessage(const void *msg, size_t s=0);
     void PostMessage(const std::string &cmd, size_t s=-1);

trunk/FACT++/src/biasctrl.cc

@@ -302 +302 @@
     fout << Time() << ": ";
     for (unsigned int i=0; i<bytes_received; i++)
-        fout << hex << setfill('0') << setw(2) << (uint32_t)buf[i];
+        fout << hex << setfill('0') << setw(2) << (uint16_t)buf[i];
     fout << endl;
 #endif