cec: fix simplink reconnect via the TV source selector (after vendor command 0x03)
[deb_libcec.git] / src / lib / implementations / SLCommandHandler.cpp
index 05cbf51fbef05dd0b6b1e066f0caa2023291545e..f9892d8dab82299ef94fb6e2ccafde81151f666b 100644 (file)
 
 using namespace CEC;
 
-#define SL_COMMAND_UNKNOWN_01        0x01
-#define SL_COMMAND_UNKNOWN_02        0x02
-#define SL_COMMAND_UNKNOWN_03        0x05
+#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
+#define SL_COMMAND_REQUEST_POWER_STATUS 0xa0
+#define SL_COMMAND_POWER_ON             0x03
+#define SL_COMMAND_CONNECT_REQUEST      0x04
+#define SL_COMMAND_CONNECT_ACCEPT       0x05
 
 CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
     CCECCommandHandler(busDevice),
     m_bAwaitingReceiveFailed(false),
     m_bSLEnabled(false),
-    m_bSkipNextVendorId(false)
+    m_bVendorIdSent(false)
 {
 }
 
@@ -59,44 +60,105 @@ bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
   if (command.parameters.size == 1 &&
       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(SL_COMMAND_UNKNOWN_02);
-    response.PushBack(SL_COMMAND_UNKNOWN_03);
-
-    m_busDevice->GetProcessor()->Transmit(response);
+    HandleVendorCommand01(command);
+    return true;
+  }
+  else if (command.parameters.size == 2 &&
+      command.parameters[0] == SL_COMMAND_POWER_ON)
+  {
+    HandleVendorCommand03(command);
     return true;
   }
   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(m_busDevice->GetProcessor()->GetLogicalAddresses().primary);
-    m_busDevice->GetProcessor()->Transmit(response);
-
-    /* set deck status for the playback device */
-    TransmitDeckStatus(command.initiator);
+    HandleVendorCommand04(command);
     return true;
   }
   else if (command.parameters.size == 1 &&
-      command.parameters[0] == SL_COMMAND_REQUEST_VENDOR_ID)
+      command.parameters[0] == SL_COMMAND_REQUEST_POWER_STATUS)
   {
-//    if (command.destination != CECDEVICE_BROADCAST)
-//      m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary]->TransmitPowerState(command.initiator);
+    HandleVendorCommandA0(command);
     return true;
   }
 
   return false;
 }
 
+bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
+{
+  if (command.parameters.size == 1)
+  {
+    if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE ||
+        command.parameters[0] == CEC_STATUS_REQUEST_ON)
+    {
+      TransmitDeckStatus(command.initiator);
+    }
+    else
+    {
+      CCECCommandHandler::HandleGiveDeckStatus(command);
+    }
+  }
+  return true;
+}
+
+void CSLCommandHandler::HandleVendorCommand01(const cec_command &command)
+{
+  cec_command response;
+  cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND);
+  response.PushBack(SL_COMMAND_UNKNOWN_02);
+  response.PushBack(SL_COMMAND_UNKNOWN_03);
+
+  Transmit(response);
+
+  /* transmit power status */
+  if (command.destination != CECDEVICE_BROADCAST)
+    m_processor->m_busDevices[command.destination]->TransmitPowerState(command.initiator);
+}
+
+void CSLCommandHandler::HandleVendorCommand03(const cec_command &command)
+{
+  CCECBusDevice *device = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
+  if (device)
+  {
+    device->SetPowerStatus(CEC_POWER_STATUS_ON);
+    device->TransmitPowerState(command.initiator);
+    device->TransmitPhysicalAddress();
+    TransmitPowerOn(device->GetLogicalAddress(), command.initiator);
+    if (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
+        device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+    {
+      ((CCECPlaybackDevice *)device)->TransmitDeckStatus(command.initiator);
+    }
+  }
+}
+
+void CSLCommandHandler::HandleVendorCommand04(const cec_command &command)
+{
+  cec_command response;
+  cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND);
+  response.PushBack(SL_COMMAND_CONNECT_ACCEPT);
+  response.PushBack((uint8_t)m_processor->GetLogicalAddresses().primary);
+  Transmit(response);
+
+  TransmitDeckStatus(command.initiator);
+}
+
+void CSLCommandHandler::HandleVendorCommandA0(const cec_command &command)
+{
+  if (command.destination != CECDEVICE_BROADCAST)
+  {
+    CCECBusDevice *device = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
+    device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+    device->TransmitPowerState(command.initiator);
+    device->SetPowerStatus(CEC_POWER_STATUS_ON);
+  }
+}
+
 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];
+  CCECBusDevice *primary = m_processor->m_busDevices[m_processor->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);
@@ -107,12 +169,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);
   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;
 }
 
@@ -129,7 +191,8 @@ 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_processor->IsStarted() && m_busDevice->MyLogicalAddressContains(command.destination) ||
       command.destination == CECDEVICE_BROADCAST)
   {
     switch(command.opcode)
@@ -137,30 +200,14 @@ bool CSLCommandHandler::HandleCommand(const cec_command &command)
     case CEC_OPCODE_VENDOR_COMMAND:
       bHandled = HandleVendorCommand(command);
       break;
-    case CEC_OPCODE_GIVE_DECK_STATUS:
-      {
-        if (command.parameters.size == 1)
-        {
-          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)
+        if (!m_bVendorIdSent)
         {
-          m_bSkipNextVendorId = true;
-          TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_BROADCAST);
-        }
-        else
-        {
-          m_bSkipNextVendorId = false;
+          m_bVendorIdSent = true;
+          TransmitLGVendorId(m_processor->GetLogicalAddresses().primary, CECDEVICE_BROADCAST);
         }
+        m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary]->SetPowerStatus(CEC_POWER_STATUS_STANDBY);
         m_bSLEnabled = false;
       }
       bHandled = true;
@@ -198,19 +245,20 @@ bool CSLCommandHandler::InitHandler(void)
     return true;
   m_bSLEnabled = true;
 
-  CCECBusDevice *primary = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary];
+  m_processor->SetStandardLineTimeout(3);
+  m_processor->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;
+
+  CCECBusDevice *primary = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary];
   if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
     primary->SetVendorId(CEC_VENDOR_LG, false);
 
   if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
   {
-    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_busDevice->GetProcessor()->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);
   }
@@ -223,14 +271,12 @@ bool CSLCommandHandler::InitHandler(void)
 
   if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
   {
+    m_processor->SetActiveSource(m_processor->GetLogicalAddresses().primary);
     /* LG TVs only route keypresses when the deck status is set to 0x20 */
-    cec_logical_addresses addr = m_busDevice->GetProcessor()->GetLogicalAddresses();
+    cec_logical_addresses addr = m_processor->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(5000);
+      CCECBusDevice *device = m_processor->m_busDevices[iPtr];
 
       if (addr[iPtr])
       {
@@ -238,7 +284,6 @@ bool CSLCommandHandler::InitHandler(void)
                        device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
         {
           ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
-          TransmitDeckStatus(CECDEVICE_TV);
         }
       }
     }
@@ -246,3 +291,19 @@ bool CSLCommandHandler::InitHandler(void)
 
   return true;
 }
+
+bool CSLCommandHandler::TransmitPowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+  if (iDestination != CECDEVICE_BROADCAST &&
+      iDestination != CECDEVICE_TV &&
+      m_processor->m_busDevices[iDestination]->GetVendorId(false) == CEC_VENDOR_LG)
+  {
+    cec_command command;
+    cec_command::Format(command, iInitiator, iDestination, CEC_OPCODE_VENDOR_COMMAND);
+    command.parameters.PushBack((uint8_t)SL_COMMAND_POWER_ON);
+    command.parameters.PushBack(0x00);
+    return Transmit(command);
+  }
+
+  return CCECCommandHandler::TransmitPowerOn(iInitiator, iDestination);
+}