diff options
| author | Andrew Hodgson <a.s.hodgson@gmail.com> | 2005-07-07 17:58:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 18:24:02 -0700 |
| commit | 58769a5486bec8ed44b3b51029f8df8f13cddd5a (patch) | |
| tree | 442ef9e0e2249612cae437a11833adf51157b120 /drivers/media/dvb/dvb-usb/a800.c | |
| parent | 1df896aa239caf72483655290c40b21da536d85e (diff) | |
| download | blackbird-op-linux-58769a5486bec8ed44b3b51029f8df8f13cddd5a.tar.gz blackbird-op-linux-58769a5486bec8ed44b3b51029f8df8f13cddd5a.zip | |
[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>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/a800.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/a800.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c index a3542935604f..672037c22819 100644 --- 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 */ |
