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, 18 insertions, 18 deletions

diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index 81a6cbf60160..a1b12b01cbe4 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -58,24 +58,24 @@ static int dtt200u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
 /* remote control */
 /* key list for the tiny remote control (Yakumo, don't know about the others) */
 static struct dvb_usb_rc_key dtt200u_rc_keys[] = {
-        { 0x80, 0x01, KEY_MUTE },
-        { 0x80, 0x02, KEY_CHANNELDOWN },
-        { 0x80, 0x03, KEY_VOLUMEDOWN },
-        { 0x80, 0x04, KEY_1 },
-        { 0x80, 0x05, KEY_2 },
-        { 0x80, 0x06, KEY_3 },
-        { 0x80, 0x07, KEY_4 },
-        { 0x80, 0x08, KEY_5 },
-        { 0x80, 0x09, KEY_6 },
-        { 0x80, 0x0a, KEY_7 },
-        { 0x80, 0x0c, KEY_ZOOM },
-        { 0x80, 0x0d, KEY_0 },
-        { 0x80, 0x0e, KEY_SELECT },
-        { 0x80, 0x12, KEY_POWER },
-        { 0x80, 0x1a, KEY_CHANNELUP },
-        { 0x80, 0x1b, KEY_8 },
-        { 0x80, 0x1e, KEY_VOLUMEUP },
-        { 0x80, 0x1f, KEY_9 },
+        { 0x8001, KEY_MUTE },
+        { 0x8002, KEY_CHANNELDOWN },
+        { 0x8003, KEY_VOLUMEDOWN },
+        { 0x8004, KEY_1 },
+        { 0x8005, KEY_2 },
+        { 0x8006, KEY_3 },
+        { 0x8007, KEY_4 },
+        { 0x8008, KEY_5 },
+        { 0x8009, KEY_6 },
+        { 0x800a, KEY_7 },
+        { 0x800c, KEY_ZOOM },
+        { 0x800d, KEY_0 },
+        { 0x800e, KEY_SELECT },
+        { 0x8012, KEY_POWER },
+        { 0x801a, KEY_CHANNELUP },
+        { 0x801b, KEY_8 },
+        { 0x801e, KEY_VOLUMEUP },
+        { 0x801f, KEY_9 },
 };
 
 static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state)