diff options
author | Jaymz Julian <jaymz@artificial-stupidity.net> | 2004-06-14 08:43:57 +0000 |
---|---|---|
committer | Jaymz Julian <jaymz@artificial-stupidity.net> | 2004-06-14 08:43:57 +0000 |
commit | 580b9a7da1bf0e20acdcddd676d471b3d6589023 (patch) | |
tree | e1076a6f1fef3433798f07dfa0cbfb039e57859e /hw/kdrive/mga/mga.h | |
parent | 95d65cf6bb753d10f4db3d857fb98bb09389228e (diff) |
MGA composite support from Damien Ciabrini - thanks!
Diffstat (limited to 'hw/kdrive/mga/mga.h')
-rw-r--r-- | hw/kdrive/mga/mga.h | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/hw/kdrive/mga/mga.h b/hw/kdrive/mga/mga.h index ff9716d85..3b3462063 100644 --- a/hw/kdrive/mga/mga.h +++ b/hw/kdrive/mga/mga.h @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright © 2003 Anders Carlsson + * Copyright � 2003-2004 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -59,6 +59,8 @@ #define MGA_REG_SRCORG (0x2cb4) #define MGA_REG_DSTORG (0x2cb8) +#define MGA_G4XX_DEVICE_ID (0x0525) + #define MGA_PW8 (0) #define MGA_PW16 (1) #define MGA_PW24 (2) @@ -66,6 +68,7 @@ /* Drawing opcodes */ #define MGA_OPCOD_TRAP (4) +#define MGA_OPCOD_TEXTURE_TRAP (6) #define MGA_OPCOD_BITBLT (8) #define MGA_DWGCTL_SOLID (1 << 11) @@ -105,6 +108,10 @@ typedef struct _mgaScreenInfo { #define getMgaScreenInfo(kd) ((MgaScreenInfo *) ((kd)->screen->driver)) #define mgaScreenInfo(kd) MgaScreenInfo *mgas = getMgaScreenInfo(kd) + +VOL8 *mmio; + + Bool mgaMapReg (KdCardInfo *card, MgaCardInfo *mgac); @@ -137,4 +144,25 @@ mgaDrawFini (ScreenPtr pScreen); extern KdCardFuncs mgaFuncs; + +void +mgaWaitAvail (int n); + +void +mgaWaitIdle (void); + +Bool +mgaSetup (ScreenPtr pScreen, int dest_bpp, int wait); + + +#if 0 +#define MGA_FALLBACK(x) \ +do { \ + ErrorF x; \ + return FALSE; \ +} while (0); +#else +#define MGA_FALLBACK(x) return FALSE; +#endif + #endif /* _MGA_H_ */ |