* http://www.pulse-eight.net/
*/
-#include "../serialport.h"
-#include "../baudrate.h"
+#include "../serialport/serialport.h"
+#include "../serialport/baudrate.h"
#include "../timeutils.h"
using namespace std;
-using namespace CEC;
+using namespace PLATFORM;
void FormatWindowsError(int iErrorCode, string &strMessage)
{
bool CSerialPort::Open(string name, uint32_t baudrate, uint8_t databits, uint8_t stopbits, uint8_t parity)
{
- CLockObject lock(&m_mutex);
- m_handle = CreateFile(name.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+ CStdString strComPath = "\\\\.\\" + name;
+ CLockObject lock(m_mutex);
+ m_handle = CreateFile(strComPath.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
if (m_handle == INVALID_HANDLE_VALUE)
{
m_error = "Unable to open COM port";
COMMCONFIG commConfig = {0};
DWORD dwSize = sizeof(commConfig);
commConfig.dwSize = dwSize;
- if (GetDefaultCommConfig(name.c_str(), &commConfig,&dwSize))
+ if (GetDefaultCommConfig(strComPath.c_str(), &commConfig,&dwSize))
{
if (!SetCommConfig(m_handle, &commConfig,dwSize))
{
void CSerialPort::Close(void)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_bIsOpen)
{
CloseHandle(m_handle);
}
}
-int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
+int64_t CSerialPort::Write(uint8_t* data, uint32_t len)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
DWORD iBytesWritten = 0;
if (!m_bIsOpen)
return -1;
return -1;
}
- return iBytesWritten;
+ return (int64_t)iBytesWritten;
}
int32_t CSerialPort::Read(uint8_t* data, uint32_t len, uint64_t iTimeoutMs /* = 0 */)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
int32_t iReturn(-1);
DWORD iBytesRead = 0;
if (m_handle == 0)
bool CSerialPort::IsOpen()
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
return m_bIsOpen;
}