korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 02:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] af9035: style changes for remote controller polling

Browse Source 
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2013-03-08 17:50:21 -03:00 committed by Mauro Carvalho Chehab
parent 1bfd5294dd
commit 75cd5886ed
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/usb/dvb-usb-v2/af9035.c
View File

@ -1221,10 +1221,10 @@ err:
#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)
@ -1232,18 +1232,21 @@ static int af9035_rc_query(struct dvb_usb_device *d)
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;