X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=a44bbeaaf3c3d033aceabe4abb5b79e01d74e4aa;hb=51b611bcf0c25eb55d3097ba5122e3549d578a17;hp=72295ada13d13ffebbe227973939c5778cf43d33;hpb=0a61dc2416f3eacb839ff67ac5abf0024c1d2f40;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index 72295ad..a44bbea 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -99,6 +99,7 @@ namespace CEC { #define CEC_DEFAULT_DEVICE_LANGUAGE "eng" #define CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS 0 #define CEC_DEFAULT_SETTING_GET_SETTINGS_FROM_ROM 0 +#define CEC_DEFAULT_SETTING_CEC_VERSION 0x05 #define CEC_DEFAULT_TRANSMIT_RETRY_WAIT 500 #define CEC_DEFAULT_TRANSMIT_TIMEOUT 1000 @@ -110,9 +111,19 @@ namespace CEC { #define CEC_SERIAL_DEFAULT_BAUDRATE 38400 #define CEC_CLEAR_INPUT_DEFAULT_WAIT 1000 +#define CEC_ACTIVE_SOURCE_SWITCH_RETRY_TIME_MS 5000 +#define CEC_FORWARD_STANDBY_MIN_INTERVAL 10000 + +#define CEC_RPI_VIRTUAL_PATH "Raspberry Pi" +#define CEC_RPI_VIRTUAL_COM "RPI" + +#define CEC_TDA995x_PATH "/dev/hdmicec" +#define CEC_TDA995x_VIRTUAL_COM "CuBox" + #define CEC_MIN_LIB_VERSION 1 #define CEC_LIB_VERSION_MAJOR 1 -#define CEC_LIB_VERSION_MINOR 7 +#define CEC_LIB_VERSION_MAJOR_STR "1" +#define CEC_LIB_VERSION_MINOR 9 typedef enum cec_abort_reason { @@ -607,52 +618,6 @@ typedef enum cec_log_level CEC_LOG_ALL = 31 } cec_log_level; -typedef enum cec_adapter_messagecode -{ - MSGCODE_NOTHING = 0, - MSGCODE_PING, - MSGCODE_TIMEOUT_ERROR, - MSGCODE_HIGH_ERROR, - MSGCODE_LOW_ERROR, - MSGCODE_FRAME_START, - MSGCODE_FRAME_DATA, - MSGCODE_RECEIVE_FAILED, - MSGCODE_COMMAND_ACCEPTED, - MSGCODE_COMMAND_REJECTED, - MSGCODE_SET_ACK_MASK, - MSGCODE_TRANSMIT, - MSGCODE_TRANSMIT_EOM, - MSGCODE_TRANSMIT_IDLETIME, - MSGCODE_TRANSMIT_ACK_POLARITY, - MSGCODE_TRANSMIT_LINE_TIMEOUT, - MSGCODE_TRANSMIT_SUCCEEDED, - MSGCODE_TRANSMIT_FAILED_LINE, - MSGCODE_TRANSMIT_FAILED_ACK, - MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA, - MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE, - MSGCODE_FIRMWARE_VERSION, - MSGCODE_START_BOOTLOADER, - MSGCODE_GET_BUILDDATE, - MSGCODE_SET_CONTROLLED, - MSGCODE_GET_AUTO_ENABLED, - MSGCODE_SET_AUTO_ENABLED, - MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS, - MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS, - MSGCODE_GET_LOGICAL_ADDRESS_MASK, - MSGCODE_SET_LOGICAL_ADDRESS_MASK, - MSGCODE_GET_PHYSICAL_ADDRESS, - MSGCODE_SET_PHYSICAL_ADDRESS, - MSGCODE_GET_DEVICE_TYPE, - MSGCODE_SET_DEVICE_TYPE, - MSGCODE_GET_HDMI_VERSION, - MSGCODE_SET_HDMI_VERSION, - MSGCODE_GET_OSD_NAME, - MSGCODE_SET_OSD_NAME, - MSGCODE_WRITE_EEPROM, - MSGCODE_FRAME_EOM = 0x80, - MSGCODE_FRAME_ACK = 0x40, -} cec_adapter_messagecode; - typedef enum cec_bus_device_status { CEC_DEVICE_STATUS_UNKNOWN, @@ -672,9 +637,28 @@ typedef enum cec_vendor_id CEC_VENDOR_PHILIPS = 0x00903E, CEC_VENDOR_SONY = 0x080046, CEC_VENDOR_TOSHIBA = 0x000039, + CEC_VENDOR_AKAI = 0x0020C7, + CEC_VENDOR_AOC = 0x002467, + CEC_VENDOR_BENQ = 0x8065E9, + CEC_VENDOR_DAEWOO = 0x009053, + CEC_VENDOR_GRUNDIG = 0x00D0D5, + CEC_VENDOR_MEDION = 0x000CB8, + CEC_VENDOR_SHARP = 0x08001F, + CEC_VENDOR_VIZIO = 0x6B746D, + CEC_VENDOR_BROADCOM = 0x18C086, + CEC_VENDOR_UNKNOWN = 0 } cec_vendor_id; +typedef enum cec_adapter_type +{ + ADAPTERTYPE_UNKNOWN = 0, + ADAPTERTYPE_P8_EXTERNAL = 0x1, + ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2, + ADAPTERTYPE_RPI = 0x100, + ADAPTERTYPE_TDA995x = 0x200 +} cec_adapter_type; + typedef struct cec_menu_language { char language[4]; /**< the iso language code. @bug the language code is only 3 chars long, not 4. will be changed in v2.0, because changing it now would break backwards compat */ @@ -789,10 +773,11 @@ typedef struct cec_command int32_t transmit_timeout; /**< the timeout to use in ms */ #ifdef __cplusplus - cec_command(void) - { - Clear(); - } + // @todo re-add in v2.0 (breaks ABI) + //cec_command(void) + //{ + // Clear(); + //} cec_command &operator =(const struct cec_command &command) { @@ -900,6 +885,12 @@ typedef struct cec_command return CEC_OPCODE_NONE; } + + void PushArray(size_t len, uint8_t *data) + { + for (size_t iPtr = 0; iPtr < len; iPtr++) + PushBack(data[iPtr]); + } #endif } cec_command; @@ -1115,6 +1106,7 @@ typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command &); typedef int (CEC_CDECL* CBCecConfigurationChangedType)(void *param, const libcec_configuration &); typedef int (CEC_CDECL* CBCecAlertType)(void *param, const libcec_alert, const libcec_parameter &); typedef int (CEC_CDECL* CBCecMenuStateChangedType)(void *param, const cec_menu_state); +typedef void (CEC_CDECL* CBCecSourceActivatedType)(void *param, const cec_logical_address, const uint8_t); typedef struct ICECCallbacks { @@ -1165,9 +1157,17 @@ typedef struct ICECCallbacks */ CBCecMenuStateChangedType CBCecMenuStateChanged; + /*! + * @brief Called when a source that's handled by this client is activated. + * @param logicalAddress The address that was just activated. + * @param bActivated 1 when activated, 0 when deactivated. + */ + CBCecSourceActivatedType CBCecSourceActivated; + #ifdef __cplusplus - ICECCallbacks(void) { Clear(); } - ~ICECCallbacks(void) { Clear(); }; + // @todo re-add in v2.0 (breaks ABI) + // ICECCallbacks(void) { Clear(); } + //~ICECCallbacks(void) { Clear(); }; void Clear(void) { @@ -1177,6 +1177,7 @@ typedef struct ICECCallbacks CBCecConfigurationChanged = NULL; CBCecAlert = NULL; CBCecMenuStateChanged = NULL; + CBCecSourceActivated = NULL; } #endif } ICECCallbacks; @@ -1192,7 +1193,13 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_6_1 = 0x1601, CEC_CLIENT_VERSION_1_6_2 = 0x1602, CEC_CLIENT_VERSION_1_6_3 = 0x1603, - CEC_CLIENT_VERSION_1_7_0 = 0x1700 + CEC_CLIENT_VERSION_1_7_0 = 0x1700, + CEC_CLIENT_VERSION_1_7_1 = 0x1701, + CEC_CLIENT_VERSION_1_7_2 = 0x1702, + CEC_CLIENT_VERSION_1_8_0 = 0x1800, + CEC_CLIENT_VERSION_1_8_1 = 0x1801, + CEC_CLIENT_VERSION_1_8_2 = 0x1802, + CEC_CLIENT_VERSION_1_9_0 = 0x1900 } cec_client_version; typedef enum cec_server_version @@ -1206,7 +1213,13 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_6_1 = 0x1601, CEC_SERVER_VERSION_1_6_2 = 0x1602, CEC_SERVER_VERSION_1_6_3 = 0x1603, - CEC_SERVER_VERSION_1_7_0 = 0x1700 + CEC_SERVER_VERSION_1_7_0 = 0x1700, + CEC_SERVER_VERSION_1_7_1 = 0x1701, + CEC_SERVER_VERSION_1_7_2 = 0x1702, + CEC_SERVER_VERSION_1_8_0 = 0x1800, + CEC_SERVER_VERSION_1_8_1 = 0x1801, + CEC_SERVER_VERSION_1_8_2 = 0x1802, + CEC_SERVER_VERSION_1_9_0 = 0x1900 } cec_server_version; typedef struct libcec_configuration @@ -1242,10 +1255,13 @@ typedef struct libcec_configuration char strDeviceLanguage[3]; /*!< the menu language used by the client. 3 character ISO 639-2 country code. see http://http://www.loc.gov/standards/iso639-2/ added in 1.6.2 */ uint32_t iFirmwareBuildDate; /*!< (read-only) the build date of the firmware, in seconds since epoch. if not available, this value will be set to 0. added in 1.6.2 */ uint8_t bMonitorOnly; /*!< won't allocate a CCECClient when starting the connection when set (same as monitor mode). added in 1.6.3 */ + cec_version cecVersion; /*!< CEC spec version to use by libCEC. defaults to v1.4. added in 1.8.0 */ + cec_adapter_type adapterType; /*!< type of the CEC adapter that we're connected to. added in 1.8.2 */ #ifdef __cplusplus - libcec_configuration(void) { Clear(); } - ~libcec_configuration(void) { Clear(); } + // @todo re-add in v2.0 (breaks ABI) + // libcec_configuration(void) { Clear(); } + //~libcec_configuration(void) { Clear(); } bool operator==(const libcec_configuration &other) const { @@ -1276,7 +1292,11 @@ typedef struct libcec_configuration (other.clientVersion < CEC_CLIENT_VERSION_1_6_2 || !strncmp(strDeviceLanguage, other.strDeviceLanguage, 3)) && (other.clientVersion < CEC_CLIENT_VERSION_1_6_2 || iFirmwareBuildDate == other.iFirmwareBuildDate) && /* libcec 1.6.3+ */ - (other.clientVersion < CEC_CLIENT_VERSION_1_6_3 || bMonitorOnly == other.bMonitorOnly)); + (other.clientVersion < CEC_CLIENT_VERSION_1_6_3 || bMonitorOnly == other.bMonitorOnly) && + /* libcec 1.8.0+ */ + (other.clientVersion < CEC_CLIENT_VERSION_1_8_0 || cecVersion == other.cecVersion) && + /* libcec 1.8.2+ */ + (other.clientVersion < CEC_CLIENT_VERSION_1_8_2 || adapterType == other.adapterType)); } bool operator!=(const libcec_configuration &other) const @@ -1308,6 +1328,8 @@ typedef struct libcec_configuration memcpy(strDeviceLanguage, CEC_DEFAULT_DEVICE_LANGUAGE, 3); iFirmwareBuildDate = CEC_FW_BUILD_UNKNOWN; bMonitorOnly = 0; + cecVersion = (cec_version)CEC_DEFAULT_SETTING_CEC_VERSION; + adapterType = ADAPTERTYPE_UNKNOWN; memset(strDeviceName, 0, 13); deviceTypes.clear(); @@ -1328,15 +1350,6 @@ typedef struct libcec_configuration #endif } libcec_configuration; -#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 }; };