1 files changed, 167 insertions, 0 deletions

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index f6790172736a..328c973a0838 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1705,6 +1705,7 @@ static struct ir_scancode ir_codes_winfast[] = {
         { 0x37, KEY_RADIO },            /* FM */
         { 0x38, KEY_DVD },
 
+        { 0x1a, KEY_MODE},              /* change to MCE mode on Y04G0051 */
         { 0x3e, KEY_F21 },              /* MCE +VOL, on Y04G0033 */
         { 0x3a, KEY_F22 },              /* MCE -VOL, on Y04G0033 */
         { 0x3b, KEY_F23 },              /* MCE +CH,  on Y04G0033 */
@@ -1846,6 +1847,76 @@ struct ir_scancode_table ir_codes_hauppauge_new_table = {
 };
 EXPORT_SYMBOL_GPL(ir_codes_hauppauge_new_table);
 
+/*
+ * Hauppauge:the newer, gray remotes (seems there are multiple
+ * slightly different versions), shipped with cx88+ivtv cards.
+ *
+ * This table contains the complete RC5 code, instead of just the data part
+ */
+static struct ir_scancode ir_codes_rc5_hauppauge_new[] = {
+        /* Keys 0 to 9 */
+        { 0x1e00, KEY_0 },
+        { 0x1e01, KEY_1 },
+        { 0x1e02, KEY_2 },
+        { 0x1e03, KEY_3 },
+        { 0x1e04, KEY_4 },
+        { 0x1e05, KEY_5 },
+        { 0x1e06, KEY_6 },
+        { 0x1e07, KEY_7 },
+        { 0x1e08, KEY_8 },
+        { 0x1e09, KEY_9 },
+
+        { 0x1e0a, KEY_TEXT },           /* keypad asterisk as well */
+        { 0x1e0b, KEY_RED },            /* red button */
+        { 0x1e0c, KEY_RADIO },
+        { 0x1e0d, KEY_MENU },
+        { 0x1e0e, KEY_SUBTITLE },               /* also the # key */
+        { 0x1e0f, KEY_MUTE },
+        { 0x1e10, KEY_VOLUMEUP },
+        { 0x1e11, KEY_VOLUMEDOWN },
+        { 0x1e12, KEY_PREVIOUS },               /* previous channel */
+        { 0x1e14, KEY_UP },
+        { 0x1e15, KEY_DOWN },
+        { 0x1e16, KEY_LEFT },
+        { 0x1e17, KEY_RIGHT },
+        { 0x1e18, KEY_VIDEO },          /* Videos */
+        { 0x1e19, KEY_AUDIO },          /* Music */
+        /* 0x1e1a: Pictures - presume this means
+           "Multimedia Home Platform" -
+           no "PICTURES" key in input.h
+         */
+        { 0x1e1a, KEY_MHP },
+
+        { 0x1e1b, KEY_EPG },            /* Guide */
+        { 0x1e1c, KEY_TV },
+        { 0x1e1e, KEY_NEXTSONG },               /* skip >| */
+        { 0x1e1f, KEY_EXIT },           /* back/exit */
+        { 0x1e20, KEY_CHANNELUP },      /* channel / program + */
+        { 0x1e21, KEY_CHANNELDOWN },    /* channel / program - */
+        { 0x1e22, KEY_CHANNEL },                /* source (old black remote) */
+        { 0x1e24, KEY_PREVIOUSSONG },   /* replay |< */
+        { 0x1e25, KEY_ENTER },          /* OK */
+        { 0x1e26, KEY_SLEEP },          /* minimize (old black remote) */
+        { 0x1e29, KEY_BLUE },           /* blue key */
+        { 0x1e2e, KEY_GREEN },          /* green button */
+        { 0x1e30, KEY_PAUSE },          /* pause */
+        { 0x1e32, KEY_REWIND },         /* backward << */
+        { 0x1e34, KEY_FASTFORWARD },    /* forward >> */
+        { 0x1e35, KEY_PLAY },
+        { 0x1e36, KEY_STOP },
+        { 0x1e37, KEY_RECORD },         /* recording */
+        { 0x1e38, KEY_YELLOW },         /* yellow key */
+        { 0x1e3b, KEY_SELECT },         /* top right button */
+        { 0x1e3c, KEY_ZOOM },           /* full */
+        { 0x1e3d, KEY_POWER },          /* system power (green button) */
+};
+
+struct ir_scancode_table ir_codes_rc5_hauppauge_new_table = {
+        .scan = ir_codes_rc5_hauppauge_new,
+        .size = ARRAY_SIZE(ir_codes_rc5_hauppauge_new),
+};
+EXPORT_SYMBOL_GPL(ir_codes_rc5_hauppauge_new_table);
+
 static struct ir_scancode ir_codes_npgtech[] = {
         { 0x1d, KEY_SWITCHVIDEOMODE },  /* switch inputs */
         { 0x2a, KEY_FRONT },
@@ -2964,6 +3035,101 @@ struct ir_scancode_table ir_codes_dm1105_nec_table = {
 };
 EXPORT_SYMBOL_GPL(ir_codes_dm1105_nec_table);
 
+static struct ir_scancode ir_codes_tevii_nec[] = {
+        { 0x0a, KEY_POWER2},
+        { 0x0c, KEY_MUTE},
+        { 0x11, KEY_1},
+        { 0x12, KEY_2},
+        { 0x13, KEY_3},
+        { 0x14, KEY_4},
+        { 0x15, KEY_5},
+        { 0x16, KEY_6},
+        { 0x17, KEY_7},
+        { 0x18, KEY_8},
+        { 0x19, KEY_9},
+        { 0x10, KEY_0},
+        { 0x1c, KEY_MENU},
+        { 0x0f, KEY_VOLUMEDOWN},
+        { 0x1a, KEY_LAST},
+        { 0x0e, KEY_OPEN},
+        { 0x04, KEY_RECORD},
+        { 0x09, KEY_VOLUMEUP},
+        { 0x08, KEY_CHANNELUP},
+        { 0x07, KEY_PVR},
+        { 0x0b, KEY_TIME},
+        { 0x02, KEY_RIGHT},
+        { 0x03, KEY_LEFT},
+        { 0x00, KEY_UP},
+        { 0x1f, KEY_OK},
+        { 0x01, KEY_DOWN},
+        { 0x05, KEY_TUNER},
+        { 0x06, KEY_CHANNELDOWN},
+        { 0x40, KEY_PLAYPAUSE},
+        { 0x1e, KEY_REWIND},
+        { 0x1b, KEY_FAVORITES},
+        { 0x1d, KEY_BACK},
+        { 0x4d, KEY_FASTFORWARD},
+        { 0x44, KEY_EPG},
+        { 0x4c, KEY_INFO},
+        { 0x41, KEY_AB},
+        { 0x43, KEY_AUDIO},
+        { 0x45, KEY_SUBTITLE},
+        { 0x4a, KEY_LIST},
+        { 0x46, KEY_F1},
+        { 0x47, KEY_F2},
+        { 0x5e, KEY_F3},
+        { 0x5c, KEY_F4},
+        { 0x52, KEY_F5},
+        { 0x5a, KEY_F6},
+        { 0x56, KEY_MODE},
+        { 0x58, KEY_SWITCHVIDEOMODE},
+};
+struct ir_scancode_table ir_codes_tevii_nec_table = {
+        .scan = ir_codes_tevii_nec,
+        .size = ARRAY_SIZE(ir_codes_tevii_nec),
+};
+EXPORT_SYMBOL_GPL(ir_codes_tevii_nec_table);
+
+static struct ir_scancode ir_codes_tbs_nec[] = {
+        { 0x04, KEY_POWER2},    /*power*/
+        { 0x14, KEY_MUTE},      /*mute*/
+        { 0x07, KEY_1},
+        { 0x06, KEY_2},
+        { 0x05, KEY_3},
+        { 0x0b, KEY_4},
+        { 0x0a, KEY_5},
+        { 0x09, KEY_6},
+        { 0x0f, KEY_7},
+        { 0x0e, KEY_8},
+        { 0x0d, KEY_9},
+        { 0x12, KEY_0},
+        { 0x16, KEY_CHANNELUP}, /*ch+*/
+        { 0x11, KEY_CHANNELDOWN},/*ch-*/
+        { 0x13, KEY_VOLUMEUP},  /*vol+*/
+        { 0x0c, KEY_VOLUMEDOWN},/*vol-*/
+        { 0x03, KEY_RECORD},    /*rec*/
+        { 0x18, KEY_PAUSE},     /*pause*/
+        { 0x19, KEY_OK},        /*ok*/
+        { 0x1a, KEY_CAMERA},    /* snapshot */
+        { 0x01, KEY_UP},
+        { 0x10, KEY_LEFT},
+        { 0x02, KEY_RIGHT},
+        { 0x08, KEY_DOWN},
+        { 0x15, KEY_FAVORITES},
+        { 0x17, KEY_SUBTITLE},
+        { 0x1d, KEY_ZOOM},
+        { 0x1f, KEY_EXIT},
+        { 0x1e, KEY_MENU},
+        { 0x1c, KEY_EPG},
+        { 0x00, KEY_PREVIOUS},
+        { 0x1b, KEY_MODE},
+};
+struct ir_scancode_table ir_codes_tbs_nec_table = {
+        .scan = ir_codes_tbs_nec,
+        .size = ARRAY_SIZE(ir_codes_tbs_nec),
+};
+EXPORT_SYMBOL_GPL(ir_codes_tbs_nec_table);
+
 /* Terratec Cinergy Hybrid T USB XS
    Devin Heitmueller <dheitmueller@linuxtv.org>
  */
@@ -3147,3 +3313,4 @@ struct ir_scancode_table ir_codes_gadmei_rm008z_table = {
         .size = ARRAY_SIZE(ir_codes_gadmei_rm008z),
 };
 EXPORT_SYMBOL_GPL(ir_codes_gadmei_rm008z_table);
+