* Play function, this message can have variable length
                 * depending on the specific play function that is used.
                 */
-               case 0x60:
+               case CEC_OP_UI_CMD_PLAY_FUNCTION:
                        if (msg->len == 2)
                                rc_keydown(adap->rc, RC_PROTO_CEC,
                                           msg->msg[2], 0);
                 * For the time being these messages are not processed by the
                 * framework and are simply forwarded to the user space.
                 */
-               case 0x56: case 0x57:
-               case 0x67: case 0x68: case 0x69: case 0x6a:
+               case CEC_OP_UI_CMD_SELECT_BROADCAST_TYPE:
+               case CEC_OP_UI_CMD_SELECT_SOUND_PRESENTATION:
+               case CEC_OP_UI_CMD_TUNE_FUNCTION:
+               case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCTION:
+               case CEC_OP_UI_CMD_SELECT_AV_INPUT_FUNCTION:
+               case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT_FUNCTION:
                        break;
                default:
                        rc_keydown(adap->rc, RC_PROTO_CEC, msg->msg[2], 0);