diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h b/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h index 3849d2b07..bbf48a6be 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h @@ -22,7 +22,7 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **********************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.6 2000/02/08 13:13:18 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.11 2000/06/30 17:15:12 dawes Exp $ */ /* * The original Precision Insight driver for @@ -36,18 +36,20 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE) */ -/* Everything using inb/outb, etc needs "compiler.h" */ -#include "compiler.h" - /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" +/* Everything using inb/outb, etc needs "compiler.h" */ +#include "compiler.h" + #include "xaa.h" #include "xaalocal.h" /* XAA internals as we replace some of XAA */ #include "xf86Cursor.h" +#include "vbe.h" + /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" @@ -66,11 +68,16 @@ typedef enum { NM2093, NM2097, NM2160, - NM2200 + NM2200, + NM2360, + NM2380 } NEOType; /* function prototypes */ +extern Bool NEOSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +extern void NEOAdjustFrame(int scrnIndex, int x, int y, int flags); + /* in neo_2070.c */ extern Bool Neo2070AccelInit(ScreenPtr pScreen); @@ -178,6 +185,10 @@ typedef struct neoRec unsigned char* NeoFbBase; long NeoFbMapSize; unsigned int vgaIOBase; + DGAModePtr DGAModes; + int numDGAModes; + Bool DGAactive; + int DGAViewportStatus; /* ??? */ int NeoFifoCount; /* cursor */ @@ -214,6 +225,7 @@ typedef struct neoRec /* proc pointer */ CloseScreenProcPtr CloseScreen; I2CBusPtr I2C; + vbeInfoPtr pVbe; unsigned char * ShadowPtr; int ShadowPitch; void (*PointerMoved)(int index, int x, int y); |