25. Make some of ATIProbe()'s verbose messages less misleading

      (Marc La France).
  24. Fix reversed memset() arguments in atimisc LUT handling (David Krause).

4 files changed, 83 insertions, 32 deletions

diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index dd2720770..d8fb05952 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,7 @@
 XFree86 4.7.99.15 (xx April 2008)
+  25. Make some of ATIProbe()'s verbose messages less misleading
+      (Marc La France).
+  24. Fix reversed memset() arguments in atimisc LUT handling (David Krause).
   23. In favour of the majority case, assume x86 and x86_64 systems cannot
       hard-fail master aborts.  On an experimental basis, also assume the same
       of alpha systems.  This adds support for such systems that don't include
@@ -20671,4 +20674,4 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3936 2008/03/23 12:03:00 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3937 2008/03/26 17:20:04 tsi Exp $
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/atidac.c b/programs/Xserver/hw/xfree86/drivers/ati/atidac.c
index 39b5f8309..6eed9dfea 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/atidac.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/atidac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c,v 1.25tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c,v 1.26tsi Exp $ */
 /*
  * Copyright 1997 through 2008 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -437,7 +437,7 @@ ATILoadPalette
 
         CARD8 fChanged[SizeOf(pATI->NewHW.lut) / 3];
 
-        (void)memset(fChanged, SizeOf(fChanged), 0);
+        (void)memset(fChanged, 0, SizeOf(fChanged));
 
         minShift = redShift;
         if (minShift > greenShift)
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c b/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
index 282ebf512..9bfdce337 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v 1.77tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v 1.78tsi Exp $ */
 /*
  * Copyright 1997 through 2008 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -1494,14 +1494,29 @@ ATIProbe
 
                 if (ProbeFlag != DoProbe)
                 {
-                    if (ProbeFlag == BadRouting)
-                        xf86MsgVerb(X_INFO, 2,
-                            ATI_NAME ":  Unshared VGA not probed in domain %d"
-                            " due to unsuitable PCI routing.\n", Domain);
-                    else
-                        xf86MsgVerb(X_INFO, 2,
-                            ATI_NAME ":  Unshared VGA not probed in domain %d"
-                            " due to an I/O conflict.\n", Domain);
+                    switch (ProbeFlag)
+                    {
+                        case BadRouting:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared VGA not probed in domain"
+                                " %d due to unsuitable PCI routing.\n",
+                                Domain);
+                            break;
+
+                        case Allowed:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared VGA not probed in domain"
+                                " %d due to a potential hard-failed master"
+                                " abort.\n", Domain);
+                            break;
+
+                        default:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared VGA not probed in domain"
+                                " %d due to an I/O conflict.\n", Domain);
+                            break;
+                    }
+
                     break;
                 }
 
@@ -1560,14 +1575,30 @@ ATIProbe
 
                 if (ProbeFlag != DoProbe)
                 {
-                    if (ProbeFlag == BadRouting)
-                        xf86MsgVerb(X_INFO, 2,
-                            ATI_NAME ":  Unshared 8514/A not probed in domain"
-                            " %d due to unsuitable PCI routing.\n", Domain);
-                    else
-                        xf86MsgVerb(X_INFO, 2,
-                            ATI_NAME ":  Unshared 8514/A not probed in domain"
-                            " %d due to an I/O conflict.\n", Domain);
+                    switch (ProbeFlag)
+                    {
+                        case BadRouting:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared 8514/A not probed in"
+                                " domain %d due to unsuitable PCI routing.\n",
+                                Domain);
+                            break;
+
+                        case Allowed:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared 8514/A not probed in"
+                                " domain %d due to a potential hard-failed"
+                                " master abort.\n", Domain);
+                            break;
+
+                        default:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared 8514/A not probed in"
+                                " domain %d due to an I/O conflict.\n",
+                                Domain);
+                            break;
+                    }
+
                     break;
                 }
 
@@ -1627,16 +1658,33 @@ ATIProbe
 
                 if (ProbeFlag != DoProbe)
                 {
-                    if (ProbeFlag == BadRouting)
-                        xf86MsgVerb(X_INFO, 2,
-                            ATI_NAME ":  Unshared Mach64 at I/O base 0x%04X"
-                            " not probed in domain %d due to unsuitable PCI"
-                            " routing.\n", Mach64SparseIOBases[i], Domain);
-                    else
-                        xf86MsgVerb(X_INFO, 2,
-                            ATI_NAME ":  Unshared Mach64 at I/O base 0x%04X"
-                            " not probed in domain %d due to I/O conflict.\n",
-                            Mach64SparseIOBases[i], Domain);
+                    switch (ProbeFlag)
+                    {
+                        case BadRouting:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared Mach64 at I/O base"
+                                " 0x%04X not probed in domain %d due to"
+                                " unsuitable PCI routing.\n",
+                                Mach64SparseIOBases[i], Domain);
+                            break;
+
+                        case Allowed:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared Mach64 at I/O base"
+                                " 0x%04X not probed in domain %d due to"
+                                " a potential hard-failed master abort.\n",
+                                Mach64SparseIOBases[i], Domain);
+                            break;
+
+                        default:
+                            xf86MsgVerb(X_INFO, 2,
+                                ATI_NAME ":  Unshared Mach64 at I/O base"
+                                " 0x%04X not probed in domain %d due to I/O"
+                                " conflict.\n",
+                                Mach64SparseIOBases[i], Domain);
+                            break;
+                    }
+
                     continue;
                 }
 
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h b/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h
index af36b7e42..57e1144ae 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h
+++ b/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h,v 1.91tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h,v 1.92tsi Exp $ */
 /*
  * Copyright 1997 through 2008 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -39,7 +39,7 @@
 
 #define ATI_VERSION_MAJOR 7
 #define ATI_VERSION_MINOR 0
-#define ATI_VERSION_PATCH 15
+#define ATI_VERSION_PATCH 16
 
 #ifndef ATI_VERSION_EXTRA
 #define ATI_VERSION_EXTRA ""