X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FSLCommandHandler.cpp;h=6e4b92f866874f3913acf285ee7365c9dbd943e2;hb=6359ffd1d200e28f5cf7ae574960e535e28b14d7;hp=d7bfb5bab2f043f4a3f20c14f7428bbdb9dee9fc;hpb=797dd7c45722f8faa92a82608b7a646dfc49fe6b;p=deb_libcec.git

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index d7bfb5b..6e4b92f 100644
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -34,67 +34,86 @@
 #include "../devices/CECBusDevice.h"
 #include "../devices/CECPlaybackDevice.h"
 #include "../CECProcessor.h"
+#include "../platform/timeutils.h"
 
 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)
+    m_bAwaitingReceiveFailed(false),
+    m_bSLEnabled(false),
+    m_bSkipNextVendorId(false)
 {
 }
 
 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, m_busDevice->GetTransmitTimeout());
-    response.PushBack(0x02);
-    response.PushBack(0x05);
+    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);
-    TransmitLGVendorId(command.destination, command.initiator);
+    Transmit(response);
     return true;
   }
   else if (command.parameters.size == 2 &&
-      command.parameters[0] == 0x04)
+      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(0x05);
-    response.PushBack(command.parameters[1]);
-    m_busDevice->GetProcessor()->Transmit(response);
+    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND, m_iTransmitTimeout);
+    response.PushBack(SL_COMMAND_CONNECT_ACCEPT);
+    response.PushBack((uint8_t)m_busDevice->GetProcessor()->GetLogicalAddresses().primary);
+    Transmit(response);
 
-    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)
-    {
-      ((CCECPlaybackDevice *)primary)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
-      ((CCECPlaybackDevice *)primary)->TransmitDeckStatus(command.initiator);
-    }
+    /* set deck status for the playback device */
+    TransmitDeckStatus(command.initiator);
     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);
+//    if (command.destination != CECDEVICE_BROADCAST)
+//      m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary]->TransmitPowerState(command.initiator);
     return true;
   }
 
   return false;
 }
 
+void CSLCommandHandler::TransmitDeckStatus(const cec_logical_address iDestination)
+{
+  /* 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)
+  {
+    ((CCECPlaybackDevice *)primary)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
+    ((CCECPlaybackDevice *)primary)->TransmitDeckStatus(iDestination);
+  }
+}
+
 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, 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));
 
-  return m_busDevice->GetProcessor()->Transmit(response);
+  Transmit(response);
+  return true;
 }
 
 bool CSLCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
@@ -110,22 +129,41 @@ bool CSLCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
 bool CSLCommandHandler::HandleCommand(const cec_command &command)
 {
   bool bHandled(false);
-  if (m_busDevice->MyLogicalAddressContains(command.destination))
+  if (m_busDevice->MyLogicalAddressContains(command.destination) ||
+      command.destination == CECDEVICE_BROADCAST)
   {
     switch(command.opcode)
     {
     case CEC_OPCODE_VENDOR_COMMAND:
       bHandled = HandleVendorCommand(command);
       break;
-    case CEC_OPCODE_DEVICE_VENDOR_ID:
+    case CEC_OPCODE_GIVE_DECK_STATUS:
       {
-        if (command.initiator == m_busDevice->GetLogicalAddress())
+        if (command.parameters.size == 1)
         {
-          TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, command.initiator);
-          bHandled = true;
+          if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE ||
+              command.parameters[0] == CEC_STATUS_REQUEST_ON)
+            TransmitDeckStatus(command.initiator);
+          else
+            CCECCommandHandler::HandleCommand(command);
         }
+        bHandled = true;
       }
       break;
+    case CEC_OPCODE_FEATURE_ABORT:
+      {
+        if (!m_bSkipNextVendorId)
+        {
+          m_bSkipNextVendorId = true;
+          TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_BROADCAST);
+        }
+        else
+        {
+          m_bSkipNextVendorId = false;
+        }
+        m_bSLEnabled = false;
+      }
+      bHandled = true;
     default:
       break;
     }
@@ -156,29 +194,61 @@ bool CSLCommandHandler::HandleReceiveFailed(void)
 
 bool CSLCommandHandler::InitHandler(void)
 {
-  if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
+  if (m_bSLEnabled)
     return true;
+  m_bSLEnabled = true;
+
+  m_busDevice->GetProcessor()->SetStandardLineTimeout(3);
+  m_busDevice->GetProcessor()->SetRetryLineTimeout(3);
+
+  /* increase the number of retries because the tv is keeping the bus busy at times */
+  m_iTransmitWait    = 2000;
+  m_iTransmitRetries = 4;
+  m_iTransmitTimeout = 500;
 
-  /* 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);
+  CCECBusDevice *primary = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary];
+  if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+    primary->SetVendorId(CEC_VENDOR_LG, false);
 
-  /* 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 (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
   {
-    CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
+    primary->TransmitVendorID(CECDEVICE_TV);
+    primary->TransmitPhysicalAddress();
+
+    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 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);
+
+  if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
+  {
+    m_busDevice->GetProcessor()->SetActiveSource(m_busDevice->GetProcessor()->GetLogicalAddresses().primary);
+    /* 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);
-        ((CCECPlaybackDevice *)device)->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;
 }