X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Flinux%2Fserialport.cpp;h=3a274fec12f35f88e9f1ec3e07b439a324fa3aa7;hb=be5b0e24ecd0ab142b4a85197d10b07a57bf0e17;hp=d323708214c8b602a9edc1dd02f0ead087a3b635;hpb=9dee1670cb5167360026a910a33de46e811a8588;p=deb_libcec.git diff --git a/src/lib/platform/linux/serialport.cpp b/src/lib/platform/linux/serialport.cpp index d323708..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 @@ -46,7 +60,7 @@ CSerialPort::~CSerialPort() Close(); } -int8_t CSerialPort::Write(const cec_adapter_message &data) +int8_t CSerialPort::Write(CCECAdapterMessage *data) { fd_set port; @@ -59,7 +73,7 @@ int8_t CSerialPort::Write(const cec_adapter_message &data) int32_t byteswritten = 0; - while (byteswritten < (int32_t) data.size()) + while (byteswritten < (int32_t) data->size()) { FD_ZERO(&port); FD_SET(m_fd, &port); @@ -70,7 +84,7 @@ int8_t CSerialPort::Write(const cec_adapter_message &data) return -1; } - returnv = write(m_fd, data.packet.data + byteswritten, data.size() - byteswritten); + returnv = write(m_fd, data->packet.data + byteswritten, data->size() - byteswritten); if (returnv == -1) { m_error = strerror(errno);