X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FPulse-Eight%2FUSBCECAdapterCommands.cpp;h=85050334a0a99841370251e11229cc964a0173bd;hb=dd36a9277ed78c09ffbf195353dfcc078c73e806;hp=ab0fa392e12633c54a0c237861bbae481b1fbfcb;hpb=2d4183227b9bec3e95ca90f427687426ec155bc6;p=deb_libcec.git diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp index ab0fa39..8505033 100644 --- a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp +++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * 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. @@ -38,6 +38,7 @@ #include "lib/LibCEC.h" #include "lib/CECProcessor.h" #include "lib/CECTypeUtils.h" +#include "lib/platform/util/util.h" #include using namespace CEC; @@ -67,14 +68,14 @@ cec_datapacket CUSBCECAdapterCommands::RequestSetting(cec_adapter_messagecode ms CCECAdapterMessage params; CCECAdapterMessage *message = m_comm->SendCommand(msgCode, params); - if (message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED) + if (message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED) { retVal = message->response; retVal.Shift(2); // shift out start and msgcode retVal.size -= 1; // remove end } - delete message; + DELETE_AND_NULL(message); return retVal; } @@ -85,13 +86,15 @@ uint16_t CUSBCECAdapterCommands::RequestFirmwareVersion(void) while (m_persistedConfiguration.iFirmwareVersion == CEC_FW_VERSION_UNKNOWN && iFwVersionTry++ < 3) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting the firmware version"); +#endif cec_datapacket response = RequestSetting(MSGCODE_FIRMWARE_VERSION); if (response.size == 2) m_persistedConfiguration.iFirmwareVersion = (response[0] << 8 | response[1]); else { - LIB_CEC->AddLog(CEC_LOG_WARNING, "the adapter did not respond with a correct firmware version (try %d)", iFwVersionTry); + LIB_CEC->AddLog(CEC_LOG_WARNING, "the adapter did not respond with a correct firmware version (try %d, size = %d)", iFwVersionTry, response.size); CEvent::Sleep(500); } } @@ -102,12 +105,18 @@ uint16_t CUSBCECAdapterCommands::RequestFirmwareVersion(void) m_persistedConfiguration.iFirmwareVersion = 1; } + // firmware versions < 2 don't have an autonomous mode + if (m_persistedConfiguration.iFirmwareVersion < 2) + m_bControlledMode = true; + return m_persistedConfiguration.iFirmwareVersion; } bool CUSBCECAdapterCommands::RequestSettingAutoEnabled(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting autonomous mode setting"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_AUTO_ENABLED); if (response.size == 1) @@ -121,7 +130,9 @@ bool CUSBCECAdapterCommands::RequestSettingAutoEnabled(void) bool CUSBCECAdapterCommands::RequestSettingCECVersion(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting CEC version setting"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_HDMI_VERSION); if (response.size == 1) @@ -137,7 +148,9 @@ p8_cec_adapter_type CUSBCECAdapterCommands::RequestAdapterType(void) { if (m_adapterType == P8_ADAPTERTYPE_UNKNOWN) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting adapter type"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_ADAPTER_TYPE); if (response.size == 1) @@ -150,7 +163,9 @@ uint32_t CUSBCECAdapterCommands::RequestBuildDate(void) { if (m_iBuildDate == CEC_FW_BUILD_UNKNOWN) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting firmware build date"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_BUILDDATE); if (response.size == 4) @@ -161,7 +176,9 @@ uint32_t CUSBCECAdapterCommands::RequestBuildDate(void) bool CUSBCECAdapterCommands::RequestSettingDefaultLogicalAddress(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting default logical address setting"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS); if (response.size == 1) @@ -175,7 +192,9 @@ bool CUSBCECAdapterCommands::RequestSettingDefaultLogicalAddress(void) bool CUSBCECAdapterCommands::RequestSettingDeviceType(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting device type setting"); +#endif m_persistedConfiguration.deviceTypes.Clear(); cec_datapacket response = RequestSetting(MSGCODE_GET_DEVICE_TYPE); @@ -191,7 +210,9 @@ bool CUSBCECAdapterCommands::RequestSettingDeviceType(void) bool CUSBCECAdapterCommands::RequestSettingLogicalAddressMask(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting logical address mask setting"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_LOGICAL_ADDRESS_MASK); if (response.size == 2) @@ -205,7 +226,9 @@ bool CUSBCECAdapterCommands::RequestSettingLogicalAddressMask(void) bool CUSBCECAdapterCommands::RequestSettingOSDName(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting OSD name setting"); +#endif memset(m_persistedConfiguration.strDeviceName, 0, 13); cec_datapacket response = RequestSetting(MSGCODE_GET_OSD_NAME); @@ -227,7 +250,9 @@ bool CUSBCECAdapterCommands::RequestSettingOSDName(void) bool CUSBCECAdapterCommands::RequestSettingPhysicalAddress(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "requesting physical address setting"); +#endif cec_datapacket response = RequestSetting(MSGCODE_GET_PHYSICAL_ADDRESS); if (response.size == 2) @@ -257,8 +282,8 @@ bool CUSBCECAdapterCommands::SetSettingAutoEnabled(bool enabled) CCECAdapterMessage params; params.PushEscaped(enabled ? 1 : 0); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_AUTO_ENABLED, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -286,8 +311,8 @@ bool CUSBCECAdapterCommands::SetSettingDeviceType(cec_device_type type) CCECAdapterMessage params; params.PushEscaped((uint8_t)type); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_DEVICE_TYPE, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -315,8 +340,8 @@ bool CUSBCECAdapterCommands::SetSettingDefaultLogicalAddress(cec_logical_address CCECAdapterMessage params; params.PushEscaped((uint8_t)address); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -345,8 +370,8 @@ bool CUSBCECAdapterCommands::SetSettingLogicalAddressMask(uint16_t iMask) params.PushEscaped(iMask >> 8); params.PushEscaped((uint8_t)iMask); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_LOGICAL_ADDRESS_MASK, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -375,8 +400,8 @@ bool CUSBCECAdapterCommands::SetSettingPhysicalAddress(uint16_t iPhysicalAddress params.PushEscaped(iPhysicalAddress >> 8); params.PushEscaped((uint8_t)iPhysicalAddress); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_PHYSICAL_ADDRESS, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -404,8 +429,8 @@ bool CUSBCECAdapterCommands::SetSettingCECVersion(cec_version version) CCECAdapterMessage params; params.PushEscaped((uint8_t)version); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_HDMI_VERSION, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -430,8 +455,8 @@ bool CUSBCECAdapterCommands::SetSettingOSDName(const char *strOSDName) for (size_t iPtr = 0; iPtr < strlen(strOSDName); iPtr++) params.PushEscaped(strOSDName[iPtr]); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_OSD_NAME, params); - bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) snprintf(m_persistedConfiguration.strDeviceName, 13, "%s", strOSDName); @@ -451,8 +476,8 @@ bool CUSBCECAdapterCommands::WriteEEPROM(void) CCECAdapterMessage params; CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_WRITE_EEPROM, params); - bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) { @@ -544,12 +569,14 @@ bool CUSBCECAdapterCommands::GetConfiguration(libcec_configuration &configuratio bool CUSBCECAdapterCommands::PingAdapter(void) { +#ifdef CEC_DEBUGGING LIB_CEC->AddLog(CEC_LOG_DEBUG, "sending ping"); +#endif CCECAdapterMessage params; CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_PING, params); - bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); return bReturn; } @@ -561,19 +588,32 @@ bool CUSBCECAdapterCommands::SetAckMask(uint16_t iMask) params.PushEscaped(iMask >> 8); params.PushEscaped((uint8_t)iMask); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_ACK_MASK, params); - bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); return bReturn; } +void CUSBCECAdapterCommands::SetActiveSource(bool bSetTo, bool bClientUnregistered) +{ + if (bClientUnregistered) return; + if (m_persistedConfiguration.iFirmwareVersion >= 3) + { + LIB_CEC->AddLog(CEC_LOG_DEBUG, "marking the adapter as %s source", bSetTo ? "active" : "inactive"); + CCECAdapterMessage params; + params.PushEscaped(bSetTo ? 1 : 0); + CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_ACTIVE_SOURCE, params); + DELETE_AND_NULL(message); + } +} + bool CUSBCECAdapterCommands::StartBootloader(void) { LIB_CEC->AddLog(CEC_LOG_DEBUG, "starting the bootloader"); CCECAdapterMessage params; CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_START_BOOTLOADER, params); - bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); return bReturn; } @@ -583,8 +623,8 @@ bool CUSBCECAdapterCommands::SetLineTimeout(uint8_t iTimeout) CCECAdapterMessage params; params.PushEscaped(iTimeout); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_TRANSMIT_IDLETIME, params); - bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); return bReturn; } @@ -601,8 +641,8 @@ bool CUSBCECAdapterCommands::SetControlledMode(bool controlled) CCECAdapterMessage params; params.PushEscaped(controlled ? 1 : 0); CCECAdapterMessage *message = m_comm->SendCommand(MSGCODE_SET_CONTROLLED, params); - bool bReturn = message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; - delete message; + bool bReturn = message && message->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + DELETE_AND_NULL(message); if (bReturn) {