X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fplatform%2Flinux%2Fserialport.cpp;h=3a274fec12f35f88e9f1ec3e07b439a324fa3aa7;hb=be5b0e24ecd0ab142b4a85197d10b07a57bf0e17;hp=e8fb8e5b411f52c34fbe82066b7800256bc89124;hpb=7eb13cca43e722f2bfd20064daf580ea65411cf5;p=deb_libcec.git
diff --git a/src/lib/platform/linux/serialport.cpp b/src/lib/platform/linux/serialport.cpp
index e8fb8e5..3a274fe 100644
--- a/src/lib/platform/linux/serialport.cpp
+++ b/src/lib/platform/linux/serialport.cpp
@@ -1,19 +1,33 @@
/*
- * boblight
- * Copyright (C) Bob 2009
- *
- * boblight is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * This file is part of the libCEC(R) library.
+ *
+ * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is an original work, containing original code.
+ *
+ * libCEC(R) is a trademark of Pulse-Eight Limited.
+ *
+ * This program is dual-licensed; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
- * boblight is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see .
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * Alternatively, you can license this library under a commercial license,
+ * please contact Pulse-Eight Licensing for more information.
+ *
+ * For more information contact:
+ * Pulse-Eight Licensing
+ * http://www.pulse-eight.com/
+ * http://www.pulse-eight.net/
*/
#include
@@ -22,6 +36,17 @@
#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;
@@ -35,7 +60,7 @@ CSerialPort::~CSerialPort()
Close();
}
-int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
+int8_t CSerialPort::Write(CCECAdapterMessage *data)
{
fd_set port;
@@ -48,7 +73,7 @@ int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
int32_t byteswritten = 0;
- while (byteswritten < (int32_t) len)
+ while (byteswritten < (int32_t) data->size())
{
FD_ZERO(&port);
FD_SET(m_fd, &port);
@@ -59,7 +84,7 @@ int32_t CSerialPort::Write(uint8_t* data, uint32_t len)
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);
@@ -74,7 +99,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("\n");
// }