History

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

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.

Hans Verkuil committed 7 years ago

Commit d7ca5af1 parent 9b211f91 file · +14 −14Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/cec-funcs.h+14−14
@@ -1304,17 +1304,17 @@ static inline void cec_msg_user_control_pressed(struct cec_msg *msg, · 1303 unmodified lines
1304 if (!ui_cmd->has_opt_arg)1304 if (!ui_cmd->has_opt_arg)
1305 return;1305 return;
1306 switch (ui_cmd->ui_cmd) {1306 switch (ui_cmd->ui_cmd) {
1307 case 0x56:1307 case CEC_OP_UI_CMD_SELECT_BROADCAST_TYPE:
1308 case 0x57:1308 case CEC_OP_UI_CMD_SELECT_SOUND_PRESENTATION:
1309 case 0x60:1309 case CEC_OP_UI_CMD_PLAY_FUNCTION:
1310 case 0x68:1310 case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCTION:
1311 case 0x69:1311 case CEC_OP_UI_CMD_SELECT_AV_INPUT_FUNCTION:
1312 case 0x6a:1312 case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT_FUNCTION:
1313 /* The optional operand is one byte for all these ui commands */1313 /* The optional operand is one byte for all these ui commands */
1314 msg->len++;1314 msg->len++;
1315 msg->msg[3] = ui_cmd->play_mode;1315 msg->msg[3] = ui_cmd->play_mode;
1316 break;1316 break;
1317 case 0x67:1317 case CEC_OP_UI_CMD_TUNE_FUNCTION:
1318 msg->len += 4;1318 msg->len += 4;
1319 msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) |1319 msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) |
1320 (ui_cmd->channel_identifier.major >> 8);1320 (ui_cmd->channel_identifier.major >> 8);
@@ -1333,17 +1333,17 @@ static inline void cec_ops_user_control_pressed(const struct cec_msg *msg, · 12 unmodified lines
1333 if (msg->len == 3)1333 if (msg->len == 3)
1334 return;1334 return;
1335 switch (ui_cmd->ui_cmd) {1335 switch (ui_cmd->ui_cmd) {
1336 case 0x56:1336 case CEC_OP_UI_CMD_SELECT_BROADCAST_TYPE:
1337 case 0x57:1337 case CEC_OP_UI_CMD_SELECT_SOUND_PRESENTATION:
1338 case 0x60:1338 case CEC_OP_UI_CMD_PLAY_FUNCTION:
1339 case 0x68:1339 case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCTION:
1340 case 0x69:1340 case CEC_OP_UI_CMD_SELECT_AV_INPUT_FUNCTION:
1341 case 0x6a:1341 case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT_FUNCTION:
1342 /* The optional operand is one byte for all these ui commands */1342 /* The optional operand is one byte for all these ui commands */
1343 ui_cmd->play_mode = msg->msg[3];1343 ui_cmd->play_mode = msg->msg[3];
1344 ui_cmd->has_opt_arg = 1;1344 ui_cmd->has_opt_arg = 1;
1345 break;1345 break;
1346 case 0x67:1346 case CEC_OP_UI_CMD_TUNE_FUNCTION:
1347 if (msg->len < 7)1347 if (msg->len < 7)
1348 break;1348 break;
1349 ui_cmd->has_opt_arg = 1;1349 ui_cmd->has_opt_arg = 1;