cec: don't hold a lock when sending an active source message. fixes potential deadlock

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index ede11f4e2f47813f25a0e6cfefdef964f08692eb..ab4dcd862de8faeb5ed264fe81bb1b55405851a0 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -58,15 +58,20 @@ namespace CEC {
 //default physical address 1.0.0.0, HDMI port 1
 #define CEC_DEFAULT_PHYSICAL_ADDRESS 0x1000
 #define CEC_DEFAULT_HDMI_PORT        1
+#define CEC_DEFAULT_BASE_DEVICE      0
 #define MSGSTART                     0xFF
 #define MSGEND                       0xFE
 #define MSGESC                       0xFD
 #define ESCOFFSET                    3
 #define CEC_BUTTON_TIMEOUT           500
 
+#define CEC_DEFAULT_TRANSMIT_TIMEOUT 1000
+#define CEC_DEFAULT_TRANSMIT_WAIT    2000
+#define CEC_DEFAULT_TRANSMIT_RETRIES 1
+
 #define CEC_MIN_LIB_VERSION          1
 #define CEC_LIB_VERSION_MAJOR        1
-#define CEC_LIB_VERSION_MINOR        2
+#define CEC_LIB_VERSION_MINOR        3
 
 typedef enum cec_abort_reason
 {
@@ -153,7 +158,8 @@ typedef enum cec_deck_info
   CEC_DECK_INFO_SKIP_REVERSE_REWIND  = 0x1C,
   CEC_DECK_INFO_INDEX_SEARCH_FORWARD = 0x1D,
   CEC_DECK_INFO_INDEX_SEARCH_REVERSE = 0x1E,
-  CEC_DECK_INFO_OTHER_STATUS         = 0x1F
+  CEC_DECK_INFO_OTHER_STATUS         = 0x1F,
+  CEC_DECK_INFO_OTHER_STATUS_LG      = 0x20
 } cec_deck_info;
 
 typedef enum cec_device_type
@@ -598,6 +604,8 @@ typedef enum cec_vendor_id
   CEC_VENDOR_PANASONIC = 0x8045,
   CEC_VENDOR_PIONEER   = 0xE036,
   CEC_VENDOR_ONKYO     = 0x09B0,
+  CEC_VENDOR_YAMAHA    = 0xA0DE,
+  CEC_VENDOR_PHILIPS   = 0x903E,
   CEC_VENDOR_UNKNOWN   = 0
 } cec_vendor_id;
 
@@ -707,11 +715,12 @@ typedef struct cec_command
     return *this;
   }
 
-  static void Format(cec_command &command, cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode)
+  static void Format(cec_command &command, cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode, int32_t timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT)
   {
     command.Clear();
-    command.initiator    = initiator;
-    command.destination  = destination;
+    command.initiator        = initiator;
+    command.destination      = destination;
+    command.transmit_timeout = timeout;
     if (opcode != CEC_OPCODE_NONE)
     {
       command.opcode     = opcode;
@@ -743,7 +752,7 @@ typedef struct cec_command
     eom              = 0;
     opcode_set       = 0;
     opcode           = CEC_OPCODE_FEATURE_ABORT;
-    transmit_timeout = 1000;
+    transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT;
     parameters.Clear();
   };
 #endif
@@ -855,6 +864,15 @@ typedef struct cec_logical_addresses
 #endif
 } cec_logical_addresses;
 
+#ifdef UNUSED
+#elif defined(__GNUC__)
+#define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+#elif defined(__LCLINT__)
+#define UNUSED(x) /*@unused@*/ x
+#else
+#define UNUSED(x) x
+#endif
+
 #ifdef __cplusplus
 };
 };