{
class CCECProcessor;
- class CUSBCECAdapterProcessor: public PLATFORM::CThread
- {
- public:
- CUSBCECAdapterProcessor(IAdapterCommunicationCallback *cb) :
- m_callback(cb) {};
- virtual ~CUSBCECAdapterProcessor(void)
- {
- StopThread();
- }
-
- void *Process(void);
- void AddCommand(cec_command command);
- private:
- IAdapterCommunicationCallback * m_callback;
- PLATFORM::SyncedBuffer<cec_command> m_inBuffer;
- };
-
class CUSBCECAdapterCommunication : public IAdapterCommunication, private PLATFORM::CThread
{
public:
CUSBCECAdapterCommunication(CCECProcessor *processor, const char *strPort, uint16_t iBaudRate = 38400);
- virtual ~CUSBCECAdapterCommunication();
+ virtual ~CUSBCECAdapterCommunication() {};
- virtual bool Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs = 10000, bool bSkipChecks = false);
+ virtual bool Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs = 10000, bool bSkipChecks = false, bool bStartListening = true);
virtual void Close(void);
virtual bool IsOpen(void);
virtual CStdString GetError(void) const;
virtual uint16_t GetFirmwareVersion(void);
virtual bool SetControlledMode(bool controlled);
virtual bool PersistConfiguration(libcec_configuration *configuration);
+ virtual bool GetConfiguration(libcec_configuration *configuration);
virtual CStdString GetPortName(void);
virtual uint16_t GetPhysicalAddress(void) { return 0; }
void *Process(void);
private:
- bool SendCommand(cec_adapter_messagecode msgCode, CCECAdapterMessage ¶ms, bool bExpectAck = true, bool bIsTransmission = false, bool bSendDirectly = true);
-
- bool SetAutoEnabled(bool enabled);
- bool SetDeviceType(cec_device_type type);
- bool SetDefaultLogicalAddress(cec_logical_address address);
- bool SetLogicalAddressMask(uint16_t iMask);
- bool SetPhysicalAddress(uint16_t iPhysicalAddress);
- bool SetCECVersion(cec_version version);
- bool SetOSDName(const char *strOSDName);
+ bool SendCommand(cec_adapter_messagecode msgCode, CCECAdapterMessage ¶ms, bool bExpectAck = true, bool bIsTransmission = false, bool bSendDirectly = true, bool bIsRetry = false);
+ cec_datapacket GetSetting(cec_adapter_messagecode msgCode, uint8_t iResponseLength);
+
+ bool SetSettingAutoEnabled(bool enabled);
+ bool GetSettingAutoEnabled(bool &enabled);
+
+ bool SetSettingDeviceType(cec_device_type type);
+ bool GetSettingDeviceType(cec_device_type &type);
+
+ bool SetSettingDefaultLogicalAddress(cec_logical_address address);
+ bool GetSettingDefaultLogicalAddress(cec_logical_address &address);
+
+ bool SetSettingLogicalAddressMask(uint16_t iMask);
+ bool GetSettingLogicalAddressMask(uint16_t &iMask);
+
+ bool SetSettingPhysicalAddress(uint16_t iPhysicalAddress);
+ bool GetSettingPhysicalAddress(uint16_t &iPhysicalAddress);
+
+ bool SetSettingCECVersion(cec_version version);
+ bool GetSettingCECVersion(cec_version &version);
+
+ bool SetSettingOSDName(const char *strOSDName);
+ bool GetSettingOSDName(CStdString &strOSDName);
+
bool WriteEEPROM(void);
bool SetAckMaskInternal(uint16_t iMask, bool bWriteDirectly = false);
uint8_t m_iLineTimeout;
uint16_t m_iFirmwareVersion;
cec_command m_currentframe;
- cec_logical_address m_lastInitiator;
+ cec_logical_address m_lastDestination;
CCECAdapterMessage m_currentAdapterMessage;
bool m_bNextIsEscaped;
bool m_bGotStart;
IAdapterCommunicationCallback * m_callback;
- CUSBCECAdapterProcessor * m_messageProcessor;
bool m_bInitialised;
+ bool m_bWaitingForAck[15];
};
};