V4L/DVB (12598): dvb-usb: store rc5 custom and data at the same field

In order to be closer to V4L IR implementation, it is needed to replace
	u8 custom, data
to:
	u16 scan

This allows using non-rc5 mappings, like the 8 bit keycodes used on older
protocols. It will also allow future implementations of rc6 keystrokes
when needed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 38 insertions, 38 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/dvb/dvb-usb/af9005-remote.c
index 7c596f926764..f4379c650a19 100644
--- a/drivers/media/dvb/dvb-usb/af9005-remote.c
+++ b/drivers/media/dvb/dvb-usb/af9005-remote.c
@@ -35,43 +35,43 @@ MODULE_PARM_DESC(debug,
 
 struct dvb_usb_rc_key af9005_rc_keys[] = {
 
-        {0x01, 0xb7, KEY_POWER},
-        {0x01, 0xa7, KEY_VOLUMEUP},
-        {0x01, 0x87, KEY_CHANNELUP},
-        {0x01, 0x7f, KEY_MUTE},
-        {0x01, 0xbf, KEY_VOLUMEDOWN},
-        {0x01, 0x3f, KEY_CHANNELDOWN},
-        {0x01, 0xdf, KEY_1},
-        {0x01, 0x5f, KEY_2},
-        {0x01, 0x9f, KEY_3},
-        {0x01, 0x1f, KEY_4},
-        {0x01, 0xef, KEY_5},
-        {0x01, 0x6f, KEY_6},
-        {0x01, 0xaf, KEY_7},
-        {0x01, 0x27, KEY_8},
-        {0x01, 0x07, KEY_9},
-        {0x01, 0xcf, KEY_ZOOM},
-        {0x01, 0x4f, KEY_0},
-        {0x01, 0x8f, KEY_GOTO}, /* marked jump on the remote */
+        {0x01b7, KEY_POWER},
+        {0x01a7, KEY_VOLUMEUP},
+        {0x0187, KEY_CHANNELUP},
+        {0x017f, KEY_MUTE},
+        {0x01bf, KEY_VOLUMEDOWN},
+        {0x013f, KEY_CHANNELDOWN},
+        {0x01df, KEY_1},
+        {0x015f, KEY_2},
+        {0x019f, KEY_3},
+        {0x011f, KEY_4},
+        {0x01ef, KEY_5},
+        {0x016f, KEY_6},
+        {0x01af, KEY_7},
+        {0x0127, KEY_8},
+        {0x0107, KEY_9},
+        {0x01cf, KEY_ZOOM},
+        {0x014f, KEY_0},
+        {0x018f, KEY_GOTO},     /* marked jump on the remote */
 
-        {0x00, 0xbd, KEY_POWER},
-        {0x00, 0x7d, KEY_VOLUMEUP},
-        {0x00, 0xfd, KEY_CHANNELUP},
-        {0x00, 0x9d, KEY_MUTE},
-        {0x00, 0x5d, KEY_VOLUMEDOWN},
-        {0x00, 0xdd, KEY_CHANNELDOWN},
-        {0x00, 0xad, KEY_1},
-        {0x00, 0x6d, KEY_2},
-        {0x00, 0xed, KEY_3},
-        {0x00, 0x8d, KEY_4},
-        {0x00, 0x4d, KEY_5},
-        {0x00, 0xcd, KEY_6},
-        {0x00, 0xb5, KEY_7},
-        {0x00, 0x75, KEY_8},
-        {0x00, 0xf5, KEY_9},
-        {0x00, 0x95, KEY_ZOOM},
-        {0x00, 0x55, KEY_0},
-        {0x00, 0xd5, KEY_GOTO}, /* marked jump on the remote */
+        {0x00bd, KEY_POWER},
+        {0x007d, KEY_VOLUMEUP},
+        {0x00fd, KEY_CHANNELUP},
+        {0x009d, KEY_MUTE},
+        {0x005d, KEY_VOLUMEDOWN},
+        {0x00dd, KEY_CHANNELDOWN},
+        {0x00ad, KEY_1},
+        {0x006d, KEY_2},
+        {0x00ed, KEY_3},
+        {0x008d, KEY_4},
+        {0x004d, KEY_5},
+        {0x00cd, KEY_6},
+        {0x00b5, KEY_7},
+        {0x0075, KEY_8},
+        {0x00f5, KEY_9},
+        {0x0095, KEY_ZOOM},
+        {0x0055, KEY_0},
+        {0x00d5, KEY_GOTO},     /* marked jump on the remote */
 };
 
 int af9005_rc_keys_size = ARRAY_SIZE(af9005_rc_keys);
@@ -131,8 +131,8 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event,
                                 return 0;
                         }
                         for (i = 0; i < af9005_rc_keys_size; i++) {
-                                if (af9005_rc_keys[i].custom == cust
-                                    && af9005_rc_keys[i].data == dat) {
+                                if (rc5_custom(&af9005_rc_keys[i]) == cust
+                                    && rc5_data(&af9005_rc_keys[i]) == dat) {
                                         *event = af9005_rc_keys[i].event;
                                         *state = REMOTE_KEY_PRESSED;
                                         deb_decode