- renamed card enum as suggested by Holger

- added fix for cards with hardware diseqc suggested by Peter Schildmann
- cleaned up the cards declaration and variables using preprocessor magic

1 files changed, 11 insertions, 86 deletions

diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.c b/linux/drivers/media/dvb/ttpci-budget/budget.c
index 550936044..ad5ef61c5 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget.c
+++ b/linux/drivers/media/dvb/ttpci-budget/budget.c
@@ -36,95 +36,20 @@
 
 static struct saa7146_extension budget_extension;
 
-struct budget_info ttbs_info = {
-	.name = "TT-Budget/WinTV-NOVA-S  PCI",
-	.type = DVB_CARD_TT_BUDGET,
-};
-struct budget_info ttbc_info = {
-	.name = "TT-Budget/WinTV-NOVA-C  PCI",
-	.type = DVB_CARD_TT_BUDGET,
-};
-struct budget_info ttbt_info = {
-	.name = "TT-Budget/WinTV-NOVA-T  PCI",
-	.type = DVB_CARD_TT_BUDGET,
-};
-struct budget_info ttbci_info = {
-	.name = "TT-Budget/WinTV-NOVA-CI PCI",
-	.type = DVB_CARD_TT_BUDGET,
-};
-struct budget_info satel_info = {
-	.name = "SATELCO Multimedia PCI",
-	.type = DVB_CARD_TT_BUDGET_CI,
-};
-
-static
-struct saa7146_pci_extension_data ttbs = {
-	.ext_priv = &ttbs_info,
-	.ext = &budget_extension,
-};
-static
-struct saa7146_pci_extension_data ttbc = {
-	.ext_priv = &ttbc_info,
-	.ext = &budget_extension,
-};
-static
-struct saa7146_pci_extension_data ttbt = {
-	.ext_priv = &ttbt_info,
-	.ext = &budget_extension,
-};
-static
-struct saa7146_pci_extension_data ttbci = {
-	.ext_priv = &ttbci_info,
-	.ext = &budget_extension,
-};
-static
-struct saa7146_pci_extension_data satel = {
-	.ext_priv = &satel_info,
-	.ext = &budget_extension,
-};
+MAKE_BUDGET_INFO(ttbs,	"TT-Budget/WinTV-NOVA-S  PCI",	BUDGET_TT);
+MAKE_BUDGET_INFO(ttbc,	"TT-Budget/WinTV-NOVA-C  PCI",	BUDGET_TT);
+MAKE_BUDGET_INFO(ttbt,	"TT-Budget/WinTV-NOVA-T  PCI",	BUDGET_TT);
+MAKE_BUDGET_INFO(ttbci,	"TT-Budget/WinTV-NOVA-CI PCI",	BUDGET_TT_HW_DISEQC);
+MAKE_BUDGET_INFO(satel,	"SATELCO Multimedia PCI",	BUDGET_TT_HW_DISEQC);
 
 static
 struct pci_device_id pci_tbl[] = {
-	   {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x1003,
-		.driver_data = (unsigned long)&ttbs,
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x1004,
-		.driver_data = (unsigned long)&ttbc,
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x1005,
-		.driver_data = (unsigned long)&ttbt,
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		 /* TT_BUDGET_CI without CI (connector not soldered in) */ 
-		.subvendor = 0x13c2,
-		.subdevice = 0x100f,
-		.driver_data = (unsigned long)&ttbci,
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x100c,
-		.driver_data = (unsigned long)&ttbci,
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x1013,
-		.driver_data = (unsigned long)&satel,
-	}, {
-		.vendor    = 0,
-	}
+	MAKE_BUDGET_PCI(ttbs, 0x13c2, 0x1003),
+	MAKE_BUDGET_PCI(ttbc, 0x13c2, 0x1004),
+	MAKE_BUDGET_PCI(ttbt, 0x13c2, 0x1005),
+	MAKE_BUDGET_PCI(ttbci, 0x13c2, 0x100f), /* TT_BUDGET_CI without CI (connector not soldered in) */ 
+	MAKE_BUDGET_PCI(ttbci, 0x13c2, 0x100c),
+	MAKE_BUDGET_PCI(satel, 0x13c2, 0x1013),
 };
 
 static