cec: refactor CEC read/write. keep a single lock for all writes, not one per device

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

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index 197db43fdef7cb6fcd9c6b6746b3a38c6086fae8..bf3ee43006bdf6db6126abc2a3e52012b8d4217e 100644 (file)
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -61,11 +61,11 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
   {
     /* enable SL */
     cec_command response;
-    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_busDevice->GetTransmitTimeout());
+    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_iTransmitTimeout);
     response.PushBack(SL_COMMAND_UNKNOWN_02);
     response.PushBack(SL_COMMAND_UNKNOWN_03);
 
-    m_busDevice->GetProcessor()->Transmit(response);
+    Transmit(response);
     return true;
   }
   else if (command.parameters.size == 2 &&
@@ -73,10 +73,10 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
   {
     /* enable SL */
     cec_command response;
-    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_busDevice->GetTransmitTimeout());
+    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_iTransmitTimeout);
     response.PushBack(SL_COMMAND_CONNECT_ACCEPT);
     response.PushBack(m_busDevice->GetProcessor()->GetLogicalAddresses().primary);
-    m_busDevice->GetProcessor()->Transmit(response);
+    Transmit(response);
 
     /* set deck status for the playback device */
     TransmitDeckStatus(command.initiator);
@@ -85,7 +85,8 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
   else if (command.parameters.size == 1 &&
       command.parameters[0] == SL_COMMAND_REQUEST_VENDOR_ID)
   {
-    TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_BROADCAST);
+//    if (command.destination != CECDEVICE_BROADCAST)
+//      m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary]->TransmitPowerState(command.initiator);
     return true;
   }
 
@@ -106,12 +107,12 @@ void CSLCommandHandler::TransmitDeckStatus(const cec_logical_address iDestinatio
 bool CSLCommandHandler::TransmitLGVendorId(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   cec_command response;
-  cec_command::Format(response, iInitiator, iDestination, CEC_OPCODE_DEVICE_VENDOR_ID, m_busDevice->GetTransmitTimeout());
+  cec_command::Format(response, iInitiator, iDestination, CEC_OPCODE_DEVICE_VENDOR_ID, m_iTransmitTimeout);
   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));
 
-  m_busDevice->GetProcessor()->Transmit(response);
+  Transmit(response);
   return true;
 }
 
@@ -156,6 +157,10 @@ bool CSLCommandHandler::HandleCommand(const cec_command &command)
           m_bSkipNextVendorId = true;
           TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_BROADCAST);
         }
+        else
+        {
+          m_bSkipNextVendorId = false;
+        }
         m_bSLEnabled = false;
       }
       bHandled = true;
@@ -189,42 +194,58 @@ bool CSLCommandHandler::HandleReceiveFailed(void)
 
 bool CSLCommandHandler::InitHandler(void)
 {
-  if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
-    return true;
-
   if (m_bSLEnabled)
     return true;
   m_bSLEnabled = true;
 
+  m_busDevice->GetProcessor()->SetStandardLineTimeout(3);
+  m_busDevice->GetProcessor()->SetRetryLineTimeout(3);
+
   CCECBusDevice *primary = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary];
-  primary->SetVendorId(CEC_VENDOR_LG);
-  primary->TransmitVendorID(CECDEVICE_TV);
-  primary->TransmitPhysicalAddress();
+  if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+    primary->SetVendorId(CEC_VENDOR_LG, false);
 
-  cec_command command;
-  cec_command::Format(command, m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_TV, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  m_busDevice->GetProcessor()->Transmit(command);
+  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+  {
+    primary->TransmitVendorID(CECDEVICE_TV);
+    primary->TransmitPhysicalAddress();
 
-  /* 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);
+    cec_command command;
+    cec_command::Format(command, m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_TV, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID, m_iTransmitTimeout);
+    Transmit(command);
 
-  /* 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];
+    /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
+    m_busDevice->SetCecVersion(CEC_VERSION_1_3A);
+  }
 
-    /* increase the transmit timeout because the tv is keeping the bus busy at times */
-    device->SetTransmitTimeout(3000);
-    if (addr[iPtr])
+  /* LG devices always return "korean" as language */
+  cec_menu_language lang;
+  lang.device = m_busDevice->GetLogicalAddress();
+  snprintf(lang.language, 4, "eng");
+  m_busDevice->SetMenuLanguage(lang);
+
+  /* increase the transmit timeout because the tv is keeping the bus busy at times */
+  m_iTransmitTimeout = 5000;
+
+  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+  {
+    /* 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++)
     {
-      if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
-                     device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+      CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
+
+      if (addr[iPtr])
       {
-        ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
-        TransmitDeckStatus(CECDEVICE_TV);
+        if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
+                       device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+        {
+          ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
+          TransmitDeckStatus(CECDEVICE_TV);
+        }
       }
     }
   }
+
   return true;
 }