using namespace CEC;
using namespace PLATFORM;
+#define CEC_ADAPTER_PING_TIMEOUT 15000
+
+void *CUSBCECAdapterProcessor::Process(void)
+{
+ cec_command command;
+ while (!IsStopped())
+ {
+ if (m_inBuffer.Pop(command))
+ m_callback->OnCommandReceived(command);
+ Sleep(5);
+ }
+
+ return NULL;
+}
+
+void CUSBCECAdapterProcessor::AddCommand(cec_command command)
+{
+ m_inBuffer.Push(command);
+}
+
CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processor, const char *strPort, uint16_t iBaudRate /* = 38400 */) :
m_port(NULL),
m_processor(processor),
m_iFirmwareVersion(CEC_FW_VERSION_UNKNOWN),
m_lastInitiator(CECDEVICE_UNKNOWN),
m_bNextIsEscaped(false),
- m_bGotStart(false)
+ m_bGotStart(false),
+ m_messageProcessor(NULL),
+ m_bInitialised(false)
{
- m_port = new PLATFORM::CSerialPort(strPort, iBaudRate);
+ m_port = new CSerialPort(strPort, iBaudRate);
}
CUSBCECAdapterCommunication::~CUSBCECAdapterCommunication(void)
while (iNow < iTarget && (bPinged = PingAdapter()) == false)
{
CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond correctly to a ping (try %d)", ++iPingTry);
- Sleep(500);
+ CEvent::Sleep(500);
iNow = GetTimeMs();
}
/* try to read the firmware version */
m_iFirmwareVersion = CEC_FW_VERSION_UNKNOWN;
unsigned iFwVersionTry(0);
- while (bPinged && iNow < iTarget && (m_iFirmwareVersion = GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN)
+ while (bPinged && iNow < iTarget && (m_iFirmwareVersion = GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN && iFwVersionTry < 3)
{
- CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond with a correct firmware version (try %d)", ++iFwVersionTry);
- Sleep(500);
+ CLibCEC::AddLog(CEC_LOG_WARNING, "the adapter did not respond with a correct firmware version (try %d)", ++iFwVersionTry);
+ CEvent::Sleep(500);
iNow = GetTimeMs();
}
+ if (m_iFirmwareVersion == CEC_FW_VERSION_UNKNOWN)
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "defaulting to firmware version 1");
+ m_iFirmwareVersion = 1;
+ }
+
if (m_iFirmwareVersion >= 2)
{
/* try to set controlled mode */
while (iNow < iTarget && (bControlled = SetControlledMode(true)) == false)
{
CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond correctly to setting controlled mode (try %d)", ++iControlledTry);
- Sleep(500);
+ CEvent::Sleep(500);
iNow = GetTimeMs();
}
bReturn = bControlled;
else
bReturn = true;
+ {
+ CLockObject lock(m_mutex);
+ m_bInitialised = bReturn;
+ }
+
return bReturn;
}
-bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */)
+bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */, bool bSkipChecks /* = false */)
{
uint64_t iNow = GetTimeMs();
uint64_t iTimeout = iNow + iTimeoutMs;
CLibCEC::AddLog(CEC_LOG_DEBUG, "connection opened, clearing any previous input and waiting for active transmissions to end before starting");
- //clear any input bytes
- uint8_t buff[1024];
- while (m_port->Read(buff, 1024, 100) > 0)
+ if (!bSkipChecks)
{
- CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it");
- Sleep(250);
+ //clear any input bytes
+ uint8_t buff[1024];
+ while (m_port->Read(buff, 1024, 100) > 0)
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it");
+ Sleep(250);
+ }
}
}
- if (CreateThread())
+ if (!bSkipChecks && !CheckAdapter())
{
- if (!CheckAdapter())
+ CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter failed to pass basic checks");
+ return false;
+ }
+ else
+ {
+ if (CreateThread())
{
- StopThread();
- CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter failed to pass basic checks");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "communication thread started");
+ return true;
}
else
{
- CLibCEC::AddLog(CEC_LOG_DEBUG, "communication thread started");
- return true;
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a communication thread");
}
}
- CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a communication thread");
return false;
}
void CUSBCECAdapterCommunication::Close(void)
{
- SetAckMask(0);
- {
- CLockObject lock(m_mutex);
- m_bHasData = true;
- m_rcvCondition.Broadcast();
- }
StopThread();
}
void *CUSBCECAdapterCommunication::Process(void)
{
+ m_messageProcessor = new CUSBCECAdapterProcessor(m_callback);
+ m_messageProcessor->CreateThread();
+
cec_command command;
+ command.Clear();
bool bCommandReceived(false);
+ CTimeout pingTimeout(CEC_ADAPTER_PING_TIMEOUT);
while (!IsStopped())
{
{
CLockObject lock(m_mutex);
ReadFromDevice(50);
- bCommandReceived = m_callback && Read(command, 0);
+ bCommandReceived = m_callback && Read(command, 0) && m_bInitialised;
}
/* push the next command to the callback method if there is one */
if (!IsStopped() && bCommandReceived)
- m_callback->OnCommandReceived(command);
+ m_messageProcessor->AddCommand(command);
+
+ /* ping the adapter every 15 seconds */
+ if (pingTimeout.TimeLeft() == 0)
+ {
+ pingTimeout.Init(CEC_ADAPTER_PING_TIMEOUT);
+ PingAdapter();
+ }
if (!IsStopped())
{
}
}
+ /* stop the message processor */
+ m_messageProcessor->StopThread();
+ delete m_messageProcessor;
+
+ /* notify all threads that are waiting on messages to be sent */
CCECAdapterMessage *msg(NULL);
- if (m_outBuffer.Pop(msg))
+ while (m_outBuffer.Pop(msg))
msg->event.Broadcast();
+ /* set the ackmask to 0 before closing the connection */
+ SetAckMaskInternal(0, true);
+
+ if (m_iFirmwareVersion >= 2)
+ SetControlledMode(false);
+
if (m_port)
{
delete m_port;
{
data->state = ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT;
m_outBuffer.Push(data);
- data->event.Wait();
+ data->event.Wait(5000);
if ((data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT_ACKED) ||
(!data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT))
if (iTimeout == 0 || !m_rcvCondition.Wait(m_mutex, m_bHasData, iTimeout))
return false;
m_inBuffer.Pop(buf);
- m_bHasData = m_inBuffer.Size() > 0;
+ m_bHasData = !m_inBuffer.IsEmpty();
}
if (buf)
return bReturn;
CLibCEC::AddLog(CEC_LOG_DEBUG, "starting the bootloader");
- CCECAdapterMessage *output = new CCECAdapterMessage;
-
- output->PushBack(MSGSTART);
- output->PushEscaped(MSGCODE_START_BOOTLOADER);
- output->PushBack(MSGEND);
- output->isTransmission = false;
- output->expectControllerAck = false;
-
- if ((bReturn = Write(output)) == false)
- CLibCEC::AddLog(CEC_LOG_ERROR, "could not start the bootloader");
- delete output;
- return bReturn;
+ CCECAdapterMessage params;
+ return SendCommand(MSGCODE_START_BOOTLOADER, params, false);
}
bool CUSBCECAdapterCommunication::PingAdapter(void)
{
- bool bReturn(false);
- if (!IsRunning())
- return bReturn;
-
+ CLockObject lock(m_mutex);
CLibCEC::AddLog(CEC_LOG_DEBUG, "sending ping");
- CCECAdapterMessage *output = new CCECAdapterMessage;
-
- output->PushBack(MSGSTART);
- output->PushEscaped(MSGCODE_PING);
- output->PushBack(MSGEND);
- output->isTransmission = false;
- if ((bReturn = Write(output)) == false)
- CLibCEC::AddLog(CEC_LOG_ERROR, "could not ping the adapter");
- delete output;
-
- return bReturn;
+ CCECAdapterMessage params;
+ return SendCommand(MSGCODE_PING, params);
}
bool CUSBCECAdapterCommunication::ParseMessage(const CCECAdapterMessage &msg)
if (msg.IsEmpty())
return bEom;
+ CLockObject adapterLock(m_mutex);
switch(msg.Message())
{
case MSGCODE_FRAME_START:
m_currentframe.PushBack(msg[1]);
m_currentframe.eom = msg.IsEOM();
}
- bEom = msg.IsEOM();
}
break;
default:
}
CLibCEC::AddLog(bIsError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
- return bEom;
+ return msg.IsEOM();
}
uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void)
{
uint16_t iReturn(m_iFirmwareVersion);
- if (!IsRunning())
- return iReturn;
if (iReturn == CEC_FW_VERSION_UNKNOWN)
{
CLockObject lock(m_mutex);
CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting the firmware version");
- CCECAdapterMessage *output = new CCECAdapterMessage;
-
- output->PushBack(MSGSTART);
- output->PushEscaped(MSGCODE_FIRMWARE_VERSION);
- output->PushBack(MSGEND);
- output->isTransmission = false;
- output->expectControllerAck = false;
-
- SendMessageToAdapter(output);
- bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT;
- delete output;
- if (!bWriteOk)
- {
- CLibCEC::AddLog(CEC_LOG_ERROR, "could not request the firmware version");
- return iReturn;
- }
-
- Sleep(250); // TODO ReadFromDevice() isn't waiting for the timeout to pass on win32
- ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, 5 /* start + msgcode + 2 bytes for fw version + end */);
- CCECAdapterMessage input;
- if (Read(input, 0))
- {
- if (input.Message() != MSGCODE_FIRMWARE_VERSION || input.Size() != 3)
- CLibCEC::AddLog(CEC_LOG_ERROR, "invalid firmware version (size = %d, message = %d)", input.Size(), input.Message());
- else
- {
- m_iFirmwareVersion = (input[1] << 8 | input[2]);
- iReturn = m_iFirmwareVersion;
- }
- }
- else
+ cec_datapacket response = GetSetting(MSGCODE_FIRMWARE_VERSION);
+ if (response.size == 2)
{
- CLibCEC::AddLog(CEC_LOG_ERROR, "no firmware version received");
+ m_iFirmwareVersion = (response[0] << 8 | response[1]);
+ iReturn = m_iFirmwareVersion;
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "firmware version %d", m_iFirmwareVersion);
}
}
bool CUSBCECAdapterCommunication::SetLineTimeout(uint8_t iTimeout)
{
m_iLineTimeout = iTimeout;
- return true;
- //TODO
-// bool bReturn(m_iLineTimeout != iTimeout);
-//
-// if (!bReturn)
-// {
-// CCECAdapterMessage *output = new CCECAdapterMessage;
-//
-// output->PushBack(MSGSTART);
-// output->PushEscaped(MSGCODE_TRANSMIT_IDLETIME);
-// output->PushEscaped(iTimeout);
-// output->PushBack(MSGEND);
-// output->isTransmission = false;
-//
-// if ((bReturn = Write(output)) == false)
-// CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the idletime");
-// delete output;
-// }
-//
-// return bReturn;
+ bool bReturn(m_iLineTimeout != iTimeout);
+
+ if (!bReturn)
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the line timeout to %d", iTimeout);
+ CCECAdapterMessage params;
+ params.PushEscaped(iTimeout);
+ bReturn = SendCommand(MSGCODE_TRANSMIT_IDLETIME, params);
+ }
+
+ return bReturn;
}
bool CUSBCECAdapterCommunication::SetAckMask(uint16_t iMask)
{
- bool bReturn(false);
- CLibCEC::AddLog(CEC_LOG_DEBUG, "setting ackmask to %2x", iMask);
+ return SetAckMaskInternal(iMask, IsRunning());
+}
- CCECAdapterMessage *output = new CCECAdapterMessage;
+bool CUSBCECAdapterCommunication::SetAckMaskInternal(uint16_t iMask, bool bWriteDirectly /* = false */)
+{
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting ackmask to %2x", iMask);
- output->PushBack(MSGSTART);
- output->PushEscaped(MSGCODE_SET_ACK_MASK);
- output->PushEscaped(iMask >> 8);
- output->PushEscaped((uint8_t)iMask);
- output->PushBack(MSGEND);
- output->isTransmission = false;
+ CCECAdapterMessage params;
+ params.PushEscaped(iMask >> 8);
+ params.PushEscaped((uint8_t)iMask);
+ return SendCommand(MSGCODE_SET_ACK_MASK, params, true, false, bWriteDirectly);
+}
- if ((bReturn = Write(output)) == false)
- CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the ackmask");
- delete output;
+bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *configuration)
+{
+ if (m_iFirmwareVersion < 2)
+ return false;
+ bool bReturn(true);
+ bReturn &= SetSettingAutoEnabled(true);
+ bReturn &= SetSettingDeviceType(CLibCEC::GetType(configuration->logicalAddresses.primary));
+ bReturn &= SetSettingDefaultLogicalAddress(configuration->logicalAddresses.primary);
+ bReturn &= SetSettingLogicalAddressMask(CLibCEC::GetMaskForType(configuration->logicalAddresses.primary));
+ bReturn &= SetSettingPhysicalAddress(configuration->iPhysicalAddress);
+ bReturn &= SetSettingCECVersion(CEC_VERSION_1_3A);
+ bReturn &= SetSettingOSDName(configuration->strDeviceName);
+ if (bReturn)
+ bReturn = WriteEEPROM();
return bReturn;
}
+bool CUSBCECAdapterCommunication::GetConfiguration(libcec_configuration *configuration)
+{
+ if (m_iFirmwareVersion < 2)
+ return false;
+
+ bool bReturn(true);
+ cec_device_type type;
+ if (GetSettingDeviceType(type))
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "using persisted device type setting %s", m_processor->ToString(type));
+ configuration->deviceTypes.Clear();
+ configuration->deviceTypes.Add(type);
+ }
+ else
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "no persisted device type setting");
+ bReturn = false;
+ }
+
+ if (GetSettingPhysicalAddress(configuration->iPhysicalAddress))
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "using persisted physical address setting %4x", configuration->iPhysicalAddress);
+ }
+ else
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "no persisted physical address setting");
+ bReturn = false;
+ }
+
+ CStdString strDeviceName;
+ if (GetSettingOSDName(strDeviceName))
+ {
+ snprintf(configuration->strDeviceName, 13, "%s", strDeviceName.c_str());
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "using persisted device name setting %s", configuration->strDeviceName);
+ }
+ else
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "no persisted device name setting");
+ bReturn = false;
+ }
+
+ // don't read the following settings:
+ // - auto enabled (always enabled)
+ // - default logical address (autodetected)
+ // - logical address mask (autodetected)
+ // - CEC version (1.3a)
+
+ // TODO to be added to the firmware:
+ // - base device (1 byte)
+ // - HDMI port number (1 byte)
+ // - TV vendor id (3 bytes)
+ // - wake devices (1 byte)
+ // - standby devices (1 bytes)
+ // - use TV menu language (1 bit)
+ // - activate source (1 bit)
+ // - power off screensaver (1 bit)
+ // - power off on standby (1 bit)
+ // - send inactive source (1 bit)
+ return bReturn;
+}
bool CUSBCECAdapterCommunication::SetControlledMode(bool controlled)
{
- bool bReturn(false);
+ CLockObject lock(m_mutex);
CLibCEC::AddLog(CEC_LOG_DEBUG, "turning controlled mode %s", controlled ? "on" : "off");
- CCECAdapterMessage *output = new CCECAdapterMessage;
+ CCECAdapterMessage params;
+ params.PushEscaped(controlled ? 1 : 0);
+ return SendCommand(MSGCODE_SET_CONTROLLED, params);
+}
- output->PushBack(MSGSTART);
- output->PushEscaped(MSGCODE_SET_CONTROLLED);
- output->PushEscaped(controlled);
- output->PushBack(MSGEND);
- output->isTransmission = false;
+bool CUSBCECAdapterCommunication::SetSettingAutoEnabled(bool enabled)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "turning autonomous mode %s", enabled ? "on" : "off");
- if ((bReturn = Write(output)) == false)
- CLibCEC::AddLog(CEC_LOG_ERROR, "could not set controlled mode");
- delete output;
+ CCECAdapterMessage params;
+ params.PushEscaped(enabled ? 1 : 0);
+ return SendCommand(MSGCODE_SET_AUTO_ENABLED, params);
+}
- return bReturn;
+bool CUSBCECAdapterCommunication::GetSettingAutoEnabled(bool &enabled)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting autonomous mode setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_AUTO_ENABLED);
+ if (response.size == 1)
+ {
+ enabled = response[0] == 1;
+ return true;
+ }
+ return false;
+}
+
+bool CUSBCECAdapterCommunication::SetSettingDeviceType(cec_device_type type)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the device type to %1X", (uint8_t)type);
+
+ CCECAdapterMessage params;
+ params.PushEscaped((uint8_t)type);
+ return SendCommand(MSGCODE_SET_DEVICE_TYPE, params);
+}
+
+bool CUSBCECAdapterCommunication::GetSettingDeviceType(cec_device_type &value)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting device type setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_DEVICE_TYPE);
+ if (response.size == 1)
+ {
+ value = (cec_device_type)response[0];
+ return true;
+ }
+ return false;
+}
+
+bool CUSBCECAdapterCommunication::SetSettingDefaultLogicalAddress(cec_logical_address address)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the default logical address to %1X", address);
+
+ CCECAdapterMessage params;
+ params.PushEscaped((uint8_t)address);
+ return SendCommand(MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS, params);
+}
+
+bool CUSBCECAdapterCommunication::GetSettingDefaultLogicalAddress(cec_logical_address &address)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting default logical address setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS);
+ if (response.size == 1)
+ {
+ address = (cec_logical_address)response[0];
+ return true;
+ }
+ return false;
+}
+
+bool CUSBCECAdapterCommunication::SetSettingLogicalAddressMask(uint16_t iMask)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the logical address mask to %2X", iMask);
+
+ CCECAdapterMessage params;
+ params.PushEscaped(iMask >> 8);
+ params.PushEscaped((uint8_t)iMask);
+ return SendCommand(MSGCODE_SET_LOGICAL_ADDRESS_MASK, params);
+}
+
+bool CUSBCECAdapterCommunication::GetSettingLogicalAddressMask(uint16_t &iMask)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting logical address mask setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_LOGICAL_ADDRESS_MASK);
+ if (response.size == 2)
+ {
+ iMask = ((uint16_t)response[0] << 8) | ((uint16_t)response[1]);
+ return true;
+ }
+ return false;
+}
+
+bool CUSBCECAdapterCommunication::SetSettingPhysicalAddress(uint16_t iPhysicalAddress)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the physical address to %2X", iPhysicalAddress);
+
+ CCECAdapterMessage params;
+ params.PushEscaped(iPhysicalAddress >> 8);
+ params.PushEscaped((uint8_t)iPhysicalAddress);
+ return SendCommand(MSGCODE_SET_PHYSICAL_ADDRESS, params);
+}
+
+bool CUSBCECAdapterCommunication::GetSettingPhysicalAddress(uint16_t &iPhysicalAddress)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting physical address setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_PHYSICAL_ADDRESS);
+ if (response.size == 2)
+ {
+ iPhysicalAddress = ((uint16_t)response[0] << 8) | ((uint16_t)response[1]);
+ return true;
+ }
+ return false;
+}
+
+bool CUSBCECAdapterCommunication::SetSettingCECVersion(cec_version version)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the CEC version to %s", CLibCEC::GetInstance()->ToString(version));
+
+ CCECAdapterMessage params;
+ params.PushEscaped((uint8_t)version);
+ return SendCommand(MSGCODE_SET_HDMI_VERSION, params);
+}
+
+bool CUSBCECAdapterCommunication::GetSettingCECVersion(cec_version &version)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting CEC version setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_HDMI_VERSION);
+ if (response.size == 1)
+ {
+ version = (cec_version)response[0];
+ return true;
+ }
+ return false;
+}
+
+bool CUSBCECAdapterCommunication::SetSettingOSDName(const char *strOSDName)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the OSD name to %s", strOSDName);
+
+ CCECAdapterMessage params;
+ for (size_t iPtr = 0; iPtr < strlen(strOSDName); iPtr++)
+ params.PushEscaped(strOSDName[iPtr]);
+ return SendCommand(MSGCODE_SET_OSD_NAME, params);
+}
+
+bool CUSBCECAdapterCommunication::GetSettingOSDName(CStdString &strOSDName)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting OSD name setting");
+
+ cec_datapacket response = GetSetting(MSGCODE_GET_OSD_NAME);
+ if (response.size == 0)
+ return false;
+
+ char buf[15];
+ for (uint8_t iPtr = 0; iPtr < response.size && iPtr < 15; iPtr++)
+ buf[iPtr] = (char)response[iPtr];
+ buf[response.size] = 0;
+
+ strOSDName.Format("%s", buf);
+ return true;
+}
+
+bool CUSBCECAdapterCommunication::WriteEEPROM(void)
+{
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "writing settings in the EEPROM");
+
+ CCECAdapterMessage params;
+ return SendCommand(MSGCODE_WRITE_EEPROM, params);
}
bool CUSBCECAdapterCommunication::IsOpen(void)
{
bool bError(false);
bool bTransmitSucceeded(false);
- uint8_t iPacketsLeft(message.Size() / 4);
+ uint8_t iPacketsLeft(message.isTransmission ? message.Size() / 4 : 1);
int64_t iNow = GetTimeMs();
int64_t iTargetTime = iNow + (message.transmit_timeout <= 5 ? CEC_DEFAULT_TRANSMIT_WAIT : message.transmit_timeout);
switch(msg.Message())
{
case MSGCODE_COMMAND_ACCEPTED:
- CLibCEC::AddLog(CEC_LOG_DEBUG, msg.ToString());
if (iPacketsLeft > 0)
iPacketsLeft--;
if (!message.isTransmission && iPacketsLeft == 0)
bTransmitSucceeded = true;
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "%s - waiting for %d more", msg.ToString().c_str(), iPacketsLeft);
break;
case MSGCODE_TRANSMIT_SUCCEEDED:
CLibCEC::AddLog(CEC_LOG_DEBUG, msg.ToString());
m_bGotStart = false;
m_bNextIsEscaped = false;
m_bHasData = true;
- m_rcvCondition.Signal();
+ m_rcvCondition.Broadcast();
}
else if (m_bNextIsEscaped)
{
void CUSBCECAdapterCommunication::SendMessageToAdapter(CCECAdapterMessage *msg)
{
CLockObject adapterLock(m_mutex);
- if (msg->tries == 1)
- SetLineTimeout(msg->lineTimeout);
- else
- SetLineTimeout(msg->retryTimeout);
+ if (!m_port->IsOpen())
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "error writing to serial port: the connection is closed");
+ msg->state = ADAPTER_MESSAGE_STATE_ERROR;
+ return;
+ }
+
+ if (msg->isTransmission && (msg->Size() < 2 || msg->At(1) != MSGCODE_TRANSMIT_IDLETIME))
+ {
+ if (msg->tries == 1)
+ SetLineTimeout(msg->lineTimeout);
+ else
+ SetLineTimeout(msg->retryTimeout);
+ }
if (m_port->Write(msg->packet.data, msg->Size()) != (ssize_t) msg->Size())
{
strName = m_port->GetName();
return strName;
}
+
+bool CUSBCECAdapterCommunication::SendCommand(cec_adapter_messagecode msgCode, CCECAdapterMessage ¶ms, bool bExpectAck /* = true */, bool bIsTransmission /* = false */, bool bSendDirectly /* = true */)
+{
+ CLockObject lock(m_mutex);
+
+ CCECAdapterMessage *output = new CCECAdapterMessage;
+
+ output->PushBack(MSGSTART);
+ output->PushEscaped(msgCode);
+ output->Append(params);
+ output->PushBack(MSGEND);
+ output->isTransmission = bIsTransmission;
+ output->expectControllerAck = bExpectAck;
+
+ if (bSendDirectly)
+ SendMessageToAdapter(output);
+ else
+ Write(output);
+
+ bool bWriteOk = output->state == (output->expectControllerAck ? ADAPTER_MESSAGE_STATE_SENT_ACKED : ADAPTER_MESSAGE_STATE_SENT);
+ if (!bWriteOk)
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "'%s' failed", CCECAdapterMessage::ToString(msgCode));
+ delete output;
+ return false;
+ }
+
+ delete output;
+ return true;
+}
+
+cec_datapacket CUSBCECAdapterCommunication::GetSetting(cec_adapter_messagecode msgCode)
+{
+ cec_datapacket retVal;
+ retVal.Clear();
+
+ CCECAdapterMessage params;
+ if (!SendCommand(msgCode, params, false))
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "%s failed", CCECAdapterMessage::ToString(msgCode));
+ return retVal;
+ }
+
+ Sleep(250); // TODO ReadFromDevice() isn't waiting for the timeout to pass on win32
+ ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, 5 /* start + msgcode + 2 bytes for fw version + end */);
+ CCECAdapterMessage input;
+ if (Read(input, 0))
+ {
+ if (input.Message() != msgCode)
+ CLibCEC::AddLog(CEC_LOG_ERROR, "invalid response to %s received (%s)", CCECAdapterMessage::ToString(msgCode), CCECAdapterMessage::ToString(input.Message()));
+ else
+ {
+ for (uint8_t iPtr = 1; iPtr < input.Size(); iPtr++)
+ retVal.PushBack(input[iPtr]);
+ }
+ }
+ else
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "no response to %s received", CCECAdapterMessage::ToString(msgCode));
+ }
+
+ return retVal;
+}
repositories / deb_libcec.git / blobdiff