cec: replaced a load of magic numbers

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 48bb70f45ebfd71652458b74780af0fc305eff5b..6de565d2fb4c37e8402cf26a70d046f787c4200a 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -73,6 +73,9 @@ namespace CEC {
 #define CEC_POWER_STATE_REFRESH_TIME 30000
 #define CEC_FW_VERSION_UNKNOWN       0xFFFF
 #define CEC_CONNECT_TRIES            3
+#define CEC_PHYSICAL_ADDRESS_TV      0
+#define CEC_MAX_PHYSICAL_ADDRESS     0xFFFE
+#define CEC_INVALID_PHYSICAL_ADDRESS 0xFFFF
 
 #define CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE      1
 #define CEC_DEFAULT_SETTING_ACTIVATE_SOURCE           1
@@ -90,6 +93,11 @@ namespace CEC {
 #define CEC_DEFAULT_TRANSMIT_WAIT       2000
 #define CEC_DEFAULT_TRANSMIT_RETRIES    1
 
+#define CEC_DEFAULT_CONNECT_TIMEOUT     10000
+#define CEC_DEFAULT_CONNECT_RETRY_WAIT  1000
+#define CEC_SERIAL_DEFAULT_BAUDRATE     38400
+#define CEC_CLEAR_INPUT_DEFAULT_WAIT    1000
+
 #define CEC_MIN_LIB_VERSION          1
 #define CEC_LIB_VERSION_MAJOR        1
 #define CEC_LIB_VERSION_MINOR        6
@@ -854,7 +862,7 @@ typedef struct cec_command
     case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
       return CEC_OPCODE_DEVICE_VENDOR_ID;
     case CEC_OPCODE_GIVE_OSD_NAME:
-      return CEC_OPCODE_GIVE_OSD_NAME;
+      return CEC_OPCODE_SET_OSD_NAME;
     case CEC_OPCODE_MENU_REQUEST:
       return CEC_OPCODE_MENU_STATUS;
     case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
@@ -869,7 +877,7 @@ typedef struct cec_command
       break;
     }
 
-    return CEC_OPCODE_FEATURE_ABORT;
+    return CEC_OPCODE_NONE;
   }
 #endif
 } cec_command;