diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 3d2b268d6..bede61423 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.42 2004/11/30 11:26:38 kraxel Exp $ + * $Id: cx88.h,v 1.43 2004/11/30 17:00:13 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -158,6 +158,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_PROVIDEO_PV259 20 #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS 21 #define CX88_BOARD_PCHDTV_HD3000 22 +#define CX88_BOARD_DNTV_LIVE_DVB_T 23 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, @@ -226,6 +227,8 @@ struct cx88_dmaqueue { u32 count; }; +struct cx88_IR; /* Private structure in cx88-ir-kbd-gpio.c */ + struct cx88_core { struct list_head devlist; atomic_t refcount; @@ -240,6 +243,7 @@ struct cx88_core { u32 __iomem *lmmio; u8 __iomem *bmmio; u32 shadow[SHADOW_MAX]; + int pci_irqmask; /* i2c i/o */ struct i2c_adapter i2c_adap; @@ -264,6 +268,9 @@ struct cx88_core { u32 tvaudio; u32 input; u32 astat; + + /* IR remote control state */ + struct cx88_IR *ir; }; struct cx8800_dev; @@ -419,7 +426,7 @@ extern void cx88_print_irqbits(char *name, char *tag, char **strings, u32 bits, u32 mask); extern void cx88_print_ioctl(char *name, unsigned int cmd); -extern void cx88_irq(struct cx88_core *core, u32 status, u32 mask); +extern int cx88_core_irq(struct cx88_core *core, u32 status); extern void cx88_wakeup(struct cx88_core *core, struct cx88_dmaqueue *q, u32 count); extern void cx88_shutdown(struct cx88_core *core); @@ -516,6 +523,13 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode); int cx88_audio_thread(void *data); /* ----------------------------------------------------------- */ +/* cx88-input.c */ + +int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci); +int cx88_ir_fini(struct cx88_core *core); +void cx88_ir_irq(struct cx88_core *core); + +/* ----------------------------------------------------------- */ /* cx88-mpeg.c */ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf); |