- 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, 5 insertions, 22 deletions

diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-av.c b/linux/drivers/media/dvb/ttpci-budget/budget-av.c
index ea5f16615..39886ff4f 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci-budget/budget-av.c
@@ -39,28 +39,11 @@
 
 static struct saa7146_extension budget_extension;
 
-struct budget_info knc1_info = {
-	.name = "KNC1 DVB-S",
-	.type = DVB_CARD_KNC1,
-};
-
-static
-struct saa7146_pci_extension_data knc1 = {
-	.ext_priv = &knc1_info,
-	.ext = &budget_extension,
-};
+MAKE_BUDGET_INFO(knc1, "KNC1 DVB-S", BUDGET_KNC1);
 
 static
 struct pci_device_id devices[] = {
-	   {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x1131,
-		.subdevice = 0x4f56,
-		.driver_data = (unsigned long)&knc1,
-	}, {
-		.vendor    = 0,
-	}
+	MAKE_BUDGET_PCI(knc1, 0x1131, 0x4f56),
 };
 
 struct budget_av_data
@@ -201,7 +184,7 @@ int av_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
 	struct budget_info *bi = info->ext_priv;
 	
 	DEB_EE(("dev: %p\n",dev));
-        if (bi->type != DVB_CARD_KNC1) {
+        if (bi->type != BUDGET_KNC1) {
 		return -1;
 	}
 
@@ -289,7 +272,7 @@ static int av_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
 		if( i->index < 0 || i->index >= KNC1_INPUTS) {
 			return -EINVAL;
 		}
-		if( DVB_CARD_KNC1 == budget->card->type ) {
+		if( BUDGET_KNC1 == budget->card->type ) {
 			memcpy(i, &knc1_inputs[i->index], sizeof(struct v4l2_input));
 		} else {
 			return -EINVAL;
@@ -315,7 +298,7 @@ static int av_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
 			return -EINVAL;
 		}
 		
-		if( DVB_CARD_KNC1 == budget->card->type ) {
+		if( BUDGET_KNC1 == budget->card->type ) {
 			knc1_setinput(budget, input);
                 } else {
 			return -EINVAL;