1 files changed, 160 insertions, 55 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index c41f30e4a1b8..931c8515830d 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -95,6 +95,7 @@ enum af9015_ir_mode {
         AF9015_IR_MODE_HID,
         AF9015_IR_MODE_RLC,
         AF9015_IR_MODE_RC6,
+        AF9015_IR_MODE_POLLING, /* just guess */
 };
 
 struct af9015_state {
@@ -119,6 +120,7 @@ enum af9015_remote {
 /* 5 */ AF9015_REMOTE_AVERMEDIA_KS,
 };
 
+/* LeadTek - Y04G0051 */
 /* Leadtek WinFast DTV Dongle Gold */
 static struct dvb_usb_rc_key af9015_rc_keys_leadtek[] = {
         { 0x001e, KEY_1 },
@@ -131,64 +133,96 @@ static struct dvb_usb_rc_key af9015_rc_keys_leadtek[] = {
         { 0x0025, KEY_8 },
         { 0x0026, KEY_9 },
         { 0x0027, KEY_0 },
-        { 0x0028, KEY_ENTER },
-        { 0x004f, KEY_VOLUMEUP },
-        { 0x0050, KEY_VOLUMEDOWN },
-        { 0x0051, KEY_CHANNELDOWN },
-        { 0x0052, KEY_CHANNELUP },
+        { 0x0028, KEY_OK },
+        { 0x004f, KEY_RIGHT },
+        { 0x0050, KEY_LEFT },
+        { 0x0051, KEY_DOWN },
+        { 0x0052, KEY_UP },
+        { 0x011a, KEY_POWER2 },
+        { 0x04b4, KEY_TV },
+        { 0x04b3, KEY_RED },
+        { 0x04b2, KEY_GREEN },
+        { 0x04b1, KEY_YELLOW },
+        { 0x04b0, KEY_BLUE },
+        { 0x003d, KEY_TEXT },
+        { 0x0113, KEY_SLEEP },
+        { 0x0010, KEY_MUTE },
+        { 0x0105, KEY_ESC },
+        { 0x0009, KEY_SCREEN },
+        { 0x010f, KEY_MENU },
+        { 0x003f, KEY_CHANNEL },
+        { 0x0013, KEY_REWIND },
+        { 0x0012, KEY_PLAY },
+        { 0x0011, KEY_FASTFORWARD },
+        { 0x0005, KEY_PREVIOUS },
+        { 0x0029, KEY_STOP },
+        { 0x002b, KEY_NEXT },
+        { 0x0041, KEY_EPG },
+        { 0x0019, KEY_VIDEO },
+        { 0x0016, KEY_AUDIO },
+        { 0x0037, KEY_DOT },
+        { 0x002a, KEY_AGAIN },
+        { 0x002c, KEY_CAMERA },
+        { 0x003c, KEY_NEW },
+        { 0x0115, KEY_RECORD },
+        { 0x010b, KEY_TIME },
+        { 0x0043, KEY_VOLUMEUP },
+        { 0x0042, KEY_VOLUMEDOWN },
+        { 0x004b, KEY_CHANNELUP },
+        { 0x004e, KEY_CHANNELDOWN },
 };
 
 static u8 af9015_ir_table_leadtek[] = {
-        0x03, 0xfc, 0x00, 0xff, 0x1a, 0x01, 0x00,
-        0x03, 0xfc, 0x56, 0xa9, 0x00, 0x00, 0x00,
-        0x03, 0xfc, 0x4b, 0xb4, 0x00, 0x00, 0x00,
-        0x03, 0xfc, 0x4c, 0xb3, 0xb2, 0x04, 0x00,
-        0x03, 0xfc, 0x4d, 0xb2, 0x00, 0x00, 0x00,
-        0x03, 0xfc, 0x4e, 0xb1, 0x00, 0x00, 0x00,
-        0x03, 0xfc, 0x1f, 0xe0, 0x3d, 0x00, 0x00,
-        0x03, 0xfc, 0x40, 0xbf, 0x13, 0x01, 0x00,
-        0x03, 0xfc, 0x14, 0xeb, 0x10, 0x00, 0x00,
-        0x03, 0xfc, 0x49, 0xb6, 0x05, 0x01, 0x00,
-        0x03, 0xfc, 0x50, 0xaf, 0x29, 0x00, 0x00,
-        0x03, 0xfc, 0x0c, 0xf3, 0x52, 0x00, 0x00,
-        0x03, 0xfc, 0x03, 0xfc, 0x09, 0x00, 0x00,
-        0x03, 0xfc, 0x08, 0xf7, 0x50, 0x00, 0x00,
-        0x03, 0xfc, 0x13, 0xec, 0x28, 0x00, 0x00,
-        0x03, 0xfc, 0x04, 0xfb, 0x4f, 0x00, 0x00,
-        0x03, 0xfc, 0x4f, 0xb0, 0x0f, 0x01, 0x00,
-        0x03, 0xfc, 0x10, 0xef, 0x51, 0x00, 0x00,
-        0x03, 0xfc, 0x51, 0xae, 0x3f, 0x00, 0x00,
-        0x03, 0xfc, 0x42, 0xbd, 0x13, 0x00, 0x00,
-        0x03, 0xfc, 0x43, 0xbc, 0x00, 0x00, 0x00,
-        0x03, 0xfc, 0x44, 0xbb, 0x11, 0x00, 0x00,
-        0x03, 0xfc, 0x52, 0xad, 0x19, 0x00, 0x00,
-        0x03, 0xfc, 0x54, 0xab, 0x05, 0x00, 0x00,
-        0x03, 0xfc, 0x46, 0xb9, 0x29, 0x00, 0x00,
-        0x03, 0xfc, 0x55, 0xaa, 0x2b, 0x00, 0x00,
-        0x03, 0xfc, 0x53, 0xac, 0x41, 0x00, 0x00,
-        0x03, 0xfc, 0x05, 0xfa, 0x1e, 0x00, 0x00,
-        0x03, 0xfc, 0x06, 0xf9, 0x1f, 0x00, 0x00,
-        0x03, 0xfc, 0x07, 0xf8, 0x20, 0x00, 0x00,
-        0x03, 0xfc, 0x1e, 0xe1, 0x19, 0x00, 0x00,
-        0x03, 0xfc, 0x09, 0xf6, 0x21, 0x00, 0x00,
-        0x03, 0xfc, 0x0a, 0xf5, 0x22, 0x00, 0x00,
-        0x03, 0xfc, 0x0b, 0xf4, 0x23, 0x00, 0x00,
-        0x03, 0xfc, 0x1b, 0xe4, 0x16, 0x00, 0x00,
-        0x03, 0xfc, 0x0d, 0xf2, 0x24, 0x00, 0x00,
-        0x03, 0xfc, 0x0e, 0xf1, 0x25, 0x00, 0x00,
-        0x03, 0xfc, 0x0f, 0xf0, 0x26, 0x00, 0x00,
-        0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00,
-        0x03, 0xfc, 0x41, 0xbe, 0x37, 0x00, 0x00,
-        0x03, 0xfc, 0x12, 0xed, 0x27, 0x00, 0x00,
-        0x03, 0xfc, 0x11, 0xee, 0x2a, 0x00, 0x00,
-        0x03, 0xfc, 0x48, 0xb7, 0x2c, 0x00, 0x00,
-        0x03, 0xfc, 0x4a, 0xb5, 0x3c, 0x00, 0x00,
-        0x03, 0xfc, 0x47, 0xb8, 0x15, 0x01, 0x00,
-        0x03, 0xfc, 0x45, 0xba, 0x0b, 0x01, 0x00,
-        0x03, 0xfc, 0x5e, 0xa1, 0x43, 0x00, 0x00,
-        0x03, 0xfc, 0x5a, 0xa5, 0x42, 0x00, 0x00,
-        0x03, 0xfc, 0x5b, 0xa4, 0x4b, 0x00, 0x00,
-        0x03, 0xfc, 0x5f, 0xa0, 0x4e, 0x00, 0x00,
+        0x03, 0xfc, 0x00, 0xff, 0x1a, 0x01, 0x00, /* KEY_POWER2 */
+        0x03, 0xfc, 0x56, 0xa9, 0xb4, 0x04, 0x00, /* KEY_TV */
+        0x03, 0xfc, 0x4b, 0xb4, 0xb3, 0x04, 0x00, /* KEY_RED */
+        0x03, 0xfc, 0x4c, 0xb3, 0xb2, 0x04, 0x00, /* KEY_GREEN */
+        0x03, 0xfc, 0x4d, 0xb2, 0xb1, 0x04, 0x00, /* KEY_YELLOW */
+        0x03, 0xfc, 0x4e, 0xb1, 0xb0, 0x04, 0x00, /* KEY_BLUE */
+        0x03, 0xfc, 0x1f, 0xe0, 0x3d, 0x00, 0x00, /* KEY_TEXT */
+        0x03, 0xfc, 0x40, 0xbf, 0x13, 0x01, 0x00, /* KEY_SLEEP */
+        0x03, 0xfc, 0x14, 0xeb, 0x10, 0x00, 0x00, /* KEY_MUTE */
+        0x03, 0xfc, 0x49, 0xb6, 0x05, 0x01, 0x00, /* KEY_ESC */
+        0x03, 0xfc, 0x50, 0xaf, 0x29, 0x00, 0x00, /* KEY_STOP (1)*/
+        0x03, 0xfc, 0x0c, 0xf3, 0x52, 0x00, 0x00, /* KEY_UP */
+        0x03, 0xfc, 0x03, 0xfc, 0x09, 0x00, 0x00, /* KEY_SCREEN */
+        0x03, 0xfc, 0x08, 0xf7, 0x50, 0x00, 0x00, /* KEY_LEFT */
+        0x03, 0xfc, 0x13, 0xec, 0x28, 0x00, 0x00, /* KEY_OK (1) */
+        0x03, 0xfc, 0x04, 0xfb, 0x4f, 0x00, 0x00, /* KEY_RIGHT */
+        0x03, 0xfc, 0x4f, 0xb0, 0x0f, 0x01, 0x00, /* KEY_MENU */
+        0x03, 0xfc, 0x10, 0xef, 0x51, 0x00, 0x00, /* KEY_DOWN */
+        0x03, 0xfc, 0x51, 0xae, 0x3f, 0x00, 0x00, /* KEY_CHANNEL */
+        0x03, 0xfc, 0x42, 0xbd, 0x13, 0x00, 0x00, /* KEY_REWIND */
+        0x03, 0xfc, 0x43, 0xbc, 0x12, 0x00, 0x00, /* KEY_PLAY */
+        0x03, 0xfc, 0x44, 0xbb, 0x11, 0x00, 0x00, /* KEY_FASTFORWARD */
+        0x03, 0xfc, 0x52, 0xad, 0x19, 0x00, 0x00, /* KEY_VIDEO (1) */
+        0x03, 0xfc, 0x54, 0xab, 0x05, 0x00, 0x00, /* KEY_PREVIOUS */
+        0x03, 0xfc, 0x46, 0xb9, 0x29, 0x00, 0x00, /* KEY_STOP (2) */
+        0x03, 0xfc, 0x55, 0xaa, 0x2b, 0x00, 0x00, /* KEY_NEXT */
+        0x03, 0xfc, 0x53, 0xac, 0x41, 0x00, 0x00, /* KEY_EPG */
+        0x03, 0xfc, 0x05, 0xfa, 0x1e, 0x00, 0x00, /* KEY_1 */
+        0x03, 0xfc, 0x06, 0xf9, 0x1f, 0x00, 0x00, /* KEY_2 */
+        0x03, 0xfc, 0x07, 0xf8, 0x20, 0x00, 0x00, /* KEY_3 */
+        0x03, 0xfc, 0x1e, 0xe1, 0x19, 0x00, 0x00, /* KEY_VIDEO (2) */
+        0x03, 0xfc, 0x09, 0xf6, 0x21, 0x00, 0x00, /* KEY_4 */
+        0x03, 0xfc, 0x0a, 0xf5, 0x22, 0x00, 0x00, /* KEY_5 */
+        0x03, 0xfc, 0x0b, 0xf4, 0x23, 0x00, 0x00, /* KEY_6 */
+        0x03, 0xfc, 0x1b, 0xe4, 0x16, 0x00, 0x00, /* KEY_AUDIO */
+        0x03, 0xfc, 0x0d, 0xf2, 0x24, 0x00, 0x00, /* KEY_7 */
+        0x03, 0xfc, 0x0e, 0xf1, 0x25, 0x00, 0x00, /* KEY_8 */
+        0x03, 0xfc, 0x0f, 0xf0, 0x26, 0x00, 0x00, /* KEY_9 */
+        0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00, /* KEY_OK (2) */
+        0x03, 0xfc, 0x41, 0xbe, 0x37, 0x00, 0x00, /* KEY_DOT */
+        0x03, 0xfc, 0x12, 0xed, 0x27, 0x00, 0x00, /* KEY_0 */
+        0x03, 0xfc, 0x11, 0xee, 0x2a, 0x00, 0x00, /* KEY_AGAIN */
+        0x03, 0xfc, 0x48, 0xb7, 0x2c, 0x00, 0x00, /* KEY_CAMERA */
+        0x03, 0xfc, 0x4a, 0xb5, 0x3c, 0x00, 0x00, /* KEY_NEW */
+        0x03, 0xfc, 0x47, 0xb8, 0x15, 0x01, 0x00, /* KEY_RECORD */
+        0x03, 0xfc, 0x45, 0xba, 0x0b, 0x01, 0x00, /* KEY_TIME */
+        0x03, 0xfc, 0x5e, 0xa1, 0x43, 0x00, 0x00, /* KEY_VOLUMEUP */
+        0x03, 0xfc, 0x5a, 0xa5, 0x42, 0x00, 0x00, /* KEY_VOLUMEDOWN */
+        0x03, 0xfc, 0x5b, 0xa4, 0x4b, 0x00, 0x00, /* KEY_CHANNELUP */
+        0x03, 0xfc, 0x5f, 0xa0, 0x4e, 0x00, 0x00, /* KEY_CHANNELDOWN */
 };
 
 /* TwinHan AzureWave AD-TU700(704J) */
@@ -746,4 +780,75 @@ static u8 af9015_ir_table_trekstor[] = {
         0x00, 0xff, 0x84, 0x7b, 0x27, 0x07, 0x00,
 };
 
+/* MSI DIGIVOX mini III */
+static struct dvb_usb_rc_key af9015_rc_keys_msi_digivox_iii[] = {
+        { 0x0713, KEY_POWER },       /* [red power button] */
+        { 0x073b, KEY_VIDEO },       /* Source */
+        { 0x073e, KEY_ZOOM },        /* Zoom */
+        { 0x070b, KEY_POWER2 },      /* ShutDown */
+        { 0x071e, KEY_1 },
+        { 0x071f, KEY_2 },
+        { 0x0720, KEY_3 },
+        { 0x0721, KEY_4 },
+        { 0x0722, KEY_5 },
+        { 0x0723, KEY_6 },
+        { 0x0724, KEY_7 },
+        { 0x0725, KEY_8 },
+        { 0x0726, KEY_9 },
+        { 0x0727, KEY_0 },
+        { 0x0752, KEY_CHANNELUP },   /* CH+ */
+        { 0x0751, KEY_CHANNELDOWN }, /* CH- */
+        { 0x0750, KEY_VOLUMEUP },    /* Vol+ */
+        { 0x074f, KEY_VOLUMEDOWN },  /* Vol- */
+        { 0x0705, KEY_ESC },         /* [back up arrow] */
+        { 0x0708, KEY_OK },          /* [enter arrow] */
+        { 0x073f, KEY_RECORD },      /* Rec */
+        { 0x0716, KEY_STOP },        /* Stop */
+        { 0x072a, KEY_PLAY },        /* Play */
+        { 0x073c, KEY_MUTE },        /* Mute */
+        { 0x0718, KEY_UP },
+        { 0x0707, KEY_DOWN },
+        { 0x070f, KEY_LEFT },
+        { 0x0715, KEY_RIGHT },
+        { 0x0736, KEY_RED },
+        { 0x0737, KEY_GREEN },
+        { 0x072d, KEY_YELLOW },
+        { 0x072e, KEY_BLUE },
+};
+
+static u8 af9015_ir_table_msi_digivox_iii[] = {
+        0x61, 0xd6, 0x43, 0xbc, 0x13, 0x07, 0x00, /* KEY_POWER */
+        0x61, 0xd6, 0x01, 0xfe, 0x3b, 0x07, 0x00, /* KEY_VIDEO */
+        0x61, 0xd6, 0x0b, 0xf4, 0x3e, 0x07, 0x00, /* KEY_ZOOM */
+        0x61, 0xd6, 0x03, 0xfc, 0x0b, 0x07, 0x00, /* KEY_POWER2 */
+        0x61, 0xd6, 0x04, 0xfb, 0x1e, 0x07, 0x00, /* KEY_1 */
+        0x61, 0xd6, 0x08, 0xf7, 0x1f, 0x07, 0x00, /* KEY_2 */
+        0x61, 0xd6, 0x02, 0xfd, 0x20, 0x07, 0x00, /* KEY_3 */
+        0x61, 0xd6, 0x0f, 0xf0, 0x21, 0x07, 0x00, /* KEY_4 */
+        0x61, 0xd6, 0x05, 0xfa, 0x22, 0x07, 0x00, /* KEY_5 */
+        0x61, 0xd6, 0x06, 0xf9, 0x23, 0x07, 0x00, /* KEY_6 */
+        0x61, 0xd6, 0x0c, 0xf3, 0x24, 0x07, 0x00, /* KEY_7 */
+        0x61, 0xd6, 0x0d, 0xf2, 0x25, 0x07, 0x00, /* KEY_8 */
+        0x61, 0xd6, 0x0a, 0xf5, 0x26, 0x07, 0x00, /* KEY_9 */
+        0x61, 0xd6, 0x11, 0xee, 0x27, 0x07, 0x00, /* KEY_0 */
+        0x61, 0xd6, 0x09, 0xf6, 0x52, 0x07, 0x00, /* KEY_CHANNELUP */
+        0x61, 0xd6, 0x07, 0xf8, 0x51, 0x07, 0x00, /* KEY_CHANNELDOWN */
+        0x61, 0xd6, 0x0e, 0xf1, 0x50, 0x07, 0x00, /* KEY_VOLUMEUP */
+        0x61, 0xd6, 0x13, 0xec, 0x4f, 0x07, 0x00, /* KEY_VOLUMEDOWN */
+        0x61, 0xd6, 0x10, 0xef, 0x05, 0x07, 0x00, /* KEY_ESC */
+        0x61, 0xd6, 0x12, 0xed, 0x08, 0x07, 0x00, /* KEY_OK */
+        0x61, 0xd6, 0x14, 0xeb, 0x3f, 0x07, 0x00, /* KEY_RECORD */
+        0x61, 0xd6, 0x15, 0xea, 0x16, 0x07, 0x00, /* KEY_STOP */
+        0x61, 0xd6, 0x16, 0xe9, 0x2a, 0x07, 0x00, /* KEY_PLAY */
+        0x61, 0xd6, 0x17, 0xe8, 0x3c, 0x07, 0x00, /* KEY_MUTE */
+        0x61, 0xd6, 0x18, 0xe7, 0x18, 0x07, 0x00, /* KEY_UP */
+        0x61, 0xd6, 0x19, 0xe6, 0x07, 0x07, 0x00, /* KEY_DOWN */
+        0x61, 0xd6, 0x1a, 0xe5, 0x0f, 0x07, 0x00, /* KEY_LEFT */
+        0x61, 0xd6, 0x1b, 0xe4, 0x15, 0x07, 0x00, /* KEY_RIGHT */
+        0x61, 0xd6, 0x1c, 0xe3, 0x36, 0x07, 0x00, /* KEY_RED */
+        0x61, 0xd6, 0x1d, 0xe2, 0x37, 0x07, 0x00, /* KEY_GREEN */
+        0x61, 0xd6, 0x1e, 0xe1, 0x2d, 0x07, 0x00, /* KEY_YELLOW */
+        0x61, 0xd6, 0x1f, 0xe0, 0x2e, 0x07, 0x00, /* KEY_BLUE */
+};
+
 #endif