usb4bsd: Hook usb, ehci, ohci, uhci, xhci, umass, and usfs into the build.

Adds some missing Makefiles and adjusts others.

With this commit, the corresponding modules all build when WANT_USB4BSD
is set, but they are not guaranteed to work. More bugs will be fixed in
subsequent commits.

The new USB code can't yet be built into the kernel.

Submitted-by: Markus Pfeiffer <markus.pfeiffer@morphism.de>

diff --git a/sys/bus/Makefile b/sys/bus/Makefile
index deb666b..5af19e0 100644 (file)
--- a/sys/bus/Makefile
+++ b/sys/bus/Makefile
@@ -1,3 +1,9 @@
-SUBDIR=cam firewire iicbus mmc pccard ppbus smbus usb
+SUBDIR=        cam firewire iicbus mmc pccard ppbus smbus
+
+.if defined(WANT_USB4BSD)
+SUBDIR+=u4b
+.else
+SUBDIR+=usb
+.endif
 
 .include <bsd.subdir.mk>

diff --git a/sys/bus/u4b/Makefile b/sys/bus/u4b/Makefile
index 5dd6b64..8e42e81 100644 (file)
--- a/sys/bus/u4b/Makefile
+++ b/sys/bus/u4b/Makefile
@@ -1,6 +1,5 @@
-# $DragonFly: src/sys/bus/cam/Makefile,v 1.2 2007/11/12 07:27:50 pavalos Exp $
-#
-
 #SUBDIR=       controller input misc net quirk serial storage template
 
+SUBDIR=        usb storage controller
+
 .include <bsd.subdir.mk>

diff --git a/sys/bus/u4b/controller/Makefile b/sys/bus/u4b/controller/Makefile
new file mode 100644 (file)
index 0000000..c884b35
--- /dev/null
+++ b/sys/bus/u4b/controller/Makefile
@@ -0,0 +1,3 @@
+SUBDIR=        uhci xhci ehci ohci
+
+.include <bsd.subdir.mk>

diff --git a/sys/bus/u4b/controller/ehci/Makefile b/sys/bus/u4b/controller/ehci/Makefile
new file mode 100644 (file)
index 0000000..da718d6
--- /dev/null
+++ b/sys/bus/u4b/controller/ehci/Makefile
@@ -0,0 +1,6 @@
+.PATH: ${.CURDIR}/..
+
+KMOD=  ehci
+SRCS=  ehci.c ohci_pci.c bus_if.h usb_if.h
+
+.include <bsd.kmod.mk>

diff --git a/sys/bus/u4b/controller/ohci/Makefile b/sys/bus/u4b/controller/ohci/Makefile
new file mode 100644 (file)
index 0000000..c507c3c
--- /dev/null
+++ b/sys/bus/u4b/controller/ohci/Makefile
@@ -0,0 +1,6 @@
+.PATH: ${.CURDIR}/..
+
+KMOD=  ohci
+SRCS=  ohci.c ohci_pci.c bus_if.h usb_if.h
+
+.include <bsd.kmod.mk>

diff --git a/sys/bus/u4b/controller/uhci/Makefile b/sys/bus/u4b/controller/uhci/Makefile
new file mode 100644 (file)
index 0000000..00e838c
--- /dev/null
+++ b/sys/bus/u4b/controller/uhci/Makefile
@@ -0,0 +1,6 @@
+.PATH: ${.CURDIR}/..
+
+KMOD=  uhci
+SRCS=  uhci.c uhci_pci.c bus_if.h usb_if.h
+
+.include <bsd.kmod.mk>

diff --git a/sys/bus/u4b/controller/xhci/Makefile b/sys/bus/u4b/controller/xhci/Makefile
new file mode 100644 (file)
index 0000000..c1047ad
--- /dev/null
+++ b/sys/bus/u4b/controller/xhci/Makefile
@@ -0,0 +1,6 @@
+.PATH: ${.CURDIR}/..
+
+KMOD=  xhci
+SRCS=  device_if.h usb_if.h xhci.h xhci.c xhci_pci.c
+
+.include <bsd.kmod.mk>

diff --git a/sys/bus/u4b/storage/Makefile b/sys/bus/u4b/storage/Makefile
new file mode 100644 (file)
index 0000000..13cbccc
--- /dev/null
+++ b/sys/bus/u4b/storage/Makefile
@@ -0,0 +1,3 @@
+SUBDIR=        umass usfs
+
+.include <bsd.subdir.mk> 

diff --git a/sys/bus/u4b/storage/umass/Makefile b/sys/bus/u4b/storage/umass/Makefile
new file mode 100644 (file)
index 0000000..2e166bb
--- /dev/null
+++ b/sys/bus/u4b/storage/umass/Makefile
@@ -0,0 +1,8 @@
+.PATH: ${.CURDIR}/..
+
+KMOD=  umass
+SRCS=  ata_if.h bus_if.h device_if.h usb_if.h \
+       opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h \
+       umass.c
+
+.include <bsd.kmod.mk>

diff --git a/sys/bus/u4b/storage/usfs/Makefile b/sys/bus/u4b/storage/usfs/Makefile
new file mode 100644 (file)
index 0000000..a6b270e
--- /dev/null
+++ b/sys/bus/u4b/storage/usfs/Makefile
@@ -0,0 +1,8 @@
+.PATH: ${.CURDIR}/..
+
+KMOD=  usfs
+SRCS=  ata_if.h bus_if.h device_if.h usb_if.h \
+       opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h \
+       ustorage_fs.c
+
+.include <bsd.kmod.mk>

diff --git a/sys/bus/u4b/usb/Makefile b/sys/bus/u4b/usb/Makefile
index c8b7c61..262136d 100644 (file)
--- a/sys/bus/u4b/usb/Makefile
+++ b/sys/bus/u4b/usb/Makefile
@@ -1,17 +1,16 @@
-.PATH: ${.CURDIR}/../ ${.CURDIR}/../controller
+.PATH: ${.CURDIR}/.. ${.CURDIR}/../controller
 
-KMOD=   usb
+KMOD=  usb
 
 # XXX usb_compat_linux.c usb_pf.c
 
-SRCS=   bus_if.h device_if.h usb_if.h usb_if.c \
-        opt_usb.h opt_bus.h opt_ddb.h \
-        usbdevs.h usbdevs_data.h \
-        usb_busdma.c usb_controller.c usb_core.c usb_debug.c \
-        usb_dev.c usb_device.c usb_dynamic.c usb_error.c usb_generic.c \
-        usb_handle_request.c usb_hid.c usb_hub.c usb_lookup.c usb_mbuf.c \
-        usb_msctest.c usb_parse.c usb_process.c usb_request.c \
-        usb_transfer.c usb_util.c 
+SRCS=  bus_if.h device_if.h usb_if.h usb_if.c \
+       opt_usb.h opt_bus.h opt_ddb.h \
+       usbdevs.h usbdevs_data.h \
+       usb_busdma.c usb_controller.c usb_core.c usb_debug.c \
+       usb_dev.c usb_device.c usb_dynamic.c usb_error.c usb_generic.c \
+       usb_handle_request.c usb_hid.c usb_hub.c usb_lookup.c usb_mbuf.c \
+       usb_msctest.c usb_parse.c usb_process.c usb_request.c \
+       usb_transfer.c usb_util.c 
 
 .include <bsd.kmod.mk>
-

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 8cd6f4c..51206d3 100644 (file)
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -303,13 +303,19 @@ MFILES?= kern/bus_if.m kern/device_if.m bus/iicbus/iicbb_if.m \
     bus/iicbus/iicbus_if.m bus/isa/isa_if.m dev/netif/mii_layer/miibus_if.m \
     bus/pccard/card_if.m bus/pccard/power_if.m bus/pci/pci_if.m \
     bus/pci/pcib_if.m \
-    bus/ppbus/ppbus_if.m bus/smbus/smbus_if.m bus/usb/usb_if.m \
+    bus/ppbus/ppbus_if.m bus/smbus/smbus_if.m \
     dev/acpica5/acpi_if.m dev/acpica5/acpi_wmi_if.m dev/disk/nata/ata_if.m \
     dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
     dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \
     libiconv/iconv_converter_if.m dev/agp/agp_if.m opencrypto/cryptodev_if.m \
     bus/mmc/mmcbus_if.m bus/mmc/mmcbr_if.m
 
+.if defined(WANT_USB4BSD)
+MFILES+=bus/u4b/usb_if.m
+.else
+MFILES+=bus/usb/usb_if.m
+.endif
+
 .for _srcsrc in ${MFILES}
 .for _ext in c h
 .for _src in ${SRCS:M${_srcsrc:T:R}.${_ext}}