From fd5d2295082f60c95ad07bf0fa8ff3569068ee06 Mon Sep 17 00:00:00 2001 From: Andrew Hodgson Date: Thu, 7 Jul 2005 17:58:26 -0700 Subject: [PATCH] --- yaml --- r: 4351 b: refs/heads/master c: 58769a5486bec8ed44b3b51029f8df8f13cddd5a h: refs/heads/master i: 4349: e373a914f7dacd4c833af94cfacc1fe26260bad6 4347: 2ded1322dd73ec82ee95cfb4f74217f7fb6c4bd9 4343: 67bff594f538fee2081d6749ebbb0d55bab254eb 4335: c140a64dbcec71e13d79dca1d2f7d1e8e40c5844 4319: 1ae3f170c95a5d7c4f5d19166c6fa04ec18ac298 4287: 9ae66755cc4b152456c53757dcfcc5afffa5fae8 4223: 15d672f9580706ce44613224eba0f16379f6e6b6 4095: 39ad1eed1795cfe398d90d135adf04b6fc26ea86 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/a800.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed0f359e9e5a..a98325643489 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1df896aa239caf72483655290c40b21da536d85e +refs/heads/master: 58769a5486bec8ed44b3b51029f8df8f13cddd5a diff --git a/trunk/drivers/media/dvb/dvb-usb/a800.c b/trunk/drivers/media/dvb/dvb-usb/a800.c index a3542935604f..672037c22819 100644 --- a/trunk/drivers/media/dvb/dvb-usb/a800.c +++ b/trunk/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 */