diff options
| author | Michael Hunold <devnull@localhost> | 2003-01-16 15:34:30 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-01-16 15:34:30 +0000 |
| commit | 8224400559ef50b53e11400aa0853cb6769bdf6b (patch) | |
| tree | 68e128b95ee5dc335ad358d29fc2d1c472922c46 /linux/drivers/media/dvb/ttpci/av7110.c | |
| parent | 7e5378db73d4f64199609f3ccf564f47c6c565e3 (diff) | |
| download | mediapointer-dvb-s2-8224400559ef50b53e11400aa0853cb6769bdf6b.tar.gz mediapointer-dvb-s2-8224400559ef50b53e11400aa0853cb6769bdf6b.tar.bz2 | |
- extended the preprocessor magic to av7110.c, too, had to change
the other files again.
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 120 |
1 files changed, 23 insertions, 97 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index aad57df96..45a60101d 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -4383,106 +4383,32 @@ struct saa7146_standard standard[] = { static struct saa7146_extension av7110_extension; -static -struct saa7146_pci_extension_data fs_1_5 = { - .ext_priv = "Siemens cable card PCI rev1.5", - .ext = &av7110_extension, -}; -static -struct saa7146_pci_extension_data fs_1_3 = { - .ext_priv = "Siemens/Technotrend/Hauppauge PCI rev1.3", - .ext = &av7110_extension, -}; -static -struct saa7146_pci_extension_data unkwn = { - .ext_priv = "Technotrend/Hauppauge PCI rev?(unknown0)?", - .ext = &av7110_extension, -}; -static -struct saa7146_pci_extension_data tt_1_6 = { - .ext_priv = "Technotrend/Hauppauge PCI rev1.3 or 1.6", - .ext = &av7110_extension, -}; -static -struct saa7146_pci_extension_data tt_2_1 = { - .ext_priv = "Technotrend/Hauppauge PCI rev2.1", - .ext = &av7110_extension, -}; -static -struct saa7146_pci_extension_data tt_t = { - .ext_priv = "Technotrend/Hauppauge PCI DVB-T", - .ext = &av7110_extension, -}; +#define MAKE_AV7110_INFO(x_var,x_name) \ +static struct saa7146_pci_extension_data x_var = { \ + .ext_priv = x_name, \ + .ext = &av7110_extension } + +MAKE_AV7110_INFO(fs_1_5, "Siemens cable card PCI rev1.5"); +MAKE_AV7110_INFO(fs_1_3, "Siemens/Technotrend/Hauppauge PCI rev1.3"); +MAKE_AV7110_INFO(unkwn, "Technotrend/Hauppauge PCI rev?(unknown0)?"); +MAKE_AV7110_INFO(tt_1_6, "Technotrend/Hauppauge PCI rev1.3 or 1.6"); +MAKE_AV7110_INFO(tt_2_1, "Technotrend/Hauppauge PCI rev2.1"); +MAKE_AV7110_INFO(tt_t, "Technotrend/Hauppauge PCI DVB-T"); static struct pci_device_id pci_tbl[] = { - { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x110a, - .subdevice = 0xffff, - .driver_data = (unsigned long)&fs_1_5 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x110a, - .subdevice = 0x0000, - .driver_data = (unsigned long)&fs_1_5 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0000, - .driver_data = (unsigned long)&fs_1_3 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x1002, - .driver_data = (unsigned long)&unkwn - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0001, - .driver_data = (unsigned long)&tt_1_6 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0002, - .driver_data = (unsigned long)&tt_2_1 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0003, - .driver_data = (unsigned long)&tt_2_1 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0004, - .driver_data = (unsigned long)&tt_2_1 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0006, - .driver_data = (unsigned long)&tt_1_6 - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0x13c2, - .subdevice = 0x0008, - .driver_data = (unsigned long)&tt_t - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7146, - .subvendor = 0xffc2, - .subdevice = 0x0000, - .driver_data = (unsigned long)&unkwn - }, { + MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0xffff), + MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0x0000), + MAKE_EXTENSION_PCI(fs_1_3, 0x13c2, 0x0000), + MAKE_EXTENSION_PCI(unkwn, 0x13c2, 0x1002), + MAKE_EXTENSION_PCI(tt_1_6, 0x13c2, 0x0001), + MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0002), + MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0003), + MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0004), + MAKE_EXTENSION_PCI(tt_1_6, 0x13c2, 0x0006), + MAKE_EXTENSION_PCI(tt_t, 0x13c2, 0x0008), + MAKE_EXTENSION_PCI(unkwn, 0xffc2, 0x0000), + { .vendor = 0, } }; |