Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357186
b: refs/heads/master
c: b677757
h: refs/heads/master
v: v3
  • Loading branch information
Antonio Ospite authored and Mauro Carvalho Chehab committed Dec 27, 2012
1 parent 0430f70 commit 7a35a3d
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7a7ef4657e84b5038eace08a1db5b480854c893e
refs/heads/master: b677757cef208203426aa8486a91214809135e01
32 changes: 32 additions & 0 deletions trunk/drivers/media/usb/dvb-usb/m920x.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,38 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
return ret;
}

static int m920x_rc_core_query(struct dvb_usb_device *d)
{
int ret = 0;
u8 *rc_state;
int state;

rc_state = kmalloc(2, GFP_KERNEL);
if (!rc_state)
return -ENOMEM;

if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, &rc_state[0], 1)) != 0)
goto out;

if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, &rc_state[1], 1)) != 0)
goto out;

deb("state=0x%02x keycode=0x%02x\n", rc_state[0], rc_state[1]);

m920x_parse_rc_state(d, rc_state[0], &state);

if (state == REMOTE_NO_KEY_PRESSED)
rc_keyup(d->rc_dev);
else if (state == REMOTE_KEY_REPEAT)
rc_repeat(d->rc_dev);
else
rc_keydown(d->rc_dev, rc_state[1], 0);

out:
kfree(rc_state);
return ret;
}

/* I2C */
static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
{
Expand Down

0 comments on commit 7a35a3d

Please sign in to comment.