Module Name: src Committed By: flxd Date: Thu Jun 22 17:51:22 UTC 2017
Modified Files: src/etc/etc.vax: MAKEDEV.conf src/sys/arch/vax/conf: files.vax majors.vax Added Files: src/sys/arch/vax/conf: GENERIC_USB Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/etc/etc.vax/MAKEDEV.conf cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/conf/GENERIC_USB cvs rdiff -u -r1.122 -r1.123 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.26 -r1.27 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.18 src/etc/etc.vax/MAKEDEV.conf:1.19 --- src/etc/etc.vax/MAKEDEV.conf:1.18 Tue Jun 20 15:10:03 2017 +++ src/etc/etc.vax/MAKEDEV.conf Thu Jun 22 17:51:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.18 2017/06/20 15:10:03 flxd Exp $ +# $NetBSD: MAKEDEV.conf,v 1.19 2017/06/22 17:51:22 flxd 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/sys/arch/vax/conf/files.vax diff -u src/sys/arch/vax/conf/files.vax:1.122 src/sys/arch/vax/conf/files.vax:1.123 --- src/sys/arch/vax/conf/files.vax:1.122 Thu Jun 22 16:46:53 2017 +++ src/sys/arch/vax/conf/files.vax Thu Jun 22 17:51:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.122 2017/06/22 16:46:53 flxd Exp $ +# $NetBSD: files.vax,v 1.123 2017/06/22 17:51:22 flxd 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.27 --- src/sys/arch/vax/conf/majors.vax:1.26 Sun Jul 5 03:06:27 2015 +++ src/sys/arch/vax/conf/majors.vax Thu Jun 22 17:51:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: majors.vax,v 1.26 2015/07/05 03:06:27 matt Exp $ +# $NetBSD: majors.vax,v 1.27 2017/06/22 17:51:22 flxd 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 --- /dev/null Thu Jun 22 17:51:22 2017 +++ src/sys/arch/vax/conf/GENERIC_USB Thu Jun 22 17:51:22 2017 @@ -0,0 +1,16 @@ +# $NetBSD: GENERIC_USB,v 1.1 2017/06/22 17:51:22 flxd 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?