V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support

Attached is a patch against latest HG which adds remote control support
to the DigiTV driver. It works for me;

Signed-off-by: Allan Third <allan.third@gmail.com>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index f5cd3a4f82a8b8fe3140d5f81a17e6d57cd2208b..015854487308b7b7f9c452dd429eb002d1350a3f 100644 (file)
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -147,21 +147,91 @@ static int digitv_tuner_attach(struct dvb_usb_device *d)
 }
 
 static struct dvb_usb_rc_key digitv_rc_keys[] = {
-       { 0x00, 0x16, KEY_POWER }, /* dummy key */
+       { 0x5f, 0x55, KEY_0 },
+       { 0x6f, 0x55, KEY_1 },
+       { 0x9f, 0x55, KEY_2 },
+       { 0xaf, 0x55, KEY_3 },
+       { 0x5f, 0x56, KEY_4 },
+       { 0x6f, 0x56, KEY_5 },
+       { 0x9f, 0x56, KEY_6 },
+       { 0xaf, 0x56, KEY_7 },
+       { 0x5f, 0x59, KEY_8 },
+       { 0x6f, 0x59, KEY_9 },
+       { 0x9f, 0x59, KEY_TV },
+       { 0xaf, 0x59, KEY_AUX },
+       { 0x5f, 0x5a, KEY_DVD },
+       { 0x6f, 0x5a, KEY_POWER },
+       { 0x9f, 0x5a, KEY_MHP },     /* labelled 'Picture' */
+       { 0xaf, 0x5a, KEY_AUDIO },
+       { 0x5f, 0x65, KEY_INFO },
+       { 0x6f, 0x65, KEY_F13 },     /* 16:9 */
+       { 0x9f, 0x65, KEY_F14 },     /* 14:9 */
+       { 0xaf, 0x65, KEY_EPG },
+       { 0x5f, 0x66, KEY_EXIT },
+       { 0x6f, 0x66, KEY_MENU },
+       { 0x9f, 0x66, KEY_UP },
+       { 0xaf, 0x66, KEY_DOWN },
+       { 0x5f, 0x69, KEY_LEFT },
+       { 0x6f, 0x69, KEY_RIGHT },
+       { 0x9f, 0x69, KEY_ENTER },
+       { 0xaf, 0x69, KEY_CHANNELUP },
+       { 0x5f, 0x6a, KEY_CHANNELDOWN },
+       { 0x6f, 0x6a, KEY_VOLUMEUP },
+       { 0x9f, 0x6a, KEY_VOLUMEDOWN },
+       { 0xaf, 0x6a, KEY_RED },
+       { 0x5f, 0x95, KEY_GREEN },
+       { 0x6f, 0x95, KEY_YELLOW },
+       { 0x9f, 0x95, KEY_BLUE },
+       { 0xaf, 0x95, KEY_SUBTITLE },
+       { 0x5f, 0x96, KEY_F15 },     /* AD */
+       { 0x6f, 0x96, KEY_TEXT },
+       { 0x9f, 0x96, KEY_MUTE },
+       { 0xaf, 0x96, KEY_REWIND },
+       { 0x5f, 0x99, KEY_STOP },
+       { 0x6f, 0x99, KEY_PLAY },
+       { 0x9f, 0x99, KEY_FASTFORWARD },
+       { 0xaf, 0x99, KEY_F16 },     /* chapter */
+       { 0x5f, 0x9a, KEY_PAUSE },
+       { 0x6f, 0x9a, KEY_PLAY },
+       { 0x9f, 0x9a, KEY_RECORD },
+       { 0xaf, 0x9a, KEY_F17 },     /* picture in picture */
+       { 0x5f, 0xa5, KEY_KPPLUS },  /* zoom in */
+       { 0x6f, 0xa5, KEY_KPMINUS }, /* zoom out */
+       { 0x9f, 0xa5, KEY_F18 },     /* capture */
+       { 0xaf, 0xa5, KEY_F19 },     /* web */
+       { 0x5f, 0xa6, KEY_EMAIL },
+       { 0x6f, 0xa6, KEY_PHONE },
+       { 0x9f, 0xa6, KEY_PC },
 };
 
-/* TODO is it really the NEC protocol ? */
 static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
+       int i;
        u8 key[5];
+       u8 b[4] = { 0 };
+
+       *event = 0;
+       *state = REMOTE_NO_KEY_PRESSED;
 
        digitv_ctrl_msg(d,USB_READ_REMOTE,0,NULL,0,&key[1],4);
-       /* TODO state, maybe it is VV ? */
+
+       /* Tell the device we've read the remote. Not sure how necessary
+          this is, but the Nebula SDK does it. */
+       digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
+
+       /* if something is inside the buffer, simulate key press */
        if (key[1] != 0)
-               key[0] = 0x01; /* if something is inside the buffer, simulate key press */
+       {
+                 for (i = 0; i < d->props.rc_key_map_size; i++) {
+                       if (d->props.rc_key_map[i].custom == key[1] &&
+                           d->props.rc_key_map[i].data == key[2]) {
+                               *event = d->props.rc_key_map[i].event;
+                               *state = REMOTE_KEY_PRESSED;
+                               return 0;
+                       }
+               }
+       }
 
-       /* call the universal NEC remote processor, to find out the key's state and event */
-       dvb_usb_nec_rc_key_to_event(d,key,event,state);
        if (key[0] != 0)
                deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
        return 0;