/*
* 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.
#include "lib/LibCEC.h"
#include "lib/CECProcessor.h"
#include "lib/CECTypeUtils.h"
+#include "lib/platform/util/util.h"
#include <stdio.h>
using namespace CEC;
m_iSettingLAMask(0),
m_bNeedsWrite(false),
m_iBuildDate(CEC_FW_BUILD_UNKNOWN),
- m_bControlledMode(false)
+ m_bControlledMode(false),
+ m_adapterType(P8_ADAPTERTYPE_UNKNOWN)
{
m_persistedConfiguration.Clear();
}
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;
}
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);
}
}
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)
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)
return false;
}
+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)
+ m_adapterType = (p8_cec_adapter_type)response[0];
+ }
+ return m_adapterType;
+}
+
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)
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)
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);
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)
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);
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)
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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
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);
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)
{
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;
}
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;
}
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;
}
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)
{