CVS commit: [netbsd-5] xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Soren Jacobsen]

Module Name:    xsrc
Committed By:   snj
Date:           Fri Oct 16 06:52:05 UTC 2009

Modified Files:
        xsrc/external/mit/xorg-server/dist/hw/xfree86/common [netbsd-5]:
            xf86Configure.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #1092):
        external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c: 
revision 1.3
let xf86AddBusDeviceToConfigure() accept BUS_ISA and BUS_NONE


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
    xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.1.1.1.2.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.1.1.1.2.1	Thu Sep 17 03:35:09 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c	Fri Oct 16 06:52:05 2009
@@ -123,6 +123,9 @@
 		return NULL;
 	break;
 #endif
+    case BUS_NONE:
+    case BUS_ISA:
+    	break;
     default:
 	return NULL;
     }
@@ -215,6 +218,11 @@
 	}
 	break;
 #endif
+    case BUS_ISA: {
+        NewDevice.GDev.busID = xnfalloc(6);
+        strcpy(NewDevice.GDev.busID, "ISA");
+    }
+    break;
     default:
 	break;
     }