X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=44f1fc170bf1d22d674e7d057c44fa4024b5afb6;hb=f7539eaf1ed0a488c0a93998c9b178d435014c51;hp=9b7a6e3cd463c44a93e6822087b2ed824c5c44a4;hpb=5734016c1b1e932c19a85bb671211c4967399f8c;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 9b7a6e3..44f1fc1 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -2,7 +2,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -32,198 +32,163 @@ */ #include -#include "../../include/cectypes.h" + #include "platform/threads/threads.h" #include "platform/util/buffer.h" + #include "adapter/AdapterCommunication.h" +#include "devices/CECDeviceMap.h" +#include "CECInputBuffer.h" namespace CEC { class CLibCEC; class IAdapterCommunication; class CCECBusDevice; - - // a buffer that priotises the input from the TV. - // if we need more than this, we'll have to change it into a priority_queue - class CCECInputBuffer + class CCECAudioSystem; + class CCECPlaybackDevice; + class CCECRecordingDevice; + class CCECTuner; + class CCECTV; + class CCECClient; + class CCECProcessor; + class CCECStandbyProtection; + + class CCECAllocateLogicalAddress : public PLATFORM::CThread { public: - CCECInputBuffer(void) : m_bHasData(false) {} - virtual ~CCECInputBuffer(void) - { - m_condition.Broadcast(); - } - - bool Push(const cec_command &command) - { - bool bReturn(false); - PLATFORM::CLockObject lock(m_mutex); - if (command.initiator == CECDEVICE_TV) - bReturn = m_tvInBuffer.Push(command); - else - bReturn = m_inBuffer.Push(command); - - m_bHasData |= bReturn; - if (m_bHasData) - m_condition.Signal(); - - return bReturn; - } - - bool Pop(cec_command &command, uint16_t iTimeout = 10000) - { - bool bReturn(false); - PLATFORM::CLockObject lock(m_mutex); - if (m_tvInBuffer.IsEmpty() && m_inBuffer.IsEmpty() && - !m_condition.Wait(m_mutex, m_bHasData, iTimeout)) - return bReturn; - - if (m_tvInBuffer.Pop(command)) - bReturn = true; - else if (m_inBuffer.Pop(command)) - bReturn = true; - - m_bHasData = !m_tvInBuffer.IsEmpty() || !m_inBuffer.IsEmpty(); - return bReturn; - } + CCECAllocateLogicalAddress(CCECProcessor* processor, CCECClient* client); + void* Process(void); private: - PLATFORM::CMutex m_mutex; - PLATFORM::CCondition m_condition; - volatile bool m_bHasData; - PLATFORM::SyncedBuffer m_tvInBuffer; - PLATFORM::SyncedBuffer m_inBuffer; + CCECProcessor* m_processor; + CCECClient* m_client; }; class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback { public: - CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress); - CCECProcessor(CLibCEC *controller, libcec_configuration *configuration); + CCECProcessor(CLibCEC *libcec); virtual ~CCECProcessor(void); - bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); + bool Start(const char *strPort, uint16_t iBaudRate = CEC_SERIAL_DEFAULT_BAUDRATE, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); void *Process(void); void Close(void); + bool RegisterClient(CCECClient *client); + bool UnregisterClient(CCECClient *client); + void UnregisterClients(void); + uint16_t GetPhysicalAddressFromEeprom(void); + CCECClient *GetPrimaryClient(void); + CCECClient *GetClient(const cec_logical_address address); + bool OnCommandReceived(const cec_command &command); + void HandleLogicalAddressLost(cec_logical_address oldAddress); + void HandlePhysicalAddressChanged(uint16_t iNewAddress); + + CCECBusDevice * GetDevice(cec_logical_address address) const; + CCECAudioSystem * GetAudioSystem(void) const; + CCECPlaybackDevice * GetPlaybackDevice(cec_logical_address address) const; + CCECRecordingDevice * GetRecordingDevice(cec_logical_address address) const; + CCECTuner * GetTuner(cec_logical_address address) const; + CCECTV * GetTV(void) const; - bool IsMonitoring(void) const { return m_bMonitor; } CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bSuppressUpdate = true); - CCECBusDevice * GetDeviceByType(cec_device_type type) const; - CCECBusDevice * GetPrimaryDevice(void) const; - cec_version GetDeviceCecVersion(cec_logical_address iAddress); - bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language); - CStdString GetDeviceName(void) const; - cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); - uint64_t GetDeviceVendorId(cec_logical_address iAddress); - cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - cec_logical_address GetLogicalAddress(void) const { return m_configuration.logicalAddresses.primary; } - cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.logicalAddresses; } - cec_logical_addresses GetActiveDevices(void); - uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); - bool HasLogicalAddress(cec_logical_address address) const { return m_configuration.logicalAddresses.IsSet(address); } + CCECBusDevice * GetPrimaryDevice(void); + cec_logical_address GetLogicalAddress(void); + cec_logical_addresses GetLogicalAddresses(void); bool IsPresentDevice(cec_logical_address address); bool IsPresentDeviceType(cec_device_type type); - uint16_t GetPhysicalAddress(void) const; + uint16_t GetDetectedPhysicalAddress(void) const; uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } cec_logical_address GetActiveSource(bool bRequestActiveSource = true); bool IsActiveSource(cec_logical_address iAddress); - bool IsInitialised(void); - bool SetStreamPath(uint16_t iPhysicalAddress); - cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; - bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); - bool PowerOnDevices(cec_logical_address address = CECDEVICE_BROADCAST); - - bool SetActiveView(void); - bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED); - bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true); + bool CECInitialised(void); + + bool StandbyDevices(const cec_logical_address initiator, const CECDEVICEVEC &devices); + bool StandbyDevice(const cec_logical_address initiator, cec_logical_address address); + bool PowerOnDevices(const cec_logical_address initiator, const CECDEVICEVEC &devices); + bool PowerOnDevice(const cec_logical_address initiator, cec_logical_address address); + bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true); - bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false); - bool TransmitInactiveSource(void); - bool SetLogicalAddress(cec_logical_address iLogicalAddress); - bool SetMenuState(cec_menu_state state, bool bSendUpdate = true); - bool SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate = true); - bool SetActiveSource(uint16_t iStreamPath); - bool SwitchMonitoring(bool bEnable); + bool ActivateSource(uint16_t iStreamPath); + void SetActiveSource(bool bSetTo, bool bClientUnregistered); bool PollDevice(cec_logical_address iAddress); - uint8_t VolumeUp(bool bSendRelease = true); - uint8_t VolumeDown(bool bSendRelease = true); - uint8_t MuteAudio(bool bSendRelease = true); - bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); - bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); - bool EnablePhysicalAddressDetection(void); void SetStandardLineTimeout(uint8_t iTimeout); + uint8_t GetStandardLineTimeout(void); void SetRetryLineTimeout(uint8_t iTimeout); - bool GetCurrentConfiguration(libcec_configuration *configuration); - bool SetConfiguration(const libcec_configuration *configuration); + uint8_t GetRetryLineTimeout(void); bool CanPersistConfiguration(void); - bool PersistConfiguration(libcec_configuration *configuration); + bool PersistConfiguration(const libcec_configuration &configuration); void RescanActiveDevices(void); bool SetLineTimeout(uint8_t iTimeout); - const char *ToString(const cec_device_type type); - const char *ToString(const cec_menu_state state); - const char *ToString(const cec_version version); - const char *ToString(const cec_power_status status); - const char *ToString(const cec_logical_address address); - const char *ToString(const cec_deck_control_mode mode); - const char *ToString(const cec_deck_info status); - const char *ToString(const cec_opcode opcode); - const char *ToString(const cec_system_audio_status mode); - const char *ToString(const cec_audio_status status); - const char *ToString(const cec_vendor_id vendor); - const char *ToString(const cec_client_version version); - const char *ToString(const cec_server_version version); - - bool Transmit(const cec_command &data); - void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); - - bool ChangeDeviceType(cec_device_type from, cec_device_type to); - bool FindLogicalAddresses(void); - bool SetAckMask(uint16_t iMask); + bool Transmit(const cec_command &data, bool bIsReply); + void TransmitAbort(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); bool StartBootloader(const char *strPort = NULL); bool PingAdapter(void); void HandlePoll(cec_logical_address initiator, cec_logical_address destination); bool HandleReceiveFailed(cec_logical_address initiator); - bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); bool TransmitPendingActiveSourceCommands(void); - CCECBusDevice * m_busDevices[16]; + CCECDeviceMap *GetDevices(void) const { return m_busDevices; } + CLibCEC *GetLib(void) const { return m_libcec; } - private: + bool IsHandledByLibCEC(const cec_logical_address address) const; + + bool TryLogicalAddress(cec_logical_address address, cec_version libCECSpecVersion = CEC_VERSION_1_4); + + bool IsRunningLatestFirmware(void); + void SwitchMonitoring(bool bSwitchTo); + + bool AllocateLogicalAddresses(CCECClient* client); + + uint16_t GetAdapterVendorId(void) const; + uint16_t GetAdapterProductId(void) const; + private: bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs, bool bStartListening = true); - bool Initialise(void); - void SetInitialised(bool bSetTo = true); - void CreateBusDevices(void); + void SetCECInitialised(bool bSetTo = true); void ReplaceHandlers(void); bool PhysicalAddressInUse(uint16_t iPhysicalAddress); - bool TryLogicalAddress(cec_logical_address address); - bool FindLogicalAddressRecordingDevice(void); - bool FindLogicalAddressTuner(void); - bool FindLogicalAddressPlaybackDevice(void); - bool FindLogicalAddressAudioSystem(void); + + bool ClearLogicalAddresses(void); + bool SetLogicalAddresses(const cec_logical_addresses &addresses); void LogOutput(const cec_command &data); - void ParseCommand(const cec_command &command); - - bool m_bConnectionOpened; - bool m_bInitialised; - PLATFORM::CMutex m_mutex; - IAdapterCommunication * m_communication; - CLibCEC* m_controller; - bool m_bMonitor; - cec_keypress m_previousKey; - PLATFORM::CThread * m_busScan; - uint8_t m_iStandardLineTimeout; - uint8_t m_iRetryLineTimeout; - uint64_t m_iLastTransmission; - CCECInputBuffer m_inBuffer; - libcec_configuration m_configuration; + void ProcessCommand(const cec_command &command); + + void ResetMembers(void); + + bool m_bInitialised; + PLATFORM::CMutex m_mutex; + IAdapterCommunication * m_communication; + CLibCEC* m_libcec; + uint8_t m_iStandardLineTimeout; + uint8_t m_iRetryLineTimeout; + uint64_t m_iLastTransmission; + CCECInputBuffer m_inBuffer; + CCECDeviceMap * m_busDevices; + std::map m_clients; + bool m_bMonitor; + CCECAllocateLogicalAddress* m_addrAllocator; + bool m_bStallCommunication; + CCECStandbyProtection* m_connCheck; + }; + + class CCECStandbyProtection : public PLATFORM::CThread + { + public: + CCECStandbyProtection(CCECProcessor* processor); + virtual ~CCECStandbyProtection(void); + void* Process(void); + + private: + CCECProcessor* m_processor; }; };