Skip to content

Commit

Permalink
[media] af9035: style changes for remote controller polling
Browse files Browse the repository at this point in the history
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Mar 21, 2013
1 parent 1bfd529 commit 75cd588
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions drivers/media/usb/dvb-usb-v2/af9035.c
Original file line number Diff line number Diff line change
Expand Up @@ -1221,29 +1221,32 @@ static int af9035_init(struct dvb_usb_device *d)
#if IS_ENABLED(CONFIG_RC_CORE)
static int af9035_rc_query(struct dvb_usb_device *d)
{
unsigned int key;
unsigned char b[4];
int ret;
struct usb_req req = { CMD_IR_GET, 0, 0, NULL, 4, b };
u32 key;
u8 buf[4];
struct usb_req req = { CMD_IR_GET, 0, 0, NULL, 4, buf };

ret = af9035_ctrl_msg(d, &req);
if (ret == 1)
return 0;
else if (ret < 0)
goto err;

if ((b[2] + b[3]) == 0xff) {
if ((b[0] + b[1]) == 0xff) {
/* NEC */
key = b[0] << 8 | b[2];
if ((buf[2] + buf[3]) == 0xff) {
if ((buf[0] + buf[1]) == 0xff) {
/* NEC standard 16bit */
key = buf[0] << 8 | buf[2];
} else {
/* ext. NEC */
key = b[0] << 16 | b[1] << 8 | b[2];
/* NEC extended 24bit */
key = buf[0] << 16 | buf[1] << 8 | buf[2];
}
} else {
key = b[0] << 24 | b[1] << 16 | b[2] << 8 | b[3];
/* NEC full code 32bit */
key = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3];
}

dev_dbg(&d->udev->dev, "%s: %*ph\n", __func__, 4, buf);

rc_keydown(d->rc_dev, key, 0);

return 0;
Expand Down

0 comments on commit 75cd588

Please sign in to comment.