Include debug.h

Author: FozzTexx

lib/hardware/COMChannel.cpp

@@ -2,6 +2,8 @@
 
 #ifdef HELLO_IM_A_PC
 
+#include "../../include/debug.h"
+
 void COMChannel::begin(const ChannelConfig& conf)
 {
     if (_fd != INVALID_HANDLE_VALUE)
@@ -15,12 +17,11 @@ void COMChannel::begin(const ChannelConfig& conf)
     if (_device.empty())
     {
         Debug_println("Serial port is not configured!");
-        suspend();
         return;
     }
 
     Debug_printf("Setting up serial port %s\n", _device.c_str());
-    _fd = CreateFile(_device,
+    _fd = CreateFile(_device.c_str(),
                      GENERIC_READ | GENERIC_WRITE,
                      0,
                      0,
@@ -61,7 +62,6 @@ void COMChannel::begin(const ChannelConfig& conf)
     // activate settings
     if (!SetCommState(_fd, &dcbSerialParams)){
         Debug_printf("SetCommState error: %d\n", GetLastError());
-        suspend();
         return;
     }
 
@@ -86,7 +86,7 @@ void COMChannel::updateFIFO()
 {
     COMSTAT cs;
 
-    if (_fd < 0)
+    if (_fd == INVALID_HANDLE_VALUE)
         return;
 
     if (!ClearCommError(_fd, NULL, &cs))
@@ -107,7 +107,7 @@ void COMChannel::updateFIFO()
 size_t COMChannel::dataOut(const void *buffer, size_t length)
 {
     DWORD txbytes;
-    if (!WriteFile(_fd, buffer, (DWORD)size, &txbytes, NULL))
+    if (!WriteFile(_fd, buffer, (DWORD) length, &txbytes, NULL))
     {
         Debug_printf("UART write() write error: %dn", GetLastError());
     }
@@ -116,7 +116,7 @@ size_t COMChannel::dataOut(const void *buffer, size_t length)
 
 void COMChannel::flushOutput()
 {
-    if (_fd >= 0)
+    if (_fd != INVALID_HANDLE_VALUE)
         FlushFileBuffers(_fd);
     return;
 }
@@ -125,7 +125,7 @@ void COMChannel::setBaudrate(uint32_t newBaud)
 {
     Debug_printf("UART set_baudrate: %d\n", newBaud);
 
-    if (_fd < 0 || newBaud == _baud)
+    if (_fd == INVALID_HANDLE_VALUE || newBaud == _baud)
         return;
 
     _baud = newBaud;