X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=004ea060170047888c636bf8d019791e7fd24f87;hb=96e09b103a541b1e64071c920f7c72ec44f5c6e6;hp=854fdebb906c76daa5870385427cb6e284b687e3;hpb=02ee2c6832291a768a1bf749baf68ec8756db528;p=deb_libcec.git

diff --git a/include/cectypes.h b/include/cectypes.h
index 854fdeb..004ea06 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -151,13 +151,13 @@ typedef enum
   CEC_DEVICE_TYPE_AUDIO_SYSTEM = 5
 } ECecDeviceType;
 
-typedef enum
+typedef enum cec_display_control
 {
   CEC_DISPLAY_CONTROL_DISPLAY_FOR_DEFAULT_TIME = 0x00,
   CEC_DISPLAY_CONTROL_DISPLAY_UNTIL_CLEARED = 0x40,
   CEC_DISPLAY_CONTROL_CLEAR_PREVIOUS_MESSAGE = 0x80,
   CEC_DISPLAY_CONTROL_RESERVED_FOR_FUTURE_USE = 0xC0
-} ECecDisplayControl;
+} cec_display_control;
 
 typedef enum
 {
@@ -660,7 +660,12 @@ typedef struct cec_command
 
   void push_back(uint8_t data)
   {
-    if (!opcode_set)
+    if (initiator == CECDEVICE_UNKNOWN && destination == CECDEVICE_UNKNOWN)
+    {
+      initiator   = (cec_logical_address) (data >> 4);
+      destination = (cec_logical_address) (data & 0xF);
+    }
+    else if (!opcode_set)
     {
       opcode_set = 1;
       opcode = (cec_opcode) data;
@@ -688,7 +693,7 @@ typedef enum cec_vendor_id
   CEC_VENDOR_UNKNOWN = 0
 } vendor_id;
 
-//default physical address 1.0.0.0
+//default physical address 1.0.0.0, HDMI port 1
 #define CEC_DEFAULT_PHYSICAL_ADDRESS 0x1000
 #define MSGSTART                     0xFF
 #define MSGEND                       0xFE
@@ -696,7 +701,6 @@ typedef enum cec_vendor_id
 #define ESCOFFSET                    3
 #define CEC_MIN_VERSION              6
 #define CEC_LIB_VERSION              7
-#define CEC_SETTLE_DOWN_TIME         1500
 #define CEC_BUTTON_TIMEOUT           500
 
 #ifdef __cplusplus