Commit 841a3f0d authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10749): sms1xxx: move smsusb_id_table into smsusb.c 



Move the usb_device_id table to the smsusb module in preparation for the
sms1xxx module to be split into sub-modules. This will allow the smsusb
driver to start up automatically upon insertion of the USB device.

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dba843af

drivers/media/dvb/siano/sms-cards.c

+0 −47
Original line number Diff line number Diff line
@@ -19,53 +19,6 @@ 


#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),

		.driver_info = SMS1XXX_BOARD_SIANO_STELLAR },

	{ USB_DEVICE(0x187f, 0x0200),

		.driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },

	{ USB_DEVICE(0x187f, 0x0201),

		.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, 0x2000),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2009),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },

	{ USB_DEVICE(0x2040, 0x200a),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2010),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2011),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2019),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x5500),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },

	{ USB_DEVICE(0x2040, 0x5510),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },

	{ USB_DEVICE(0x2040, 0x5520),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },

	{ USB_DEVICE(0x2040, 0x5530),

		.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);



static struct sms_board sms_boards[] = {

	[SMS_BOARD_UNKNOWN] = {

		.name	= "Unknown board",

drivers/media/dvb/siano/sms-cards.h

+0 −2
Original line number Diff line number Diff line
@@ -54,6 +54,4 @@ int sms_board_led_feedback(struct smscore_device_t *coredev, int led); 
int sms_board_power(struct smscore_device_t *coredev, int onoff);

int sms_board_lna_control(struct smscore_device_t *coredev, int onoff);



extern struct usb_device_id smsusb_id_table[];



#endif /* __SMS_CARDS_H__ */

drivers/media/dvb/siano/smsusb.c

+47 −0
Original line number Diff line number Diff line
@@ -474,6 +474,53 @@ static int smsusb_resume(struct usb_interface *intf) 
	return 0;

}



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),

		.driver_info = SMS1XXX_BOARD_SIANO_STELLAR },

	{ USB_DEVICE(0x187f, 0x0200),

		.driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },

	{ USB_DEVICE(0x187f, 0x0201),

		.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, 0x2000),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2009),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },

	{ USB_DEVICE(0x2040, 0x200a),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2010),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2011),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x2019),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },

	{ USB_DEVICE(0x2040, 0x5500),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },

	{ USB_DEVICE(0x2040, 0x5510),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },

	{ USB_DEVICE(0x2040, 0x5520),

		.driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },

	{ USB_DEVICE(0x2040, 0x5530),

		.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);



static struct usb_driver smsusb_driver = {

	.name			= "smsusb",

	.probe			= smsusb_probe,