X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FSLCommandHandler.cpp;h=0f007176d623f9e83732abbef114790b97446d28;hb=37b0c5724f06a98e14686695b5089f66ac657f11;hp=32ff88940fb10d0fbd54547979954fde50171ed7;hpb=37acf382b4a151ba018ecd3558fdd5b8cc585077;p=deb_libcec.git diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp index 32ff889..0f00717 100644 --- a/src/lib/implementations/SLCommandHandler.cpp +++ b/src/lib/implementations/SLCommandHandler.cpp @@ -38,20 +38,23 @@ 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) { + /* TODO set to powered off until we fixed the connect on start loop issue */ + m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary]->m_powerStatus = CEC_POWER_STATUS_STANDBY; } bool CSLCommandHandler::HandleVendorCommand(const cec_command &command) @@ -59,44 +62,110 @@ 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) + { + HandleVendorCommandPowerOn(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); + HandleVendorCommandSLConnect(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); + HandleVendorCommandPowerOnStatus(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) +{ + TransmitVendorCommand0205(command.destination, command.initiator); +} + +void CSLCommandHandler::TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination) +{ + cec_command response; + cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND); + response.PushBack(SL_COMMAND_UNKNOWN_02); + response.PushBack(SL_COMMAND_UNKNOWN_03); + + Transmit(response); +} + +void CSLCommandHandler::TransmitVendorCommand05(const cec_logical_address iSource, const cec_logical_address iDestination) +{ + m_bSLEnabled = true; + cec_command response; + cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND); + response.PushBack(SL_COMMAND_CONNECT_ACCEPT); + response.PushBack((uint8_t)iSource); + Transmit(response); +} + +void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command) +{ + CCECBusDevice *device = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary]; + if (device) + { + m_bSLEnabled = true; + device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); + device->TransmitPowerState(command.initiator); + device->TransmitVendorID(command.initiator); + TransmitPowerOn(device->GetLogicalAddress(), command.initiator); + } +} + +void CSLCommandHandler::HandleVendorCommandSLConnect(const cec_command &command) +{ + m_bSLEnabled = true; + m_processor->m_busDevices[command.initiator]->SetActiveSource(); + m_processor->m_busDevices[command.destination]->TransmitActiveSource(); + TransmitVendorCommand05(command.destination, command.initiator); + TransmitDeckStatus(command.initiator); +} + +void CSLCommandHandler::HandleVendorCommandPowerOnStatus(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 +176,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,39 +198,22 @@ bool CSLCommandHandler::HandleGiveDeviceVendorId(const cec_command &command) bool CSLCommandHandler::HandleCommand(const cec_command &command) { bool bHandled(false); - if (m_busDevice->MyLogicalAddressContains(command.destination) || - command.destination == CECDEVICE_BROADCAST) + + if (m_processor->IsStarted() && (m_busDevice->MyLogicalAddressContains(command.destination) || + command.destination == CECDEVICE_BROADCAST)) { switch(command.opcode) { 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) - { - m_bSkipNextVendorId = true; - TransmitLGVendorId(m_busDevice->GetProcessor()->GetLogicalAddresses().primary, CECDEVICE_BROADCAST); - } - else + if (!m_bVendorIdSent) { - m_bSkipNextVendorId = false; + m_bVendorIdSent = true; + TransmitLGVendorId(m_processor->GetLogicalAddresses().primary, CECDEVICE_BROADCAST); } - m_bSLEnabled = false; } bHandled = true; default: @@ -194,22 +246,23 @@ bool CSLCommandHandler::HandleReceiveFailed(void) bool CSLCommandHandler::InitHandler(void) { - if (m_bSLEnabled) - return true; - m_bSLEnabled = true; + m_processor->SetStandardLineTimeout(3); + m_processor->SetRetryLineTimeout(3); - CCECBusDevice *primary = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetProcessor()->GetLogicalAddresses().primary]; - primary->SetVendorId(CEC_VENDOR_LG); + /* increase the number of retries because the tv is keeping the bus busy at times */ + m_iTransmitWait = 2000; + m_iTransmitRetries = 4; + m_iTransmitTimeout = 500; - if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV) + CCECBusDevice *primary = m_processor->m_busDevices[m_processor->GetLogicalAddresses().primary]; + if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress()) { - 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); + primary->SetVendorId(CEC_VENDOR_LG, false); + primary->TransmitVendorID(CECDEVICE_TV, false); + } + if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV) + { /* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */ m_busDevice->SetCecVersion(CEC_VERSION_1_3A); } @@ -222,14 +275,13 @@ bool CSLCommandHandler::InitHandler(void) if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV) { + m_processor->SetActiveSource(); + /* 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]) { @@ -237,7 +289,7 @@ bool CSLCommandHandler::InitHandler(void) device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)) { ((CCECPlaybackDevice *)device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG); - TransmitDeckStatus(CECDEVICE_TV); + ((CCECPlaybackDevice *)device)->TransmitDeckStatus(CECDEVICE_TV); } } } @@ -245,3 +297,20 @@ 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); +} +