cec: don't retry polls

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 3e4c85390978f71c36f7b6d7aaddd18bd97eb523..467f15049a422f8e9945130ab0a7d8706029a65d 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -57,6 +57,8 @@ 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
@@ -582,12 +584,23 @@ typedef enum cec_adapter_messagecode
   MSGCODE_FRAME_ACK = 0x40,
 } cec_adapter_messagecode;
 
+typedef enum cec_bus_device_status
+{
+  CEC_DEVICE_STATUS_UNKNOWN,
+  CEC_DEVICE_STATUS_PRESENT,
+  CEC_DEVICE_STATUS_NOT_PRESENT,
+  CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC
+} cec_bus_device_status;
+
 typedef enum cec_vendor_id
 {
   CEC_VENDOR_SAMSUNG   = 0x00F0,
   CEC_VENDOR_LG        = 0xE091,
   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;
 
@@ -597,6 +610,12 @@ typedef struct cec_menu_language
   cec_logical_address device;
 } cec_menu_language;
 
+typedef struct cec_osd_name
+{
+  char                name[14];
+  cec_logical_address device;
+} cec_osd_name;
+
 typedef struct cec_log_message
 {
   char          message[1024];
@@ -675,6 +694,7 @@ typedef struct cec_command
   cec_datapacket      parameters;
   int8_t              opcode_set;
   int32_t             transmit_timeout;
+  int8_t              retries;
 
 #ifdef __cplusplus
   cec_command &operator =(const struct cec_command &command)
@@ -687,6 +707,7 @@ typedef struct cec_command
     opcode_set       = command.opcode_set;
     transmit_timeout = command.transmit_timeout;
     parameters       = command.parameters;
+    retries          = command.retries;
 
     return *this;
   }
@@ -728,6 +749,7 @@ typedef struct cec_command
     opcode_set       = 0;
     opcode           = CEC_OPCODE_FEATURE_ABORT;
     transmit_timeout = 1000;
+    retries          = 4;
     parameters.Clear();
   };
 #endif
@@ -738,6 +760,15 @@ typedef struct cec_device_type_list
   cec_device_type types[5];
 
 #ifdef __cplusplus
+  /*!
+   * @deprecated
+   */
+  void clear(void) { Clear(); }
+  /*!
+   * @deprecated
+   */
+  void add(const cec_device_type type) { Add(type); }
+
   void Clear(void)
   {
     for (unsigned int iPtr = 0; iPtr < 5; iPtr++)