v4l-utils: sync-with-kernel

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

4 files changed, 119 insertions, 2 deletions

diff --git a/utils/common/v4l2-tpg-core.c b/utils/common/v4l2-tpg-core.c
index 25b89245..372310af 100644
--- a/utils/common/v4l2-tpg-core.c
+++ b/utils/common/v4l2-tpg-core.c
@@ -767,7 +767,7 @@ static void precalculate_color(struct tpg_data *tpg, int k)
 	 * Remember that r, g and b are still in the 0 - 0xff0 range.
 	 */
 	if (tpg->real_rgb_range == V4L2_DV_RGB_RANGE_LIMITED &&
-	    tpg->rgb_range == V4L2_DV_RGB_RANGE_FULL) {
+	    tpg->rgb_range == V4L2_DV_RGB_RANGE_FULL && !tpg->is_yuv) {
 		/*
 		 * Convert from full range (which is what r, g and b are)
 		 * to limited range (which is the 'real' RGB range), which
@@ -777,7 +777,7 @@ static void precalculate_color(struct tpg_data *tpg, int k)
 		g = (g * 219) / 255 + (16 << 4);
 		b = (b * 219) / 255 + (16 << 4);
 	} else if (tpg->real_rgb_range != V4L2_DV_RGB_RANGE_LIMITED &&
-		   tpg->rgb_range == V4L2_DV_RGB_RANGE_LIMITED) {
+		   tpg->rgb_range == V4L2_DV_RGB_RANGE_LIMITED && !tpg->is_yuv) {
 		/*
 		 * Clamp r, g and b to the limited range and convert to full
 		 * range since that's what we deliver.
diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h
index 6ada6e59..67eb1a64 100644
--- a/utils/keytable/parse.h
+++ b/utils/keytable/parse.h
@@ -518,6 +518,24 @@ struct parse_event key_events[] = {
 	{"KEY_KBDINPUTASSIST_NEXTGROUP", 0x263},
 	{"KEY_KBDINPUTASSIST_ACCEPT", 0x264},
 	{"KEY_KBDINPUTASSIST_CANCEL", 0x265},
+	{"KEY_RIGHT_UP", 0x266},
+	{"KEY_RIGHT_DOWN", 0x267},
+	{"KEY_LEFT_UP", 0x268},
+	{"KEY_LEFT_DOWN", 0x269},
+	{"KEY_ROOT_MENU", 0x26a},
+	{"KEY_MEDIA_TOP_MENU", 0x26b},
+	{"KEY_NUMERIC_11", 0x26c},
+	{"KEY_NUMERIC_12", 0x26d},
+	{"KEY_AUDIO_DESC", 0x26e},
+	{"KEY_3D_MODE", 0x26f},
+	{"KEY_NEXT_FAVORITE", 0x270},
+	{"KEY_STOP_RECORD", 0x271},
+	{"KEY_PAUSE_RECORD", 0x272},
+	{"KEY_VOD", 0x273},
+	{"KEY_UNMUTE", 0x274},
+	{"KEY_FASTREVERSE", 0x275},
+	{"KEY_SLOWREVERSE", 0x276},
+	{"KEY_DATA", 0x275},
 	{"BTN_TRIGGER_HAPPY", 0x2c0},
 	{"BTN_TRIGGER_HAPPY1", 0x2c0},
 	{"BTN_TRIGGER_HAPPY2", 0x2c1},
diff --git a/utils/keytable/rc_keymaps/cec b/utils/keytable/rc_keymaps/cec
new file mode 100644
index 00000000..e6c619ab
--- /dev/null
+++ b/utils/keytable/rc_keymaps/cec
@@ -0,0 +1,98 @@
+# table cec, type: CEC
+0x00 KEY_OK
+0x01 KEY_UP
+0x02 KEY_DOWN
+0x03 KEY_LEFT
+0x04 KEY_RIGHT
+0x05 KEY_RIGHT_UP
+0x06 KEY_RIGHT_DOWN
+0x07 KEY_LEFT_UP
+0x08 KEY_LEFT_DOWN
+0x09 KEY_ROOT_MENU
+0x0a KEY_SETUP
+0x0b KEY_MENU
+0x0c KEY_FAVORITES
+0x0d KEY_EXIT
+0x10 KEY_MEDIA_TOP_MENU
+0x11 KEY_CONTEXT_MENU
+0x1d KEY_DIGITS
+0x1e KEY_NUMERIC_11
+0x1f KEY_NUMERIC_12
+0x20 KEY_NUMERIC_0
+0x21 KEY_NUMERIC_1
+0x22 KEY_NUMERIC_2
+0x23 KEY_NUMERIC_3
+0x24 KEY_NUMERIC_4
+0x25 KEY_NUMERIC_5
+0x26 KEY_NUMERIC_6
+0x27 KEY_NUMERIC_7
+0x28 KEY_NUMERIC_8
+0x29 KEY_NUMERIC_9
+0x2a KEY_DOT
+0x2b KEY_ENTER
+0x2c KEY_CLEAR
+0x2f KEY_NEXT_FAVORITE
+0x30 KEY_CHANNELUP
+0x31 KEY_CHANNELDOWN
+0x32 KEY_PREVIOUS
+0x33 KEY_SOUND
+0x34 KEY_VIDEO
+0x35 KEY_INFO
+0x36 KEY_HELP
+0x37 KEY_PAGEUP
+0x38 KEY_PAGEDOWN
+0x40 KEY_POWER
+0x41 KEY_VOLUMEUP
+0x42 KEY_VOLUMEDOWN
+0x43 KEY_MUTE
+0x44 KEY_PLAYCD
+0x45 KEY_STOPCD
+0x46 KEY_PAUSECD
+0x47 KEY_RECORD
+0x48 KEY_REWIND
+0x49 KEY_FASTFORWARD
+0x4a KEY_EJECTCD
+0x4b KEY_FORWARD
+0x4c KEY_BACK
+0x4d KEY_STOP_RECORD
+0x4e KEY_PAUSE_RECORD
+0x50 KEY_ANGLE
+0x51 KEY_TV2
+0x52 KEY_VOD
+0x53 KEY_EPG
+0x54 KEY_TIME
+0x55 KEY_CONFIG
+0x58 KEY_AUDIO_DESC
+0x59 KEY_WWW
+0x5a KEY_3D_MODE
+0x60 KEY_PLAYCD
+0x6005 KEY_FASTFORWARD
+0x6006 KEY_FASTFORWARD
+0x6007 KEY_FASTFORWARD
+0x6015 KEY_SLOW
+0x6016 KEY_SLOW
+0x6017 KEY_SLOW
+0x6009 KEY_FASTREVERSE
+0x600a KEY_FASTREVERSE
+0x600b KEY_FASTREVERSE
+0x6019 KEY_SLOWREVERSE
+0x601a KEY_SLOWREVERSE
+0x601b KEY_SLOWREVERSE
+0x6020 KEY_REWIND
+0x6024 KEY_PLAYCD
+0x6025 KEY_PAUSECD
+0x61 KEY_PLAYPAUSE
+0x62 KEY_RECORD
+0x63 KEY_PAUSE_RECORD
+0x64 KEY_STOPCD
+0x65 KEY_MUTE
+0x66 KEY_UNMUTE
+0x6b KEY_POWER
+0x6c KEY_SLEEP
+0x6d KEY_WAKEUP
+0x71 KEY_BLUE
+0x72 KEY_RED
+0x73 KEY_GREEN
+0x74 KEY_YELLOW
+0x75 KEY_F5
+0x76 KEY_DATA
diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
index e69fd6aa..3bd7197a 100644
--- a/utils/keytable/rc_maps.cfg
+++ b/utils/keytable/rc_maps.cfg
@@ -50,6 +50,7 @@
 *	rc-behold-columbus       behold_columbus
 *	rc-behold                behold
 *	rc-budget-ci-old         budget_ci_old
+*	rc-cec                   cec
 *	rc-cinergy-1400          cinergy_1400
 *	rc-cinergy               cinergy
 *	rc-delock-61959          delock_61959