Module Name: src Committed By: plunky Date: Sat Mar 6 23:45:40 UTC 2010
Modified Files: src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: majors.hpcmips src/sys/arch/i386/conf: majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: majors.landisk src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/conf: majors Log Message: use a MI major number for uhso(4) driver (requested by mrg) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/conf/majors.i386 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/conf/majors.powerpc cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sgimips/conf/majors.sgimips cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/conf/majors.sparc cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/conf/majors.sparc64 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/conf/majors.x68k cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/conf/majors.zaurus cvs rdiff -u -r1.47 -r1.48 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/algor/conf/majors.algor diff -u src/sys/arch/algor/conf/majors.algor:1.20 src/sys/arch/algor/conf/majors.algor:1.21 --- src/sys/arch/algor/conf/majors.algor:1.20 Sat Mar 6 21:31:50 2010 +++ src/sys/arch/algor/conf/majors.algor Sat Mar 6 23:45:38 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.algor,v 1.20 2010/03/06 21:31:50 plunky Exp $ +# $NetBSD: majors.algor,v 1.21 2010/03/06 23:45:38 plunky Exp $ # # Device majors for algor # @@ -67,7 +67,6 @@ device-major ksyms char 69 ksyms device-major wsfont char 70 wsfont device-major nsmb char 71 nsmb -device-major uhso char 72 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/alpha/conf/majors.alpha diff -u src/sys/arch/alpha/conf/majors.alpha:1.24 src/sys/arch/alpha/conf/majors.alpha:1.25 --- src/sys/arch/alpha/conf/majors.alpha:1.24 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/alpha/conf/majors.alpha Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.alpha,v 1.24 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.alpha,v 1.25 2010/03/06 23:45:39 plunky Exp $ # # Device majors for alpha # @@ -76,7 +76,6 @@ device-major nsmb char 77 nsmb device-major joy char 78 joy device-major twe char 79 twe -device-major uhso char 80 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/amd64/conf/majors.amd64 diff -u src/sys/arch/amd64/conf/majors.amd64:1.22 src/sys/arch/amd64/conf/majors.amd64:1.23 --- src/sys/arch/amd64/conf/majors.amd64:1.22 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/amd64/conf/majors.amd64 Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.amd64,v 1.22 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.amd64,v 1.23 2010/03/06 23:45:39 plunky Exp $ # # Device majors for amd64 # @@ -89,7 +89,6 @@ device-major dpt char 96 dpt device-major twe char 97 twe device-major nsmb char 98 nsmb -device-major uhso char 99 uhso # # Device majors for Xen. These are assigned here so that: Index: src/sys/arch/arm/conf/majors.arm32 diff -u src/sys/arch/arm/conf/majors.arm32:1.30 src/sys/arch/arm/conf/majors.arm32:1.31 --- src/sys/arch/arm/conf/majors.arm32:1.30 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/arm/conf/majors.arm32 Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.arm32,v 1.30 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.arm32,v 1.31 2010/03/06 23:45:39 plunky Exp $ # # Device majors for arm32 # @@ -103,7 +103,6 @@ device-major tslcd char 108 tslcd device-major twe char 109 twe device-major nsmb char 110 nsmb -device-major uhso char 111 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/cobalt/conf/majors.cobalt diff -u src/sys/arch/cobalt/conf/majors.cobalt:1.27 src/sys/arch/cobalt/conf/majors.cobalt:1.28 --- src/sys/arch/cobalt/conf/majors.cobalt:1.27 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/cobalt/conf/majors.cobalt Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.cobalt,v 1.27 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.cobalt,v 1.28 2010/03/06 23:45:39 plunky Exp $ # # Device majors for cobalt # @@ -57,7 +57,6 @@ device-major wsmouse char 53 wsmouse device-major wsmux char 54 wsmux device-major wsfont char 55 wsfont -device-major uhso char 56 uhso device-major altq char 77 altq Index: src/sys/arch/evbmips/conf/majors.evbmips diff -u src/sys/arch/evbmips/conf/majors.evbmips:1.25 src/sys/arch/evbmips/conf/majors.evbmips:1.26 --- src/sys/arch/evbmips/conf/majors.evbmips:1.25 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/evbmips/conf/majors.evbmips Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbmips,v 1.25 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.evbmips,v 1.26 2010/03/06 23:45:39 plunky Exp $ # # Device majors for evbmips # @@ -77,7 +77,6 @@ device-major cgd char 75 block 18 cgd device-major ksyms char 76 ksyms device-major uart char 77 uart -device-major uhso char 78 uhso device-major nsmb char 98 nsmb device-major athflash char 99 athflash Index: src/sys/arch/evbppc/conf/majors.evbppc diff -u src/sys/arch/evbppc/conf/majors.evbppc:1.29 src/sys/arch/evbppc/conf/majors.evbppc:1.30 --- src/sys/arch/evbppc/conf/majors.evbppc:1.29 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/evbppc/conf/majors.evbppc Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbppc,v 1.29 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.evbppc,v 1.30 2010/03/06 23:45:39 plunky Exp $ # # Device majors for evbppc # (When possible, make entries the same as macppc) @@ -77,7 +77,6 @@ device-major ksyms char 74 ksyms device-major dmoverio char 75 dmoverio device-major twe char 76 twe -device-major uhso char 77 uhso device-major nsmb char 98 nsmb device-major xlcom char 99 xlcom Index: src/sys/arch/hpcarm/conf/majors.hpcarm diff -u src/sys/arch/hpcarm/conf/majors.hpcarm:1.10 src/sys/arch/hpcarm/conf/majors.hpcarm:1.11 --- src/sys/arch/hpcarm/conf/majors.hpcarm:1.10 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/hpcarm/conf/majors.hpcarm Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcarm,v 1.10 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.hpcarm,v 1.11 2010/03/06 23:45:39 plunky Exp $ # # Device majors for hpcarm # @@ -103,7 +103,6 @@ device-major tslcd char 108 tslcd device-major twe char 109 twe device-major nsmb char 110 nsmb -device-major uhso char 111 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/hpcmips/conf/majors.hpcmips diff -u src/sys/arch/hpcmips/conf/majors.hpcmips:1.28 src/sys/arch/hpcmips/conf/majors.hpcmips:1.29 --- src/sys/arch/hpcmips/conf/majors.hpcmips:1.28 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/hpcmips/conf/majors.hpcmips Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcmips,v 1.28 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.hpcmips,v 1.29 2010/03/06 23:45:39 plunky Exp $ # # Device majors for hpcmips # @@ -62,7 +62,6 @@ device-major wsfont char 102 wsfont device-major ses char 103 ses device-major nsmb char 104 nsmb -device-major uhso char 105 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/i386/conf/majors.i386 diff -u src/sys/arch/i386/conf/majors.i386:1.38 src/sys/arch/i386/conf/majors.i386:1.39 --- src/sys/arch/i386/conf/majors.i386:1.38 Sat Mar 6 21:12:04 2010 +++ src/sys/arch/i386/conf/majors.i386 Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.i386,v 1.38 2010/03/06 21:12:04 plunky Exp $ +# $NetBSD: majors.i386,v 1.39 2010/03/06 23:45:39 plunky Exp $ # # Device majors for i386 # @@ -104,7 +104,6 @@ device-major rd char 105 block 22 rd device-major ct char 106 block 23 ct device-major mt char 107 block 24 mt -device-major uhso char 108 uhso # # Device majors for Xen. These are assigned here so that: Index: src/sys/arch/ia64/conf/majors.ia64 diff -u src/sys/arch/ia64/conf/majors.ia64:1.6 src/sys/arch/ia64/conf/majors.ia64:1.7 --- src/sys/arch/ia64/conf/majors.ia64:1.6 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/ia64/conf/majors.ia64 Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.ia64,v 1.6 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.ia64,v 1.7 2010/03/06 23:45:39 plunky Exp $ # # Device majors for ia64 # @@ -105,7 +105,6 @@ device-major rd char 105 block 22 rd device-major ct char 106 block 23 ct device-major mt char 107 block 24 mt -device-major uhso char 108 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/landisk/conf/majors.landisk diff -u src/sys/arch/landisk/conf/majors.landisk:1.5 src/sys/arch/landisk/conf/majors.landisk:1.6 --- src/sys/arch/landisk/conf/majors.landisk:1.5 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/landisk/conf/majors.landisk Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.landisk,v 1.5 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.landisk,v 1.6 2010/03/06 23:45:39 plunky Exp $ # # Device majors for landisk # @@ -59,7 +59,6 @@ device-major ucom char 68 ucom device-major uscanner char 69 uscanner device-major urio char 70 urio -device-major uhso char 71 uhso device-major midi char 72 midi device-major sequencer char 73 sequencer Index: src/sys/arch/powerpc/conf/majors.powerpc diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.4 src/sys/arch/powerpc/conf/majors.powerpc:1.5 --- src/sys/arch/powerpc/conf/majors.powerpc:1.4 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/powerpc/conf/majors.powerpc Sat Mar 6 23:45:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.powerpc,v 1.4 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.powerpc,v 1.5 2010/03/06 23:45:40 plunky Exp $ # # Device majors for shared PowerPC # @@ -90,7 +90,6 @@ device-major nsmb char 98 nsmb device-major xlcom char 99 xlcom -device-major uhso char 100 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/sgimips/conf/majors.sgimips diff -u src/sys/arch/sgimips/conf/majors.sgimips:1.24 src/sys/arch/sgimips/conf/majors.sgimips:1.25 --- src/sys/arch/sgimips/conf/majors.sgimips:1.24 Sat Mar 6 21:31:52 2010 +++ src/sys/arch/sgimips/conf/majors.sgimips Sat Mar 6 23:45:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sgimips,v 1.24 2010/03/06 21:31:52 plunky Exp $ +# $NetBSD: majors.sgimips,v 1.25 2010/03/06 23:45:40 plunky Exp $ # # Device majors for sgimips # @@ -70,7 +70,6 @@ device-major lpt char 78 lpt device-major sysmon char 79 sysmon_envsys | sysmon_wdog device-major nsmb char 98 nsmb -device-major uhso char 99 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/sparc/conf/majors.sparc diff -u src/sys/arch/sparc/conf/majors.sparc:1.31 src/sys/arch/sparc/conf/majors.sparc:1.32 --- src/sys/arch/sparc/conf/majors.sparc:1.31 Sat Mar 6 21:31:52 2010 +++ src/sys/arch/sparc/conf/majors.sparc Sat Mar 6 23:45:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sparc,v 1.31 2010/03/06 21:31:52 plunky Exp $ +# $NetBSD: majors.sparc,v 1.32 2010/03/06 23:45:40 plunky Exp $ # # Device majors for sparc # @@ -77,7 +77,6 @@ # sparc64: device-major urio char 83 urio # sparc64: device-major uscanner char 84 uscanner # sparc64: device-major radio char 85 radio -# sparc64: device-major uhso char 86 uhso device-major wsdisplay char 90 wsdisplay device-major wskbd char 91 wskbd Index: src/sys/arch/sparc64/conf/majors.sparc64 diff -u src/sys/arch/sparc64/conf/majors.sparc64:1.30 src/sys/arch/sparc64/conf/majors.sparc64:1.31 --- src/sys/arch/sparc64/conf/majors.sparc64:1.30 Sat Mar 6 21:31:52 2010 +++ src/sys/arch/sparc64/conf/majors.sparc64 Sat Mar 6 23:45:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sparc64,v 1.30 2010/03/06 21:31:52 plunky Exp $ +# $NetBSD: majors.sparc64,v 1.31 2010/03/06 23:45:40 plunky Exp $ # # Device majors for sparc64 # @@ -74,7 +74,6 @@ device-major urio char 83 urio device-major uscanner char 84 uscanner device-major radio char 85 radio -device-major uhso char 86 uhso device-major wsdisplay char 90 wsdisplay device-major wskbd char 91 wskbd Index: src/sys/arch/x68k/conf/majors.x68k diff -u src/sys/arch/x68k/conf/majors.x68k:1.22 src/sys/arch/x68k/conf/majors.x68k:1.23 --- src/sys/arch/x68k/conf/majors.x68k:1.22 Sat Mar 6 21:31:52 2010 +++ src/sys/arch/x68k/conf/majors.x68k Sat Mar 6 23:45:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.x68k,v 1.22 2010/03/06 21:31:52 plunky Exp $ +# $NetBSD: majors.x68k,v 1.23 2010/03/06 23:45:40 plunky Exp $ # # Device majors for x68k # @@ -59,7 +59,6 @@ device-major uscanner char 60 uscanner device-major sysmon char 61 sysmon_power device-major nsmb char 98 nsmb -device-major uhso char 99 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/zaurus/conf/majors.zaurus diff -u src/sys/arch/zaurus/conf/majors.zaurus:1.4 src/sys/arch/zaurus/conf/majors.zaurus:1.5 --- src/sys/arch/zaurus/conf/majors.zaurus:1.4 Sat Mar 6 21:31:52 2010 +++ src/sys/arch/zaurus/conf/majors.zaurus Sat Mar 6 23:45:40 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.zaurus,v 1.4 2010/03/06 21:31:52 plunky Exp $ +# $NetBSD: majors.zaurus,v 1.5 2010/03/06 23:45:40 plunky Exp $ # # Device majors for zaurus # @@ -103,7 +103,6 @@ device-major tslcd char 108 tslcd device-major twe char 109 twe device-major nsmb char 110 nsmb -device-major uhso char 111 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independant driver majors are assigned in Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.47 src/sys/conf/majors:1.48 --- src/sys/conf/majors:1.47 Sun Sep 6 17:25:56 2009 +++ src/sys/conf/majors Sat Mar 6 23:45:38 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.47 2009/09/06 17:25:56 sborrill Exp $ +# $NetBSD: majors,v 1.48 2010/03/06 23:45:38 plunky Exp $ # # Device majors for Machine-Independent drivers. # @@ -41,3 +41,4 @@ device-major video char 193 video device-major dm char 194 block 169 dm device-major hdaudio char 195 hdaudio +device-major uhso char 196 uhso