xf86-video-nv: Branch 'nv-2.0-branch' - 3 commits - configure.ac src/g80_ddc.c src/g80_display.c src/g80_type.h

[Aaron Plattner]

 configure.ac      |    2 +-
 src/g80_ddc.c     |    2 +-
 src/g80_display.c |    2 +-
 src/g80_type.h    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 25c478653fc95da159cd6cabb8ad03ef23ba8fdb
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jan 25 18:53:28 2008 -0800

    Bump to 2.0.3.

diff --git a/configure.ac b/configure.ac
index e2f3999..5f22425 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-nv],
-        2.0.2,
+        2.0.3,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-nv)
 
commit 5a3d025784ad2168fde380b676bc0f2919a5c38d
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jan 25 18:53:15 2008 -0800

    Don't consider DAC0 for load detection.

diff --git a/src/g80_display.c b/src/g80_display.c
index 6349258..3103284 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -223,7 +223,7 @@ Bool G80LoadDetect(ScrnInfoPtr pScrn)
 
     pNv->orType = DAC;
 
-    for(or = DAC0; or <= DAC2; or++) {
+    for(or = DAC1; or <= DAC2; or++) {
         xf86DrvMsg(scrnIndex, X_PROBED, "Trying load detection on DAC%i ... ", or);
 
         if(G80DispDetectLoad(pScrn, or)) {
commit e77c67e88e92cf03d3dfb4c58b6f6c09763673b0
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jan 25 18:16:20 2008 -0800

    Fix warning.
    (cherry picked from commit d2367140ad1fe96bce5e780332d21999e5aa31bf)
    
    Conflicts:
    
    	src/g80_type.h

diff --git a/src/g80_ddc.c b/src/g80_ddc.c
index 6af2267..284b9ab 100644
--- a/src/g80_ddc.c
+++ b/src/g80_ddc.c
@@ -34,7 +34,7 @@
 
 #include <xf86DDC.h>
 
-static CARD32 G80FindLoadVal(const unsigned char *table1)
+static unsigned G80FindLoadVal(const unsigned char *table1)
 {
     const unsigned char *p = table1;
     int count;
diff --git a/src/g80_type.h b/src/g80_type.h
index c63dc0f..6657c49 100644
--- a/src/g80_type.h
+++ b/src/g80_type.h
@@ -41,7 +41,7 @@ typedef struct G80Rec {
     Head                head;
     ORType              orType;
     ORNum               or;
-    CARD32              loadVal;
+    unsigned            loadVal;
 
     xf86Int10InfoPtr    int10;
     int                 int10Mode; /* Console mode to restore */