Module Name: src
Committed By: snj
Date: Wed Jul 5 20:13:37 UTC 2017
Modified Files:
src/etc/etc.vax [netbsd-8]: MAKEDEV.conf Makefile.inc
src/sys/arch/vax/conf [netbsd-8]: files.vax majors.vax
Added Files:
src/sys/arch/vax/conf [netbsd-8]: GENERIC_USB
Log Message:
Pull up following revision(s) (requested by flxd in ticket #95):
etc/etc.vax/MAKEDEV.conf: revision 1.19
etc/etc.vax/Makefile.inc: revision 1.25
sys/arch/vax/conf/GENERIC_USB: revision 1.1
sys/arch/vax/conf/files.vax: revision 1.123
sys/arch/vax/conf/majors.vax: revision 1.27
USB for vax (similar to pmax; no/negligible impact on legacy):
* Add USB device files/majors.
* Make kernel configs with USB work.
* Provide a USB-enabled kernel config.
--
Add GENERIC_USB to vax kernel sets, but not to sysinst (yet), as bootloader
cannot handle kernels that large (yet).
To generate a diff of this commit:
cvs rdiff -u -r1.17.26.1 -r1.17.26.2 src/etc/etc.vax/MAKEDEV.conf
cvs rdiff -u -r1.24 -r1.24.34.1 src/etc/etc.vax/Makefile.inc
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/vax/conf/GENERIC_USB
cvs rdiff -u -r1.120.10.1 -r1.120.10.2 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.26 -r1.26.10.1 src/sys/arch/vax/conf/majors.vax
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.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.17.26.1 src/etc/etc.vax/MAKEDEV.conf:1.17.26.2
--- src/etc/etc.vax/MAKEDEV.conf:1.17.26.1 Wed Jun 21 18:16:13 2017
+++ src/etc/etc.vax/MAKEDEV.conf Wed Jul 5 20:13:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.17.26.1 2017/06/21 18:16:13 snj Exp $
+# $NetBSD: MAKEDEV.conf,v 1.17.26.2 2017/07/05 20:13:36 snj Exp $
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
@@ -7,6 +7,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev audio speaker
+ makedev usbs
makedev std_vax
;;
Index: src/etc/etc.vax/Makefile.inc
diff -u src/etc/etc.vax/Makefile.inc:1.24 src/etc/etc.vax/Makefile.inc:1.24.34.1
--- src/etc/etc.vax/Makefile.inc:1.24 Sun Jan 15 17:36:55 2012
+++ src/etc/etc.vax/Makefile.inc Wed Jul 5 20:13:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.24 2012/01/15 17:36:55 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.24.34.1 2017/07/05 20:13:36 snj Exp $
#
# etc.vax/Makefile.inc -- vax-specific etc Makefile targets
#
@@ -6,7 +6,7 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-KERNEL_SETS= GENERIC GENERIC.MP
+KERNEL_SETS= GENERIC GENERIC.MP GENERIC_USB
BUILD_KERNELS= INSTALL
Index: src/sys/arch/vax/conf/files.vax
diff -u src/sys/arch/vax/conf/files.vax:1.120.10.1 src/sys/arch/vax/conf/files.vax:1.120.10.2
--- src/sys/arch/vax/conf/files.vax:1.120.10.1 Sat Jul 1 08:39:21 2017
+++ src/sys/arch/vax/conf/files.vax Wed Jul 5 20:13:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.vax,v 1.120.10.1 2017/07/01 08:39:21 snj Exp $
+# $NetBSD: files.vax,v 1.120.10.2 2017/07/05 20:13:37 snj Exp $
#
# new style config file for vax architecture
#
@@ -180,6 +180,11 @@ device si: scsi, ncr5380sbc
attach si at vsbus with si_vsbus
file arch/vax/vsa/ncr.c si_vsbus
+#
+# Machine-independent ATA drivers
+#
+include "dev/ata/files.ata"
+
# Monochrome framebuffer on VS3100.
device smg: displaydev, wsemuldisplaydev
attach smg at vsbus
@@ -412,4 +417,12 @@ include "compat/vax1k/files.vax1k"
#arch/vax/if/if_vv.c optional vv device-driver
#arch/vax/if/raw_hy.c optional hy device-driver
+# this wants to be probed as late as possible.
+#
+# Machine-independent USB device support
+#
+include "dev/usb/files.usb"
+
+include "dev/bluetooth/files.bluetooth"
+
include "arch/vax/conf/majors.vax"
Index: src/sys/arch/vax/conf/majors.vax
diff -u src/sys/arch/vax/conf/majors.vax:1.26 src/sys/arch/vax/conf/majors.vax:1.26.10.1
--- src/sys/arch/vax/conf/majors.vax:1.26 Sun Jul 5 03:06:27 2015
+++ src/sys/arch/vax/conf/majors.vax Wed Jul 5 20:13:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: majors.vax,v 1.26 2015/07/05 03:06:27 matt Exp $
+# $NetBSD: majors.vax,v 1.26.10.1 2017/07/05 20:13:37 snj Exp $
#
# Device majors for vax
#
@@ -97,3 +97,5 @@ device-major uu block 13 uu
# 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"
Added files:
Index: src/sys/arch/vax/conf/GENERIC_USB
diff -u /dev/null src/sys/arch/vax/conf/GENERIC_USB:1.1.2.2
--- /dev/null Wed Jul 5 20:13:37 2017
+++ src/sys/arch/vax/conf/GENERIC_USB Wed Jul 5 20:13:37 2017
@@ -0,0 +1,16 @@
+# $NetBSD: GENERIC_USB,v 1.1.2.2 2017/07/05 20:13:37 snj Exp $
+#
+# GENERIC kernel with USB
+
+include "arch/vax/conf/GENERIC"
+
+# TC-USB
+tcu* at tc? slot ? offset ?
+slhci* at tcu?
+gpio* at gpiobus?
+
+# USB bus support
+usb* at slhci?
+
+include "dev/usb/usbdevices.config"
+midi* at midibus?
