From f0478b8b4541546dc0fc6a0248e1a039b037f1ae Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 10 Mar 2014 02:49:31 +0100 Subject: [PATCH] Make usb4bsd the default USB stack. To get back to the old stack, put "WANT_OLDUSB=yes" in /etc/make.conf and replace "device usb" with "device oldusb" in the kernel configuration. Requested-by: dillon, profmakx, marino etc. --- Makefile_upgrade.inc | 2 +- UPDATING | 6 + include/Makefile | 2 +- lib/Makefile | 2 +- share/man/man4/Makefile | 2 +- share/man/man5/make.conf.5 | 4 +- sys/bus/Makefile | 2 +- sys/bus/pci/pci.c | 12 +- sys/conf/files | 257 ++++++++++++++-------------- sys/conf/kmod.mk | 2 +- sys/config/GENERIC | 6 +- sys/config/LINT | 4 +- sys/config/LINT64 | 4 +- sys/config/SOEKRIS | 2 +- sys/config/X86_64_GENERIC | 6 +- sys/dev/Makefile | 2 +- sys/dev/disk/nata/Makefile | 2 +- sys/dev/netif/Makefile | 6 +- sys/dev/netif/ndis/Makefile | 8 +- sys/dev/netif/ndis/if_ndis.c | 14 +- sys/dev/netif/ndis/if_ndis_pccard.c | 4 +- sys/dev/netif/ndis/if_ndis_pci.c | 4 +- sys/dev/netif/ndis/if_ndisvar.h | 10 +- sys/dev/sound/driver/Makefile | 2 +- sys/emulation/ndis/Makefile | 8 +- sys/emulation/ndis/kern_ndis.c | 6 +- sys/emulation/ndis/kern_windrv.c | 6 +- sys/emulation/ndis/ntoskrnl_var.h | 6 +- sys/emulation/ndis/subr_ndis.c | 4 +- sys/platform/pc32/conf/files | 8 +- sys/platform/pc64/conf/files | 8 +- sys/sys/param.h | 3 +- usr.bin/Makefile | 2 +- usr.sbin/Makefile | 2 +- 34 files changed, 212 insertions(+), 206 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 499ad89005..c83f671d88 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2449,7 +2449,7 @@ TO_REMOVE+=/usr/share/man/man4/ural.4.gz # Clean up old USB stuff when the new stack is requested # and vice versa -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) TO_REMOVE+=/boot/kernel/if_aue.ko TO_REMOVE+=/boot/kernel/if_cue.ko TO_REMOVE+=/boot/kernel/if_kue.ko diff --git a/UPDATING b/UPDATING index 4a427e332b..4f841a740d 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,12 @@ + UPGRADING DRAGONFLY FROM 3.6 TO LATER VERSIONS + +-----------------------------------------------------------------------+ +USB4BSD IS NOW THE DEFAULT USB STACK +------------------------------------ + +To get back to the old stack, put "WANT_OLDUSB=yes" in /etc/make.conf and +replace "device usb" with "device oldusb" in the kernel configuration. + MORE ISA SUPPORT DROPPED ------------------------ diff --git a/include/Makefile b/include/Makefile index 87b790ca7e..f1f5b2369d 100644 --- a/include/Makefile +++ b/include/Makefile @@ -93,7 +93,7 @@ LSUBDIRS= \ vfs/msdosfs vfs/nfs vfs/ntfs vfs/nwfs \ vfs/smbfs vfs/udf vfs/ufs vfs/hammer vfs/hammer2 -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) LSUBDIRS+= bus/u4b .else LSUBDIRS+= bus/usb diff --git a/lib/Makefile b/lib/Makefile index cfd60e1339..2cbabcd2ca 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -117,7 +117,7 @@ _libnetgraph= libnetgraph7 _libnetgraph= libnetgraph .endif -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) _libusb= libusb _libusbhid= libu4bhid .else diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index efc7aa773f..62f10d63e7 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -516,7 +516,7 @@ MLINKS+=wpi.4 if_wpi.4 MLINKS+=xe.4 if_xe.4 MLINKS+=xl.4 if_xl.4 -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) MAN+= rum.4 \ run.4 \ runfw.4 \ diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 43037e9754..38ca52d352 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -596,9 +596,9 @@ userland. It has to be accompanied by .Dv NETGRAPH7* options in the kernel. -.It Va WANT_USB4BSD +.It Va WANT_OLDUSB .Pq Vt bool -Set to build a newer, experimental +Set to build the old, deprecated .Xr usb 4 userland. .El diff --git a/sys/bus/Makefile b/sys/bus/Makefile index 5af19e0748..fdb37e4b5f 100644 --- a/sys/bus/Makefile +++ b/sys/bus/Makefile @@ -1,6 +1,6 @@ SUBDIR= cam firewire iicbus mmc pccard ppbus smbus -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) SUBDIR+=u4b .else SUBDIR+=usb diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index a874dedb7e..e23da996b5 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -30,7 +30,7 @@ #include "opt_acpi.h" #include "opt_compat_oldpci.h" -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -60,7 +60,7 @@ #include #include -#if NUSB4BSD > 0 +#if NUSB > 1 #include #include #include @@ -311,7 +311,7 @@ TUNABLE_INT("hw.pci.honor_msi_blacklist", &pci_honor_msi_blacklist); SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD, &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI"); -#if NUSB4BSD > 0 +#if NUSB > 1 #if defined(__i386__) || defined(__x86_64__) static int pci_usb_takeover = 1; #else @@ -2777,7 +2777,7 @@ pci_assign_interrupt(device_t bus, device_t dev, int force_route) machintr_legacy_intr_cpuid(irq)); } -#if NUSB4BSD > 0 +#if NUSB > 1 /* Perform early OHCI takeover from SMM. */ static void ohci_early_takeover(device_t self) @@ -2970,7 +2970,7 @@ xhci_early_takeover(device_t self) } bus_release_resource(self, SYS_RES_MEMORY, rid, res); } -#endif /* NUSB4BSD > 0 */ +#endif /* NUSB > 1 */ void pci_add_resources(device_t pcib, device_t bus, device_t dev, int force, uint32_t prefetchmask) @@ -3017,7 +3017,7 @@ pci_add_resources(device_t pcib, device_t bus, device_t dev, int force, uint32_t pci_assign_interrupt(bus, dev, 1); } -#if NUSB4BSD > 0 +#if NUSB > 1 if (pci_usb_takeover && pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_USB) { if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_XHCI) diff --git a/sys/conf/files b/sys/conf/files index 295131bd29..ef00c1c392 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -162,7 +162,7 @@ dev/disk/nata/ata-lowlevel.c optional nata dev/disk/nata/ata-pci.c optional nata pci dev/disk/nata/ata-queue.c optional nata dev/disk/nata/ata-raid.c optional nataraid -dev/disk/nata/ata-usb.c optional natausb usb +dev/disk/nata/ata-usb.c optional natausb oldusb dev/disk/nata/atapi-cam.c optional natapicam dev/disk/nata/atapi-cd.c optional natapicd dev/disk/nata/atapi-fd.c optional natapifd @@ -680,8 +680,8 @@ rt2860.fw optional ralfw \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "rt2860.fw" -#dev/netif/rum/if_rum.c optional rum usb -#dev/netif/ural/if_ural.c optional ural usb +#dev/netif/rum/if_rum.c optional rum oldusb +#dev/netif/ural/if_ural.c optional ural oldusb dev/netif/lge/if_lge.c optional lge dev/disk/md/md.c optional md dev/raid/mfi/mfi.c optional mfi @@ -1803,54 +1803,53 @@ vm/vm_zeroidle.c standard vm/vm_zone.c standard # # USB support -bus/usb/usb_if.m optional usb -bus/usb/uhci.c optional uhci usb -bus/usb/uhci_pci.c optional uhci usb -bus/usb/ohci.c optional ohci usb -bus/usb/ohci_pci.c optional ohci usb -bus/usb/ehci.c optional ehci usb -bus/usb/ehci_pci.c optional ehci usb -dev/usbmisc/ucom/ucom.c optional ucom usb -dev/usbmisc/uvisor/uvisor.c optional uvisor ucom usb -dev/usbmisc/uvscom/uvscom.c optional uvscom ucom usb -bus/usb/usb.c optional usb -bus/usb/usbdi.c optional usb -bus/usb/usbdi_util.c optional usb -#bus/usb/usb_mem.c optional usb -bus/usb/usb_ethersubr.c optional usb -bus/usb/usb_mem.c optional usb -bus/usb/usb_subr.c optional usb -bus/usb/usb_quirks.c optional usb -bus/usb/hid.c optional usb -bus/usb/uhub.c optional usb -dev/usbmisc/moscom/moscom.c optional moscom ucom usb -dev/usbmisc/ubt/ubt.c optional ubt usb -dev/usbmisc/uark/uark.c optional uark ucom usb -dev/usbmisc/uchcom/uchcom.c optional uchcom ucom usb -dev/usbmisc/ufm/ufm.c optional ufm usb -dev/usbmisc/ubsa/ubsa.c optional ubsa ucom usb -dev/usbmisc/uftdi/uftdi.c optional uftdi ucom usb -dev/usbmisc/ugen/ugen.c optional ugen usb -dev/usbmisc/ugen/ugenbuf.c optional ugen usb -dev/usbmisc/ugensa/ugensa.c optional ugensa ucom usb -dev/usbmisc/uhid/uhid.c optional uhid usb -dev/usbmisc/umct/umct.c optional umct ucom usb -dev/usbmisc/ums/ums.c optional ums usb -dev/usbmisc/uplcom/uplcom.c optional uplcom ucom usb -dev/usbmisc/urio/urio.c optional urio usb -dev/usbmisc/uslcom/uslcom.c optional uslcom ucom usb -dev/usbmisc/uticom/uticom.c optional uticom ucom usb -dev/usbmisc/ulpt/ulpt.c optional ulpt usb -dev/usbmisc/ukbd/ukbd.c optional ukbd usb -dev/usbmisc/umass/umass.c optional umass usb -dev/usbmisc/umodem/umodem.c optional umodem usb -dev/usbmisc/uscanner/uscanner.c optional uscanner usb -dev/netif/aue/if_aue.c optional aue usb -dev/netif/axe/if_axe.c optional axe usb -dev/netif/cue/if_cue.c optional cue usb -dev/netif/kue/if_kue.c optional kue usb -dev/netif/lgue/if_lgue.c optional lgue usb -dev/netif/rue/if_rue.c optional rue usb +bus/usb/usb_if.m optional oldusb +bus/usb/uhci.c optional uhci oldusb +bus/usb/uhci_pci.c optional uhci oldusb +bus/usb/ohci.c optional ohci oldusb +bus/usb/ohci_pci.c optional ohci oldusb +bus/usb/ehci.c optional ehci oldusb +bus/usb/ehci_pci.c optional ehci oldusb +dev/usbmisc/ucom/ucom.c optional ucom oldusb +dev/usbmisc/uvisor/uvisor.c optional uvisor ucom oldusb +dev/usbmisc/uvscom/uvscom.c optional uvscom ucom oldusb +bus/usb/usb.c optional oldusb +bus/usb/usbdi.c optional oldusb +bus/usb/usbdi_util.c optional oldusb +bus/usb/usb_ethersubr.c optional oldusb +bus/usb/usb_mem.c optional oldusb +bus/usb/usb_subr.c optional oldusb +bus/usb/usb_quirks.c optional oldusb +bus/usb/hid.c optional oldusb +bus/usb/uhub.c optional oldusb +dev/usbmisc/moscom/moscom.c optional moscom ucom oldusb +dev/usbmisc/ubt/ubt.c optional ubt oldusb +dev/usbmisc/uark/uark.c optional uark ucom oldusb +dev/usbmisc/uchcom/uchcom.c optional uchcom ucom oldusb +dev/usbmisc/ufm/ufm.c optional ufm oldusb +dev/usbmisc/ubsa/ubsa.c optional ubsa ucom oldusb +dev/usbmisc/uftdi/uftdi.c optional uftdi ucom oldusb +dev/usbmisc/ugen/ugen.c optional ugen oldusb +dev/usbmisc/ugen/ugenbuf.c optional ugen oldusb +dev/usbmisc/ugensa/ugensa.c optional ugensa ucom oldusb +dev/usbmisc/uhid/uhid.c optional uhid oldusb +dev/usbmisc/umct/umct.c optional umct ucom oldusb +dev/usbmisc/ums/ums.c optional ums oldusb +dev/usbmisc/uplcom/uplcom.c optional uplcom ucom oldusb +dev/usbmisc/urio/urio.c optional urio oldusb +dev/usbmisc/uslcom/uslcom.c optional uslcom ucom oldusb +dev/usbmisc/uticom/uticom.c optional uticom ucom oldusb +dev/usbmisc/ulpt/ulpt.c optional ulpt oldusb +dev/usbmisc/ukbd/ukbd.c optional ukbd oldusb +dev/usbmisc/umass/umass.c optional umass oldusb +dev/usbmisc/umodem/umodem.c optional umodem oldusb +dev/usbmisc/uscanner/uscanner.c optional uscanner oldusb +dev/netif/aue/if_aue.c optional aue oldusb +dev/netif/axe/if_axe.c optional axe oldusb +dev/netif/cue/if_cue.c optional cue oldusb +dev/netif/kue/if_kue.c optional kue oldusb +dev/netif/lgue/if_lgue.c optional lgue oldusb +dev/netif/rue/if_rue.c optional rue oldusb dev/netif/lnc/am7990.c optional lnc dev/netif/lnc/am79900.c optional lnc dev/netif/lnc/if_lnc_pci.c optional lnc pci @@ -1916,8 +1915,8 @@ dev/sound/pcm/mixer_if.m optional pcm dev/sound/pcm/sndstat.c optional pcm dev/sound/pcm/sound.c optional pcm dev/sound/pcm/vchan.c optional pcm -dev/sound/usb/uaudio.c optional snd_uaudio usb -dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb +dev/sound/usb/uaudio.c optional snd_uaudio oldusb +dev/sound/usb/uaudio_pcm.c optional snd_uaudio oldusb # # These files in libkern/ are those needed by all architectures. Some # of the files in libkern/ are only needed on some architectures, e.g., @@ -2408,12 +2407,12 @@ ${ACPICA_COMP_DIR}/utilities/utxfinit.c optional acpi # # experimental new USB stack from recent FreeBSD # -usbdevs.h optional usb4bsd \ +usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/bus/u4b/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/bus/u4b/usbdevs -h" \ no-obj no-implicit-rule before-depend \ clean "usbdevs.h" -usbdevs_data.h optional usb4bsd \ +usbdevs_data.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/bus/u4b/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/bus/u4b/usbdevs -d" \ no-obj no-implicit-rule before-depend \ @@ -2421,94 +2420,94 @@ usbdevs_data.h optional usb4bsd \ # # USB core # -bus/u4b/usb_busdma.c optional usb4bsd -bus/u4b/usb_core.c optional usb4bsd -bus/u4b/usb_debug.c optional usb4bsd -bus/u4b/usb_dev.c optional usb4bsd -bus/u4b/usb_device.c optional usb4bsd -bus/u4b/usb_dynamic.c optional usb4bsd -bus/u4b/usb_error.c optional usb4bsd -bus/u4b/usb_generic.c optional usb4bsd -bus/u4b/usb_handle_request.c optional usb4bsd -bus/u4b/usb_hid.c optional usb4bsd -bus/u4b/usb_hub.c optional usb4bsd -bus/u4b/usb_lookup.c optional usb4bsd -bus/u4b/usb_mbuf.c optional usb4bsd -bus/u4b/usb_msctest.c optional usb4bsd -bus/u4b/usb_parse.c optional usb4bsd -#bus/u4b/usb_pf.c optional usb4bsd -bus/u4b/usb_process.c optional usb4bsd -bus/u4b/usb_request.c optional usb4bsd -bus/u4b/usb_transfer.c optional usb4bsd -bus/u4b/usb_util.c optional usb4bsd -bus/u4b/usb_if.m optional usb4bsd +bus/u4b/usb_busdma.c optional usb +bus/u4b/usb_core.c optional usb +bus/u4b/usb_debug.c optional usb +bus/u4b/usb_dev.c optional usb +bus/u4b/usb_device.c optional usb +bus/u4b/usb_dynamic.c optional usb +bus/u4b/usb_error.c optional usb +bus/u4b/usb_generic.c optional usb +bus/u4b/usb_handle_request.c optional usb +bus/u4b/usb_hid.c optional usb +bus/u4b/usb_hub.c optional usb +bus/u4b/usb_lookup.c optional usb +bus/u4b/usb_mbuf.c optional usb +bus/u4b/usb_msctest.c optional usb +bus/u4b/usb_parse.c optional usb +#bus/u4b/usb_pf.c optional usb +bus/u4b/usb_process.c optional usb +bus/u4b/usb_request.c optional usb +bus/u4b/usb_transfer.c optional usb +bus/u4b/usb_util.c optional usb +bus/u4b/usb_if.m optional usb # # USB controller drivers # -bus/u4b/controller/ehci.c optional ehci usb4bsd -bus/u4b/controller/ehci_pci.c optional ehci pci usb4bsd -bus/u4b/controller/ohci.c optional ohci usb4bsd -bus/u4b/controller/ohci_pci.c optional ohci pci usb4bsd -bus/u4b/controller/uhci.c optional uhci usb4bsd -bus/u4b/controller/uhci_pci.c optional uhci pci usb4bsd -bus/u4b/controller/xhci.c optional xhci usb4bsd -bus/u4b/controller/xhci_pci.c optional xhci pci usb4bsd -bus/u4b/controller/usb_controller.c optional usb4bsd +bus/u4b/controller/ehci.c optional ehci usb +bus/u4b/controller/ehci_pci.c optional ehci pci usb +bus/u4b/controller/ohci.c optional ohci usb +bus/u4b/controller/ohci_pci.c optional ohci pci usb +bus/u4b/controller/uhci.c optional uhci usb +bus/u4b/controller/uhci_pci.c optional uhci pci usb +bus/u4b/controller/xhci.c optional xhci usb +bus/u4b/controller/xhci_pci.c optional xhci pci usb +bus/u4b/controller/usb_controller.c optional usb # # USB storage drivers # -bus/u4b/storage/umass.c optional umass usb4bsd -bus/u4b/storage/ustorage_fs.c optional usfs usb4bsd +bus/u4b/storage/umass.c optional umass usb +bus/u4b/storage/ustorage_fs.c optional usfs usb # # USB network drivers # -bus/u4b/net/usb_ethernet.c optional uether usb4bsd -bus/u4b/net/if_axe.c optional axe uether usb4bsd -bus/u4b/net/if_udav.c optional udav uether usb4bsd +bus/u4b/net/usb_ethernet.c optional uether usb +bus/u4b/net/if_axe.c optional axe uether usb +bus/u4b/net/if_udav.c optional udav uether usb # # USB WLAN drivers # -bus/u4b/wlan/if_rum.c optional rum usb4bsd -bus/u4b/wlan/if_run.c optional run usb4bsd -runfw.c optional runfw usb4bsd \ +bus/u4b/wlan/if_rum.c optional rum usb +bus/u4b/wlan/if_run.c optional run usb +runfw.c optional runfw usb \ compile-with "${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "runfw.c" -runfw.fwo optional runfw usb4bsd \ +runfw.fwo optional runfw usb \ dependency "run.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ clean "runfw.fwo" -run.fw optional runfw usb4bsd \ +run.fw optional runfw usb \ dependency "$S/contrib/dev/run/rt2870.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "run.fw" -bus/u4b/wlan/if_urtwn.c optional urtwn usb4bsd -urtwn-rtl8192cfwT.c optional urtwnfw usb4bsd \ +bus/u4b/wlan/if_urtwn.c optional urtwn usb +urtwn-rtl8192cfwT.c optional urtwnfw usb \ compile-with "${AWK} -f $S/tools/fw_stub.awk urtwn-rtl8192cfwT.fw:urtwn-rtl8192cfwT:111 -murtwn-rtl8192cfwT -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "urtwn-rtl8192cfwT.c" -urtwn-rtl8192cfwT.fwo optional urtwnfw usb4bsd \ +urtwn-rtl8192cfwT.fwo optional urtwnfw usb \ dependency "urtwn-rtl8192cfwT.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ clean "urtwn-rtl8192cfwT.fwo" -urtwn-rtl8192cfwT.fw optional urtwnfw usb4bsd \ +urtwn-rtl8192cfwT.fw optional urtwnfw usb \ dependency "$S/contrib/dev/urtwn/urtwn-rtl8192cfwT.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "urtwn-rtl8192cfwT.fw" -urtwn-rtl8192cfwU.c optional urtwnfw usb4bsd \ +urtwn-rtl8192cfwU.c optional urtwnfw usb \ compile-with "${AWK} -f $S/tools/fw_stub.awk urtwn-rtl8192cfwU.fw:urtwn-rtl8192cfwU:111 -murtwn-rtl8192cfwU -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "urtwn-rtl8192cfwU.c" -urtwn-rtl8192cfwU.fwo optional urtwnfw usb4bsd \ +urtwn-rtl8192cfwU.fwo optional urtwnfw usb \ dependency "urtwn-rtl8192cfwU.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ clean "urtwn-rtl8192cfwU.fwo" -urtwn-rtl8192cfwU.fw optional urtwnfw usb4bsd \ +urtwn-rtl8192cfwU.fw optional urtwnfw usb \ dependency "$S/contrib/dev/urtwn/urtwn-rtl8192cfwU.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ @@ -2516,42 +2515,42 @@ urtwn-rtl8192cfwU.fw optional urtwnfw usb4bsd \ # # USB serial and parallel port drivers # -bus/u4b/serial/usb_serial.c optional ucom usb4bsd -bus/u4b/serial/u3g.c optional u3g ucom usb4bsd -bus/u4b/serial/uark.c optional uark ucom usb4bsd -bus/u4b/serial/ubsa.c optional ubsa ucom usb4bsd -bus/u4b/serial/ubser.c optional ubser ucom usb4bsd -bus/u4b/serial/uchcom.c optional uchcom ucom usb4bsd -bus/u4b/serial/ucycom.c optional ucycom ucom usb4bsd -bus/u4b/serial/ufoma.c optional ufoma ucom usb4bsd -bus/u4b/serial/uftdi.c optional uftdi ucom usb4bsd -bus/u4b/serial/ugensa.c optional ugensa ucom usb4bsd -bus/u4b/serial/uipaq.c optional uipaq ucom usb4bsd -bus/u4b/serial/ulpt.c optional ulpt ucom usb4bsd -bus/u4b/serial/umcs.c optional umcs ucom usb4bsd -bus/u4b/serial/umct.c optional umct ucom usb4bsd -bus/u4b/serial/umodem.c optional umodem ucom usb4bsd -bus/u4b/serial/umoscom.c optional umoscom ucom usb4bsd -bus/u4b/serial/uplcom.c optional uplcom ucom usb4bsd -bus/u4b/serial/uslcom.c optional uslcom ucom usb4bsd -bus/u4b/serial/uvisor.c optional uvisor ucom usb4bsd -bus/u4b/serial/uvscom.c optional uvscom ucom usb4bsd +bus/u4b/serial/usb_serial.c optional ucom usb +bus/u4b/serial/u3g.c optional u3g ucom usb +bus/u4b/serial/uark.c optional uark ucom usb +bus/u4b/serial/ubsa.c optional ubsa ucom usb +bus/u4b/serial/ubser.c optional ubser ucom usb +bus/u4b/serial/uchcom.c optional uchcom ucom usb +bus/u4b/serial/ucycom.c optional ucycom ucom usb +bus/u4b/serial/ufoma.c optional ufoma ucom usb +bus/u4b/serial/uftdi.c optional uftdi ucom usb +bus/u4b/serial/ugensa.c optional ugensa ucom usb +bus/u4b/serial/uipaq.c optional uipaq ucom usb +bus/u4b/serial/ulpt.c optional ulpt ucom usb +bus/u4b/serial/umcs.c optional umcs ucom usb +bus/u4b/serial/umct.c optional umct ucom usb +bus/u4b/serial/umodem.c optional umodem ucom usb +bus/u4b/serial/umoscom.c optional umoscom ucom usb +bus/u4b/serial/uplcom.c optional uplcom ucom usb +bus/u4b/serial/uslcom.c optional uslcom ucom usb +bus/u4b/serial/uvisor.c optional uvisor ucom usb +bus/u4b/serial/uvscom.c optional uvscom ucom usb # # USB input drivers # -bus/u4b/input/ukbd.c optional ukbd usb4bsd -bus/u4b/input/ums.c optional ums usb4bsd -bus/u4b/input/uep.c optional uep usb4bsd -bus/u4b/input/uhid.c optional uhid usb4bsd +bus/u4b/input/ukbd.c optional ukbd usb +bus/u4b/input/ums.c optional ums usb +bus/u4b/input/uep.c optional uep usb +bus/u4b/input/uhid.c optional uhid usb # # USB quirks # -bus/u4b/quirk/usb_quirk.c optional usb4bsd +bus/u4b/quirk/usb_quirk.c optional usb # # Other drivers # -bus/u4b/audio/uaudio.c optional snd_uaudio usb4bsd -#bus/u4b/audio/uaudio_pcm.c optional snd_uaudio usb4bsd +bus/u4b/audio/uaudio.c optional snd_uaudio usb +#bus/u4b/audio/uaudio_pcm.c optional snd_uaudio usb # # virtio support diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 29222a6c3c..2e605c74a3 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -312,7 +312,7 @@ MFILES?= kern/bus_if.m kern/device_if.m bus/iicbus/iicbb_if.m \ dev/virtual/virtio/virtio/virtio_bus_if.m \ dev/virtual/virtio/virtio/virtio_if.m -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) MFILES+=bus/u4b/usb_if.m .else MFILES+=bus/usb/usb_if.m diff --git a/sys/config/GENERIC b/sys/config/GENERIC index faaa51f200..e7601c5420 100644 --- a/sys/config/GENERIC +++ b/sys/config/GENERIC @@ -340,14 +340,14 @@ pseudo-device cryptodev # USB support # -# NOTE: If you enable 'usb4bsd' you must also disable 'usb' and rebuild -# the world with WANT_USB4BSD=true in /etc/make.conf, in addition +# NOTE: If you enable 'oldusb' you must also disable 'usb' and rebuild +# the world with WANT_OLDUSB=true in /etc/make.conf, in addition # to rebuilding the kernel. # device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface device usb # USB Bus (required) -#device "usb4bsd" # use this instead of usb for the new stack +#device oldusb # use this instead of usb for the old stack device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard diff --git a/sys/config/LINT b/sys/config/LINT index 448fb33fbe..ed256a5df9 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -2158,8 +2158,8 @@ device ohci device ehci # General USB code (mandatory for USB) device usb -# Use this instead of usb for the new stack -#device "usb4bsd" +# Use this instead of usb for the old stack +#device oldusb # # USB Bluetooth device ubt diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 911b3a158e..83e3818d8a 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -1994,8 +1994,8 @@ device ohci device ehci # General USB code (mandatory for USB) device usb -# Use this instead of usb for the new stack -#device "usb4bsd" +# Use this instead of usb for the old stack +#device oldusb # # USB Bluetooth device ubt diff --git a/sys/config/SOEKRIS b/sys/config/SOEKRIS index 511e77e81c..3441a0e497 100644 --- a/sys/config/SOEKRIS +++ b/sys/config/SOEKRIS @@ -178,7 +178,7 @@ device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface #device ehci # EHCI interface device usb # USB Bus (required) -#device "usb4bsd" # use this instead of usb for the new stack +#device oldusb # use this instead of usb for the old stack device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC index 7066422dd2..c763ca5760 100644 --- a/sys/config/X86_64_GENERIC +++ b/sys/config/X86_64_GENERIC @@ -316,14 +316,14 @@ pseudo-device crypto # core crypto support, used by wlan # USB support # -# NOTE: If you enable 'usb4bsd' you must also disable 'usb' and rebuild -# the world with WANT_USB4BSD=true in /etc/make.conf, in addition +# NOTE: If you enable 'oldusb' you must also disable 'usb' and rebuild +# the world with WANT_OLDUSB=true in /etc/make.conf, in addition # to rebuilding the kernel. # device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface device usb # USB Bus (required) -#device "usb4bsd" # use this instead of usb for the new stack +#device oldusb # use this instead of usb for the old stack device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard diff --git a/sys/dev/Makefile b/sys/dev/Makefile index 0ed1df8d22..538bc12fd1 100644 --- a/sys/dev/Makefile +++ b/sys/dev/Makefile @@ -17,7 +17,7 @@ SUBDIR= \ video \ virtual -.if !defined(WANT_USB4BSD) +.if defined(WANT_OLDBSD) SUBDIR+=usbmisc .endif diff --git a/sys/dev/disk/nata/Makefile b/sys/dev/disk/nata/Makefile index 0e7153a7b8..656684fade 100644 --- a/sys/dev/disk/nata/Makefile +++ b/sys/dev/disk/nata/Makefile @@ -1,7 +1,7 @@ SUBDIR= nata natacard natadisk nataisa natapci natapicd natapifd \ natapist natapicam nataraid -.if !defined(WANT_USB4BSD) +.if defined(WANT_OLDUSB) SUBDIR+= natausb .endif diff --git a/sys/dev/netif/Makefile b/sys/dev/netif/Makefile index 843420e7e2..14755f2f78 100644 --- a/sys/dev/netif/Makefile +++ b/sys/dev/netif/Makefile @@ -14,11 +14,11 @@ SUBDIR+=ar sbni # .endif # # ...and to the new USB stack -# .if !defined(WANT_USB4BSD) -# SUBDIR+= rum ural +# .if defined(WANT_OLDUSB) +# SUBDIR+= ural # .endif -.if !defined(WANT_USB4BSD) +.if defined(WANT_OLDUSB) SUBDIR+=aue axe cue kue lgue rue .endif diff --git a/sys/dev/netif/ndis/Makefile b/sys/dev/netif/ndis/Makefile index b30cdb43a7..8725e0b679 100644 --- a/sys/dev/netif/ndis/Makefile +++ b/sys/dev/netif/ndis/Makefile @@ -5,15 +5,15 @@ SRCS= if_ndis.c if_ndis_pci.c if_ndis_pccard.c SRCS+= device_if.h bus_if.h pci_if.h card_if.h SRCS+= opt_usb.h use_usb4bsd.h -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) SRCS+= if_ndis_u4b.c .else SRCS+= if_ndis_usb.c .endif -.if !defined(BUILDING_WITH_KERNEL) && defined(WANT_USB4BSD) -use_usb4bsd.h: - echo "#define NUSB4BSD 1" > ${.TARGET} +.if !defined(BUILDING_WITH_KERNEL) && !defined(WANT_OLDBSD) +use_usb.h: + echo "#define NUSB 1" > ${.TARGET} .endif .include diff --git a/sys/dev/netif/ndis/if_ndis.c b/sys/dev/netif/ndis/if_ndis.c index b0c5e25152..89af209429 100644 --- a/sys/dev/netif/ndis/if_ndis.c +++ b/sys/dev/netif/ndis/if_ndis.c @@ -35,7 +35,7 @@ * then hacked upon mercilessly by me. */ -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -73,7 +73,7 @@ #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #include #else @@ -87,7 +87,7 @@ #include #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #else #include @@ -560,14 +560,14 @@ ndis_attach(device_t dev) lockinit(&sc->ndis_lock, "network driver", 0, LK_CANRECURSE); KeInitializeSpinLock(&sc->ndis_rxlock); -#if NUSB4BSD > 0 +#if NUSB > 0 KeInitializeSpinLock(&sc->ndisusb_tasklock); KeInitializeSpinLock(&sc->ndisusb_xferdonelock); #else KeInitializeSpinLock(&sc->ndisusb_xferlock); #endif InitializeListHead(&sc->ndis_shlist); -#if NUSB4BSD > 0 +#if NUSB > 0 InitializeListHead(&sc->ndisusb_tasklist); InitializeListHead(&sc->ndisusb_xferdonelist); #else @@ -636,7 +636,7 @@ ndis_attach(device_t dev) sc->ndis_startitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); sc->ndis_resetitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); sc->ndis_inputitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); -#if NUSB4BSD > 0 +#if NUSB > 0 sc->ndisusb_xferdoneitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); sc->ndisusb_taskitem = @@ -1077,7 +1077,7 @@ ndis_detach(device_t dev) IoFreeWorkItem(sc->ndis_resetitem); if (sc->ndis_inputitem != NULL) IoFreeWorkItem(sc->ndis_inputitem); -#if NUSB4BSD > 0 +#if NUSB > 0 if (sc->ndisusb_xferdoneitem != NULL) IoFreeWorkItem(sc->ndisusb_xferdoneitem); if (sc->ndisusb_taskitem != NULL) diff --git a/sys/dev/netif/ndis/if_ndis_pccard.c b/sys/dev/netif/ndis/if_ndis_pccard.c index f2c9e5fd33..f02d4f2796 100644 --- a/sys/dev/netif/ndis/if_ndis_pccard.c +++ b/sys/dev/netif/ndis/if_ndis_pccard.c @@ -32,7 +32,7 @@ * $FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.21 2012/11/17 01:51:54 svnexp Exp $ */ -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -53,7 +53,7 @@ #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #include #else diff --git a/sys/dev/netif/ndis/if_ndis_pci.c b/sys/dev/netif/ndis/if_ndis_pci.c index 7f243f95e8..ddf03f5e28 100644 --- a/sys/dev/netif/ndis/if_ndis_pci.c +++ b/sys/dev/netif/ndis/if_ndis_pci.c @@ -32,7 +32,7 @@ * $FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.26 2010/12/19 11:14:34 tijl Exp $ */ -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -54,7 +54,7 @@ #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #include #else diff --git a/sys/dev/netif/ndis/if_ndisvar.h b/sys/dev/netif/ndis/if_ndisvar.h index d2fcf01607..4758f20601 100644 --- a/sys/dev/netif/ndis/if_ndisvar.h +++ b/sys/dev/netif/ndis/if_ndisvar.h @@ -32,7 +32,7 @@ * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.39 2009/05/02 15:14:18 thompsa Exp $ */ -#include "use_usb4bsd.h" +#include "use_usb.h" #define NDIS_DEFAULT_NODENAME "FreeBSD NDIS node" #define NDIS_NODENAME_LEN 32 @@ -115,7 +115,7 @@ struct ndis_vap { }; #define NDIS_VAP(vap) ((struct ndis_vap *)(vap)) -#if NUSB4BSD > 0 +#if NUSB > 0 #define NDISUSB_CONFIG_NO 0 #define NDISUSB_IFACE_INDEX 0 /* XXX at USB2 there's no USBD_NO_TIMEOUT macro anymore */ @@ -153,7 +153,7 @@ struct ndisusb_task { void *nt_ctx; list_entry nt_tasklist; }; -#else /* !NUSB4BSD > 0 */ +#else /* !NUSB > 0 */ #define NDISUSB_CONFIG_NO 1 #define NDISUSB_IFACE_INDEX 0 #define NDISUSB_INTR_TIMEOUT 1000 @@ -242,7 +242,7 @@ struct ndis_softc { int ndis_tx_timer; int ndis_hang_timer; -#if NUSB4BSD > 0 +#if NUSB > 0 struct usb_device *ndisusb_dev; struct lock ndisusb_lock; struct ndisusb_ep ndisusb_dread_ep; @@ -270,7 +270,7 @@ struct ndis_softc { #define NDISUSB_LOCK(_sc) lockmgr(&(_sc)->ndisusb_lock, LK_EXCLUSIVE) #define NDISUSB_UNLOCK(_sc) lockmgr(&(_sc)->ndisusb_lock, LK_RELEASE) #define NDISUSB_LOCK_ASSERT(_sc, t) KKASSERT(lockstatus(&(_sc)->ndisusb_lock, curthread) != 0) -#else /* !NUSB4BSD > 0 */ +#else /* !NUSB > 0 */ io_workitem *ndisusb_xferitem; list_entry ndisusb_xferlist; kspin_lock ndisusb_xferlock; diff --git a/sys/dev/sound/driver/Makefile b/sys/dev/sound/driver/Makefile index c21c55ae68..0ffe82ea55 100644 --- a/sys/dev/sound/driver/Makefile +++ b/sys/dev/sound/driver/Makefile @@ -5,7 +5,7 @@ SUBDIR += envy24ht es137x fm801 hda ich maestro maestro3 neomagic SUBDIR += solo spicds t4dwave via8233 via82c686 vibes SUBDIR += driver -.if !defined(WANT_USB4BSD) +.if defined(WANT_OLDUSB) SUBDIR += uaudio .endif diff --git a/sys/emulation/ndis/Makefile b/sys/emulation/ndis/Makefile index 9e717f0104..471b65bc54 100644 --- a/sys/emulation/ndis/Makefile +++ b/sys/emulation/ndis/Makefile @@ -14,15 +14,15 @@ SRCS+= winx64_wrap.S SRCS+= winx32_wrap.S .endif -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) SRCS+= subr_u4bd.c .else SRCS+= subr_usbd.c .endif -.if !defined(BUILDING_WITH_KERNEL) && defined(WANT_USB4BSD) -use_usb4bsd.h: - echo "#define NUSB4BSD 1" > ${.TARGET} +.if !defined(BUILDING_WITH_KERNEL) && !defined(WANT_OLDUSB) +use_usb.h: + echo "#define NUSB 1" > ${.TARGET} .endif .include diff --git a/sys/emulation/ndis/kern_ndis.c b/sys/emulation/ndis/kern_ndis.c index 538015a6a5..2e3bb4546d 100644 --- a/sys/emulation/ndis/kern_ndis.c +++ b/sys/emulation/ndis/kern_ndis.c @@ -32,7 +32,7 @@ * $FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.111 2011/02/23 21:45:28 brucec Exp $ */ -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -65,7 +65,7 @@ #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #include #else @@ -79,7 +79,7 @@ #include #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #else #include diff --git a/sys/emulation/ndis/kern_windrv.c b/sys/emulation/ndis/kern_windrv.c index 620cfa0b15..e5ef9cb03f 100644 --- a/sys/emulation/ndis/kern_windrv.c +++ b/sys/emulation/ndis/kern_windrv.c @@ -32,7 +32,7 @@ * $FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.21 2010/11/22 20:46:38 bschmidt Exp $ */ -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -56,7 +56,7 @@ #include #endif -#if NUSB4BSD > 0 +#if NUSB > 0 #include #include #else @@ -70,7 +70,7 @@ #include #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #else #include diff --git a/sys/emulation/ndis/ntoskrnl_var.h b/sys/emulation/ndis/ntoskrnl_var.h index beaf90f54a..aada604af9 100644 --- a/sys/emulation/ndis/ntoskrnl_var.h +++ b/sys/emulation/ndis/ntoskrnl_var.h @@ -35,7 +35,7 @@ #ifndef _NTOSKRNL_VAR_H_ #define _NTOSKRNL_VAR_H_ -#include "use_usb4bsd.h" +#include "use_usb.h" #define MTX_NTOSKRNL_SPIN_LOCK "NDIS thread lock" @@ -1068,7 +1068,7 @@ struct irp { union { kapc irp_apc; struct { -#if NUSB4BSD > 0 +#if NUSB > 0 void *irp_ep; #else void *irp_xfer; @@ -1084,7 +1084,7 @@ struct irp { #define irp_pkttype s2.u2.irp_pkttype #define IRP_NDIS_DEV(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_dev -#if NUSB4BSD > 0 +#if NUSB > 0 #define IRP_NDISUSB_EP(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_ep #else #define IRP_NDISUSB_XFER(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_xfer diff --git a/sys/emulation/ndis/subr_ndis.c b/sys/emulation/ndis/subr_ndis.c index ddcec44f2f..637916384e 100644 --- a/sys/emulation/ndis/subr_ndis.c +++ b/sys/emulation/ndis/subr_ndis.c @@ -47,7 +47,7 @@ * expects. */ -#include "use_usb4bsd.h" +#include "use_usb.h" #include #include @@ -91,7 +91,7 @@ #include #include -#if NUSB4BSD > 0 +#if NUSB > 0 #include #include #else diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files index b734734fa2..8a0f3ea4f8 100644 --- a/sys/platform/pc32/conf/files +++ b/sys/platform/pc32/conf/files @@ -74,8 +74,8 @@ emulation/ndis/subr_hal.c optional ndisapi pci emulation/ndis/subr_ndis.c optional ndisapi pci emulation/ndis/subr_ntoskrnl.c optional ndisapi pci emulation/ndis/subr_pe.c optional ndisapi pci -emulation/ndis/subr_usbd.c optional ndisapi pci usb -emulation/ndis/subr_u4bd.c optional ndisapi pci usb4bsd +emulation/ndis/subr_usbd.c optional ndisapi pci oldusb +emulation/ndis/subr_u4bd.c optional ndisapi pci usb emulation/ndis/winx32_wrap.S optional ndisapi pci # bf_enc.o optional ipsec ipsec_esp \ @@ -131,8 +131,8 @@ dev/netif/ndis/if_ndis.c optional ndis dev/netif/ndis/if_ndis_pccard.c optional ndis pccard dev/netif/ndis/if_ndis_pci.c optional ndis cardbus dev/netif/ndis/if_ndis_pci.c optional ndis pci -dev/netif/ndis/if_ndis_usb.c optional ndis usb -dev/netif/ndis/if_ndis_u4b.c optional ndis usb4bsd +dev/netif/ndis/if_ndis_usb.c optional ndis oldusb +dev/netif/ndis/if_ndis_u4b.c optional ndis usb dev/misc/kbd/atkbd.c optional atkbd dev/misc/kbd/atkbdc.c optional atkbdc dev/misc/kbd/kbd.c optional atkbd diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files index b75f3017b3..0012fb245f 100644 --- a/sys/platform/pc64/conf/files +++ b/sys/platform/pc64/conf/files @@ -37,8 +37,8 @@ emulation/ndis/subr_hal.c optional ndisapi pci emulation/ndis/subr_ndis.c optional ndisapi pci emulation/ndis/subr_ntoskrnl.c optional ndisapi pci emulation/ndis/subr_pe.c optional ndisapi pci -emulation/ndis/subr_usbd.c optional ndisapi pci usb -emulation/ndis/subr_u4bd.c optional ndisapi pci usb4bsd +emulation/ndis/subr_usbd.c optional ndisapi pci oldusb +emulation/ndis/subr_u4bd.c optional ndisapi pci usb emulation/ndis/winx64_wrap.S optional ndisapi pci # XXX use assembler versions of bf_enc and des_enc @@ -83,8 +83,8 @@ dev/netif/ndis/if_ndis.c optional ndis dev/netif/ndis/if_ndis_pccard.c optional ndis pccard dev/netif/ndis/if_ndis_pci.c optional ndis cardbus dev/netif/ndis/if_ndis_pci.c optional ndis pci -dev/netif/ndis/if_ndis_usb.c optional ndis usb -dev/netif/ndis/if_ndis_u4b.c optional ndis usb4bsd +dev/netif/ndis/if_ndis_usb.c optional ndis oldusb +dev/netif/ndis/if_ndis_u4b.c optional ndis usb dev/misc/kbd/atkbd.c optional atkbd dev/misc/kbd/atkbdc.c optional atkbdc dev/misc/kbd/kbd.c optional atkbd diff --git a/sys/sys/param.h b/sys/sys/param.h index 6edae78aaa..ea8dc59632 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -106,9 +106,10 @@ * 300700 - 3.7 master * 300701 - Relocate bus/smbus/smb.h to dev/smbus/smb/smb.h * 300702 - drm/i915 update + * 300703 - Make usb4bsd default */ #undef __DragonFly_version -#define __DragonFly_version 300702 /* propagated to newvers */ +#define __DragonFly_version 300703 /* propagated to newvers */ #include diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 89d053938d..6b3ce3d7d5 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -251,7 +251,7 @@ SUBDIR= alias \ SUBDIR+=hesinfo .endif -.if defined(WANT_USB4BSD) +.if !defined(WANT_OLDUSB) _usbhidctl= u4bhidctl .else _usbhidctl= usbhidctl diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 5dda66a47f..2cd5e8fe1e 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -143,7 +143,7 @@ SUBDIR= 802_11 \ ypset \ zic -.if !defined(WANT_USB4BSD) +.if defined(WANT_OLDUSB) _usbd= usbd _usbdevs= usbdevs .else -- 2.41.0