cec: replaced magic numbers in CSLCommandHandler

[deb_libcec.git] / src / lib / implementations / SLCommandHandler.cpp

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index d442eaf44a09fd6650832309044518baac45533f..ec5126304114fc0cae5c125da526a3d3da6ffaa4 100644 (file)
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -37,6 +37,14 @@
 
 using namespace CEC;
 
+#define SL_COMMAND_UNKNOWN_01        0x01
+#define SL_COMMAND_UNKNOWN_02        0x02
+#define SL_COMMAND_UNKNOWN_03        0x05
+
+#define SL_COMMAND_REQUEST_VENDOR_ID 0xa0
+#define SL_COMMAND_CONNECT_REQUEST   0x04
+#define SL_COMMAND_CONNECT_ACCEPT    0x05
+
 CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
     CCECCommandHandler(busDevice),
     m_bAwaitingReceiveFailed(false)
@@ -46,21 +54,29 @@ CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
 bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
 {
   if (command.parameters.size == 1 &&
-      command.parameters[0] == 0x01)
+      command.parameters[0] == SL_COMMAND_UNKNOWN_01)
   {
     /* enable SL */
     cec_command response;
-    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND);
-    response.PushBack(0x02);
-    response.PushBack(0x05);
+    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_busDevice->GetTransmitTimeout());
+    response.PushBack(SL_COMMAND_UNKNOWN_02);
+    response.PushBack(SL_COMMAND_UNKNOWN_03);
 
     m_busDevice->GetProcessor()->Transmit(response);
     TransmitLGVendorId(command.destination, command.initiator);
     return true;
   }
-  else if (command.parameters.size >= 1 &&
-      command.parameters[0] == 0x04)
+  else if (command.parameters.size == 2 &&
+      command.parameters[0] == SL_COMMAND_CONNECT_REQUEST)
   {
+    /* enable SL */
+    cec_command response;
+    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_busDevice->GetTransmitTimeout());
+    response.PushBack(SL_COMMAND_CONNECT_ACCEPT);
+    response.PushBack(command.parameters[1]);
+    m_busDevice->GetProcessor()->Transmit(response);
+
+    /* set deck status for the playback device */
     CCECBusDevice *primary = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary];
     if (primary->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
     {
@@ -70,7 +86,7 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
     return true;
   }
   else if (command.parameters.size == 1 &&
-      command.parameters[0] == 0xa0)
+      command.parameters[0] == SL_COMMAND_REQUEST_VENDOR_ID)
   {
     TransmitLGVendorId(command.destination, command.initiator);
     return true;
@@ -82,7 +98,7 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
 bool CSLCommandHandler::TransmitLGVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   cec_command response;
-  cec_command::Format(response, iInitiator, iDestination, CEC_OPCODE_VENDOR_COMMAND);
+  cec_command::Format(response, iInitiator, iDestination, CEC_OPCODE_VENDOR_COMMAND, m_busDevice->GetTransmitTimeout());
   response.parameters.PushBack((uint8_t) (((uint64_t)CEC_VENDOR_LG >> 16) & 0xFF));
   response.parameters.PushBack((uint8_t) (((uint64_t)CEC_VENDOR_LG >> 8) & 0xFF));
   response.parameters.PushBack((uint8_t) ((uint64_t)CEC_VENDOR_LG & 0xFF));
@@ -152,13 +168,19 @@ bool CSLCommandHandler::InitHandler(void)
   if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
     return true;
 
+  /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
+  m_busDevice->GetProcessor()->m_busDevices[CECDEVICE_TV]->SetCecVersion(CEC_VERSION_1_3A);
+
   /* LG TVs only route keypresses when the deck status is set to 0x20 */
   cec_logical_addresses addr = m_busDevice->GetProcessor()->GetLogicalAddresses();
   for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
   {
+    CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
+
+    /* increase the transmit timeout because the tv is keeping the bus busy at times */
+    device->SetTransmitTimeout(3000);
     if (addr[iPtr])
     {
-      CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
       if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
                      device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
       {