Make pATI->Cursor into a Bool pATI->HWCursor.

5 files changed, 17 insertions, 22 deletions

diff --git a/src/aticonfig.c b/src/aticonfig.c
index 03227b7..2132910 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -188,7 +188,6 @@ ATIProcessOptions
 #   define CRTScreen     PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool
 #   define CSync         PublicOption[ATI_OPTION_CSYNC].value.bool
 #   define Devel         PrivateOption[ATI_OPTION_DEVEL].value.bool
-#   define HWCursor      PublicOption[ATI_OPTION_HWCURSOR].value.bool
 
 #ifdef XF86DRI_DEVEL
 
@@ -224,7 +223,8 @@ ATIProcessOptions
     xf86CollectOptions(pScreenInfo, NULL);
 
     /* Set non-zero defaults */
-    Accel = CacheMMIO = HWCursor = TRUE;
+    Accel = CacheMMIO = TRUE;
+    PublicOption[ATI_OPTION_HWCURSOR].value.bool = TRUE;
 
 #ifdef TV_OUT
 
@@ -319,23 +319,19 @@ ATIProcessOptions
 #endif /* XF86DRI_DEVEL */
 
     /* Validate and set cursor options */
-    pATI->Cursor = ATI_CURSOR_SOFTWARE;
-    if (SWCursor || !HWCursor)
-    {
-        if (HWCursor && PublicOption[ATI_OPTION_HWCURSOR].found)
+    pATI->HWCursor = FALSE;
+    if (SWCursor || !PublicOption[ATI_OPTION_HWCURSOR].value.bool) {
+        if (PublicOption[ATI_OPTION_HWCURSOR].value.bool &&
+            PublicOption[ATI_OPTION_HWCURSOR].found)
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
                 "Option \"sw_cursor\" overrides Option \"hw_cursor\".\n");
-    }
-    else if (pATI->Chip < ATI_CHIP_264CT)
-    {
-        if (HWCursor && PublicOption[ATI_OPTION_HWCURSOR].found)
+    } else if (pATI->Chip < ATI_CHIP_264CT) {
+        if (PublicOption[ATI_OPTION_HWCURSOR].value.bool
+            && PublicOption[ATI_OPTION_HWCURSOR].found)
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
                 "Option \"hw_cursor\" not supported in this configuration.\n");
-    }
-    else
-    {
-        pATI->Cursor = ATI_CURSOR_HARDWARE;
-    }
+    } else
+        pATI->HWCursor = TRUE;
 
     /* Only set the reference clock if it hasn't already been determined */
     if (!pATI->ReferenceNumerator || !pATI->ReferenceDenominator)
diff --git a/src/atiload.c b/src/atiload.c
index 5dcba50..5bb651a 100644
--- a/src/atiload.c
+++ b/src/atiload.c
@@ -94,7 +94,7 @@ ATILoadModules
         return NULL;
 
     /* Load ramdac module if needed */
-    if ((pATI->Cursor > ATI_CURSOR_SOFTWARE) &&
+    if (pATI->HWCursor &&
         !ATILoadModule(pScreenInfo, "ramdac", ATIramdacSymbols))
         return NULL;
 
diff --git a/src/atimach64cursor.c b/src/atimach64cursor.c
index bcdee1f..0c5444d 100644
--- a/src/atimach64cursor.c
+++ b/src/atimach64cursor.c
@@ -387,7 +387,7 @@ ATIMach64CursorInit(ScreenPtr pScreen)
     if (!miDCInitialize(pScreen, xf86GetPointerScreenFuncs()))
         return FALSE;
 
-    if (pATI->Cursor == ATI_CURSOR_SOFTWARE)
+    if (!pATI->HWCursor)
         return TRUE;
 
     /* Initialise hardware cursor */
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 1006866..3259021 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -2003,7 +2003,7 @@ ATIPreInit(ScrnInfoPtr pScreenInfo, int flags)
 
             ServerVideoRAM = pATI->VideoRAM;
 
-            if (pATI->Cursor > ATI_CURSOR_SOFTWARE) {
+            if (pATI->HWCursor) {
                 /*
                  * Allocate a 1 kB cursor image area at the top of the
                  * little-endian aperture, just before any MMIO area that
@@ -2146,12 +2146,11 @@ ATIPreInit(ScrnInfoPtr pScreenInfo, int flags)
 
 #endif /* AVOID_CPIO */
 
-    if ((pATI->Cursor > ATI_CURSOR_SOFTWARE) && !pATI->CursorBase)
-    {
+    if (pATI->HWCursor && !pATI->CursorBase) {
         xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
             "Unable to store hardware cursor image.  Reverting to software"
             " cursor.\n");
-        pATI->Cursor = ATI_CURSOR_SOFTWARE;
+        pATI->HWCursor = FALSE;
     }
 
     /*
diff --git a/src/atistruct.h b/src/atistruct.h
index 33c7cee..852df48 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -301,7 +301,7 @@ typedef struct _ATIRec
     unsigned long CursorBase;
     CARD32 CursorOffset;
     CARD16 CursorXOffset, CursorYOffset;
-    CARD8 Cursor;
+    Bool   HWCursor;
 
     /*
      * MMIO cache.