X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FSLCommandHandler.cpp;h=ec5126304114fc0cae5c125da526a3d3da6ffaa4;hb=2bdfdeefe29b5d897135f5d3d4adc86721334c73;hp=c6affec4330c3977c9fa6fb734af6b852a133e91;hpb=9902f4e81052ba0260c587a4b9309e1dd4c729db;p=deb_libcec.git

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index c6affec..ec51263 100644
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -32,10 +32,19 @@
 
 #include "SLCommandHandler.h"
 #include "../devices/CECBusDevice.h"
+#include "../devices/CECPlaybackDevice.h"
 #include "../CECProcessor.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)
@@ -45,43 +54,58 @@ 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);
 
-    return m_busDevice->GetProcessor()->Transmit(response);
+    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);
-    response.PushBack(0x05);
-    response.PushBack(0x04);
-
-    return m_busDevice->GetProcessor()->Transmit(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)
+    {
+      ((CCECPlaybackDevice *)primary)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
+      ((CCECPlaybackDevice *)primary)->TransmitDeckStatus(command.initiator);
+    }
+    return true;
   }
   else if (command.parameters.size == 1 &&
-      command.parameters[0] == 0xa0)
+      command.parameters[0] == SL_COMMAND_REQUEST_VENDOR_ID)
   {
-    /* enable SL */
-    cec_command response;
-    cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND);
-    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);
+    TransmitLGVendorId(command.destination, command.initiator);
+    return true;
   }
 
   return false;
 }
 
+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());
+  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);
+}
+
 bool CSLCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
 {
   /* imitate LG devices */
@@ -102,6 +126,15 @@ bool CSLCommandHandler::HandleCommand(const cec_command &command)
     case CEC_OPCODE_VENDOR_COMMAND:
       bHandled = HandleVendorCommand(command);
       break;
+    case CEC_OPCODE_DEVICE_VENDOR_ID:
+      {
+        if (command.initiator == m_busDevice->GetLogicalAddress())
+        {
+          TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, command.initiator);
+          bHandled = true;
+        }
+      }
+      break;
     default:
       break;
     }
@@ -113,7 +146,6 @@ bool CSLCommandHandler::HandleCommand(const cec_command &command)
   return bHandled;
 }
 
-
 void CSLCommandHandler::HandlePoll(const cec_logical_address iInitiator, const cec_logical_address iDestination)
 {
   CCECCommandHandler::HandlePoll(iInitiator, iDestination);
@@ -130,3 +162,32 @@ bool CSLCommandHandler::HandleReceiveFailed(void)
 
   return true;
 }
+
+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])
+    {
+      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);
+        ((CCECPlaybackDevice *)device)->TransmitDeckStatus(CECDEVICE_TV);
+      }
+    }
+  }
+  return true;
+}