korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-27 06:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: cec-funcs.h: use new CEC_OP_UI_CMD defines

Browse Source 
When the new CEC_OP_UI_CMD defines were added I forgot to update this
header to use these new defines. This is now fixed.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2019-10-02 05:04:14 -03:00 committed by Mauro Carvalho Chehab
parent 9b211f9c5a
commit d7ca5afdce
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/uapi/linux/cec-funcs.h
View File

@ -1304,17 +1304,17 @@ static inline void cec_msg_user_control_pressed(struct cec_msg *msg,
if (!ui_cmd->has_opt_arg) if (!ui_cmd->has_opt_arg)
return; return;
switch (ui_cmd->ui_cmd) { switch (ui_cmd->ui_cmd) {
case 0x56: case CEC_OP_UI_CMD_SELECT_BROADCAST_TYPE:
case 0x57: case CEC_OP_UI_CMD_SELECT_SOUND_PRESENTATION:
case 0x60: case CEC_OP_UI_CMD_PLAY_FUNCTION:
case 0x68: case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCTION:
case 0x69: case CEC_OP_UI_CMD_SELECT_AV_INPUT_FUNCTION:
case 0x6a: case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT_FUNCTION:
/* The optional operand is one byte for all these ui commands */ /* The optional operand is one byte for all these ui commands */
msg->len++; msg->len++;
msg->msg[3] = ui_cmd->play_mode; msg->msg[3] = ui_cmd->play_mode;
break; break;
case 0x67: case CEC_OP_UI_CMD_TUNE_FUNCTION:
msg->len += 4; msg->len += 4;
msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) | msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) |
(ui_cmd->channel_identifier.major >> 8); (ui_cmd->channel_identifier.major >> 8);
@ -1333,17 +1333,17 @@ static inline void cec_ops_user_control_pressed(const struct cec_msg *msg,
if (msg->len == 3) if (msg->len == 3)
return; return;
switch (ui_cmd->ui_cmd) { switch (ui_cmd->ui_cmd) {
case 0x56: case CEC_OP_UI_CMD_SELECT_BROADCAST_TYPE:
case 0x57: case CEC_OP_UI_CMD_SELECT_SOUND_PRESENTATION:
case 0x60: case CEC_OP_UI_CMD_PLAY_FUNCTION:
case 0x68: case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCTION:
case 0x69: case CEC_OP_UI_CMD_SELECT_AV_INPUT_FUNCTION:
case 0x6a: case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT_FUNCTION:
/* The optional operand is one byte for all these ui commands */ /* The optional operand is one byte for all these ui commands */
ui_cmd->play_mode = msg->msg[3]; ui_cmd->play_mode = msg->msg[3];
ui_cmd->has_opt_arg = 1; ui_cmd->has_opt_arg = 1;
break; break;
case 0x67: case CEC_OP_UI_CMD_TUNE_FUNCTION:
if (msg->len < 7) if (msg->len < 7)
break; break;
ui_cmd->has_opt_arg = 1; ui_cmd->has_opt_arg = 1;