Make usb4bsd the default USB stack.
authorSascha Wildner <saw@online.de>
Mon, 10 Mar 2014 01:49:31 +0000 (02:49 +0100)
committerSascha Wildner <saw@online.de>
Mon, 10 Mar 2014 01:50:27 +0000 (02:50 +0100)
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.
34 files changed:
Makefile_upgrade.inc
UPDATING
include/Makefile
lib/Makefile
share/man/man4/Makefile
share/man/man5/make.conf.5
sys/bus/Makefile
sys/bus/pci/pci.c
sys/conf/files
sys/conf/kmod.mk
sys/config/GENERIC
sys/config/LINT
sys/config/LINT64
sys/config/SOEKRIS
sys/config/X86_64_GENERIC
sys/dev/Makefile
sys/dev/disk/nata/Makefile
sys/dev/netif/Makefile
sys/dev/netif/ndis/Makefile
sys/dev/netif/ndis/if_ndis.c
sys/dev/netif/ndis/if_ndis_pccard.c
sys/dev/netif/ndis/if_ndis_pci.c
sys/dev/netif/ndis/if_ndisvar.h
sys/dev/sound/driver/Makefile
sys/emulation/ndis/Makefile
sys/emulation/ndis/kern_ndis.c
sys/emulation/ndis/kern_windrv.c
sys/emulation/ndis/ntoskrnl_var.h
sys/emulation/ndis/subr_ndis.c
sys/platform/pc32/conf/files
sys/platform/pc64/conf/files
sys/sys/param.h
usr.bin/Makefile
usr.sbin/Makefile

index 499ad89..c83f671 100644 (file)
@@ -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
index 4a427e3..4f841a7 100644 (file)
--- a/UPDATING
+++ b/UPDATING
 +         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
 ------------------------
 
index 87b790c..f1f5b23 100644 (file)
@@ -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
index cfd60e1..2cbabcd 100644 (file)
@@ -117,7 +117,7 @@ _libnetgraph=       libnetgraph7
 _libnetgraph=  libnetgraph
 .endif
 
-.if defined(WANT_USB4BSD)
+.if !defined(WANT_OLDUSB)
 _libusb=       libusb
 _libusbhid=    libu4bhid
 .else
index efc7aa7..62f10d6 100644 (file)
@@ -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 \
index 43037e9..38ca52d 100644 (file)
@@ -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
index 5af19e0..fdb37e4 100644 (file)
@@ -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
index a874ded..e23da99 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "opt_acpi.h"
 #include "opt_compat_oldpci.h"
-#include "use_usb4bsd.h"
+#include "use_usb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,7 +60,7 @@
 #include <bus/pci/pcivar.h>
 #include <bus/pci/pci_private.h>
 
-#if NUSB4BSD > 0
+#if NUSB > 1
 #include <bus/u4b/controller/xhcireg.h>
 #include <bus/u4b/controller/ehcireg.h>
 #include <bus/u4b/controller/ohcireg.h>
@@ -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)
index 295131b..ef00c1c 100644 (file)
@@ -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
index 29222a6..2e605c7 100644 (file)
@@ -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
index faaa51f..e7601c5 100644 (file)
@@ -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
index 448fb33..ed256a5 100644 (file)
@@ -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
index 911b3a1..83e3818 100644 (file)
@@ -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
index 511e77e..3441a0e 100644 (file)
@@ -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
index 7066422..c763ca5 100644 (file)
@@ -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
index 0ed1df8..538bc12 100644 (file)
@@ -17,7 +17,7 @@ SUBDIR=       \
        video \
        virtual
 
-.if !defined(WANT_USB4BSD)
+.if defined(WANT_OLDBSD)
 SUBDIR+=usbmisc
 .endif
 
index 0e7153a..656684f 100644 (file)
@@ -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
 
index 843420e..14755f2 100644 (file)
@@ -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
 
index b30cdb4..8725e0b 100644 (file)
@@ -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 <bsd.kmod.mk>
index b0c5e25..89af209 100644 (file)
@@ -35,7 +35,7 @@
  * then hacked upon mercilessly by me.
  */
 
-#include "use_usb4bsd.h"
+#include "use_usb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,7 +73,7 @@
 
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <bus/u4b/usb.h>
 #include <bus/u4b/usbdi.h>
 #else
@@ -87,7 +87,7 @@
 #include <emulation/ndis/ntoskrnl_var.h>
 #include <emulation/ndis/hal_var.h>
 #include <emulation/ndis/ndis_var.h>
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <emulation/ndis/u4bd_var.h>
 #else
 #include <emulation/ndis/usbd_var.h>
@@ -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)
index f2c9e5f..f02d4f2 100644 (file)
@@ -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 <sys/ctype.h>
 #include <sys/param.h>
@@ -53,7 +53,7 @@
 
 #include <netproto/802_11/ieee80211_var.h>
 
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <bus/u4b/usb.h>
 #include <bus/u4b/usbdi.h>
 #else
index 7f243f9..ddf03f5 100644 (file)
@@ -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 <sys/param.h>
 #include <sys/systm.h>
@@ -54,7 +54,7 @@
 
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <bus/u4b/usb.h>
 #include <bus/u4b/usbdi.h>
 #else
index d2fcf01..4758f20 100644 (file)
@@ -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;
index c21c55a..0ffe82e 100644 (file)
@@ -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
 
index 9e717f0..471b65b 100644 (file)
@@ -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 <bsd.kmod.mk>
index 538015a..2e3bb45 100644 (file)
@@ -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 <sys/param.h>
 #include <sys/systm.h>
@@ -65,7 +65,7 @@
 #include <netproto/802_11/ieee80211_var.h>
 #include <netproto/802_11/ieee80211_ioctl.h>
 
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <bus/u4b/usb.h>
 #include <bus/u4b/usbdi.h>
 #else
@@ -79,7 +79,7 @@
 #include <emulation/ndis/ntoskrnl_var.h>
 #include <emulation/ndis/ndis_var.h>
 #include <emulation/ndis/hal_var.h>
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <emulation/ndis/u4bd_var.h>
 #else
 #include <emulation/ndis/usbd_var.h>
index 620cfa0..e5ef9cb 100644 (file)
@@ -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 <sys/param.h>
 #include <sys/systm.h>
@@ -56,7 +56,7 @@
 #include <machine/segments.h>
 #endif
 
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <bus/u4b/usb.h>
 #include <bus/u4b/usbdi.h>
 #else
@@ -70,7 +70,7 @@
 #include <emulation/ndis/ntoskrnl_var.h>
 #include <emulation/ndis/ndis_var.h>
 #include <emulation/ndis/hal_var.h>
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <emulation/ndis/u4bd_var.h>
 #else
 #include <emulation/ndis/usbd_var.h>
index beaf90f..aada604 100644 (file)
@@ -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
index ddcec44..6379163 100644 (file)
@@ -47,7 +47,7 @@
  * expects.
  */
 
-#include "use_usb4bsd.h"
+#include "use_usb.h"
 
 #include <sys/ctype.h>
 #include <sys/param.h>
@@ -91,7 +91,7 @@
 
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
-#if NUSB4BSD > 0
+#if NUSB > 0
 #include <bus/u4b/usb.h>
 #include <bus/u4b/usbdi.h>
 #else
index b734734..8a0f3ea 100644 (file)
@@ -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
index b75f301..0012fb2 100644 (file)
@@ -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
index 6edae78..ea8dc59 100644 (file)
  * 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 <sys/_null.h>
 
index 89d0539..6b3ce3d 100644 (file)
@@ -251,7 +251,7 @@ SUBDIR=     alias \
 SUBDIR+=hesinfo
 .endif
 
-.if defined(WANT_USB4BSD)
+.if !defined(WANT_OLDUSB)
 _usbhidctl=    u4bhidctl
 .else
 _usbhidctl=    usbhidctl
index 5dda66a..2cd5e8f 100644 (file)
@@ -143,7 +143,7 @@ SUBDIR= 802_11 \
        ypset \
        zic
 
-.if !defined(WANT_USB4BSD)
+.if defined(WANT_OLDUSB)
 _usbd=         usbd
 _usbdevs=      usbdevs
 .else