[PATCH] dvb: usb: A800 rc and timeout fixes

o add some remote control codes
o not using HZ for control_msg-timeout

Signed-off-by: Andrew Hodgson <a.s.hodgson@gmail.com>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index a3542935604fb14a9a5065fbd599253133e92b05..672037c22819c5dd31b3a9cbf111a6a101a820b3 100644 (file)
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -61,6 +61,12 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
        { 0x02, 0x00, KEY_LAST },        /* >>| / BLUE */
        { 0x02, 0x04, KEY_EPG },         /* EPG */
        { 0x02, 0x15, KEY_MENU },        /* MENU */
+
+       { 0x03, 0x03, KEY_CHANNELUP },   /* CH UP */
+       { 0x03, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */
+       { 0x03, 0x01, KEY_FIRST },       /* |<< / GREEN */
+       { 0x03, 0x00, KEY_LAST },        /* >>| / BLUE */
+
 };
 
 int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
@@ -68,7 +74,7 @@ int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        u8 key[5];
        if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0),
                                0x04, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, key, 5,
-                               2*HZ) != 5)
+                               2000) != 5)
                return -ENODEV;
 
        /* call the universal NEC remote processor, to find out the key's state and event */