diff options
Diffstat (limited to 'linux/drivers/media/common/saa7146.h')
| -rw-r--r-- | linux/drivers/media/common/saa7146.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h index 972e7774f..907989cfe 100644 --- a/linux/drivers/media/common/saa7146.h +++ b/linux/drivers/media/common/saa7146.h @@ -55,7 +55,10 @@ struct saa7146_extension; struct saa7146_vv; struct saa7146_sub_info { - unsigned int subvendor, subdevice; + unsigned int subvendor; + unsigned int subdevice; + char **name; + int type; }; /* saa7146 page table */ @@ -88,8 +91,7 @@ struct saa7146_extension /* extension functions */ int (*preinit)(struct saa7146_dev*); int (*probe)(struct saa7146_dev*, unsigned int subvendor, unsigned int subdevice); - - int (*attach)(struct saa7146_dev*); + int (*attach)(struct saa7146_dev *, struct saa7146_sub_info *); int (*detach)(struct saa7146_dev*); u32 irq_mask; /* mask to indicate, which irq-events are handled by the extension */ @@ -112,6 +114,8 @@ struct saa7146_dev /* pci-device & irq stuff*/ char name[32]; struct pci_dev *pci; + u32 int_todo; + spinlock_t int_slock; /* extension handling */ struct saa7146_extension *ext; /* indicates if handled by extension */ |