Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / drivers / media / dvb / siano / sms-cards.c

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index 88fc2a4edc1ea2828561fde86cd32c429d766831..e7a8ac0c4049d1de1f225df6d3b764f00f43c510 100644 (file)
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -20,6 +20,7 @@
 #include "sms-cards.h"
 
 struct usb_device_id smsusb_id_table[] = {
+#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
        { USB_DEVICE(0x187f, 0x0010),
                .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
        { USB_DEVICE(0x187f, 0x0100),
@@ -30,6 +31,19 @@ struct usb_device_id smsusb_id_table[] = {
                .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
        { USB_DEVICE(0x187f, 0x0300),
                .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
+#endif
+       { USB_DEVICE(0x2040, 0x1700),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
+       { USB_DEVICE(0x2040, 0x1800),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
+       { USB_DEVICE(0x2040, 0x1801),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
+       { USB_DEVICE(0x2040, 0x5500),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+       { USB_DEVICE(0x2040, 0x5580),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+       { USB_DEVICE(0x2040, 0x5590),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
        { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, smsusb_id_table);
@@ -38,26 +52,45 @@ static struct sms_board sms_boards[] = {
        [SMS_BOARD_UNKNOWN] = {
                .name   = "Unknown board",
        },
-       [SMS1XXX_BOARD_SIANO_SMS1000] = {
-               .name   = "Siano Digital Receiver",
-               .type   = SMS_STELLAR,
-       },
        [SMS1XXX_BOARD_SIANO_STELLAR] = {
-               .name   = "Siano Stellar reference board",
+               .name   = "Siano Stellar Digital Receiver",
                .type   = SMS_STELLAR,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-stellar-dvbt-01.fw",
        },
        [SMS1XXX_BOARD_SIANO_NOVA_A] = {
-               .name   = "Siano Nova A reference board",
+               .name   = "Siano Nova A Digital Receiver",
                .type   = SMS_NOVA_A0,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-a-dvbt-01.fw",
        },
        [SMS1XXX_BOARD_SIANO_NOVA_B] = {
-               .name   = "Siano Nova B reference board",
+               .name   = "Siano Nova B Digital Receiver",
                .type   = SMS_NOVA_B0,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-b-dvbt-01.fw",
        },
        [SMS1XXX_BOARD_SIANO_VEGA] = {
-               .name   = "Siano Vega reference board",
+               .name   = "Siano Vega Digital Receiver",
                .type   = SMS_VEGA,
        },
+       [SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT] = {
+               .name   = "Hauppauge Catamount",
+               .type   = SMS_STELLAR,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-stellar-dvbt-01.fw",
+       },
+       [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A] = {
+               .name   = "Hauppauge Okemo-A",
+               .type   = SMS_NOVA_A0,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-a-dvbt-01.fw",
+       },
+       [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B] = {
+               .name   = "Hauppauge Okemo-B",
+               .type   = SMS_NOVA_B0,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-b-dvbt-01.fw",
+       },
+       [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = {
+               .name   = "Hauppauge WinTV-Nova-T-MiniStick",
+               .type   = SMS_NOVA_B0,
+               .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-01.fw",
+       },
 };
 
 struct sms_board *sms_get_board(int id)