media: em28xx: give RC device proper name
Subsystems (2)
PATCH 1/3 media: em28xx: give RC device proper name
Give the RC device the name of the board rather than "1-2:1.0 IR".
Signed-off-by Sean Young <[email protected]>
--- drivers/media/usb/em28xx/em28xx-input.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/media/usb/em28xx/em28xx-input.c +1 -6
@@ -58,7 +58,6 @@ struct em28xx_ir_poll_result {struct em28xx_IR {struct em28xx *dev;struct rc_dev *rc; -char name[32 ];char phys[32 ];/* poll decoder */
@@ -832,14 +831,10 @@ static int em28xx_ir_init(struct em28xx *dev)/* This is how often we ask the chip for IR information */ ir->polling =100 ;/* ms */ -/* init input device */ -snprintf (ir->name,sizeof (ir->name),"%s IR" , -dev_name (&dev->intf->dev)); -usb_make_path (udev, ir->phys,sizeof (ir->phys));strlcat (ir->phys,"/input0" ,sizeof (ir->phys)); - rc->device_name = ir->name; + rc->device_name = em28xx_boards[dev->model].name; rc->input_phys = ir->phys; rc->input_id.bustype =BUS_USB ; rc->input_id.version =1 ;
Signature · 1 line
2.20.1
PATCH 2/3 media: em28xx: use common code for decoding nec scancodes
Tested on WinTV-HVR-930C.
Signed-off-by Sean Young <[email protected]>
--- drivers/media/usb/em28xx/em28xx-input.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/media/usb/em28xx/em28xx-input.c +2 -15
@@ -276,21 +276,8 @@ static int em2874_polling_getkey(struct em28xx_IR *ir,break ;case RC_PROTO_BIT_NEC : - poll_result->scancode = msg[1 ] <<8 | msg[2 ]; -if ((msg[3 ] ^ msg[4 ]) !=0xff ) {/* 32 bits NEC */ - poll_result->protocol =RC_PROTO_NEC32 ; - poll_result->scancode =RC_SCANCODE_NEC32 ((msg[1 ] <<24 ) | - (msg[2 ] <<16 ) | - (msg[3 ] <<8 ) | - (msg[4 ])); - }else if ((msg[1 ] ^ msg[2 ]) !=0xff ) {/* 24 bits NEC */ - poll_result->protocol =RC_PROTO_NECX ; - poll_result->scancode =RC_SCANCODE_NECX (msg[1 ] <<8 | - msg[2 ], msg[3 ]); - }else {/* Normal NEC */ - poll_result->protocol =RC_PROTO_NEC ; - poll_result->scancode =RC_SCANCODE_NEC (msg[1 ], msg[3 ]); - } + poll_result->scancode =ir_nec_bytes_to_scancode (msg[1 ], msg[2 ], msg[3 ], msg[4 ], + &poll_result->protocol);break ;case RC_PROTO_BIT_RC6_0 :
Signature · 1 line
2.20.1
PATCH 3/3 media: em28xx: use usb_to_input_id() rather than handrolling it
In reply to Sean YoungThis also populates the version member correctly.
Signed-off-by Sean Young <[email protected]>
--- drivers/media/usb/em28xx/em28xx-input.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/media/usb/em28xx/em28xx-input.c +3 -8
@@ -24,6 +24,7 @@#include <linux/delay.h> #include <linux/interrupt.h> #include <linux/usb.h> +#include <linux/usb/input.h> #include <linux/slab.h> #include <linux/bitrev.h>
@@ -603,10 +604,7 @@ static int em28xx_register_snapshot_button(struct em28xx *dev)set_bit (EM28XX_SNAPSHOT_KEY , input_dev->keybit); input_dev->keycodesize =0 ; input_dev->keycodemax =0 ; - input_dev->id.bustype =BUS_USB ; - input_dev->id.vendor =le16_to_cpu (udev->descriptor.idVendor); - input_dev->id.product =le16_to_cpu (udev->descriptor.idProduct); - input_dev->id.version =1 ; +usb_to_input_id (udev, &input_dev->id); input_dev->dev.parent = &dev->intf->dev; err =input_register_device (input_dev);
@@ -823,10 +821,7 @@ static int em28xx_ir_init(struct em28xx *dev) rc->device_name = em28xx_boards[dev->model].name; rc->input_phys = ir->phys; - rc->input_id.bustype =BUS_USB ; - rc->input_id.version =1 ; - rc->input_id.vendor =le16_to_cpu (udev->descriptor.idVendor); - rc->input_id.product =le16_to_cpu (udev->descriptor.idProduct); +usb_to_input_id (udev, &rc->input_id); rc->dev.parent = &dev->intf->dev; rc->driver_name =MODULE_NAME ;
Signature · 1 line
2.20.1