1 files changed, 186 insertions, 184 deletions

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 7b0263f89de..d1d6f449140 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -509,7 +509,8 @@ static int dib0700_rc_query_legacy(struct dvb_usb_device *d, u32 *event,
                         return 0;
                 }
                 for (i=0;i<d->props.rc_key_map_size; i++) {
-                        if (keymap[i].custom == key[3-2] && keymap[i].data == key[3-3]) {
+                        if (rc5_custom(&keymap[i]) == key[3-2] &&
+                            rc5_data(&keymap[i]) == key[3-3]) {
                                 st->rc_counter = 0;
                                 *event = keymap[i].event;
                                 *state = REMOTE_KEY_PRESSED;
@@ -522,7 +523,8 @@ static int dib0700_rc_query_legacy(struct dvb_usb_device *d, u32 *event,
         default: {
                 /* RC-5 protocol changes toggle bit on new keypress */
                 for (i = 0; i < d->props.rc_key_map_size; i++) {
-                        if (keymap[i].custom == key[3-2] && keymap[i].data == key[3-3]) {
+                        if (rc5_custom(&keymap[i]) == key[3-2] &&
+                            rc5_data(&keymap[i]) == key[3-3]) {
                                 if (d->last_event == keymap[i].event &&
                                         key[3-1] == st->rc_toggle) {
                                         st->rc_counter++;
@@ -616,8 +618,8 @@ static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event,
 
         /* Find the key in the map */
         for (i = 0; i < d->props.rc_key_map_size; i++) {
-                if (keymap[i].custom == poll_reply.system_lsb &&
-                    keymap[i].data == poll_reply.data) {
+                if (rc5_custom(&keymap[i]) == poll_reply.system_lsb &&
+                    rc5_data(&keymap[i]) == poll_reply.data) {
                         *event = keymap[i].event;
                         found = 1;
                         break;
@@ -684,193 +686,193 @@ static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 
 static struct dvb_usb_rc_key dib0700_rc_keys[] = {
         /* Key codes for the tiny Pinnacle remote*/
-        { 0x07, 0x00, KEY_MUTE },
-        { 0x07, 0x01, KEY_MENU }, // Pinnacle logo
-        { 0x07, 0x39, KEY_POWER },
-        { 0x07, 0x03, KEY_VOLUMEUP },
-        { 0x07, 0x09, KEY_VOLUMEDOWN },
-        { 0x07, 0x06, KEY_CHANNELUP },
-        { 0x07, 0x0c, KEY_CHANNELDOWN },
-        { 0x07, 0x0f, KEY_1 },
-        { 0x07, 0x15, KEY_2 },
-        { 0x07, 0x10, KEY_3 },
-        { 0x07, 0x18, KEY_4 },
-        { 0x07, 0x1b, KEY_5 },
-        { 0x07, 0x1e, KEY_6 },
-        { 0x07, 0x11, KEY_7 },
-        { 0x07, 0x21, KEY_8 },
-        { 0x07, 0x12, KEY_9 },
-        { 0x07, 0x27, KEY_0 },
-        { 0x07, 0x24, KEY_SCREEN }, // 'Square' key
-        { 0x07, 0x2a, KEY_TEXT },   // 'T' key
-        { 0x07, 0x2d, KEY_REWIND },
-        { 0x07, 0x30, KEY_PLAY },
-        { 0x07, 0x33, KEY_FASTFORWARD },
-        { 0x07, 0x36, KEY_RECORD },
-        { 0x07, 0x3c, KEY_STOP },
-        { 0x07, 0x3f, KEY_CANCEL }, // '?' key
+        { 0x0700, KEY_MUTE },
+        { 0x0701, KEY_MENU }, /* Pinnacle logo */
+        { 0x0739, KEY_POWER },
+        { 0x0703, KEY_VOLUMEUP },
+        { 0x0709, KEY_VOLUMEDOWN },
+        { 0x0706, KEY_CHANNELUP },
+        { 0x070c, KEY_CHANNELDOWN },
+        { 0x070f, KEY_1 },
+        { 0x0715, KEY_2 },
+        { 0x0710, KEY_3 },
+        { 0x0718, KEY_4 },
+        { 0x071b, KEY_5 },
+        { 0x071e, KEY_6 },
+        { 0x0711, KEY_7 },
+        { 0x0721, KEY_8 },
+        { 0x0712, KEY_9 },
+        { 0x0727, KEY_0 },
+        { 0x0724, KEY_SCREEN }, /* 'Square' key */
+        { 0x072a, KEY_TEXT },   /* 'T' key */
+        { 0x072d, KEY_REWIND },
+        { 0x0730, KEY_PLAY },
+        { 0x0733, KEY_FASTFORWARD },
+        { 0x0736, KEY_RECORD },
+        { 0x073c, KEY_STOP },
+        { 0x073f, KEY_CANCEL }, /* '?' key */
         /* Key codes for the Terratec Cinergy DT XS Diversity, similar to cinergyT2.c */
-        { 0xeb, 0x01, KEY_POWER },
-        { 0xeb, 0x02, KEY_1 },
-        { 0xeb, 0x03, KEY_2 },
-        { 0xeb, 0x04, KEY_3 },
-        { 0xeb, 0x05, KEY_4 },
-        { 0xeb, 0x06, KEY_5 },
-        { 0xeb, 0x07, KEY_6 },
-        { 0xeb, 0x08, KEY_7 },
-        { 0xeb, 0x09, KEY_8 },
-        { 0xeb, 0x0a, KEY_9 },
-        { 0xeb, 0x0b, KEY_VIDEO },
-        { 0xeb, 0x0c, KEY_0 },
-        { 0xeb, 0x0d, KEY_REFRESH },
-        { 0xeb, 0x0f, KEY_EPG },
-        { 0xeb, 0x10, KEY_UP },
-        { 0xeb, 0x11, KEY_LEFT },
-        { 0xeb, 0x12, KEY_OK },
-        { 0xeb, 0x13, KEY_RIGHT },
-        { 0xeb, 0x14, KEY_DOWN },
-        { 0xeb, 0x16, KEY_INFO },
-        { 0xeb, 0x17, KEY_RED },
-        { 0xeb, 0x18, KEY_GREEN },
-        { 0xeb, 0x19, KEY_YELLOW },
-        { 0xeb, 0x1a, KEY_BLUE },
-        { 0xeb, 0x1b, KEY_CHANNELUP },
-        { 0xeb, 0x1c, KEY_VOLUMEUP },
-        { 0xeb, 0x1d, KEY_MUTE },
-        { 0xeb, 0x1e, KEY_VOLUMEDOWN },
-        { 0xeb, 0x1f, KEY_CHANNELDOWN },
-        { 0xeb, 0x40, KEY_PAUSE },
-        { 0xeb, 0x41, KEY_HOME },
-        { 0xeb, 0x42, KEY_MENU }, /* DVD Menu */
-        { 0xeb, 0x43, KEY_SUBTITLE },
-        { 0xeb, 0x44, KEY_TEXT }, /* Teletext */
-        { 0xeb, 0x45, KEY_DELETE },
-        { 0xeb, 0x46, KEY_TV },
-        { 0xeb, 0x47, KEY_DVD },
-        { 0xeb, 0x48, KEY_STOP },
-        { 0xeb, 0x49, KEY_VIDEO },
-        { 0xeb, 0x4a, KEY_AUDIO }, /* Music */
-        { 0xeb, 0x4b, KEY_SCREEN }, /* Pic */
-        { 0xeb, 0x4c, KEY_PLAY },
-        { 0xeb, 0x4d, KEY_BACK },
-        { 0xeb, 0x4e, KEY_REWIND },
-        { 0xeb, 0x4f, KEY_FASTFORWARD },
-        { 0xeb, 0x54, KEY_PREVIOUS },
-        { 0xeb, 0x58, KEY_RECORD },
-        { 0xeb, 0x5c, KEY_NEXT },
+        { 0xeb01, KEY_POWER },
+        { 0xeb02, KEY_1 },
+        { 0xeb03, KEY_2 },
+        { 0xeb04, KEY_3 },
+        { 0xeb05, KEY_4 },
+        { 0xeb06, KEY_5 },
+        { 0xeb07, KEY_6 },
+        { 0xeb08, KEY_7 },
+        { 0xeb09, KEY_8 },
+        { 0xeb0a, KEY_9 },
+        { 0xeb0b, KEY_VIDEO },
+        { 0xeb0c, KEY_0 },
+        { 0xeb0d, KEY_REFRESH },
+        { 0xeb0f, KEY_EPG },
+        { 0xeb10, KEY_UP },
+        { 0xeb11, KEY_LEFT },
+        { 0xeb12, KEY_OK },
+        { 0xeb13, KEY_RIGHT },
+        { 0xeb14, KEY_DOWN },
+        { 0xeb16, KEY_INFO },
+        { 0xeb17, KEY_RED },
+        { 0xeb18, KEY_GREEN },
+        { 0xeb19, KEY_YELLOW },
+        { 0xeb1a, KEY_BLUE },
+        { 0xeb1b, KEY_CHANNELUP },
+        { 0xeb1c, KEY_VOLUMEUP },
+        { 0xeb1d, KEY_MUTE },
+        { 0xeb1e, KEY_VOLUMEDOWN },
+        { 0xeb1f, KEY_CHANNELDOWN },
+        { 0xeb40, KEY_PAUSE },
+        { 0xeb41, KEY_HOME },
+        { 0xeb42, KEY_MENU }, /* DVD Menu */
+        { 0xeb43, KEY_SUBTITLE },
+        { 0xeb44, KEY_TEXT }, /* Teletext */
+        { 0xeb45, KEY_DELETE },
+        { 0xeb46, KEY_TV },
+        { 0xeb47, KEY_DVD },
+        { 0xeb48, KEY_STOP },
+        { 0xeb49, KEY_VIDEO },
+        { 0xeb4a, KEY_AUDIO }, /* Music */
+        { 0xeb4b, KEY_SCREEN }, /* Pic */
+        { 0xeb4c, KEY_PLAY },
+        { 0xeb4d, KEY_BACK },
+        { 0xeb4e, KEY_REWIND },
+        { 0xeb4f, KEY_FASTFORWARD },
+        { 0xeb54, KEY_PREVIOUS },
+        { 0xeb58, KEY_RECORD },
+        { 0xeb5c, KEY_NEXT },
 
         /* Key codes for the Haupauge WinTV Nova-TD, copied from nova-t-usb2.c (Nova-T USB2) */
-        { 0x1e, 0x00, KEY_0 },
-        { 0x1e, 0x01, KEY_1 },
-        { 0x1e, 0x02, KEY_2 },
-        { 0x1e, 0x03, KEY_3 },
-        { 0x1e, 0x04, KEY_4 },
-        { 0x1e, 0x05, KEY_5 },
-        { 0x1e, 0x06, KEY_6 },
-        { 0x1e, 0x07, KEY_7 },
-        { 0x1e, 0x08, KEY_8 },
-        { 0x1e, 0x09, KEY_9 },
-        { 0x1e, 0x0a, KEY_KPASTERISK },
-        { 0x1e, 0x0b, KEY_RED },
-        { 0x1e, 0x0c, KEY_RADIO },
-        { 0x1e, 0x0d, KEY_MENU },
-        { 0x1e, 0x0e, KEY_GRAVE }, /* # */
-        { 0x1e, 0x0f, KEY_MUTE },
-        { 0x1e, 0x10, KEY_VOLUMEUP },
-        { 0x1e, 0x11, KEY_VOLUMEDOWN },
-        { 0x1e, 0x12, KEY_CHANNEL },
-        { 0x1e, 0x14, KEY_UP },
-        { 0x1e, 0x15, KEY_DOWN },
-        { 0x1e, 0x16, KEY_LEFT },
-        { 0x1e, 0x17, KEY_RIGHT },
-        { 0x1e, 0x18, KEY_VIDEO },
-        { 0x1e, 0x19, KEY_AUDIO },
-        { 0x1e, 0x1a, KEY_MEDIA },
-        { 0x1e, 0x1b, KEY_EPG },
-        { 0x1e, 0x1c, KEY_TV },
-        { 0x1e, 0x1e, KEY_NEXT },
-        { 0x1e, 0x1f, KEY_BACK },
-        { 0x1e, 0x20, KEY_CHANNELUP },
-        { 0x1e, 0x21, KEY_CHANNELDOWN },
-        { 0x1e, 0x24, KEY_LAST }, /* Skip backwards */
-        { 0x1e, 0x25, KEY_OK },
-        { 0x1e, 0x29, KEY_BLUE},
-        { 0x1e, 0x2e, KEY_GREEN },
-        { 0x1e, 0x30, KEY_PAUSE },
-        { 0x1e, 0x32, KEY_REWIND },
-        { 0x1e, 0x34, KEY_FASTFORWARD },
-        { 0x1e, 0x35, KEY_PLAY },
-        { 0x1e, 0x36, KEY_STOP },
-        { 0x1e, 0x37, KEY_RECORD },
-        { 0x1e, 0x38, KEY_YELLOW },
-        { 0x1e, 0x3b, KEY_GOTO },
-        { 0x1e, 0x3d, KEY_POWER },
+        { 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_KPASTERISK },
+        { 0x1e0b, KEY_RED },
+        { 0x1e0c, KEY_RADIO },
+        { 0x1e0d, KEY_MENU },
+        { 0x1e0e, KEY_GRAVE }, /* # */
+        { 0x1e0f, KEY_MUTE },
+        { 0x1e10, KEY_VOLUMEUP },
+        { 0x1e11, KEY_VOLUMEDOWN },
+        { 0x1e12, KEY_CHANNEL },
+        { 0x1e14, KEY_UP },
+        { 0x1e15, KEY_DOWN },
+        { 0x1e16, KEY_LEFT },
+        { 0x1e17, KEY_RIGHT },
+        { 0x1e18, KEY_VIDEO },
+        { 0x1e19, KEY_AUDIO },
+        { 0x1e1a, KEY_MEDIA },
+        { 0x1e1b, KEY_EPG },
+        { 0x1e1c, KEY_TV },
+        { 0x1e1e, KEY_NEXT },
+        { 0x1e1f, KEY_BACK },
+        { 0x1e20, KEY_CHANNELUP },
+        { 0x1e21, KEY_CHANNELDOWN },
+        { 0x1e24, KEY_LAST }, /* Skip backwards */
+        { 0x1e25, KEY_OK },
+        { 0x1e29, KEY_BLUE},
+        { 0x1e2e, KEY_GREEN },
+        { 0x1e30, KEY_PAUSE },
+        { 0x1e32, KEY_REWIND },
+        { 0x1e34, KEY_FASTFORWARD },
+        { 0x1e35, KEY_PLAY },
+        { 0x1e36, KEY_STOP },
+        { 0x1e37, KEY_RECORD },
+        { 0x1e38, KEY_YELLOW },
+        { 0x1e3b, KEY_GOTO },
+        { 0x1e3d, KEY_POWER },
 
         /* Key codes for the Leadtek Winfast DTV Dongle */
-        { 0x00, 0x42, KEY_POWER },
-        { 0x07, 0x7c, KEY_TUNER },
-        { 0x0f, 0x4e, KEY_PRINT }, /* PREVIEW */
-        { 0x08, 0x40, KEY_SCREEN }, /* full screen toggle*/
-        { 0x0f, 0x71, KEY_DOT }, /* frequency */
-        { 0x07, 0x43, KEY_0 },
-        { 0x0c, 0x41, KEY_1 },
-        { 0x04, 0x43, KEY_2 },
-        { 0x0b, 0x7f, KEY_3 },
-        { 0x0e, 0x41, KEY_4 },
-        { 0x06, 0x43, KEY_5 },
-        { 0x09, 0x7f, KEY_6 },
-        { 0x0d, 0x7e, KEY_7 },
-        { 0x05, 0x7c, KEY_8 },
-        { 0x0a, 0x40, KEY_9 },
-        { 0x0e, 0x4e, KEY_CLEAR },
-        { 0x04, 0x7c, KEY_CHANNEL }, /* show channel number */
-        { 0x0f, 0x41, KEY_LAST }, /* recall */
-        { 0x03, 0x42, KEY_MUTE },
-        { 0x06, 0x4c, KEY_RESERVED }, /* PIP button*/
-        { 0x01, 0x72, KEY_SHUFFLE }, /* SNAPSHOT */
-        { 0x0c, 0x4e, KEY_PLAYPAUSE }, /* TIMESHIFT */
-        { 0x0b, 0x70, KEY_RECORD },
-        { 0x03, 0x7d, KEY_VOLUMEUP },
-        { 0x01, 0x7d, KEY_VOLUMEDOWN },
-        { 0x02, 0x42, KEY_CHANNELUP },
-        { 0x00, 0x7d, KEY_CHANNELDOWN },
+        { 0x0042, KEY_POWER },
+        { 0x077c, KEY_TUNER },
+        { 0x0f4e, KEY_PRINT }, /* PREVIEW */
+        { 0x0840, KEY_SCREEN }, /* full screen toggle*/
+        { 0x0f71, KEY_DOT }, /* frequency */
+        { 0x0743, KEY_0 },
+        { 0x0c41, KEY_1 },
+        { 0x0443, KEY_2 },
+        { 0x0b7f, KEY_3 },
+        { 0x0e41, KEY_4 },
+        { 0x0643, KEY_5 },
+        { 0x097f, KEY_6 },
+        { 0x0d7e, KEY_7 },
+        { 0x057c, KEY_8 },
+        { 0x0a40, KEY_9 },
+        { 0x0e4e, KEY_CLEAR },
+        { 0x047c, KEY_CHANNEL }, /* show channel number */
+        { 0x0f41, KEY_LAST }, /* recall */
+        { 0x0342, KEY_MUTE },
+        { 0x064c, KEY_RESERVED }, /* PIP button*/
+        { 0x0172, KEY_SHUFFLE }, /* SNAPSHOT */
+        { 0x0c4e, KEY_PLAYPAUSE }, /* TIMESHIFT */
+        { 0x0b70, KEY_RECORD },
+        { 0x037d, KEY_VOLUMEUP },
+        { 0x017d, KEY_VOLUMEDOWN },
+        { 0x0242, KEY_CHANNELUP },
+        { 0x007d, KEY_CHANNELDOWN },
 
         /* Key codes for Nova-TD "credit card" remote control. */
-        { 0x1d, 0x00, KEY_0 },
-        { 0x1d, 0x01, KEY_1 },
-        { 0x1d, 0x02, KEY_2 },
-        { 0x1d, 0x03, KEY_3 },
-        { 0x1d, 0x04, KEY_4 },
-        { 0x1d, 0x05, KEY_5 },
-        { 0x1d, 0x06, KEY_6 },
-        { 0x1d, 0x07, KEY_7 },
-        { 0x1d, 0x08, KEY_8 },
-        { 0x1d, 0x09, KEY_9 },
-        { 0x1d, 0x0a, KEY_TEXT },
-        { 0x1d, 0x0d, KEY_MENU },
-        { 0x1d, 0x0f, KEY_MUTE },
-        { 0x1d, 0x10, KEY_VOLUMEUP },
-        { 0x1d, 0x11, KEY_VOLUMEDOWN },
-        { 0x1d, 0x12, KEY_CHANNEL },
-        { 0x1d, 0x14, KEY_UP },
-        { 0x1d, 0x15, KEY_DOWN },
-        { 0x1d, 0x16, KEY_LEFT },
-        { 0x1d, 0x17, KEY_RIGHT },
-        { 0x1d, 0x1c, KEY_TV },
-        { 0x1d, 0x1e, KEY_NEXT },
-        { 0x1d, 0x1f, KEY_BACK },
-        { 0x1d, 0x20, KEY_CHANNELUP },
-        { 0x1d, 0x21, KEY_CHANNELDOWN },
-        { 0x1d, 0x24, KEY_LAST },
-        { 0x1d, 0x25, KEY_OK },
-        { 0x1d, 0x30, KEY_PAUSE },
-        { 0x1d, 0x32, KEY_REWIND },
-        { 0x1d, 0x34, KEY_FASTFORWARD },
-        { 0x1d, 0x35, KEY_PLAY },
-        { 0x1d, 0x36, KEY_STOP },
-        { 0x1d, 0x37, KEY_RECORD },
-        { 0x1d, 0x3b, KEY_GOTO },
-        { 0x1d, 0x3d, KEY_POWER },
+        { 0x1d00, KEY_0 },
+        { 0x1d01, KEY_1 },
+        { 0x1d02, KEY_2 },
+        { 0x1d03, KEY_3 },
+        { 0x1d04, KEY_4 },
+        { 0x1d05, KEY_5 },
+        { 0x1d06, KEY_6 },
+        { 0x1d07, KEY_7 },
+        { 0x1d08, KEY_8 },
+        { 0x1d09, KEY_9 },
+        { 0x1d0a, KEY_TEXT },
+        { 0x1d0d, KEY_MENU },
+        { 0x1d0f, KEY_MUTE },
+        { 0x1d10, KEY_VOLUMEUP },
+        { 0x1d11, KEY_VOLUMEDOWN },
+        { 0x1d12, KEY_CHANNEL },
+        { 0x1d14, KEY_UP },
+        { 0x1d15, KEY_DOWN },
+        { 0x1d16, KEY_LEFT },
+        { 0x1d17, KEY_RIGHT },
+        { 0x1d1c, KEY_TV },
+        { 0x1d1e, KEY_NEXT },
+        { 0x1d1f, KEY_BACK },
+        { 0x1d20, KEY_CHANNELUP },
+        { 0x1d21, KEY_CHANNELDOWN },
+        { 0x1d24, KEY_LAST },
+        { 0x1d25, KEY_OK },
+        { 0x1d30, KEY_PAUSE },
+        { 0x1d32, KEY_REWIND },
+        { 0x1d34, KEY_FASTFORWARD },
+        { 0x1d35, KEY_PLAY },
+        { 0x1d36, KEY_STOP },
+        { 0x1d37, KEY_RECORD },
+        { 0x1d3b, KEY_GOTO },
+        { 0x1d3d, KEY_POWER },
 };
 
 /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */