X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=8c6cf9c79dab4e7d428662104926a097d0b76548;hb=5d5a2dc2f0200aff181c385ce71672e1c50b7de1;hp=afd5b162cbb4bdaf9b5339b99a96a3481d75c6aa;hpb=1f0e9e0fb3ddfaf84650867e55e645cda7868e06;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index afd5b16..8c6cf9c 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -82,14 +82,14 @@ typedef enum CEC_AUDIO_RATE_SLOW_RATE_MIN_99_9 = 6 } ECecAudioRate; -typedef enum +typedef enum cec_audio_status { CEC_AUDIO_MUTE_STATUS_MASK = 0x80, CEC_AUDIO_VOLUME_STATUS_MASK = 0x7F, CEC_AUDIO_VOLUME_MIN = 0x00, CEC_AUDIO_VOLUME_MAX = 0x64, CEC_AUDIO_VOLUME_STATUS_UNKNOWN = 0x7F -} ECecAudioStatus; +} cec_audio_status; typedef enum { @@ -142,7 +142,7 @@ typedef enum CEC_DECK_INFO_OTHER_STATUS = 0x1F } ECecDeckInfo; -typedef enum +typedef enum cec_device_type { CEC_DEVICE_TYPE_TV = 0, CEC_DEVICE_TYPE_RECORDING_DEVICE = 1, @@ -150,7 +150,54 @@ typedef enum CEC_DEVICE_TYPE_TUNER = 3, CEC_DEVICE_TYPE_PLAYBACK_DEVICE = 4, CEC_DEVICE_TYPE_AUDIO_SYSTEM = 5 -} ECecDeviceType; +} cec_device_type; + +typedef struct cec_device_type_list +{ + cec_device_type types[5]; + +#ifdef __cplusplus + void clear(void) + { + for (unsigned int iPtr = 0; iPtr < 5; iPtr++) + types[iPtr] = CEC_DEVICE_TYPE_RESERVED; + } + + void add(const cec_device_type type) + { + for (unsigned int iPtr = 0; iPtr < 5; iPtr++) + { + if (types[iPtr] == CEC_DEVICE_TYPE_RESERVED) + { + types[iPtr] = type; + break; + } + } + } + + bool isset(cec_device_type type) + { + bool bReturn(false); + for (unsigned int iPtr = 0; !bReturn && iPtr < 5; iPtr++) + { + if (types[iPtr] == type) + bReturn = true; + } + return bReturn; + } + + bool empty() + { + bool bReturn(true); + for (unsigned int iPtr = 0; bReturn && iPtr < 5; iPtr++) + { + if (types[iPtr] != CEC_DEVICE_TYPE_RESERVED) + bReturn = false; + } + return bReturn; + } +#endif +} cec_device_type_list; typedef enum cec_display_control { @@ -263,11 +310,11 @@ typedef enum CEC_STATUS_REQUEST_ONCE = 3 } ECecStatusRequest; -typedef enum +typedef enum cec_system_audio_status { CEC_SYSTEM_AUDIO_STATUS_OFF = 0, CEC_SYSTEM_AUDIO_STATUS_ON = 1 -} ECecSystemAudioStatus; +} cec_system_audio_status; typedef enum { @@ -463,6 +510,53 @@ typedef enum cec_logical_address CECDEVICE_BROADCAST = 15 } cec_logical_address; +typedef struct cec_logical_addresses +{ + cec_logical_address primary; + int addresses[16]; + +#ifdef __cplusplus + void clear(void) + { + primary = CECDEVICE_UNKNOWN; + for (unsigned int iPtr = 0; iPtr < 16; iPtr++) + addresses[iPtr] = 0; + } + + bool empty(void) const + { + return primary == CECDEVICE_UNKNOWN; + } + + uint16_t ackmask(void) const + { + uint16_t mask = 0; + for (unsigned int iPtr = 0; iPtr < 16; iPtr++) + if (addresses[iPtr] == 1) + mask |= 0x1 << iPtr; + return mask; + } + + void set(cec_logical_address address) + { + if (primary == CECDEVICE_UNKNOWN) + primary = address; + + addresses[(int) address] = 1; + } + + void unset(cec_logical_address address) + { + if (primary == address) + primary = CECDEVICE_UNKNOWN; + + addresses[(int) address] = 0; + } + + bool isset(cec_logical_address address) const { return addresses[(int) address] == 1; } +#endif +} cec_logical_addresses; + typedef enum cec_opcode { CEC_OPCODE_ACTIVE_SOURCE = 0x82, @@ -526,7 +620,8 @@ typedef enum cec_opcode CEC_OPCODE_SET_SYSTEM_AUDIO_MODE = 0x72, CEC_OPCODE_SYSTEM_AUDIO_MODE_REQUEST = 0x70, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS = 0x7E, - CEC_OPCODE_SET_AUDIO_RATE = 0x9A + CEC_OPCODE_SET_AUDIO_RATE = 0x9A, + CEC_OPCODE_NONE = 0xFD /* when this opcode is set, no opcode will be sent to the device. this is one of the reserved numbers */ } cec_opcode; typedef enum cec_log_level @@ -599,6 +694,15 @@ typedef struct cec_datapacket uint8_t size; #ifdef __cplusplus + cec_datapacket &operator =(const struct cec_datapacket &packet) + { + clear(); + for (uint8_t iPtr = 0; iPtr < packet.size; iPtr++) + push_back(packet[iPtr]); + + return *this; + } + bool empty(void) const { return size == 0; } bool full(void) const { return size == 100; } uint8_t operator[](uint8_t pos) const { return pos < size ? data[pos] : 0; } @@ -645,13 +749,30 @@ typedef struct cec_command int32_t transmit_timeout; #ifdef __cplusplus + cec_command &operator =(const struct cec_command &command) + { + initiator = command.initiator; + destination = command.destination; + ack = command.ack; + eom = command.eom; + opcode = command.opcode; + opcode_set = command.opcode_set; + transmit_timeout = command.transmit_timeout; + parameters = command.parameters; + + return *this; + } + static void format(cec_command &command, cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode) { command.clear(); - command.initiator = initiator; - command.destination = destination; - command.opcode = opcode; - command.opcode_set = 1; + command.initiator = initiator; + command.destination = destination; + if (opcode != CEC_OPCODE_NONE) + { + command.opcode = opcode; + command.opcode_set = 1; + } } void push_back(uint8_t data) @@ -686,9 +807,11 @@ typedef struct cec_command typedef enum cec_vendor_id { - CEC_VENDOR_SAMSUNG = 0x00F0, - CEC_VENDOR_LG = 0xE091, - CEC_VENDOR_UNKNOWN = 0 + CEC_VENDOR_SAMSUNG = 0x00F0, + CEC_VENDOR_LG = 0xE091, + CEC_VENDOR_PANASONIC = 0x8045, + CEC_VENDOR_PIONEER = 0xE036, + CEC_VENDOR_UNKNOWN = 0 } cec_vendor_id; typedef struct cec_vendor @@ -700,7 +823,11 @@ typedef struct cec_vendor case CEC_VENDOR_SAMSUNG: return "Samsung"; case CEC_VENDOR_LG: - return "LG"; + return "LG"; + case CEC_VENDOR_PANASONIC: + return "Panasonic"; + case CEC_VENDOR_PIONEER: + return "Pioneer"; default: return "Unknown"; } @@ -715,10 +842,12 @@ typedef struct cec_vendor #define MSGEND 0xFE #define MSGESC 0xFD #define ESCOFFSET 3 -#define CEC_MIN_VERSION 8 -#define CEC_LIB_VERSION 8 #define CEC_BUTTON_TIMEOUT 500 +#define CEC_MIN_LIB_VERSION 1 +#define CEC_LIB_VERSION_MAJOR 1 +#define CEC_LIB_VERSION_MINOR 0 + #ifdef __cplusplus }; };