Module Name: src
Committed By: phx
Date: Tue Mar 1 09:17:07 UTC 2011
Modified Files:
src/etc/etc.sandpoint: MAKEDEV.conf
src/sys/arch/powerpc/conf: majors.powerpc
src/sys/arch/sandpoint/conf: files.sandpoint
Log Message:
Revert the major number for satmgr(4) back to 100 and allocate it from
majors.powerpc, as suggested by matt@.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/etc/etc.sandpoint/MAKEDEV.conf
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/conf/majors.powerpc
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sandpoint/conf/files.sandpoint
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.sandpoint/MAKEDEV.conf
diff -u src/etc/etc.sandpoint/MAKEDEV.conf:1.10 src/etc/etc.sandpoint/MAKEDEV.conf:1.11
--- src/etc/etc.sandpoint/MAKEDEV.conf:1.10 Sat Feb 26 09:52:16 2011
+++ src/etc/etc.sandpoint/MAKEDEV.conf Tue Mar 1 09:17:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.10 2011/02/26 09:52:16 phx Exp $
+# $NetBSD: MAKEDEV.conf,v 1.11 2011/03/01 09:17:06 phx Exp $
init)
makedev std tty00 tty01 opty ptm pty0
@@ -25,7 +25,7 @@
;;
satmgr)
- mkdev satmgr c 144 0 620
+ mkdev satmgr c 100 0 620
;;
power)
Index: src/sys/arch/powerpc/conf/majors.powerpc
diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.6 src/sys/arch/powerpc/conf/majors.powerpc:1.7
--- src/sys/arch/powerpc/conf/majors.powerpc:1.6 Sat May 29 22:48:57 2010
+++ src/sys/arch/powerpc/conf/majors.powerpc Tue Mar 1 09:17:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.powerpc,v 1.6 2010/05/29 22:48:57 phx Exp $
+# $NetBSD: majors.powerpc,v 1.7 2011/03/01 09:17:06 phx Exp $
#
# Device majors for shared PowerPC
#
@@ -90,6 +90,7 @@
device-major nsmb char 98 nsmb
device-major xlcom char 99 xlcom
+device-major satmgr char 100 satmgr
# Majors up to 143 are reserved for machine-dependant drivers.
# New machine-independent driver majors are assigned in
Index: src/sys/arch/sandpoint/conf/files.sandpoint
diff -u src/sys/arch/sandpoint/conf/files.sandpoint:1.28 src/sys/arch/sandpoint/conf/files.sandpoint:1.29
--- src/sys/arch/sandpoint/conf/files.sandpoint:1.28 Sat Feb 26 09:52:16 2011
+++ src/sys/arch/sandpoint/conf/files.sandpoint Tue Mar 1 09:17:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.sandpoint,v 1.28 2011/02/26 09:52:16 phx Exp $
+# $NetBSD: files.sandpoint,v 1.29 2011/03/01 09:17:07 phx Exp $
#
# Motorola's "SandPoint" evaluation board and multiplied descendents.
#
@@ -109,5 +109,3 @@
file arch/sandpoint/sandpoint/satmgr.c satmgr
include "arch/powerpc/conf/majors.powerpc"
-
-device-major satmgr char 144 satmgr
