summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/mantis/mantis_common.h
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-02 22:07:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:55:28 -0200
commitdf0cca174b4d85ea041509a13e5e68b377758bf1 (patch)
tree1e35b52b855b4bb3d2359e04dbe70a0cce6df836 /drivers/media/dvb/mantis/mantis_common.h
parentbd1fcac0148fb4a44395227edb0ff8ee31e09de1 (diff)
V4L/DVB (13706): [MB86A16] Overhaul
* better ISR handling * I2C fixes * better handling of configurations Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_common.h')
-rw-r--r--drivers/media/dvb/mantis/mantis_common.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index ba360f88496..60a7457b2b9 100644
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -65,10 +65,19 @@
#define mmaor(dat, addr) mmwrite((dat) | ((mask) & mmread(addr)), addr)
+struct mantis_hwconfig {
+ char *model_name;
+ char *dev_type;
+};
+
+
struct mantis_pci {
/* PCI stuff */
u16 vendor_id;
u16 device_id;
+ u16 subsystem_vendor;
+ u16 subsystem_device;
+
u8 latency;
struct pci_dev *pdev;
@@ -110,7 +119,7 @@ struct mantis_pci {
u8 feeds;
- struct mantis_config *config;
+ struct mantis_hwconfig *hwconfig;
u32 mantis_int_stat;
u32 mantis_int_mask;
@@ -121,7 +130,8 @@ struct mantis_pci {
u32 sub_device_id;
/* A12 A13 A14 */
- int gpio_status;};
+ int gpio_status;
+};
extern unsigned int verbose;
extern unsigned int devs;