Merge ../torvalds-2.6/

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / ttpci / av7110.h

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index ee6237b926bf08eeaefcf7dd47ad5bfb3a42e4a7..cce00ef293e94fa41daa0419f54cca8b85778d61 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -119,8 +119,7 @@ struct av7110 {
        volatile int            bmp_state;
 #define BMP_NONE     0
 #define BMP_LOADING  1
-#define BMP_LOADINGS 2
-#define BMP_LOADED   3
+#define BMP_LOADED   2
        wait_queue_head_t       bmpq;
 
 
@@ -220,7 +219,7 @@ struct av7110 {
 
        struct audio_mixer      mixer;
 
-       struct dvb_adapter       *dvb_adapter;
+       struct dvb_adapter       dvb_adapter;
        struct dvb_device        *video_dev;
        struct dvb_device        *audio_dev;
        struct dvb_device        *ca_dev;
@@ -229,7 +228,10 @@ struct av7110 {
        struct dvb_video_events  video_events;
        video_size_t             video_size;
 
-       u32                 ir_config;
+       u32                     ir_config;
+       u32                     ir_command;
+       void                    (*ir_handler)(struct av7110 *av7110, u32 ircom);
+       struct tasklet_struct   ir_tasklet;
 
        /* firmware stuff */
        unsigned char *bin_fw;
@@ -255,15 +257,13 @@ struct av7110 {
 };
 
 
-extern void ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
+extern int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
                       u16 subpid, u16 pcrpid);
 
-extern void av7110_register_irc_handler(void (*func)(u32));
-extern void av7110_unregister_irc_handler(void (*func)(u32));
-extern void av7110_setup_irc_config (struct av7110 *av7110, u32 ir_config);
+extern int av7110_setup_irc_config (struct av7110 *av7110, u32 ir_config);
 
-extern int av7110_ir_init (void);
-extern void av7110_ir_exit (void);
+extern int av7110_ir_init(struct av7110 *av7110);
+extern void av7110_ir_exit(struct av7110 *av7110);
 
 /* msp3400 i2c subaddresses */
 #define MSP_WR_DEM 0x10