X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=72295ada13d13ffebbe227973939c5778cf43d33;hb=75060af4927b7e412634756bb1ec952a25fab772;hp=b596113f883f2e7d438ffde129820d06a101ca4e;hpb=64ec6e7919cb9a43578156b9e24dcf2fa75c7446;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index b596113..72295ad 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -72,9 +72,11 @@ namespace CEC { #define CEC_BUTTON_TIMEOUT 500 #define CEC_POWER_STATE_REFRESH_TIME 30000 #define CEC_FW_VERSION_UNKNOWN 0xFFFF +#define CEC_FW_BUILD_UNKNOWN 0 #define CEC_CONNECT_TRIES 3 #define CEC_PHYSICAL_ADDRESS_TV 0 +#define CEC_MIN_PHYSICAL_ADDRESS 0x1000 #define CEC_MAX_PHYSICAL_ADDRESS 0xFFFE #define CEC_INVALID_PHYSICAL_ADDRESS 0xFFFF @@ -84,6 +86,7 @@ namespace CEC { #define CEC_MIN_HDMI_PORTNUMBER 1 #define CEC_MAX_HDMI_PORTNUMBER 15 +#define CEC_HDMI_PORTNUMBER_NONE 0 #define CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE 1 #define CEC_DEFAULT_SETTING_ACTIVATE_SOURCE 1 @@ -94,13 +97,12 @@ namespace CEC { #define CEC_DEFAULT_SETTING_SEND_INACTIVE_SOURCE 1 #define CEC_DEFAULT_SETTING_POWER_OFF_DEVICES_STANDBY 1 #define CEC_DEFAULT_DEVICE_LANGUAGE "eng" -#define CEC_DEFAULT_FIRMWARE_BUILD_DATE 0 -#define CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS 1 +#define CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS 0 #define CEC_DEFAULT_SETTING_GET_SETTINGS_FROM_ROM 0 #define CEC_DEFAULT_TRANSMIT_RETRY_WAIT 500 #define CEC_DEFAULT_TRANSMIT_TIMEOUT 1000 -#define CEC_DEFAULT_TRANSMIT_WAIT 2000 +#define CEC_DEFAULT_TRANSMIT_WAIT 1000 #define CEC_DEFAULT_TRANSMIT_RETRIES 1 #define CEC_DEFAULT_CONNECT_TIMEOUT 10000 @@ -110,7 +112,7 @@ namespace CEC { #define CEC_MIN_LIB_VERSION 1 #define CEC_LIB_VERSION_MAJOR 1 -#define CEC_LIB_VERSION_MINOR 6 +#define CEC_LIB_VERSION_MINOR 7 typedef enum cec_abort_reason { @@ -582,6 +584,15 @@ typedef enum cec_opcode CEC_OPCODE_SYSTEM_AUDIO_MODE_REQUEST = 0x70, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS = 0x7E, CEC_OPCODE_SET_AUDIO_RATE = 0x9A, + + /* CEC 1.4 */ + CEC_OPCODE_START_ARC = 0xC0, + CEC_OPCODE_REPORT_ARC_STARTED = 0xC1, + CEC_OPCODE_REPORT_ARC_ENDED = 0xC2, + CEC_OPCODE_REQUEST_ARC_START = 0xC3, + CEC_OPCODE_REQUEST_ARC_END = 0xC4, + CEC_OPCODE_END_ARC = 0xC5, + CEC_OPCODE_CDC = 0xF8, /* when this opcode is set, no opcode will be sent to the device. this is one of the reserved numbers */ CEC_OPCODE_NONE = 0xFD } cec_opcode; @@ -997,7 +1008,7 @@ typedef struct cec_logical_addresses */ void Clear(void) { - primary = CECDEVICE_UNKNOWN; + primary = CECDEVICE_UNREGISTERED; for (unsigned int iPtr = 0; iPtr < 16; iPtr++) addresses[iPtr] = 0; } @@ -1007,7 +1018,7 @@ typedef struct cec_logical_addresses */ bool IsEmpty(void) const { - return primary == CECDEVICE_UNKNOWN; + return primary == CECDEVICE_UNREGISTERED; } /*! @@ -1029,7 +1040,7 @@ typedef struct cec_logical_addresses */ void Set(cec_logical_address address) { - if (primary == CECDEVICE_UNKNOWN) + if (primary == CECDEVICE_UNREGISTERED) primary = address; addresses[(int) address] = 1; @@ -1039,10 +1050,10 @@ typedef struct cec_logical_addresses * @brief Mark a logical address as 'unset' * @param address The logical address to remove from this list. */ - void Unset(cec_logical_address address) + void Unset(const cec_logical_address address) { if (primary == address) - primary = CECDEVICE_UNKNOWN; + primary = CECDEVICE_UNREGISTERED; addresses[(int) address] = 0; } @@ -1079,12 +1090,15 @@ typedef struct cec_logical_addresses typedef enum libcec_alert { CEC_ALERT_SERVICE_DEVICE, - CEC_ALERT_CONNECTION_LOST + CEC_ALERT_CONNECTION_LOST, + CEC_ALERT_PERMISSION_ERROR, + CEC_ALERT_PORT_BUSY } libcec_alert; typedef enum libcec_parameter_type { - CEC_PARAMETER_TYPE_STRING + CEC_PARAMETER_TYPE_STRING, + CEC_PARAMETER_TYPE_UNKOWN } libcec_parameter_type; struct libcec_parameter @@ -1176,7 +1190,9 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_5_3 = 0x1503, CEC_CLIENT_VERSION_1_6_0 = 0x1600, CEC_CLIENT_VERSION_1_6_1 = 0x1601, - CEC_CLIENT_VERSION_1_6_2 = 0x1602 + CEC_CLIENT_VERSION_1_6_2 = 0x1602, + CEC_CLIENT_VERSION_1_6_3 = 0x1603, + CEC_CLIENT_VERSION_1_7_0 = 0x1700 } cec_client_version; typedef enum cec_server_version @@ -1188,7 +1204,9 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_5_3 = 0x1503, CEC_SERVER_VERSION_1_6_0 = 0x1600, CEC_SERVER_VERSION_1_6_1 = 0x1601, - CEC_SERVER_VERSION_1_6_2 = 0x1602 + CEC_SERVER_VERSION_1_6_2 = 0x1602, + CEC_SERVER_VERSION_1_6_3 = 0x1603, + CEC_SERVER_VERSION_1_7_0 = 0x1700 } cec_server_version; typedef struct libcec_configuration @@ -1196,7 +1214,7 @@ typedef struct libcec_configuration uint32_t clientVersion; /*!< the version of the client that is connecting */ char strDeviceName[13]; /*!< how to name the device on the CEC bus */ cec_device_type_list deviceTypes; /*!< the CEC device types to emulate */ - uint8_t bAutodetectAddress; /*!< try to autodetect the physical address when 1 */ + uint8_t bAutodetectAddress; /*!< (read only) set to 1 by libCEC when the physical address was autodetected */ uint16_t iPhysicalAddress; /*!< the physical address of the CEC adapter. only used when bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ cec_logical_address baseDevice; /*!< the logical address of the device to which the adapter is connected. only used when iPhysicalAddress = 0 and bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ uint8_t iHDMIPort; /*!< the HDMI port to which the adapter is connected. only used when iPhysicalAddress = 0 and bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ @@ -1217,12 +1235,13 @@ typedef struct libcec_configuration void * callbackParam; /*!< the object to pass along with a call of the callback methods. NULL to ignore */ ICECCallbacks * callbacks; /*!< the callback methods to use. set this to NULL when not using callbacks */ - cec_logical_addresses logicalAddresses; /*!< the current logical addresses. read-only. added in 1.5.3 */ - uint16_t iFirmwareVersion; /*!< the firmware version of the adapter. added in 1.6.0 */ + cec_logical_addresses logicalAddresses; /*!< (read-only) the current logical addresses. added in 1.5.3 */ + uint16_t iFirmwareVersion; /*!< (read-only) the firmware version of the adapter. added in 1.6.0 */ uint8_t bPowerOffDevicesOnStandby; /*!< put devices in standby when the PC/player is put in standby. added in 1.6.0 */ uint8_t bShutdownOnStandby; /*!< shutdown this PC when the TV is switched off. only used when bPowerOffOnStandby = 0. added in 1.6.0 */ 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; /*!< 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 */ + 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 */ #ifdef __cplusplus libcec_configuration(void) { Clear(); } @@ -1248,14 +1267,16 @@ typedef struct libcec_configuration bPowerOffOnStandby == other.bPowerOffOnStandby && bSendInactiveSource == other.bSendInactiveSource && /* libcec 1.5.3+ */ - (other.serverVersion < CEC_SERVER_VERSION_1_5_3 || logicalAddresses == other.logicalAddresses) && + (other.clientVersion < CEC_CLIENT_VERSION_1_5_3 || logicalAddresses == other.logicalAddresses) && /* libcec 1.6.0+ */ - (other.serverVersion < CEC_SERVER_VERSION_1_6_0 || iFirmwareVersion == other.iFirmwareVersion) && - (other.serverVersion < CEC_SERVER_VERSION_1_6_0 || bPowerOffDevicesOnStandby == other.bPowerOffDevicesOnStandby) && - (other.serverVersion < CEC_SERVER_VERSION_1_6_0 || bShutdownOnStandby == other.bShutdownOnStandby) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_0 || iFirmwareVersion == other.iFirmwareVersion) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_0 || bPowerOffDevicesOnStandby == other.bPowerOffDevicesOnStandby) && + (other.clientVersion < CEC_CLIENT_VERSION_1_6_0 || bShutdownOnStandby == other.bShutdownOnStandby) && /* libcec 1.6.2+ */ - (other.serverVersion < CEC_SERVER_VERSION_1_6_2 || !strncmp(strDeviceLanguage, other.strDeviceLanguage, 3)) && - (other.serverVersion < CEC_SERVER_VERSION_1_6_2 || iFirmwareBuildDate == other.iFirmwareBuildDate)); + (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)); } bool operator!=(const libcec_configuration &other) const @@ -1268,13 +1289,13 @@ typedef struct libcec_configuration */ void Clear(void) { - iPhysicalAddress = 0; + iPhysicalAddress = CEC_PHYSICAL_ADDRESS_TV; baseDevice = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; iHDMIPort = CEC_DEFAULT_HDMI_PORT; tvVendor = (uint64_t)CEC_VENDOR_UNKNOWN; clientVersion = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5; serverVersion = (uint32_t)CEC_SERVER_VERSION_PRE_1_5; - bAutodetectAddress = CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS; + bAutodetectAddress = 0; bGetSettingsFromROM = CEC_DEFAULT_SETTING_GET_SETTINGS_FROM_ROM; bUseTVMenuLanguage = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE; bActivateSource = CEC_DEFAULT_SETTING_ACTIVATE_SOURCE; @@ -1285,7 +1306,8 @@ typedef struct libcec_configuration iFirmwareVersion = CEC_FW_VERSION_UNKNOWN; bPowerOffDevicesOnStandby = CEC_DEFAULT_SETTING_POWER_OFF_DEVICES_STANDBY; memcpy(strDeviceLanguage, CEC_DEFAULT_DEVICE_LANGUAGE, 3); - iFirmwareBuildDate = CEC_DEFAULT_FIRMWARE_BUILD_DATE; + iFirmwareBuildDate = CEC_FW_BUILD_UNKNOWN; + bMonitorOnly = 0; memset(strDeviceName, 0, 13); deviceTypes.clear();