summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h23
1 files changed, 20 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h b/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h
index 4277fd6c1..22b1d5649 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h
@@ -1,5 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.33 2000/12/06 15:35:24 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.35 2001/02/15 17:54:57 eich Exp $ */
@@ -150,6 +150,10 @@ typedef struct {
} TsengRegRec, *TsengRegPtr;
typedef struct {
+ unsigned char save1, save2, save3, save4;
+} clock_save;
+
+typedef struct {
Bool Programmable; /* MemClk is programmable if set */
Bool Set; /* reprogram MClk if TRUE */
int MemClk; /* MemClk value in kHz */
@@ -157,12 +161,18 @@ typedef struct {
} TsengMClkInfoRec, *TsengMclkInfoPtr;
typedef struct {
+ int saved_cr;
+ int rmr;
+} dac_save;
+
+typedef struct {
t_ramdactype DacType;
Bool NotAttCompat; /* avoid treating the RAMDAC as AT&T compatible */
int RamdacShift; /* typically 10 or 8 for 6- or 8-bit dac */
int RamdacMask; /* typically 0x3f for 6 bit, 0xff for 8-bit ramdac */
Bool Dac8Bit; /* dac is 8 bit instead of the default 6 bit */
Bool DacPort16; /* Ramdac port is 16 bits wide instead of default 8 */
+ rgb rgb24packed;
} TsengDacInfoRec, *TsengDacInfoPtr;
typedef struct {
@@ -227,7 +237,16 @@ typedef struct {
CARD32 HWCursorBufferOffset;
unsigned char *HWCursorBuffer;
unsigned char * XAAScanlineColorExpandBuffers[1];
+ int acl_blitxdir;
+ int acl_blitydir;
+ CARD32 acl_iw_dest;
+ CARD32 acl_skipleft;
+ CARD32 acl_ColorExpandDst;
+ int acl_colexp_width_dwords;
+ int acl_colexp_width_bytes;
+ dac_save dac;
CARD32* ColExpLUT;
+ clock_save save_clock;
EntityInfoPtr pEnt;
char * MMioBase;
pointer scratchMemBase;
@@ -352,10 +371,8 @@ Bool TsengHWCursorInit(ScreenPtr pScreen);
* From tseng_dpms.c
*/
-#ifdef DPMSExtension
void TsengHVSyncDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
void TsengCrtcDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
-#endif
/*
* For debugging