vserver 1.9.5.x5

[linux-2.6.git] / drivers / media / dvb / ttpci / av7110_hw.h

diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index 826ea87..bf901c6 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -39,29 +39,6 @@ enum av7110_osd_palette_type
        Pal8Bit =  256     /* 256 colors for 16 bit palette */
 };
 
-enum av7110_window_display_type {
-       BITMAP1,           /* 1 bit bitmap */
-       BITMAP2,           /* 2 bit bitmap */
-       BITMAP4,           /* 4 bit bitmap */
-       BITMAP8,           /* 8 bit bitmap */
-       BITMAP1HR,         /* 1 Bit bitmap half resolution */
-       BITMAP2HR,         /* 2 bit bitmap half resolution */
-       BITMAP4HR,         /* 4 bit bitmap half resolution */
-       BITMAP8HR,         /* 8 bit bitmap half resolution */
-       YCRCB422,          /* 4:2:2 YCRCB Graphic Display */
-       YCRCB444,          /* 4:4:4 YCRCB Graphic Display */
-       YCRCB444HR,        /* 4:4:4 YCRCB graphic half resolution */
-       VIDEOTSIZE,        /* True Size Normal MPEG Video Display */
-       VIDEOHSIZE,        /* MPEG Video Display Half Resolution */
-       VIDEOQSIZE,        /* MPEG Video Display Quarter Resolution */
-       VIDEODSIZE,        /* MPEG Video Display Double Resolution */
-       VIDEOTHSIZE,       /* True Size MPEG Video Display Half Resolution */
-       VIDEOTQSIZE,       /* True Size MPEG Video Display Quarter Resolution*/
-       VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
-       VIDEONSIZE,        /* Full Size MPEG Video Display */
-       CURSOR             /* Cursor */
-};
-
 /* switch defines */
 #define SB_GPIO 3
 #define SB_OFF SAA7146_GPIO_OUTLO  /* SlowBlank off (TV-Mode) */
@@ -88,6 +65,9 @@ enum av7110_video_output_mode
 #define HPQOver                0x0008
 #define OSDQFull       0x0010          /* OSD Queue Full */
 #define OSDQOver       0x0020
+#define GPMQBusy       0x0040          /* Queue not empty, FW >= 261d */
+#define HPQBusy                0x0080
+#define OSDQBusy       0x0100
 
 /* hw section filter flags */
 #define        SECTION_EIT             0x01
@@ -388,8 +368,10 @@ extern void av7110_reset_arm(struct av7110 *av7110);
 extern int av7110_bootarm(struct av7110 *av7110);
 extern int av7110_firmversion(struct av7110 *av7110);
 #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000)
+#define FW_4M_SDRAM(arm_app)      ((arm_app) & 0x40000000)
 #define FW_VERSION(arm_app)      ((arm_app) & 0x0000FFFF)
 
+extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags);
 extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...);
 extern int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
 extern int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
@@ -495,7 +477,7 @@ static int inline vidcom(struct av7110 *av7110, u32 com, u32 arg)
 
 static int inline audcom(struct av7110 *av7110, u32 com)
 {
-       return av7110_fw_cmd(av7110, COMTYPE_MISC, AV7110_FW_AUDIO_COMMAND, 4,
+       return av7110_fw_cmd(av7110, COMTYPE_MISC, AV7110_FW_AUDIO_COMMAND, 2,
                             (com>>16), (com&0xffff));
 }
 
@@ -510,6 +492,7 @@ extern int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned
 
 #ifdef CONFIG_DVB_AV7110_OSD
 extern int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc);
+extern int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap);
 #endif /* CONFIG_DVB_AV7110_OSD */