summaryrefslogtreecommitdiff
path: root/src/atistruct.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:39 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:39 +0000
commitec3f00ae3c2b6d521364161674ff5d88e10cc62c (patch)
tree5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/atistruct.h
parent42cbea1d05a9e44b0d560da29bff19711ebb8a94 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/atistruct.h')
-rw-r--r--src/atistruct.h27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/atistruct.h b/src/atistruct.h
index beca835..a80c8b4 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.41 2004/01/05 16:42:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.41tsi Exp $ */
/*
* Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
@@ -406,24 +406,25 @@ typedef struct _ATIRec
/*
* Driver options.
*/
- CARD8 OptionAccel; /* Use hardware draw engine */
- CARD8 OptionBlend; /* Force horizontal blending */
- CARD8 OptionCRTDisplay; /* Display on both CRT and digital panel */
- CARD8 OptionCSync; /* Use composite sync */
- CARD8 OptionDevel; /* Intentionally undocumented */
+ CARD8 OptionAccel:1; /* Use hardware draw engine */
+ CARD8 OptionBIOSDisplay:1; /* Allow BIOS interference */
+ CARD8 OptionBlend:1; /* Force horizontal blending */
+ CARD8 OptionCRTDisplay:1; /* Display on both CRT and digital panel */
+ CARD8 OptionCSync:1; /* Use composite sync */
+ CARD8 OptionDevel:1; /* Intentionally undocumented */
#ifndef AVOID_CPIO
- CARD8 OptionLinear; /* Use linear fb aperture when available */
+ CARD8 OptionLinear:1; /* Use linear fb aperture when available */
#endif /* AVOID_CPIO */
- CARD8 OptionMMIOCache; /* Cache MMIO writes */
- CARD8 OptionTestMMIOCache; /* Test MMIO cache integrity */
- CARD8 OptionPanelDisplay; /* Prefer digital panel over CRT */
- CARD8 OptionProbeClocks; /* Force probe for fixed clocks */
- CARD8 OptionShadowFB; /* Use shadow frame buffer */
- CARD8 OptionLCDSync; /* Temporary */
+ CARD8 OptionMMIOCache:1; /* Cache MMIO writes */
+ CARD8 OptionTestMMIOCache:1;/* Test MMIO cache integrity */
+ CARD8 OptionPanelDisplay:1; /* Prefer digital panel over CRT */
+ CARD8 OptionProbeClocks:1; /* Force probe for fixed clocks */
+ CARD8 OptionShadowFB:1; /* Use shadow frame buffer */
+ CARD8 OptionLCDSync:1; /* Temporary */
/*
* State flags.