Module Name: src
Committed By: flxd
Date: Fri Oct 21 18:11:59 UTC 2016
Modified Files:
src/etc/etc.pmax: MAKEDEV.conf
src/sys/arch/pmax/conf: files.pmax majors.pmax
Log Message:
Bless pmax with USB device files/majors and make kernel configs with USB and
typical drivers work.
OK christos@ simonb@
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/etc.pmax/MAKEDEV.conf
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/pmax/conf/files.pmax
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/pmax/conf/majors.pmax
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.pmax/MAKEDEV.conf
diff -u src/etc/etc.pmax/MAKEDEV.conf:1.8 src/etc/etc.pmax/MAKEDEV.conf:1.9
--- src/etc/etc.pmax/MAKEDEV.conf:1.8 Tue Sep 6 14:40:11 2011
+++ src/etc/etc.pmax/MAKEDEV.conf Fri Oct 21 18:11:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:11 apb Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2016/10/21 18:11:59 flxd Exp $
all_md)
makedev minimal
@@ -6,6 +6,7 @@ all_md)
makedev stic0 stic1 stic2
makedev audio
makedev scsibus0 scsibus1 scsibus2 scsibus3
+ makedev usbs
;;
minimal)
Index: src/sys/arch/pmax/conf/files.pmax
diff -u src/sys/arch/pmax/conf/files.pmax:1.115 src/sys/arch/pmax/conf/files.pmax:1.116
--- src/sys/arch/pmax/conf/files.pmax:1.115 Sun Jul 20 10:22:54 2014
+++ src/sys/arch/pmax/conf/files.pmax Fri Oct 21 18:11:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.115 2014/07/20 10:22:54 alnsn Exp $
+# $NetBSD: files.pmax,v 1.116 2016/10/21 18:11:59 flxd Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -95,6 +95,12 @@ file arch/mips/mips/mips_mcclock_loop.S
include "dev/scsipi/files.scsipi"
+#
+# Machine-independent ATA drivers
+#
+include "dev/ata/files.ata"
+
+
# Memory Disk
file dev/md_root.c memory_disk_hooks
@@ -166,4 +172,10 @@ device xcfb: wsemuldisplaydev, rasops8
attach xcfb at tc
file dev/tc/xcfb.c xcfb needs-flag
+# this wants to be probed as late as possible.
+#
+# Machine-independent USB device support
+#
+include "dev/usb/files.usb"
+
include "arch/pmax/conf/majors.pmax"
Index: src/sys/arch/pmax/conf/majors.pmax
diff -u src/sys/arch/pmax/conf/majors.pmax:1.21 src/sys/arch/pmax/conf/majors.pmax:1.22
--- src/sys/arch/pmax/conf/majors.pmax:1.21 Thu Jun 30 20:09:34 2011
+++ src/sys/arch/pmax/conf/majors.pmax Fri Oct 21 18:11:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: majors.pmax,v 1.21 2011/06/30 20:09:34 wiz Exp $
+# $NetBSD: majors.pmax,v 1.22 2016/10/21 18:11:59 flxd Exp $
#
# Device majors for pmax
#
@@ -55,3 +55,5 @@ device-major nsmb char 106 nsmb
# Majors up to 143 are reserved for machine-dependent drivers.
# New machine-independent driver majors are assigned in
# sys/conf/majors.
+
+include "conf/majors.usb"