From 1722f3b376f10182db85c2f6cf5bd79b857bc9e0 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 1 Aug 2010 15:30:50 -0300 Subject: V4L/DVB: sms: properly initialize IR phys and IR name sms were using a non-compliant nomenclature for the USB devices. Fix it. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/siano/smsir.c | 17 +++++++++++------ drivers/media/dvb/siano/smsir.h | 5 +++-- drivers/media/dvb/siano/smsusb.c | 3 +-- 3 files changed, 15 insertions(+), 10 deletions(-) (limited to 'drivers/media/dvb') diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/dvb/siano/smsir.c index a56eac76e0f..f8a4fd61e3d 100644 --- a/drivers/media/dvb/siano/smsir.c +++ b/drivers/media/dvb/siano/smsir.c @@ -22,6 +22,7 @@ #include #include +#include #include "smscoreapi.h" #include "smsir.h" @@ -247,6 +248,7 @@ void sms_ir_event(struct smscore_device_t *coredev, const char *buf, int len) int sms_ir_init(struct smscore_device_t *coredev) { struct input_dev *input_dev; + int board_id = smscore_get_board_id(coredev); sms_log("Allocating input device"); input_dev = input_allocate_device(); @@ -256,8 +258,7 @@ int sms_ir_init(struct smscore_device_t *coredev) } coredev->ir.input_dev = input_dev; - coredev->ir.ir_kb_type = - sms_get_board(smscore_get_board_id(coredev))->ir_kb_type; + coredev->ir.ir_kb_type = sms_get_board(board_id)->ir_kb_type; coredev->ir.keyboard_layout_map = keyboard_layout_maps[coredev->ir.ir_kb_type]. keyboard_layout_map; @@ -269,11 +270,15 @@ int sms_ir_init(struct smscore_device_t *coredev) coredev->ir.controller, coredev->ir.timeout); snprintf(coredev->ir.name, - IR_DEV_NAME_MAX_LEN, - "SMS IR w/kbd type %d", - coredev->ir.ir_kb_type); + sizeof(coredev->ir.name), + "SMS IR (%s)", + sms_get_board(board_id)->name); + + strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys)); + strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys)); + input_dev->name = coredev->ir.name; - input_dev->phys = coredev->ir.name; + input_dev->phys = coredev->ir.phys; input_dev->dev.parent = coredev->device; /* Key press events only */ diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/dvb/siano/smsir.h index b7d703e2d33..77e65057949 100644 --- a/drivers/media/dvb/siano/smsir.h +++ b/drivers/media/dvb/siano/smsir.h @@ -24,7 +24,7 @@ along with this program. If not, see . #include -#define IR_DEV_NAME_MAX_LEN 23 /* "SMS IR kbd type nn\0" */ +#define IR_DEV_NAME_MAX_LEN 40 #define IR_KEYBOARD_LAYOUT_SIZE 64 #define IR_DEFAULT_TIMEOUT 100 @@ -78,7 +78,8 @@ struct smscore_device_t; struct ir_t { struct input_dev *input_dev; enum ir_kb_type ir_kb_type; - char name[IR_DEV_NAME_MAX_LEN+1]; + char name[IR_DEV_NAME_MAX_LEN + 1]; + char phys[32]; u16 *keyboard_layout_map; u32 timeout; u32 controller; diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index a9c27fb69ba..50d4338610e 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c @@ -352,8 +352,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) params.num_buffers = MAX_BUFFERS; params.sendrequest_handler = smsusb_sendrequest; params.context = dev; - snprintf(params.devpath, sizeof(params.devpath), - "usb\\%d-%s", dev->udev->bus->busnum, dev->udev->devpath); + usb_make_path(dev->udev, params.devpath, sizeof(params.devpath)); /* register in smscore */ rc = smscore_register_device(¶ms, &dev->coredev); -- cgit v1.2.3-70-g09d2