diff options
author | Uri Shkolnik <uris@siano-ms.com> | 2009-05-19 08:51:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:14:37 -0400 |
commit | d0b66180c3b288678853e31ec4330b2b5d01e2db (patch) | |
tree | 3f6929a99a1b049baa857fc78242d705bf6fe083 | |
parent | bebfa762b171ffcfeeec08f3e677fa9076db6d4c (diff) |
V4L/DVB (11883): Siano: cards - add two additional (USB) devices
Add two additional USB targets, add these to the 'cards' modules
and to the 'smsusb' module.
Signed-off-by: Uri Shkolnik <uris@siano-ms.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/siano/sms-cards.c | 10 | ||||
-rw-r--r-- | drivers/media/dvb/siano/sms-cards.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smsusb.c | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c index fda483f07f2e..1a1890680349 100644 --- a/drivers/media/dvb/siano/sms-cards.c +++ b/drivers/media/dvb/siano/sms-cards.c | |||
@@ -85,6 +85,16 @@ static struct sms_board sms_boards[] = { | |||
85 | .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", | 85 | .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", |
86 | .lna_ctrl = -1, | 86 | .lna_ctrl = -1, |
87 | }, | 87 | }, |
88 | [SMS1XXX_BOARD_SIANO_NICE] = { | ||
89 | /* 11 */ | ||
90 | .name = "Siano Nice Digital Receiver", | ||
91 | .type = SMS_NOVA_B0, | ||
92 | }, | ||
93 | [SMS1XXX_BOARD_SIANO_VENICE] = { | ||
94 | /* 12 */ | ||
95 | .name = "Siano Venice Digital Receiver", | ||
96 | .type = SMS_VEGA, | ||
97 | }, | ||
88 | }; | 98 | }; |
89 | 99 | ||
90 | struct sms_board *sms_get_board(int id) | 100 | struct sms_board *sms_get_board(int id) |
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h index 447481ab58be..e183f946af4d 100644 --- a/drivers/media/dvb/siano/sms-cards.h +++ b/drivers/media/dvb/siano/sms-cards.h | |||
@@ -35,6 +35,8 @@ | |||
35 | #define SMS1XXX_BOARD_HAUPPAUGE_WINDHAM 8 | 35 | #define SMS1XXX_BOARD_HAUPPAUGE_WINDHAM 8 |
36 | #define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD 9 | 36 | #define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD 9 |
37 | #define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 10 | 37 | #define SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 10 |
38 | #define SMS1XXX_BOARD_SIANO_NICE 11 | ||
39 | #define SMS1XXX_BOARD_SIANO_VENICE 12 | ||
38 | 40 | ||
39 | struct sms_board_gpio_cfg { | 41 | struct sms_board_gpio_cfg { |
40 | int lna_vhf_exist; | 42 | int lna_vhf_exist; |
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index 37a00e906768..a4325d945e77 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c | |||
@@ -527,8 +527,13 @@ struct usb_device_id smsusb_id_table[] = { | |||
527 | .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, | 527 | .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, |
528 | { USB_DEVICE(0x2040, 0x5590), | 528 | { USB_DEVICE(0x2040, 0x5590), |
529 | .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, | 529 | .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, |
530 | { } /* Terminating entry */ | 530 | { USB_DEVICE(0x187f, 0x0202), |
531 | }; | 531 | .driver_info = SMS1XXX_BOARD_SIANO_NICE }, |
532 | { USB_DEVICE(0x187f, 0x0301), | ||
533 | .driver_info = SMS1XXX_BOARD_SIANO_VENICE }, | ||
534 | { } /* Terminating entry */ | ||
535 | }; | ||
536 | |||
532 | MODULE_DEVICE_TABLE(usb, smsusb_id_table); | 537 | MODULE_DEVICE_TABLE(usb, smsusb_id_table); |
533 | 538 | ||
534 | static struct usb_driver smsusb_driver = { | 539 | static struct usb_driver smsusb_driver = { |