Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4351
b: refs/heads/master
c: 58769a5
h: refs/heads/master
i:
  4349: e373a91
  4347: 2ded132
  4343: 67bff59
  4335: c140a64
  4319: 1ae3f17
  4287: 9ae6675
  4223: 15d672f
  4095: 39ad1ee
v: v3
  • Loading branch information
Andrew Hodgson authored and Linus Torvalds committed Jul 8, 2005
1 parent d691d49 commit fd5d229
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1df896aa239caf72483655290c40b21da536d85e
refs/heads/master: 58769a5486bec8ed44b3b51029f8df8f13cddd5a
8 changes: 7 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/a800.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,20 @@ 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)
{
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 */
Expand Down

0 comments on commit fd5d229

Please sign in to comment.