* http://www.pulse-eight.net/
*/
-#include "../os.h"
+#include "env.h"
#include <stdio.h>
#include <fcntl.h>
-#include "../sockets/serialport.h"
-#include "../util/baudrate.h"
-#include "../posix/os-socket.h"
+#include "lib/platform/sockets/serialport.h"
+#include "lib/platform/util/baudrate.h"
+#include "lib/platform/posix/os-socket.h"
#if defined(__APPLE__) || defined(__FreeBSD__)
#ifndef XCASE
using namespace std;
using namespace PLATFORM;
+inline bool RemoveLock(const char *strDeviceName)
+{
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ return dev_unlock(strDeviceName, 0) == 0;
+ #else
+ void *tmp = (void*)strDeviceName; // silence unused warning
+ tmp = NULL;
+ return true;
+ #endif
+}
+
void CSerialSocket::Close(void)
{
if (IsOpen())
{
SocketClose(m_socket);
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
- dev_unlock(m_strName.c_str(), m_lockPid);
- #endif
+ RemoveLock(m_strName.c_str());
}
}
if (IsOpen())
{
SocketClose(m_socket);
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
- dev_unlock(m_strName.c_str(), m_lockPid);
- #endif
+ RemoveLock(m_strName.c_str());
}
}
//setting all this stuff up is a pain in the ass
bool CSerialSocket::Open(uint64_t iTimeoutMs /* = 0 */)
{
- iTimeoutMs = 0;
+ iTimeoutMs = 0; if (!iTimeoutMs){} // silence unused warning
if (IsOpen())
{
m_iError = EINVAL;
}
#if !defined(__APPLE__) && !defined(__FreeBSD__)
- m_lockPid = dev_lock(m_strName.c_str());
- if (m_lockPid != 0)
+ if (dev_lock(m_strName.c_str()) != 0)
{
m_strError = "Couldn't lock the serial port";
m_iError = EBUSY;
if (m_socket == INVALID_SERIAL_SOCKET_VALUE)
{
m_strError = strerror(errno);
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
- m_lockPid = dev_unlock(m_strName.c_str(), m_lockPid);
- #endif
+ RemoveLock(m_strName.c_str());
return false;
}
if (tcsetattr(m_socket, TCSANOW, &m_options) != 0)
{
m_strError = strerror(errno);
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
- m_lockPid = dev_unlock(m_strName.c_str(), m_lockPid);
- #endif
+ RemoveLock(m_strName.c_str());
return false;
}