summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h b/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h
index 08b10a531..bea904796 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h
@@ -26,7 +26,7 @@
*
* Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.9 2001/05/04 19:05:49 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.13 2002/09/19 02:57:03 dawes Exp $
*/
#ifndef _VESA_H_
@@ -52,6 +52,7 @@
/* VBE/DDC support */
#include "vbe.h"
+#include "vbeModes.h"
#include "xf86DDC.h"
/* ShadowFB support */
@@ -102,25 +103,21 @@ typedef struct _VESARec
CARD8 *state, *pstate; /* SVGA state */
int statePage, stateSize, stateMode;
int page;
- int pix24bpp;
CARD32 *pal, *savedPal;
CARD8 *fonts;
xf86MonPtr monitor;
Bool shadowFB, primary;
CARD8 *shadowPtr;
CARD32 windowAoffset;
+ /* Don't override the default refresh rate. */
+ Bool defaultRefresh;
/* DGA info */
DGAModePtr pDGAMode;
int nDGAMode;
CloseScreenProcPtr CloseScreen;
OptionInfoPtr Options;
+ IOADDRESS ioBase;
} VESARec, *VESAPtr;
-typedef struct _ModeInfoData {
- int mode;
- VbeModeInfoBlock *data;
- VbeCRTCInfoBlock *block;
-} ModeInfoData;
-
#endif /* _VESA_H_ */