From f9baa931e2c4bc43371addc9b654afa06ae325a0 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Sat, 4 Jan 2003 18:00:25 +0000 Subject: Some more changes... (but we're stabilizing...) 2.5.x: - exchanged the Kconfig files for "ttpci" and "ttpci-budget" - removed the "SAA7146 based" from the card descriptions, but put it to the remark some lines above saa7146: - simplified the probe(), attach(), detach() logic, since all dvb devices can be identified by their subvendor/subdevice ids av7110: - added two wait_for_debi_done() calls in gpioirq(). (All other IER_ENABLE() calls are preceded by wait_for_debi_done()) budget: - budget.c has been split up into budget.c and budget-av.c. The latter is for budget cards with analog video (av) inputs. Definitions are now in budget.h. budget.c exports various functions that are used by budget-av.c, too. The av code is currently missing, though, and needs to be added. unsorted: - various c99 initializer cleanups --- linux/drivers/media/common/saa7146.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/common/saa7146.h') 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 */ -- cgit v1.2.3