diff options
| author | Keith Packard <keithp@keithp.com> | 2000-09-03 05:11:46 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2000-09-03 05:11:46 +0000 |
| commit | c97fb611dd7dedef6d075ef9d56f3d32c8018d39 (patch) | |
| tree | 92dbb45f2e31b7ab709255d2d07a606f466c1a38 /hw/kdrive/trident/trident.h | |
| parent | 38059656849a5bab5b56b23359a90aca4ba396c7 (diff) | |
Rework vesa driver for shadowing and multiple screen support. Allow enable
to fail and avoid crashing
Diffstat (limited to 'hw/kdrive/trident/trident.h')
| -rw-r--r-- | hw/kdrive/trident/trident.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/kdrive/trident/trident.h b/hw/kdrive/trident/trident.h index c4b0d862b..c04d83200 100644 --- a/hw/kdrive/trident/trident.h +++ b/hw/kdrive/trident/trident.h @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/trident.h,v 1.2 1999/12/30 03:03:16 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/trident.h,v 1.4 2000/08/29 17:20:15 keithp Exp $ */ #ifndef _TRIDENT_H_ #define _TRIDENT_H_ @@ -151,11 +151,10 @@ typedef struct _tridentSave { typedef struct _tridentCardInfo { #ifdef VESA - VesaPrivRec vesa; + VesaCardPrivRec vesa; #else FbdevPriv fb; #endif - CARD8 *screen; CARD8 *cop_base; Cop *cop; CARD32 cop_depth; @@ -178,7 +177,11 @@ typedef struct _tridentCursor { #define TRIDENT_CURSOR_HEIGHT 64 typedef struct _tridentScreenInfo { +#ifdef VESA + VesaScreenPrivRec vesa; +#endif CARD8 *cursor_base; + CARD8 *screen; TridentCursor cursor; } TridentScreenInfo; |