repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[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 de60da6e5f43ae58c58c89690d38eb4b6e4a4572..56bdc3070fc8fa6603a0f85317d35ca03c611f19 100644
(file)
--- a/
src/lib/platform/linux/serialport.cpp
+++ b/
src/lib/platform/linux/serialport.cpp
@@
-46,7
+46,7
@@
CSerialPort::~CSerialPort()
Close();
}
Close();
}
-int8_t CSerialPort::Write(
const cec_frame &
data)
+int8_t CSerialPort::Write(
CCECAdapterMessage *
data)
{
fd_set port;
{
fd_set port;
@@
-59,7
+59,7
@@
int8_t CSerialPort::Write(const cec_frame &data)
int32_t byteswritten = 0;
int32_t byteswritten = 0;
- while (byteswritten < (int32_t) data
.size
)
+ while (byteswritten < (int32_t) data
->size()
)
{
FD_ZERO(&port);
FD_SET(m_fd, &port);
{
FD_ZERO(&port);
FD_SET(m_fd, &port);
@@
-70,7
+70,7
@@
int8_t CSerialPort::Write(const cec_frame &data)
return -1;
}
return -1;
}
- returnv = write(m_fd, data
.data + byteswritten, data.size
- 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);
@@
-84,7
+84,7
@@
int8_t CSerialPort::Write(const cec_frame &data)
// {
// printf("%s write:", m_name.c_str());
// for (int i = 0; i < byteswritten; i++)
// {
// printf("%s write:", m_name.c_str());
// for (int i = 0; i < byteswritten; i++)
-// printf(" %02x", (unsigned int)data
.data
[i]);
+// printf(" %02x", (unsigned int)data[i]);
//
// printf("\n");
// }
//
// printf("\n");
// }