repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32: don't include the .pdb in the installer. only include include/cec*
[deb_libcec.git]
/
src
/
lib
/
platform
/
linux
/
serialport.cpp
diff --git
a/src/lib/platform/linux/serialport.cpp
b/src/lib/platform/linux/serialport.cpp
index e8fb8e5b411f52c34fbe82066b7800256bc89124..e362396e6cd471d41d4d562658fbc8adc5c54ec0 100644
(file)
--- a/
src/lib/platform/linux/serialport.cpp
+++ b/
src/lib/platform/linux/serialport.cpp
@@
-22,6
+22,17
@@
#include "../baudrate.h"
#include "../timeutils.h"
#include "../baudrate.h"
#include "../timeutils.h"
+#if defined(__APPLE__)
+#ifndef XCASE
+#define XCASE 0
+#endif
+#ifndef OLCUC
+#define OLCUC 0
+#endif
+#ifndef IUCLC
+#define IUCLC 0
+#endif
+#endif
using namespace std;
using namespace CEC;
using namespace std;
using namespace CEC;
@@
-35,7
+46,7
@@
CSerialPort::~CSerialPort()
Close();
}
Close();
}
-int
32_t CSerialPort::Write(uint8_t* data, uint32_t len
)
+int
8_t CSerialPort::Write(CCECAdapterMessagePtr data
)
{
fd_set port;
{
fd_set port;
@@
-48,7
+59,7
@@
int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
int32_t byteswritten = 0;
int32_t byteswritten = 0;
- while (byteswritten < (int32_t)
len
)
+ while (byteswritten < (int32_t)
data->size()
)
{
FD_ZERO(&port);
FD_SET(m_fd, &port);
{
FD_ZERO(&port);
FD_SET(m_fd, &port);
@@
-59,7
+70,7
@@
int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
return -1;
}
return -1;
}
- returnv = write(m_fd, data
+ byteswritten, len
- byteswritten);
+ returnv = write(m_fd, data
->packet.data + byteswritten, data->size()
- byteswritten);
if (returnv == -1)
{
m_error = strerror(errno);
if (returnv == -1)
{
m_error = strerror(errno);
@@
-74,7
+85,7
@@
int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
// printf("%s write:", m_name.c_str());
// for (int i = 0; i < byteswritten; i++)
// printf(" %02x", (unsigned int)data[i]);
// printf("%s write:", m_name.c_str());
// for (int i = 0; i < byteswritten; i++)
// printf(" %02x", (unsigned int)data[i]);
-
+//
// printf("\n");
// }
// printf("\n");
// }