diff options
author | Janne Grunau <janne-dvb@grunau.be> | 2008-04-09 18:13:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:08:00 -0400 |
commit | 78e92006f410a4044f8c1760c25ac9d11d259aa2 (patch) | |
tree | 293de8abe261420df2db5e12936ec2721ea52c7c /drivers/media/dvb/ttusb-dec | |
parent | 9950c1b5b4b86d4aae12853c2f0a0ef11d976764 (diff) |
V4L/DVB (7538): Adds selectable adapter numbers as per module option
The adapter_nr module options can be used to allocate static adapter
numbers on a driver level. It avoids problems with changing DVB apapter
numbers after warm/cold boot or device unplugging and repluging.
Each driver holds DVB_MAX_ADAPTER long array of the preferred order of
adapter numbers.
options dvb-usb-dib0700 adapter_nr=7,6,5,4,3,2,1,0 would result in a
reversed allocation of adapter numbers.
With adapter_nr=2,5 it tries first to get adapter number 2 and 5. If
both are already in use it will allocate the lowest free adapter number.
Signed-off-by: Janne Grunau <janne-dvb@grunau.be>
Acked-by: Hermann Pitton <hermann.pitton@arcor.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/ttusb-dec')
-rw-r--r-- | drivers/media/dvb/ttusb-dec/ttusb_dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 95110c483312..42eee04daa5d 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
@@ -52,6 +52,8 @@ MODULE_PARM_DESC(output_pva, "Output PVA from dvr device (default:off)"); | |||
52 | module_param(enable_rc, int, 0644); | 52 | module_param(enable_rc, int, 0644); |
53 | MODULE_PARM_DESC(enable_rc, "Turn on/off IR remote control(default: off)"); | 53 | MODULE_PARM_DESC(enable_rc, "Turn on/off IR remote control(default: off)"); |
54 | 54 | ||
55 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | ||
56 | |||
55 | #define dprintk if (debug) printk | 57 | #define dprintk if (debug) printk |
56 | 58 | ||
57 | #define DRIVER_NAME "TechnoTrend/Hauppauge DEC USB" | 59 | #define DRIVER_NAME "TechnoTrend/Hauppauge DEC USB" |
@@ -1437,7 +1439,9 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1437 | dprintk("%s\n", __func__); | 1439 | dprintk("%s\n", __func__); |
1438 | 1440 | ||
1439 | if ((result = dvb_register_adapter(&dec->adapter, | 1441 | if ((result = dvb_register_adapter(&dec->adapter, |
1440 | dec->model_name, THIS_MODULE, &dec->udev->dev)) < 0) { | 1442 | dec->model_name, THIS_MODULE, |
1443 | &dec->udev->dev, | ||
1444 | adapter_nr)) < 0) { | ||
1441 | printk("%s: dvb_register_adapter failed: error %d\n", | 1445 | printk("%s: dvb_register_adapter failed: error %d\n", |
1442 | __func__, result); | 1446 | __func__, result); |
1443 | 1447 | ||