- Add a new option, BuildDevelDRIDrivers, which controls whether

    DevelDRIDrivers is non-empty. DevelDRIDrivers contains those drivers
    aren't built by default either due to being unusable on that
    architecture (but buildable for testing) or due to security concerns,
    as in the mach64 and savage cases.
- Merge the Mach64 DDX's DRI support, under the XF86DRI_DEVEL define, which
    is set only when BuildDevelDRIDrivers is set.
- Fix up of the sets of DRI drivers built for various architectures.
- Fix build of unichrome DRI driver, which is now enabled on x86.

1 files changed, 24 insertions, 23 deletions

diff --git a/src/atistruct.h b/src/atistruct.h
index cbaf1b85..87ff0a1c 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.39 2003/07/24 22:08:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.41tsi Exp $ */
 /*
- * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -32,8 +32,8 @@
 #include "aticlock.h"
 #include "atiregs.h"
 
-#ifdef XF86DRI
-                                                                                
+#ifdef XF86DRI_DEVEL
+
 /*
  * DRI support
  */
@@ -44,7 +44,7 @@
 #include "xf86dri.h"
 #include "dri.h"
  
-#endif /* XF86DRI */
+#endif /* XF86DRI_DEVEL */
 
 #include "xaa.h"
 #include "xf86Cursor.h"
@@ -336,8 +336,8 @@ typedef struct _ATIRec
      * LCD panel data.
      */
     int LCDPanelID, LCDClock, LCDHorizontal, LCDVertical;
-    int LCDHSyncStart, LCDHSyncWidth, LCDHBlankWidth;
-    int LCDVSyncStart, LCDVSyncWidth, LCDVBlankWidth;
+    unsigned LCDHSyncStart, LCDHSyncWidth, LCDHBlankWidth;
+    unsigned LCDVSyncStart, LCDVSyncWidth, LCDVBlankWidth;
     int LCDVBlendFIFOSize;
 
     /*
@@ -424,24 +424,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 CRT over digital panel */
-    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.
@@ -454,8 +455,8 @@ typedef struct _ATIRec
      */
     CloseScreenProcPtr CloseScreen;
 
-#ifdef XF86DRI
- 
+#ifdef XF86DRI_DEVEL
+
     /*
      * DRI data.
      */
@@ -481,8 +482,8 @@ typedef struct _ATIRec
     CARD8 OptionAGPSize;         /* AGP size in MB */
     CARD8 OptionLocalTextures;   /* Use local textures + AGP textures (only valid for AGP) */
     CARD8 OptionBufferSize;      /* Command/dma buffer size in MB */
-                                                                                
-#endif /* XF86DRI */
+
+#endif /* XF86DRI_DEVEL */
 
 } ATIRec;