diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 9805f89918b..e517dacc998 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -17,12 +17,20 @@ ################################################################################ PKG_NAME="libcec" -PKG_VERSION="2.2.0" +case "$KODIPLAYER_DRIVER" in + libfslvpuwrap) + PKG_VERSION="2.1.4" + PKG_URL="http://packages.pulse-eight.net/pulse/sources/libcec/$PKG_NAME-$PKG_VERSION.tar.gz" + ;; + *) + PKG_VERSION="2.2.0" + PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz" + ;; +esac PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://libcec.pulse-eight.com/" -PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz" PKG_DEPENDS_TARGET="toolchain systemd lockdev" PKG_PRIORITY="optional" PKG_SECTION="system" diff --git a/packages/devel/libcec/patches/libcec-mk01-imx6-supprt.patch b/projects/imx6/patches/libcec/libcec-mk01-imx6-support.patch similarity index 50% rename from packages/devel/libcec/patches/libcec-mk01-imx6-supprt.patch rename to projects/imx6/patches/libcec/libcec-mk01-imx6-support.patch index ebb78de8d4b..18d98ed9155 100644 --- a/packages/devel/libcec/patches/libcec-mk01-imx6-supprt.patch +++ b/projects/imx6/patches/libcec/libcec-mk01-imx6-support.patch @@ -1,7 +1,34 @@ -diff -Naur libcec-2.2-8d84f8b/configure.ac libcec-2.2-8d84f8b.patch/configure.ac ---- libcec-2.2-8d84f8b/configure.ac 2014-10-27 12:55:30.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/configure.ac 2014-10-27 13:11:03.726445999 +0100 -@@ -100,6 +100,14 @@ +From 36a63772ea697682613b71e8b578fe005e309d68 Mon Sep 17 00:00:00 2001 +From: wolfgar +Date: Sat, 28 Sep 2013 13:31:13 +0200 +Subject: [PATCH 1/2] Early support for i.MX6 + +Fix compiler warning (or even error depending on fpermissive flag) + +Fix adapter thanks to geexbox and rudi (0003-fix-adapter-factory.patch) +--- + configure.ac | 19 ++ + include/cectypes.h | 14 +- + src/lib/CECTypeUtils.h | 2 + + src/lib/Makefile.am | 5 + + src/lib/adapter/AdapterFactory.cpp | 29 ++- + src/lib/adapter/IMX/AdapterMessageQueue.h | 134 ++++++++++ + src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp | 279 +++++++++++++++++++++ + src/lib/adapter/IMX/IMXCECAdapterCommunication.h | 114 +++++++++ + src/lib/adapter/IMX/IMXCECAdapterDetection.cpp | 42 ++++ + src/lib/adapter/IMX/IMXCECAdapterDetection.h | 36 +++ + 10 files changed, 671 insertions(+), 3 deletions(-) + create mode 100644 src/lib/adapter/IMX/AdapterMessageQueue.h + create mode 100644 src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + create mode 100644 src/lib/adapter/IMX/IMXCECAdapterCommunication.h + create mode 100644 src/lib/adapter/IMX/IMXCECAdapterDetection.cpp + create mode 100644 src/lib/adapter/IMX/IMXCECAdapterDetection.h + +diff --git a/configure.ac b/configure.ac +index 510d851..923d7e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -93,6 +93,14 @@ if test "x$use_rpi" != "xno"; then esac fi @@ -16,10 +43,10 @@ diff -Naur libcec-2.2-8d84f8b/configure.ac libcec-2.2-8d84f8b.patch/configure.ac ## add the top dir and include to the include path, so we can include config.h and cec.h CPPFLAGS="$CPPFLAGS -I\$(abs_top_srcdir)/src -I\$(abs_top_srcdir)/include" -@@ -305,6 +313,17 @@ +@@ -270,6 +278,17 @@ else + features="$features\n TDA995x support :\t\t\tno" fi - +## mark i.MX6 support as available +if test "x$use_imx6" != "xno"; then + AC_DEFINE([HAVE_IMX_API],[1],[Define to 1 to include i.MX6 support]) @@ -34,11 +61,12 @@ diff -Naur libcec-2.2-8d84f8b/configure.ac libcec-2.2-8d84f8b.patch/configure.ac ## check if our build system is complete AC_CHECK_HEADER(algorithm,,AC_MSG_ERROR($msg_required_header_missing)) AC_CHECK_HEADER(ctype.h,,AC_MSG_ERROR($msg_required_header_missing)) -diff -Naur libcec-2.2-8d84f8b/include/cectypes.h libcec-2.2-8d84f8b.patch/include/cectypes.h ---- libcec-2.2-8d84f8b/include/cectypes.h 2014-10-27 12:55:30.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/include/cectypes.h 2014-10-27 13:12:22.785470074 +0100 -@@ -306,6 +306,17 @@ - #define CEC_EXYNOS_VIRTUAL_COM "Exynos" +diff --git a/include/cectypes.h b/include/cectypes.h +index 9f86253..7fabf00 100644 +--- a/include/cectypes.h ++++ b/include/cectypes.h +@@ -295,6 +295,17 @@ namespace CEC { + #define CEC_TDA995x_VIRTUAL_COM "CuBox" /*! + * the path to use for the i.MX CEC wire @@ -55,21 +83,50 @@ diff -Naur libcec-2.2-8d84f8b/include/cectypes.h libcec-2.2-8d84f8b.patch/includ * Mimimum client version */ #define CEC_MIN_LIB_VERSION 2 -@@ -887,7 +898,8 @@ +@@ -858,7 +869,8 @@ typedef enum cec_adapter_type + ADAPTERTYPE_P8_EXTERNAL = 0x1, ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2, ADAPTERTYPE_RPI = 0x100, - ADAPTERTYPE_TDA995x = 0x200, -- ADAPTERTYPE_EXYNOS = 0x300 -+ ADAPTERTYPE_EXYNOS = 0x300, -+ ADAPTERTYPE_IMX = 0x400 +- ADAPTERTYPE_TDA995x = 0x200 ++ ADAPTERTYPE_TDA995x = 0x200, ++ ADAPTERTYPE_IMX = 0x300, } cec_adapter_type; typedef struct cec_menu_language -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/AdapterFactory.cpp libcec-2.2-8d84f8b.patch/src/lib/adapter/AdapterFactory.cpp ---- libcec-2.2-8d84f8b/src/lib/adapter/AdapterFactory.cpp 2014-10-27 12:55:30.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/AdapterFactory.cpp 2014-10-27 13:16:07.856765188 +0100 -@@ -57,6 +57,11 @@ - #include "Exynos/ExynosCECAdapterCommunication.h" +diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h +index dc4e5f1..1cf7ef1 100644 +--- a/src/lib/CECTypeUtils.h ++++ b/src/lib/CECTypeUtils.h +@@ -858,6 +858,8 @@ namespace CEC + return "Raspberry Pi"; + case ADAPTERTYPE_TDA995x: + return "TDA995x"; ++ case ADAPTERTYPE_IMX: ++ return "i.MX"; + default: + return "unknown"; + } +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 9117d8e..6788303 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -59,5 +59,10 @@ libcec_la_SOURCES += adapter/TDA995x/TDA995xCECAdapterDetection.cpp \ + adapter/TDA995x/TDA995xCECAdapterCommunication.cpp + endif + ++## i.MX6 support ++if USE_IMX_API ++libcec_la_SOURCES += adapter/IMX/IMXCECAdapterDetection.cpp \ ++ adapter/IMX/IMXCECAdapterCommunication.cpp ++endif + + libcec_la_LDFLAGS = @LIBS_LIBCEC@ -version-info @VERSION@ +diff --git a/src/lib/adapter/AdapterFactory.cpp b/src/lib/adapter/AdapterFactory.cpp +index 42cdd0b..576589f 100644 +--- a/src/lib/adapter/AdapterFactory.cpp ++++ b/src/lib/adapter/AdapterFactory.cpp +@@ -52,6 +52,11 @@ + #include "TDA995x/TDA995xCECAdapterCommunication.h" #endif +#if defined(HAVE_IMX_API) @@ -80,10 +137,10 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/AdapterFactory.cpp libcec-2.2-8d84 using namespace std; using namespace CEC; -@@ -127,7 +132,22 @@ +@@ -109,7 +114,22 @@ int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8 + } #endif - -#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) + +#if defined(HAVE_IMX_API) @@ -104,24 +161,170 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/AdapterFactory.cpp libcec-2.2-8d84 #error "libCEC doesn't have support for any type of adapter. please check your build system or configuration" #endif -@@ -155,7 +175,12 @@ - return new CUSBCECAdapterCommunication(m_lib->m_cec, strPort, iBaudRate); +@@ -128,11 +148,16 @@ IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_ + return new CRPiCECAdapterCommunication(m_lib->m_cec); #endif --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_EXYNOS_API) +#if defined(HAVE_IMX_API) + if (!strcmp(strPort, CEC_IMX_VIRTUAL_COM)) + return new CIMXCECAdapterCommunication(m_lib->m_cec); +#endif + -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_EXYNOS_API) && !defined(HAVE_IMX_API) + #if defined(HAVE_P8_USB) + return new CUSBCECAdapterCommunication(m_lib->m_cec, strPort, iBaudRate); + #endif + +-#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) ++#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_IMX_API) return NULL; #endif } -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp ---- libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp 2014-10-27 13:11:03.735446822 +0100 -@@ -0,0 +1,367 @@ +diff --git a/src/lib/adapter/IMX/AdapterMessageQueue.h b/src/lib/adapter/IMX/AdapterMessageQueue.h +new file mode 100644 +index 0000000..c8bcf71 +--- /dev/null ++++ b/src/lib/adapter/IMX/AdapterMessageQueue.h +@@ -0,0 +1,134 @@ ++#pragma once ++/* ++ * This file is part of the libCEC(R) library. ++ * ++ * libCEC(R) is Copyright (C) 2011-2013 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. ++ * ++ * 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 "lib/platform/threads/mutex.h" ++ ++namespace CEC ++{ ++ using namespace PLATFORM; ++ ++ class CAdapterMessageQueueEntry ++ { ++ public: ++ CAdapterMessageQueueEntry(const cec_command &command) ++ : m_bWaiting(true), m_retval((uint32_t)-1), m_bSucceeded(false) ++ { ++ m_hash = hashValue( ++ uint32_t(command.opcode_set ? command.opcode : CEC_OPCODE_NONE), ++ command.initiator, command.destination); ++ } ++ ++ virtual ~CAdapterMessageQueueEntry(void) {} ++ ++ /*! ++ * @brief Query result from worker thread ++ */ ++ uint32_t Result() const ++ { ++ return m_retval; ++ } ++ ++ /*! ++ * @brief Signal waiting threads ++ */ ++ void Broadcast(void) ++ { ++ CLockObject lock(m_mutex); ++ m_condition.Broadcast(); ++ } ++ ++ /*! ++ * @brief Signal waiting thread(s) when message matches this entry ++ */ ++ bool CheckMatch(uint32_t opcode, cec_logical_address initiator, ++ cec_logical_address destination, uint32_t response) ++ { ++ uint32_t hash = hashValue(opcode, initiator, destination); ++ ++ if (hash == m_hash) ++ { ++ CLockObject lock(m_mutex); ++ ++ m_retval = response; ++ m_bSucceeded = true; ++ m_condition.Signal(); ++ return true; ++ } ++ ++ return false; ++ } ++ ++ /*! ++ * @brief Wait for a response to this command. ++ * @param iTimeout The timeout to use while waiting. ++ * @return True when a response was received before the timeout passed, false otherwise. ++ */ ++ bool Wait(uint32_t iTimeout) ++ { ++ CLockObject lock(m_mutex); ++ ++ bool bReturn = m_bSucceeded ? true : m_condition.Wait(m_mutex, m_bSucceeded, iTimeout); ++ m_bWaiting = false; ++ return bReturn; ++ } ++ ++ /*! ++ * @return True while a thread is waiting for a signal or isn't waiting yet, false otherwise. ++ */ ++ bool IsWaiting(void) ++ { ++ CLockObject lock(m_mutex); ++ return m_bWaiting; ++ } ++ ++ /*! ++ * @return Hash value for given cec_command ++ */ ++ static uint32_t hashValue(uint32_t opcode, ++ cec_logical_address initiator, ++ cec_logical_address destination) ++ { ++ return 1 | ((uint32_t)initiator << 8) | ++ ((uint32_t)destination << 16) | ((uint32_t)opcode << 16); ++ } ++ ++ private: ++ bool m_bWaiting; /**< true while a thread is waiting or when it hasn't started waiting yet */ ++ PLATFORM::CCondition m_condition; /**< the condition to wait on */ ++ PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */ ++ uint32_t m_hash; ++ uint32_t m_retval; ++ bool m_bSucceeded; ++ }; ++ ++}; +diff --git a/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp +new file mode 100644 +index 0000000..54e5662 +--- /dev/null ++++ b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp +@@ -0,0 +1,279 @@ +/* + * This file is part of the libCEC(R) library. + * @@ -131,7 +334,6 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + * libCEC(R) is a trademark of Pulse-Eight Limited. + * + * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * Copyright (C) 2014 by Matus Kral + * + * You can redistribute this file and/or modify + * it under the terms of the GNU General Public License as published by @@ -159,12 +361,37 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp +#include "lib/LibCEC.h" +#include "lib/platform/sockets/cdevsocket.h" +#include "lib/platform/util/StdString.h" ++#include "lib/platform/util/buffer.h" ++ ++/* ++ * Ioctl definitions from kernel header ++ */ ++#define HDMICEC_IOC_MAGIC 'H' ++#define HDMICEC_IOC_SETLOGICALADDRESS _IOW(HDMICEC_IOC_MAGIC, 1, unsigned char) ++#define HDMICEC_IOC_STARTDEVICE _IO(HDMICEC_IOC_MAGIC, 2) ++#define HDMICEC_IOC_STOPDEVICE _IO(HDMICEC_IOC_MAGIC, 3) ++#define HDMICEC_IOC_GETPHYADDRESS _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4]) ++ ++#define MAX_CEC_MESSAGE_LEN 17 ++ ++#define MESSAGE_TYPE_RECEIVE_SUCCESS 1 ++#define MESSAGE_TYPE_NOACK 2 ++#define MESSAGE_TYPE_DISCONNECTED 3 ++#define MESSAGE_TYPE_CONNECTED 4 ++#define MESSAGE_TYPE_SEND_SUCCESS 5 ++ ++typedef struct hdmi_cec_event{ ++ int event_type; ++ int msg_len; ++ unsigned char msg[MAX_CEC_MESSAGE_LEN]; ++}hdmi_cec_event; ++ + +using namespace std; +using namespace CEC; +using namespace PLATFORM; + -+#include "IMXCECAdapterMessageQueue.h" ++#include "AdapterMessageQueue.h" + +#define LIB_CEC m_callback->GetLib() + @@ -178,15 +405,16 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp +#define CEC_MSG_FAIL_DEST_NOT_ACK 0x85 /*Message transmisson failed: Destination Address not aknowledged*/ +#define CEC_MSG_FAIL_DATA_NOT_ACK 0x86 /*Message transmisson failed: Databyte not acknowledged*/ + ++ +CIMXCECAdapterCommunication::CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback) : -+ IAdapterCommunication(callback) ++ IAdapterCommunication(callback)/*, ++ m_bLogicalAddressChanged(false)*/ +{ + CLockObject lock(m_mutex); + + m_iNextMessage = 0; -+ m_logicalAddress = CECDEVICE_UNKNOWN; -+ m_bLogicalAddressRegistered = false; -+ m_bInitialised = false; ++ //m_logicalAddresses.Clear(); ++ m_logicalAddress = CECDEVICE_UNKNOWN; + m_dev = new CCDevSocket(CEC_IMX_PATH); +} + @@ -209,12 +437,10 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + if (m_dev->Open(iTimeoutMs)) + { + if (!bStartListening || CreateThread()) { -+ if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) == 0) { -+ m_bInitialised = true; -+ RegisterLogicalAddress(CECDEVICE_BROADCAST); -+ return true; ++ if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) != 0) { ++ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); + } -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); ++ return true; + } + m_dev->Close(); + } @@ -225,16 +451,9 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + +void CIMXCECAdapterCommunication::Close(void) +{ -+ StopThread(-1); -+ if (m_bInitialised) -+ { -+ m_bInitialised = false; -+ UnregisterLogicalAddress(); -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); -+ } ++ StopThread(0); ++ if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) { ++ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); + } + m_dev->Close(); +} @@ -248,19 +467,17 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + + +cec_adapter_message_state CIMXCECAdapterCommunication::Write( -+ const cec_command &data, bool &bRetry, uint8_t iLineTimeout, bool UNUSED(bIsReply)) ++ const cec_command &data, bool &UNUSED(bRetry), uint8_t UNUSED(iLineTimeout), bool UNUSED(bIsReply)) +{ -+ unsigned char message[MAX_MESSAGE_LEN]; -+ CIMXCECAdapterMessageQueueEntry *entry; ++ //cec_frame frame; ++ unsigned char message[MAX_CEC_MESSAGE_LEN]; + int msg_len = 1; + cec_adapter_message_state rc = ADAPTER_MESSAGE_STATE_ERROR; + -+ bRetry = true; + if ((size_t)data.parameters.size + data.opcode_set + 1 > sizeof(message)) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: data size too large !", __func__); -+ bRetry = false; -+ return rc; ++ return ADAPTER_MESSAGE_STATE_ERROR; + } + + message[0] = (data.initiator << 4) | (data.destination & 0x0f); @@ -272,46 +489,12 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + msg_len+=data.parameters.size; + } + -+ entry = new CIMXCECAdapterMessageQueueEntry(message[0], data.opcode); -+ m_messageMutex.Lock(); -+ uint32_t msgKey = ++m_iNextMessage; -+ m_messages.insert(make_pair(msgKey, entry)); -+ m_messageMutex.Unlock(); -+ -+ if (m_dev->Write(message, msg_len) > 0) -+ { -+ if (entry->Wait(data.transmit_timeout ? data.transmit_timeout : iLineTimeout *1000)) -+ { -+ int status = entry->Result(); -+ -+ if (status == MESSAGE_TYPE_NOACK) -+ rc = ADAPTER_MESSAGE_STATE_SENT_NOT_ACKED; -+ else if (status == MESSAGE_TYPE_SEND_SUCCESS) -+ rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; -+ -+ bRetry = false; -+ } -+ else -+ { -+ rc = ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT; -+#ifdef CEC_DEBUGGING -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: command timed out !", __func__); -+#endif -+ } -+ } -+ else ++ if (m_dev->Write(message, msg_len) == msg_len) + { -+ Sleep(CEC_DEFAULT_TRANSMIT_RETRY_WAIT); -+#ifdef CEC_DEBUGGING -+ LIB_CEC->AddLog(CEC_LOG_WARNING, "%s: write failed !", __func__); -+#endif ++ rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; + } -+ -+ m_messageMutex.Lock(); -+ m_messages.erase(msgKey); -+ m_messageMutex.Unlock(); -+ -+ delete entry; ++ else ++ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: sent command error !", __func__); + + return rc; +} @@ -332,16 +515,15 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + +uint16_t CIMXCECAdapterCommunication::GetPhysicalAddress(void) +{ -+ uint8_t phy_addr[4]; ++ uint32_t info; + -+ if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &phy_addr) != 0) ++ if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &info) != 0) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_GETPHYADDRESS failed !", __func__); + return CEC_INVALID_PHYSICAL_ADDRESS; + } + -+ m_physicalAddress = ((phy_addr[0] << 4 | phy_addr[1]) << 8) | (phy_addr[2] << 4 | phy_addr[3]); -+ return m_physicalAddress; ++ return info; +} + + @@ -351,148 +533,83 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp + addresses.Clear(); + + CLockObject lock(m_mutex); -+ if (m_bLogicalAddressRegistered) ++ if ( m_logicalAddress != CECDEVICE_UNKNOWN) + addresses.Set(m_logicalAddress); + + return addresses; +} + -+void CIMXCECAdapterCommunication::HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)) -+{ -+ UnregisterLogicalAddress(); -+} + -+bool CIMXCECAdapterCommunication::UnregisterLogicalAddress(void) ++bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) +{ -+ { -+ CLockObject lock(m_mutex); -+ if (!m_bLogicalAddressRegistered) ++ int log_addr = addresses.primary; ++ ++ CLockObject lock(m_mutex); ++ if (m_logicalAddress == log_addr) + return true; -+ } + -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)CECDEVICE_BROADCAST) != 0) ++ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)log_addr) != 0) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); + return false; + } + -+#ifdef CEC_DEBUGGING -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s - releasing previous logical address", __func__); -+#endif -+ m_bLogicalAddressRegistered = false; ++ m_logicalAddress = (cec_logical_address)log_addr; + return true; +} + -+bool CIMXCECAdapterCommunication::RegisterLogicalAddress(const cec_logical_address address) ++ ++void *CIMXCECAdapterCommunication::Process(void) +{ ++ bool bHandled; ++ hdmi_cec_event event; ++ int ret; ++ ++ uint32_t opcode, status; ++ cec_logical_address initiator, destination; ++ ++ while (!IsStopped()) + { -+ CLockObject lock(m_mutex); -+ if (m_logicalAddress == address && m_bLogicalAddressRegistered) -+ { -+ return true; -+ } -+ } -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)address) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); -+ return false; -+ } -+ -+ CLockObject lock(m_mutex); -+ -+#ifdef CEC_DEBUGGING -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: %x to %x", __func__, m_logicalAddress, address); -+#endif -+ -+ m_logicalAddress = address; -+ m_bLogicalAddressRegistered = (address != CECDEVICE_BROADCAST) ? true : false; -+ return true; -+} -+ -+bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) -+{ -+ int log_addr = addresses.primary; -+ -+ return RegisterLogicalAddress((cec_logical_address)log_addr); -+} -+ -+ -+void *CIMXCECAdapterCommunication::Process(void) -+{ -+ bool bHandled; -+ hdmi_cec_event event; -+ int ret; -+ -+ cec_logical_address initiator, destination; -+ -+ while (!IsStopped()) -+ { -+ if (IsInitialised() && (ret = m_dev->Read((char *)&event, sizeof(event), 5000)) > 0) ++ ret = m_dev->Read((char *)&event, sizeof(event), 5000); ++ if (ret > 0) + { + + initiator = cec_logical_address(event.msg[0] >> 4); + destination = cec_logical_address(event.msg[0] & 0x0f); + -+ if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) -+ { -+ cec_command cmd; -+ -+ cec_command::Format( -+ cmd, initiator, destination, -+ ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); -+ -+ for( uint8_t i = 2; i < event.msg_len; i++ ) -+ cmd.parameters.PushBack(event.msg[i]); ++ //LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read data : type : %d initiator %d dest %d", __func__, event.event_type, initiator, destination); ++ if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) ++ /* Message received */ ++ { ++ cec_command cmd; + -+ if (!IsStopped()) { -+ m_callback->OnCommandReceived(cmd); -+ } -+ } -+ else if (event.event_type == MESSAGE_TYPE_SEND_SUCCESS -+ || event.event_type == MESSAGE_TYPE_NOACK) -+ { -+ bHandled = false; ++ cec_command::Format( ++ cmd, initiator, destination, ++ ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); + -+ m_messageMutex.Lock(); -+ for (map::iterator it = m_messages.begin(); -+ !bHandled && it != m_messages.end(); it++) -+ { -+ bHandled = it->second->Received(event.event_type, event.msg[0], (cec_opcode)event.msg[1]); -+ } -+ m_messageMutex.Unlock(); ++ for( uint8_t i = 2; i < event.msg_len; i++ ) ++ cmd.parameters.PushBack(event.msg[i]); + -+ if (!bHandled) -+ LIB_CEC->AddLog(CEC_LOG_WARNING, "%s: response not matched !", __func__); -+ } -+ else if (event.event_type == MESSAGE_TYPE_DISCONNECTED) -+ { -+ /* HDMI Hotplug event - disconnect */ -+ } -+ else if (event.event_type == MESSAGE_TYPE_CONNECTED) -+ { -+ /* HDMI Hotplug event - connect */ -+ uint16_t oldAddress = m_physicalAddress; ++ if (!IsStopped()) ++ m_callback->OnCommandReceived(cmd); ++ } ++ /* We are not interested in other events */ ++ } /*else { ++ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read returned %d", __func__, ret); ++ }*/ + -+ if (oldAddress != GetPhysicalAddress()) -+ m_callback->HandlePhysicalAddressChanged(m_physicalAddress); -+#ifdef CEC_DEBUGGING -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: plugin event received", __func__); -+#endif -+ } -+ else -+ LIB_CEC->AddLog(CEC_LOG_WARNING, "%s: unhandled response received %d!", __func__, event.event_type); -+ } + } + + return 0; +} + +#endif // HAVE_IMX_API -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.h ---- libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.h 2014-10-27 13:11:03.736446898 +0100 -@@ -0,0 +1,126 @@ +diff --git a/src/lib/adapter/IMX/IMXCECAdapterCommunication.h b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h +new file mode 100644 +index 0000000..910dd39 +--- /dev/null ++++ b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h +@@ -0,0 +1,114 @@ +#pragma once +/* + * This file is part of the libCEC(R) library. @@ -503,7 +620,6 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h l + * libCEC(R) is a trademark of Pulse-Eight Limited. + * + * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * Copyright (C) 2014 by Matus Kral + * + * You can redistribute this file and/or modify + * it under the terms of the GNU General Public License as published by @@ -527,18 +643,12 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h l +#include "lib/platform/threads/mutex.h" +#include "lib/platform/threads/threads.h" +#include "lib/platform/sockets/socket.h" -+#include "lib/adapter/IMX/mxc_hdmi-cec.h" +#include "lib/adapter/AdapterCommunication.h" +#include + +#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/ +#define IMX_ADAPTER_PID 0x1001 + -+typedef struct hdmi_cec_event{ -+ int event_type; -+ int msg_len; -+ unsigned char msg[MAX_MESSAGE_LEN]; -+}hdmi_cec_event; + + +namespace PLATFORM @@ -546,9 +656,10 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h l + class CCDevSocket; +}; + ++ +namespace CEC +{ -+ class CIMXCECAdapterMessageQueueEntry; ++ class CAdapterMessageQueueEntry; + + class CIMXCECAdapterCommunication : public IAdapterCommunication, public PLATFORM::CThread + { @@ -582,7 +693,6 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h l + uint16_t GetPhysicalAddress(void); + bool SetControlledMode(bool UNUSED(controlled)) { return true; } + cec_vendor_id GetVendorId(void); -+ void HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)); + bool SupportsSourceLogicalAddress(const cec_logical_address address) { return address > CECDEVICE_TV && address <= CECDEVICE_BROADCAST; } + cec_adapter_type GetAdapterType(void) { return ADAPTERTYPE_IMX; } + uint16_t GetAdapterVendorId(void) const { return IMX_ADAPTER_VID; } @@ -596,32 +706,29 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h l + ///} + + private: -+ bool IsInitialised(void) { return m_bInitialised; }; -+ bool RegisterLogicalAddress(const cec_logical_address address); -+ bool UnregisterLogicalAddress(void); ++ bool IsInitialised(void) const { return m_dev != 0; }; + + std::string m_strError; /**< current error message */ + ++ //cec_logical_addresses m_logicalAddresses; + cec_logical_address m_logicalAddress; -+ uint16_t m_physicalAddress; + + PLATFORM::CMutex m_mutex; + PLATFORM::CCDevSocket *m_dev; /**< the device connection */ + + PLATFORM::CMutex m_messageMutex; + uint32_t m_iNextMessage; -+ std::map m_messages; -+ -+ bool m_bLogicalAddressRegistered; -+ bool m_bInitialised; ++ std::map m_messages; + }; + +}; + +#endif -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp ---- libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp 2014-10-27 13:11:03.733446659 +0100 +diff --git a/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp b/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp +new file mode 100644 +index 0000000..6c93c45 +--- /dev/null ++++ b/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp @@ -0,0 +1,42 @@ +/* + * This file is part of the libCEC(R) library. @@ -665,9 +772,11 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp lib +} + +#endif -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterDetection.h libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.h ---- libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterDetection.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.h 2014-10-27 13:11:03.734446742 +0100 +diff --git a/src/lib/adapter/IMX/IMXCECAdapterDetection.h b/src/lib/adapter/IMX/IMXCECAdapterDetection.h +new file mode 100644 +index 0000000..d54891d +--- /dev/null ++++ b/src/lib/adapter/IMX/IMXCECAdapterDetection.h @@ -0,0 +1,36 @@ +#pragma once +/* @@ -705,9 +814,620 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterDetection.h libce + static bool FindAdapter(void); + }; +} -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h ---- libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h 2014-10-27 13:11:03.736446898 +0100 + +From b15d8de0993286abc2551b2d7d66b7f1f193c044 Mon Sep 17 00:00:00 2001 +From: Matus Kral +Date: Wed, 10 Sep 2014 22:23:37 +0200 +Subject: [PATCH 2/2] update to IMX6 support + +--- + src/lib/adapter/IMX/AdapterMessageQueue.h | 134 ----------- + src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp | 246 ++++++++++++++------- + src/lib/adapter/IMX/IMXCECAdapterCommunication.h | 22 +- + src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h | 118 ++++++++++ + src/lib/adapter/IMX/mxc_hdmi-cec.h | 47 ++++ + 5 files changed, 349 insertions(+), 218 deletions(-) + delete mode 100644 src/lib/adapter/IMX/AdapterMessageQueue.h + create mode 100644 src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h + create mode 100644 src/lib/adapter/IMX/mxc_hdmi-cec.h + +diff --git a/src/lib/adapter/IMX/AdapterMessageQueue.h b/src/lib/adapter/IMX/AdapterMessageQueue.h +deleted file mode 100644 +index c8bcf71..0000000 +--- a/src/lib/adapter/IMX/AdapterMessageQueue.h ++++ /dev/null +@@ -1,134 +0,0 @@ +-#pragma once +-/* +- * This file is part of the libCEC(R) library. +- * +- * libCEC(R) is Copyright (C) 2011-2013 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. +- * +- * 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 "lib/platform/threads/mutex.h" +- +-namespace CEC +-{ +- using namespace PLATFORM; +- +- class CAdapterMessageQueueEntry +- { +- public: +- CAdapterMessageQueueEntry(const cec_command &command) +- : m_bWaiting(true), m_retval((uint32_t)-1), m_bSucceeded(false) +- { +- m_hash = hashValue( +- uint32_t(command.opcode_set ? command.opcode : CEC_OPCODE_NONE), +- command.initiator, command.destination); +- } +- +- virtual ~CAdapterMessageQueueEntry(void) {} +- +- /*! +- * @brief Query result from worker thread +- */ +- uint32_t Result() const +- { +- return m_retval; +- } +- +- /*! +- * @brief Signal waiting threads +- */ +- void Broadcast(void) +- { +- CLockObject lock(m_mutex); +- m_condition.Broadcast(); +- } +- +- /*! +- * @brief Signal waiting thread(s) when message matches this entry +- */ +- bool CheckMatch(uint32_t opcode, cec_logical_address initiator, +- cec_logical_address destination, uint32_t response) +- { +- uint32_t hash = hashValue(opcode, initiator, destination); +- +- if (hash == m_hash) +- { +- CLockObject lock(m_mutex); +- +- m_retval = response; +- m_bSucceeded = true; +- m_condition.Signal(); +- return true; +- } +- +- return false; +- } +- +- /*! +- * @brief Wait for a response to this command. +- * @param iTimeout The timeout to use while waiting. +- * @return True when a response was received before the timeout passed, false otherwise. +- */ +- bool Wait(uint32_t iTimeout) +- { +- CLockObject lock(m_mutex); +- +- bool bReturn = m_bSucceeded ? true : m_condition.Wait(m_mutex, m_bSucceeded, iTimeout); +- m_bWaiting = false; +- return bReturn; +- } +- +- /*! +- * @return True while a thread is waiting for a signal or isn't waiting yet, false otherwise. +- */ +- bool IsWaiting(void) +- { +- CLockObject lock(m_mutex); +- return m_bWaiting; +- } +- +- /*! +- * @return Hash value for given cec_command +- */ +- static uint32_t hashValue(uint32_t opcode, +- cec_logical_address initiator, +- cec_logical_address destination) +- { +- return 1 | ((uint32_t)initiator << 8) | +- ((uint32_t)destination << 16) | ((uint32_t)opcode << 16); +- } +- +- private: +- bool m_bWaiting; /**< true while a thread is waiting or when it hasn't started waiting yet */ +- PLATFORM::CCondition m_condition; /**< the condition to wait on */ +- PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */ +- uint32_t m_hash; +- uint32_t m_retval; +- bool m_bSucceeded; +- }; +- +-}; +diff --git a/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp +index 54e5662..8467ba7 100644 +--- a/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp ++++ b/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp +@@ -7,6 +7,7 @@ + * libCEC(R) is a trademark of Pulse-Eight Limited. + * + * IMX adpater port is Copyright (C) 2013 by Stephan Rafin ++ * Copyright (C) 2014 by Matus Kral + * + * You can redistribute this file and/or modify + * it under the terms of the GNU General Public License as published by +@@ -34,37 +35,12 @@ + #include "lib/LibCEC.h" + #include "lib/platform/sockets/cdevsocket.h" + #include "lib/platform/util/StdString.h" +-#include "lib/platform/util/buffer.h" +- +-/* +- * Ioctl definitions from kernel header +- */ +-#define HDMICEC_IOC_MAGIC 'H' +-#define HDMICEC_IOC_SETLOGICALADDRESS _IOW(HDMICEC_IOC_MAGIC, 1, unsigned char) +-#define HDMICEC_IOC_STARTDEVICE _IO(HDMICEC_IOC_MAGIC, 2) +-#define HDMICEC_IOC_STOPDEVICE _IO(HDMICEC_IOC_MAGIC, 3) +-#define HDMICEC_IOC_GETPHYADDRESS _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4]) +- +-#define MAX_CEC_MESSAGE_LEN 17 +- +-#define MESSAGE_TYPE_RECEIVE_SUCCESS 1 +-#define MESSAGE_TYPE_NOACK 2 +-#define MESSAGE_TYPE_DISCONNECTED 3 +-#define MESSAGE_TYPE_CONNECTED 4 +-#define MESSAGE_TYPE_SEND_SUCCESS 5 +- +-typedef struct hdmi_cec_event{ +- int event_type; +- int msg_len; +- unsigned char msg[MAX_CEC_MESSAGE_LEN]; +-}hdmi_cec_event; +- + + using namespace std; + using namespace CEC; + using namespace PLATFORM; + +-#include "AdapterMessageQueue.h" ++#include "IMXCECAdapterMessageQueue.h" + + #define LIB_CEC m_callback->GetLib() + +@@ -78,16 +54,15 @@ using namespace PLATFORM; + #define CEC_MSG_FAIL_DEST_NOT_ACK 0x85 /*Message transmisson failed: Destination Address not aknowledged*/ + #define CEC_MSG_FAIL_DATA_NOT_ACK 0x86 /*Message transmisson failed: Databyte not acknowledged*/ + +- + CIMXCECAdapterCommunication::CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback) : +- IAdapterCommunication(callback)/*, +- m_bLogicalAddressChanged(false)*/ ++ IAdapterCommunication(callback) + { + CLockObject lock(m_mutex); + + m_iNextMessage = 0; +- //m_logicalAddresses.Clear(); +- m_logicalAddress = CECDEVICE_UNKNOWN; ++ m_logicalAddress = CECDEVICE_UNKNOWN; ++ m_bLogicalAddressRegistered = false; ++ m_bInitialised = false; + m_dev = new CCDevSocket(CEC_IMX_PATH); + } + +@@ -110,10 +85,12 @@ bool CIMXCECAdapterCommunication::Open(uint32_t iTimeoutMs, bool UNUSED(bSkipChe + if (m_dev->Open(iTimeoutMs)) + { + if (!bStartListening || CreateThread()) { +- if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) != 0) { +- LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); ++ if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) == 0) { ++ m_bInitialised = true; ++ RegisterLogicalAddress(CECDEVICE_BROADCAST); ++ return true; + } +- return true; ++ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); + } + m_dev->Close(); + } +@@ -124,9 +101,16 @@ bool CIMXCECAdapterCommunication::Open(uint32_t iTimeoutMs, bool UNUSED(bSkipChe + + void CIMXCECAdapterCommunication::Close(void) + { +- StopThread(0); +- if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) { +- LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); ++ StopThread(-1); ++ if (m_bInitialised) ++ { ++ m_bInitialised = false; ++ UnregisterLogicalAddress(); ++ ++ if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) ++ { ++ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); ++ } + } + m_dev->Close(); + } +@@ -140,17 +124,19 @@ std::string CIMXCECAdapterCommunication::GetError(void) const + + + cec_adapter_message_state CIMXCECAdapterCommunication::Write( +- const cec_command &data, bool &UNUSED(bRetry), uint8_t UNUSED(iLineTimeout), bool UNUSED(bIsReply)) ++ const cec_command &data, bool &bRetry, uint8_t iLineTimeout, bool UNUSED(bIsReply)) + { +- //cec_frame frame; +- unsigned char message[MAX_CEC_MESSAGE_LEN]; ++ unsigned char message[MAX_MESSAGE_LEN]; ++ CIMXCECAdapterMessageQueueEntry *entry; + int msg_len = 1; + cec_adapter_message_state rc = ADAPTER_MESSAGE_STATE_ERROR; + ++ bRetry = true; + if ((size_t)data.parameters.size + data.opcode_set + 1 > sizeof(message)) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: data size too large !", __func__); +- return ADAPTER_MESSAGE_STATE_ERROR; ++ bRetry = false; ++ return rc; + } + + message[0] = (data.initiator << 4) | (data.destination & 0x0f); +@@ -162,12 +148,46 @@ cec_adapter_message_state CIMXCECAdapterCommunication::Write( + msg_len+=data.parameters.size; + } + +- if (m_dev->Write(message, msg_len) == msg_len) ++ entry = new CIMXCECAdapterMessageQueueEntry(message[0], data.opcode); ++ m_messageMutex.Lock(); ++ uint32_t msgKey = ++m_iNextMessage; ++ m_messages.insert(make_pair(msgKey, entry)); ++ m_messageMutex.Unlock(); ++ ++ if (m_dev->Write(message, msg_len) > 0) ++ { ++ if (entry->Wait(data.transmit_timeout ? data.transmit_timeout : iLineTimeout *1000)) ++ { ++ int status = entry->Result(); ++ ++ if (status == MESSAGE_TYPE_NOACK) ++ rc = ADAPTER_MESSAGE_STATE_SENT_NOT_ACKED; ++ else if (status == MESSAGE_TYPE_SEND_SUCCESS) ++ rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; ++ ++ bRetry = false; ++ } ++ else ++ { ++ rc = ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT; ++#ifdef CEC_DEBUGGING ++ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: command timed out !", __func__); ++#endif ++ } ++ } ++ else + { +- rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; ++ Sleep(CEC_DEFAULT_TRANSMIT_RETRY_WAIT); ++#ifdef CEC_DEBUGGING ++ LIB_CEC->AddLog(CEC_LOG_WARNING, "%s: write failed !", __func__); ++#endif + } +- else +- LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: sent command error !", __func__); ++ ++ m_messageMutex.Lock(); ++ m_messages.erase(msgKey); ++ m_messageMutex.Unlock(); ++ ++ delete entry; + + return rc; + } +@@ -188,15 +208,16 @@ cec_vendor_id CIMXCECAdapterCommunication::GetVendorId(void) + + uint16_t CIMXCECAdapterCommunication::GetPhysicalAddress(void) + { +- uint32_t info; ++ uint8_t phy_addr[4]; + +- if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &info) != 0) ++ if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &phy_addr) != 0) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_GETPHYADDRESS failed !", __func__); + return CEC_INVALID_PHYSICAL_ADDRESS; + } + +- return info; ++ m_physicalAddress = ((phy_addr[0] << 4 | phy_addr[1]) << 8) | (phy_addr[2] << 4 | phy_addr[3]); ++ return m_physicalAddress; + } + + +@@ -206,31 +227,72 @@ cec_logical_addresses CIMXCECAdapterCommunication::GetLogicalAddresses(void) + addresses.Clear(); + + CLockObject lock(m_mutex); +- if ( m_logicalAddress != CECDEVICE_UNKNOWN) ++ if (m_bLogicalAddressRegistered) + addresses.Set(m_logicalAddress); + + return addresses; + } + ++void CIMXCECAdapterCommunication::HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)) ++{ ++ UnregisterLogicalAddress(); ++} + +-bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) ++bool CIMXCECAdapterCommunication::UnregisterLogicalAddress(void) + { +- int log_addr = addresses.primary; ++ { ++ CLockObject lock(m_mutex); ++ if (!m_bLogicalAddressRegistered) ++ return true; ++ } + +- CLockObject lock(m_mutex); +- if (m_logicalAddress == log_addr) ++ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)CECDEVICE_BROADCAST) != 0) ++ { ++ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); ++ return false; ++ } ++ ++#ifdef CEC_DEBUGGING ++ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s - releasing previous logical address", __func__); ++#endif ++ m_bLogicalAddressRegistered = false; ++ return true; ++} ++ ++bool CIMXCECAdapterCommunication::RegisterLogicalAddress(const cec_logical_address address) ++{ ++ { ++ CLockObject lock(m_mutex); ++ if (m_logicalAddress == address && m_bLogicalAddressRegistered) ++ { + return true; ++ } ++ } + +- if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)log_addr) != 0) ++ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)address) != 0) + { + LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); + return false; + } + +- m_logicalAddress = (cec_logical_address)log_addr; ++ CLockObject lock(m_mutex); ++ ++#ifdef CEC_DEBUGGING ++ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: %x to %x", __func__, m_logicalAddress, address); ++#endif ++ ++ m_logicalAddress = address; ++ m_bLogicalAddressRegistered = (address != CECDEVICE_BROADCAST) ? true : false; + return true; + } + ++bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) ++{ ++ int log_addr = addresses.primary; ++ ++ return RegisterLogicalAddress((cec_logical_address)log_addr); ++} ++ + + void *CIMXCECAdapterCommunication::Process(void) + { +@@ -238,39 +300,65 @@ void *CIMXCECAdapterCommunication::Process(void) + hdmi_cec_event event; + int ret; + +- uint32_t opcode, status; + cec_logical_address initiator, destination; + + while (!IsStopped()) + { +- ret = m_dev->Read((char *)&event, sizeof(event), 5000); +- if (ret > 0) ++ if (IsInitialised() && (ret = m_dev->Read((char *)&event, sizeof(event), 5000)) > 0) + { + + initiator = cec_logical_address(event.msg[0] >> 4); + destination = cec_logical_address(event.msg[0] & 0x0f); + +- //LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read data : type : %d initiator %d dest %d", __func__, event.event_type, initiator, destination); +- if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) +- /* Message received */ +- { +- cec_command cmd; +- +- cec_command::Format( +- cmd, initiator, destination, +- ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); +- +- for( uint8_t i = 2; i < event.msg_len; i++ ) +- cmd.parameters.PushBack(event.msg[i]); +- +- if (!IsStopped()) +- m_callback->OnCommandReceived(cmd); +- } +- /* We are not interested in other events */ +- } /*else { +- LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read returned %d", __func__, ret); +- }*/ +- ++ if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) ++ { ++ cec_command cmd; ++ ++ cec_command::Format( ++ cmd, initiator, destination, ++ ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); ++ ++ for( uint8_t i = 2; i < event.msg_len; i++ ) ++ cmd.parameters.PushBack(event.msg[i]); ++ ++ if (!IsStopped()) { ++ m_callback->OnCommandReceived(cmd); ++ } ++ } ++ else if (event.event_type == MESSAGE_TYPE_SEND_SUCCESS ++ || event.event_type == MESSAGE_TYPE_NOACK) ++ { ++ bHandled = false; ++ ++ m_messageMutex.Lock(); ++ for (map::iterator it = m_messages.begin(); ++ !bHandled && it != m_messages.end(); it++) ++ { ++ bHandled = it->second->Received(event.event_type, event.msg[0], (cec_opcode)event.msg[1]); ++ } ++ m_messageMutex.Unlock(); ++ ++ if (!bHandled) ++ LIB_CEC->AddLog(CEC_LOG_WARNING, "%s: response not matched !", __func__); ++ } ++ else if (event.event_type == MESSAGE_TYPE_DISCONNECTED) ++ { ++ /* HDMI Hotplug event - disconnect */ ++ } ++ else if (event.event_type == MESSAGE_TYPE_CONNECTED) ++ { ++ /* HDMI Hotplug event - connect */ ++ uint16_t oldAddress = m_physicalAddress; ++ ++ if (oldAddress != GetPhysicalAddress()) ++ m_callback->HandlePhysicalAddressChanged(m_physicalAddress); ++#ifdef CEC_DEBUGGING ++ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: plugin event received", __func__); ++#endif ++ } ++ else ++ LIB_CEC->AddLog(CEC_LOG_WARNING, "%s: unhandled response received %d!", __func__, event.event_type); ++ } + } + + return 0; +diff --git a/src/lib/adapter/IMX/IMXCECAdapterCommunication.h b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h +index 910dd39..f551122 100644 +--- a/src/lib/adapter/IMX/IMXCECAdapterCommunication.h ++++ b/src/lib/adapter/IMX/IMXCECAdapterCommunication.h +@@ -8,6 +8,7 @@ + * libCEC(R) is a trademark of Pulse-Eight Limited. + * + * IMX adpater port is Copyright (C) 2013 by Stephan Rafin ++ * Copyright (C) 2014 by Matus Kral + * + * You can redistribute this file and/or modify + * it under the terms of the GNU General Public License as published by +@@ -31,12 +32,18 @@ + #include "lib/platform/threads/mutex.h" + #include "lib/platform/threads/threads.h" + #include "lib/platform/sockets/socket.h" ++#include "lib/adapter/IMX/mxc_hdmi-cec.h" + #include "lib/adapter/AdapterCommunication.h" + #include + + #define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/ + #define IMX_ADAPTER_PID 0x1001 + ++typedef struct hdmi_cec_event{ ++ int event_type; ++ int msg_len; ++ unsigned char msg[MAX_MESSAGE_LEN]; ++}hdmi_cec_event; + + + namespace PLATFORM +@@ -44,10 +51,9 @@ namespace PLATFORM + class CCDevSocket; + }; + +- + namespace CEC + { +- class CAdapterMessageQueueEntry; ++ class CIMXCECAdapterMessageQueueEntry; + + class CIMXCECAdapterCommunication : public IAdapterCommunication, public PLATFORM::CThread + { +@@ -81,6 +87,7 @@ namespace CEC + uint16_t GetPhysicalAddress(void); + bool SetControlledMode(bool UNUSED(controlled)) { return true; } + cec_vendor_id GetVendorId(void); ++ void HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)); + bool SupportsSourceLogicalAddress(const cec_logical_address address) { return address > CECDEVICE_TV && address <= CECDEVICE_BROADCAST; } + cec_adapter_type GetAdapterType(void) { return ADAPTERTYPE_IMX; } + uint16_t GetAdapterVendorId(void) const { return IMX_ADAPTER_VID; } +@@ -94,19 +101,24 @@ namespace CEC + ///} + + private: +- bool IsInitialised(void) const { return m_dev != 0; }; ++ bool IsInitialised(void) { return m_bInitialised; }; ++ bool RegisterLogicalAddress(const cec_logical_address address); ++ bool UnregisterLogicalAddress(void); + + std::string m_strError; /**< current error message */ + +- //cec_logical_addresses m_logicalAddresses; + cec_logical_address m_logicalAddress; ++ uint16_t m_physicalAddress; + + PLATFORM::CMutex m_mutex; + PLATFORM::CCDevSocket *m_dev; /**< the device connection */ + + PLATFORM::CMutex m_messageMutex; + uint32_t m_iNextMessage; +- std::map m_messages; ++ std::map m_messages; ++ ++ bool m_bLogicalAddressRegistered; ++ bool m_bInitialised; + }; + + }; +diff --git a/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h b/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h +new file mode 100644 +index 0000000..340b702 +--- /dev/null ++++ b/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h @@ -0,0 +1,118 @@ +#pragma once +/* @@ -827,9 +1547,11 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/IMXCECAdapterMessageQueue.h li + }; + +}; -diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/mxc_hdmi-cec.h libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/mxc_hdmi-cec.h ---- libcec-2.2-8d84f8b/src/lib/adapter/IMX/mxc_hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/adapter/IMX/mxc_hdmi-cec.h 2014-10-27 13:11:03.736446898 +0100 +diff --git a/src/lib/adapter/IMX/mxc_hdmi-cec.h b/src/lib/adapter/IMX/mxc_hdmi-cec.h +new file mode 100644 +index 0000000..bc5bbce +--- /dev/null ++++ b/src/lib/adapter/IMX/mxc_hdmi-cec.h @@ -0,0 +1,47 @@ +/* + * Copyright 2005-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -878,29 +1600,3 @@ diff -Naur libcec-2.2-8d84f8b/src/lib/adapter/IMX/mxc_hdmi-cec.h libcec-2.2-8d84 + +#endif /* !_HDMICEC_H_ */ + -diff -Naur libcec-2.2-8d84f8b/src/lib/CECTypeUtils.h libcec-2.2-8d84f8b.patch/src/lib/CECTypeUtils.h ---- libcec-2.2-8d84f8b/src/lib/CECTypeUtils.h 2014-10-27 12:55:30.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/CECTypeUtils.h 2014-10-27 13:11:03.729446299 +0100 -@@ -877,6 +877,8 @@ - return "Raspberry Pi"; - case ADAPTERTYPE_TDA995x: - return "TDA995x"; -+ case ADAPTERTYPE_IMX: -+ return "i.MX"; - default: - return "unknown"; - } -diff -Naur libcec-2.2-8d84f8b/src/lib/Makefile.am libcec-2.2-8d84f8b.patch/src/lib/Makefile.am ---- libcec-2.2-8d84f8b/src/lib/Makefile.am 2014-10-27 12:55:30.000000000 +0100 -+++ libcec-2.2-8d84f8b.patch/src/lib/Makefile.am 2014-10-27 13:14:08.229600205 +0100 -@@ -69,4 +69,10 @@ - adapter/Exynos/ExynosCECAdapterCommunication.cpp - endif - -+## i.MX6 support -+if USE_IMX_API -+libcec_la_SOURCES += adapter/IMX/IMXCECAdapterDetection.cpp \ -+ adapter/IMX/IMXCECAdapterCommunication.cpp -+endif -+ - libcec_la_LDFLAGS = @LIBS_LIBCEC@ -version-info @VERSION@ diff --git a/projects/imx6/patches/libcec/libcec-mk01-libCEC-fixes.patch b/projects/imx6/patches/libcec/libcec-mk01-libCEC-fixes.patch new file mode 100644 index 00000000000..33cffc74ad5 --- /dev/null +++ b/projects/imx6/patches/libcec/libcec-mk01-libCEC-fixes.patch @@ -0,0 +1,37 @@ +From 2a579cc8641a4cf2aba9c03274de68064508ff06 Mon Sep 17 00:00:00 2001 +From: Matus Kral +Date: Sun, 25 May 2014 07:03:32 +0200 +Subject: [PATCH] this solves problem with device dissapearing from TV's menu + when source is changed to another device. + +(needs fix on adapter side to correctly mark devices with +"ishandledbycec"). +--- + src/lib/implementations/CECCommandHandler.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp +index 29d1ffb..a89ebe6 100644 +--- a/src/lib/implementations/CECCommandHandler.cpp ++++ b/src/lib/implementations/CECCommandHandler.cpp +@@ -592,12 +592,15 @@ int CCECCommandHandler::HandleSetStreamPath(const cec_command &command) + CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamAddress); + if (device) + { +- if (device->IsHandledByLibCEC() && !device->IsActiveSource()) +- device->ActivateSource(); +- else ++ if (device->IsHandledByLibCEC()) + { +- device->MarkAsActiveSource(); +- device->TransmitActiveSource(true); ++ if (!device->IsActiveSource()) ++ device->ActivateSource(); ++ else ++ { ++ device->MarkAsActiveSource(); ++ device->TransmitActiveSource(true); ++ } + } + return COMMAND_HANDLED; + }