From 0b0fb28e22b71beb91e53ccc2e87a2105fec02a2 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 2 Oct 2012 06:21:24 +0200 Subject: [PATCH] usb4bsd: Separate building of the old USB modules. Don't build the old USB driver modules when WANT_USB4BSD is set. Also, do some cleanup in some of the Makefiles, while I'm here. --- sys/dev/Makefile | 5 ++++- sys/dev/disk/nata/Makefile | 20 +++++++++----------- sys/dev/netif/Makefile | 20 +++++++++++++++----- sys/dev/netif/ndis/Makefile | 7 +++++-- sys/dev/sound/driver/Makefile | 9 ++++----- sys/emulation/ndis/Makefile | 7 +++++-- 6 files changed, 42 insertions(+), 26 deletions(-) rewrite sys/dev/disk/nata/Makefile (78%) diff --git a/sys/dev/Makefile b/sys/dev/Makefile index 9f66709d6d..afad74d9b8 100644 --- a/sys/dev/Makefile +++ b/sys/dev/Makefile @@ -13,10 +13,13 @@ SUBDIR= \ raid \ serial \ sound \ - usbmisc \ video \ virtual +.if !defined(WANT_USB4BSD) +SUBDIR+=usbmisc +.endif + .for dir in ${SUBDIR} .if empty(DEV_SUPPORT:M${dir}) && empty(DEV_SUPPORT:M${dir}/*) SUBDIR:= ${SUBDIR:N${dir}} diff --git a/sys/dev/disk/nata/Makefile b/sys/dev/disk/nata/Makefile dissimilarity index 78% index 667e083a2d..04884df4c6 100644 --- a/sys/dev/disk/nata/Makefile +++ b/sys/dev/disk/nata/Makefile @@ -1,11 +1,9 @@ -# Makefile - module build for nata modules -# -# $DragonFly: src/sys/dev/disk/nata/Makefile,v 1.4 2006/12/06 20:20:51 tgen Exp $ - -#SUBDIR= nata natacard natadisk nataisa natapci natapicam natapicd natapifd \ -# natapist nataraid natausb -# XXX TGEN These are ready for more heavy testing, the others are still largely untested. -SUBDIR= nata natacard natadisk nataisa natapci natapicd natapifd \ - natapist natapicam natausb - -.include +SUBDIR= nata natacard natadisk nataisa natapci natapicd natapifd \ + natapist natapicam +#SUBDIR+= nataraid + +.if !defined(WANT_USB4BSD) +SUBDIR+= natausb +.endif + +.include diff --git a/sys/dev/netif/Makefile b/sys/dev/netif/Makefile index 2916bc5227..3c6c4b8aaf 100644 --- a/sys/dev/netif/Makefile +++ b/sys/dev/netif/Makefile @@ -1,11 +1,21 @@ -SUBDIR= an age alc ale ar ath aue axe bce bfe bge \ - cue dc ed em ep et \ - fwe fxp ic iwi iwn jme kue lge lgue lnc \ +SUBDIR= an age alc ale ar ath bce bfe bge \ + dc ed em ep et \ + fwe fxp ic iwi iwn jme lge lnc \ mii_layer my msk mxge ndis nfe nge pcn \ - ral re rl rue sbni sbsh sf sis sk sln sr ste stge ti tl tx txp \ + ral re rl sbni sbsh sf sis sk sln sr ste stge ti tl tx txp \ vge vr vx wb wi wpi xe xl ig_hal emx ae igb ixgbe bnx # XXX need to be updated to the new net80211 stack -# SUBDIR= acx bwi iwl rtw rum ural +# SUBDIR+= acx bwi iwl rtw +# .endif +# +# ...and to the new USB stack +# .if !defined(WANT_USB4BSD) +# SUBDIR+= rum ural +# .endif + +.if !defined(WANT_USB4BSD) +SUBDIR+=aue axe cue kue lgue rue +.endif .include diff --git a/sys/dev/netif/ndis/Makefile b/sys/dev/netif/ndis/Makefile index 3493815a82..5367a0df12 100644 --- a/sys/dev/netif/ndis/Makefile +++ b/sys/dev/netif/ndis/Makefile @@ -1,8 +1,11 @@ # $FreeBSD: src/sys/modules/if_ndis/Makefile,v 1.6 2005/09/27 18:10:35 mlaier Exp $ KMOD= if_ndis -SRCS= if_ndis.c if_ndis_pci.c if_ndis_pccard.c if_ndis_usb.c +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 + +.if !defined(WANT_USB4BSD) +SRCS+= if_ndis_usb.c opt_usb.h +.endif .include diff --git a/sys/dev/sound/driver/Makefile b/sys/dev/sound/driver/Makefile index ce4c2ddd23..cdc5ea5975 100644 --- a/sys/dev/sound/driver/Makefile +++ b/sys/dev/sound/driver/Makefile @@ -1,13 +1,12 @@ # $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.16.2.2 2007/05/13 21:11:40 ariff Exp $ -# $DragonFly: src/sys/dev/sound/driver/Makefile,v 1.4 2007/06/16 19:48:04 hasso Exp $ -.if ${MACHINE_ARCH} == "sparc64" -SUBDIR = audiocs es137x -.else SUBDIR = als4000 ad1816 atiixp cmi cs4281 csa ds1 emu10k1 envy24 SUBDIR += envy24ht es137x ess fm801 hda ich maestro maestro3 mss neomagic SUBDIR += sb16 sb8 sbc solo spicds t4dwave via8233 via82c686 vibes -SUBDIR += driver uaudio +SUBDIR += driver + +.if !defined(WANT_USB4BSD) +SUBDIR += uaudio .endif .include diff --git a/sys/emulation/ndis/Makefile b/sys/emulation/ndis/Makefile index 5b70ade497..831355af16 100644 --- a/sys/emulation/ndis/Makefile +++ b/sys/emulation/ndis/Makefile @@ -2,9 +2,8 @@ KMOD= ndis SRCS= subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c -SRCS+= kern_windrv.c subr_usbd.c +SRCS+= kern_windrv.c SRCS+= device_if.h bus_if.h pci_if.h -SRCS+= opt_usb.h .if ${MACHINE_ARCH} == "x86_64" SRCS+= winx64_wrap.S @@ -14,4 +13,8 @@ SRCS+= winx64_wrap.S SRCS+= winx32_wrap.S .endif +.if !defined(WANT_USB4BSD) +SRCS+= subr_usbd.c opt_usb.h +.endif + .include -- 2.11.4.GIT