[src/netbsd-8]: src Pull up following revision(s) (requested by flxd in ticke...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8b1aa9b68a83
branches:  netbsd-8
changeset: 850804:8b1aa9b68a83
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jul 05 20:13:36 2017 +0000

description:
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).

diffstat:

 etc/etc.vax/MAKEDEV.conf      |   3 ++-
 etc/etc.vax/Makefile.inc      |   4 ++--
 sys/arch/vax/conf/GENERIC_USB |  16 ++++++++++++++++
 sys/arch/vax/conf/files.vax   |  15 ++++++++++++++-
 sys/arch/vax/conf/majors.vax  |   4 +++-
 5 files changed, 37 insertions(+), 5 deletions(-)

diffs (104 lines):

diff -r 01004e1bfcd5 -r 8b1aa9b68a83 etc/etc.vax/MAKEDEV.conf
--- a/etc/etc.vax/MAKEDEV.conf  Wed Jul 05 20:11:18 2017 +0000
+++ b/etc/etc.vax/MAKEDEV.conf  Wed Jul 05 20:13:36 2017 +0000
@@ -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 @@
        makedev scsibus0 scsibus1 scsibus2 scsibus3
        makedev ses0 ses1 ses2 ses3
        makedev audio speaker
+       makedev usbs
        makedev std_vax
        ;;
 
diff -r 01004e1bfcd5 -r 8b1aa9b68a83 etc/etc.vax/Makefile.inc
--- a/etc/etc.vax/Makefile.inc  Wed Jul 05 20:11:18 2017 +0000
+++ b/etc/etc.vax/Makefile.inc  Wed Jul 05 20:13:36 2017 +0000
@@ -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
 
diff -r 01004e1bfcd5 -r 8b1aa9b68a83 sys/arch/vax/conf/GENERIC_USB
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/vax/conf/GENERIC_USB     Wed Jul 05 20:13:36 2017 +0000
@@ -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?
diff -r 01004e1bfcd5 -r 8b1aa9b68a83 sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax       Wed Jul 05 20:11:18 2017 +0000
+++ b/sys/arch/vax/conf/files.vax       Wed Jul 05 20:13:36 2017 +0000
@@ -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 @@
 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 @@
 #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"
diff -r 01004e1bfcd5 -r 8b1aa9b68a83 sys/arch/vax/conf/majors.vax
--- a/sys/arch/vax/conf/majors.vax      Wed Jul 05 20:11:18 2017 +0000
+++ b/sys/arch/vax/conf/majors.vax      Wed Jul 05 20:13:36 2017 +0000
@@ -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 @@
 # 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"