usb subsystem now builds as modules.

dependancies still seem broken.

drivers/usb/Makefile

@@ -8,27 +8,21 @@ O_TARGET	:= usbdrv.o
 
 # Objects that export symbols.
 
-export-objs		:= usb.o hcd.o ov511.o pwc-uncompress.o
+export-objs		:= media/ov511.o media/pwc-uncompress.o
 
 # Multipart objects.
 
-usbcore-objs		:= usb.o usb-debug.o hub.o hcd.o
-hid-objs		:= hid-core.o
-pwc-objs		:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
+hid-objs		:= class/hid-core.o
+pwc-objs		:= media/pwc-if.o media/pwc-misc.o media/pwc-ctrl.o media/pwc-uncompress.o
 
 
 # Optional parts of multipart objects.
-
-ifeq ($(CONFIG_USB_DEVICEFS),y)
-	usbcore-objs	+= devio.o inode.o drivers.o devices.o
-endif
-
 ifeq ($(CONFIG_USB_HIDDEV),y)
-	hid-objs	+= hiddev.o
+	hid-objs	+= class/hiddev.o
 endif
 
 ifeq ($(CONFIG_USB_HIDINPUT),y)
-	hid-objs	+= hid-input.o
+	hid-objs	+= class/hid-input.o
 endif
 
 # Object file lists.
@@ -40,70 +34,77 @@ obj-	:=
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_USB)		+= usbcore.o
 
 # EHCI needs to be linked before the other HCD drivers
 ifeq ($(CONFIG_USB_EHCI_HCD),y)
-	obj-y += hcd/ehci-hcd.o
+	obj-y += host/ehci-hcd.o
 endif
 
 ifeq ($(CONFIG_USB_OHCI_HCD),y)
-	obj-y += hcd/ohci-hcd.o
+	obj-y += host/ohci-hcd.o
 endif
 
-obj-$(CONFIG_USB_UHCI)		+= usb-uhci.o
-obj-$(CONFIG_USB_UHCI_ALT)	+= uhci.o
-obj-$(CONFIG_USB_OHCI)		+= usb-ohci.o
-
-obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
-obj-$(CONFIG_USB_HID)		+= hid.o
-obj-$(CONFIG_USB_KBD)		+= usbkbd.o
-obj-$(CONFIG_USB_WACOM)		+= wacom.o
-
-obj-$(CONFIG_USB_SCANNER)	+= scanner.o
-obj-$(CONFIG_USB_ACM)		+= acm.o
-obj-$(CONFIG_USB_PRINTER)	+= printer.o
-obj-$(CONFIG_USB_AUDIO)		+= audio.o
-obj-$(CONFIG_USB_EMI26)		+= emi26.o
-obj-$(CONFIG_USB_IBMCAM)	+= ibmcam.o usbvideo.o ultracam.o
-obj-$(CONFIG_USB_KONICAWC)	+= konicawc.o usbvideo.o
-obj-$(CONFIG_USB_PWC)		+= pwc.o
-obj-$(CONFIG_USB_DC2XX)		+= dc2xx.o
-obj-$(CONFIG_USB_MDC800)	+= mdc800.o
-obj-$(CONFIG_USB_USS720)	+= uss720.o
-obj-$(CONFIG_USB_DABUSB)	+= dabusb.o
-obj-$(CONFIG_USB_VICAM)		+= vicam.o
-obj-$(CONFIG_USB_OV511)		+= ov511.o
-obj-$(CONFIG_USB_SE401)		+= se401.o
-obj-$(CONFIG_USB_STV680)	+= stv680.o
-obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
-obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
-obj-$(CONFIG_USB_CATC)		+= catc.o
-obj-$(CONFIG_USB_KAWETH)        += kaweth.o
-obj-$(CONFIG_USB_CDCETHER)	+= CDCEther.o
-obj-$(CONFIG_USB_RIO500)	+= rio500.o
-obj-$(CONFIG_USB_DSBR)		+= dsbr100.o
-obj-$(CONFIG_USB_MICROTEK)	+= microtek.o
-obj-$(CONFIG_USB_HPUSBSCSI)	+= hpusbscsi.o
-obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
-obj-$(CONFIG_USB_USBNET)	+= usbnet.o
-obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.o
-obj-$(CONFIG_USB_TIGL)		+= tiglusb.o
+obj-$(CONFIG_USB_MOUSE)		+= class/usbmouse.o
+obj-$(CONFIG_USB_HID)		+= class/hid.o
+obj-$(CONFIG_USB_KBD)		+= class/usbkbd.o
+obj-$(CONFIG_USB_ACM)		+= class/cdc-acm.o
+obj-$(CONFIG_USB_PRINTER)	+= class/printer.o
+obj-$(CONFIG_USB_AUDIO)		+= class/audio.o
+obj-$(CONFIG_USB_CDCETHER)	+= class/cdc-ether.o
+obj-$(CONFIG_USB_BLUETOOTH)	+= class/bluetooth.o
+
+obj-$(CONFIG_USB_WACOM)		+= misc/wacom.o
+obj-$(CONFIG_USB_SCANNER)	+= scanner/scanner.o
+obj-$(CONFIG_USB_EMI26)		+= misc/emi26.o
+obj-$(CONFIG_USB_IBMCAM)	+= media/ibmcam.o media/usbvideo.o media/ultracam.o
+obj-$(CONFIG_USB_KONICAWC)	+= media/konicawc.o media/usbvideo.o
+obj-$(CONFIG_USB_PWC)		+= media/pwc.o
+obj-$(CONFIG_USB_DC2XX)		+= misc/dc2xx.o
+obj-$(CONFIG_USB_MDC800)	+= misc/mdc800.o
+obj-$(CONFIG_USB_USS720)	+= misc/uss720.o
+obj-$(CONFIG_USB_DABUSB)	+= misc/dabusb.o
+obj-$(CONFIG_USB_VICAM)		+= media/vicam.o
+obj-$(CONFIG_USB_OV511)		+= media/ov511.o
+obj-$(CONFIG_USB_SE401)		+= media/se401.o
+obj-$(CONFIG_USB_STV680)	+= media/stv680.o
+obj-$(CONFIG_USB_PEGASUS)	+= net/pegasus.o
+obj-$(CONFIG_USB_RTL8150)	+= net/rtl8150.o
+obj-$(CONFIG_USB_CATC)		+= net/catc.o
+obj-$(CONFIG_USB_KAWETH)        += net/kaweth.o
+obj-$(CONFIG_USB_RIO500)	+= misc/rio500.o
+obj-$(CONFIG_USB_DSBR)		+= media/dsbr100.o
+obj-$(CONFIG_USB_MICROTEK)	+= scanner/microtek.o
+obj-$(CONFIG_USB_HPUSBSCSI)	+= scanner/hpusbscsi.o
+obj-$(CONFIG_USB_USBNET)	+= net/usbnet.o
+obj-$(CONFIG_USB_AUERSWALD)	+= misc/auerswald.o
+obj-$(CONFIG_USB_TIGL)		+= misc/tiglusb.o
 
 # Object files in subdirectories
-mod-subdirs	:= serial hcd
-
-subdir-$(CONFIG_USB_EHCI_HCD)	+= hcd
-subdir-$(CONFIG_USB_OHCI_HCD)	+= hcd
+mod-subdirs	:= core host serial
+
+subdir-$(CONFIG_USB)		+= core
+subdir-$(CONFIG_USB_EHCI_HCD)	+= host
+subdir-$(CONFIG_USB_OHCI_HCD)	+= host
+subdir-$(CONFIG_USB_UHCI)	+= host
+subdir-$(CONFIG_USB_UHCI_ALT)	+= host
+subdir-$(CONFIG_USB_OHCI)	+= host
 subdir-$(CONFIG_USB_SERIAL)	+= serial
-subdir-$(CONFIG_USB_STORAGE)	+= storage
+subdir-$(CONFIG_USB_STORAGE)	+= class/storage
+
+ifeq ($(CONFIG_USB),y)
+	obj-y += core/usb-core.o
+endif
+
+ifeq ($(CONFIG_USB_EHCI_HCD),y)
+	obj-y += host/usb-host.o
+endif
 
 ifeq ($(CONFIG_USB_SERIAL),y)
 	obj-y += serial/usb-serial.o
 endif
 
 ifeq ($(CONFIG_USB_STORAGE),y)
-	obj-y += storage/storage.o
+	obj-y += class/storage/storage.o
 endif
 
 include $(TOPDIR)/Rules.make

drivers/usb/class/cdc-ether.c

@@ -27,7 +27,7 @@
 #include <linux/etherdevice.h>
 #include <linux/usb.h>
 #include <linux/module.h>
-#include "CDCEther.h"
+#include "cdc-ether.h"
 
 static const char *version = __FILE__ ": v0.98.5 22 Sep 2001 Brad Hards and another";
 

drivers/usb/class/storage/Makefile

@@ -6,7 +6,7 @@
 #
 
 O_TARGET	:= storage.o
-EXTRA_CFLAGS	:= -I../../scsi/
+EXTRA_CFLAGS	:= -I../../../scsi/
 
 list-multi	:= usb-storage.o
 

drivers/usb/core/fs/devices.c

@@ -59,7 +59,7 @@
 #include <linux/usbdevice_fs.h>
 #include <asm/uaccess.h>
 
-#include "hcd.h"
+#include "../hcd.h"
 
 #define MAX_TOPO_LEVEL		6
 

drivers/usb/host/Makefile

@@ -3,25 +3,14 @@
 # framework and drivers
 #
 
-O_TARGET	:=
+O_TARGET	:= usb-host.o
 
 obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)	+= ohci-hcd.o
 # obj-$(CONFIG_USB_UHCI_HCD)	+= uhci-hcd.o
 
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are the intermediate files used to build the multi's.
-multi-y		:= $(filter $(list-multi), $(obj-y))
-multi-m		:= $(filter $(list-multi), $(obj-m))
-int-y		:= $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-# Take multi-part drivers out of obj-y and put components in.
-obj-y		:= $(filter-out $(list-multi), $(obj-y)) $(int-y)
-
-# Translate to Rules.make lists.
-OX_OBJS		:= $(obj-y)
-MX_OBJS		:= $(obj-m)
-MIX_OBJS	:= $(int-m)
+obj-$(CONFIG_USB_UHCI)		+= usb-uhci.o
+obj-$(CONFIG_USB_UHCI_ALT)	+= uhci.o
+obj-$(CONFIG_USB_OHCI)		+= usb-ohci.o
 
 include $(TOPDIR)/Rules.make

drivers/usb/host/ehci-hcd.c

@@ -38,7 +38,7 @@
 #endif
 
 #include <linux/usb.h>
-#include "../hcd.h"
+#include "../core/hcd.h"
 
 #include <asm/byteorder.h>
 #include <asm/io.h>

drivers/usb/host/ohci-hcd.c

@@ -81,7 +81,7 @@
 #endif
 
 #include <linux/usb.h>
-#include "../hcd.h"
+#include "../core/hcd.h"
 
 #include <asm/io.h>
 #include <asm/irq.h>

drivers/usb/host/uhci.c

@@ -53,7 +53,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 
-#include "hcd.h"
+#include "../core/hcd.h"
 #include "uhci.h"
 
 #include <linux/pm.h>

drivers/usb/host/usb-ohci.c

@@ -78,7 +78,7 @@
 #define OHCI_USE_NPS		// force NoPowerSwitching mode
 // #define OHCI_VERBOSE_DEBUG	/* not always helpful */
 
-#include "hcd.h"
+#include "../core/hcd.h"
 #include "usb-ohci.h"
 
 

drivers/usb/host/usb-uhci.c

@@ -57,7 +57,7 @@
 #define VERSTR "$Revision: 1.275 $ time " __TIME__ " " __DATE__
 
 #include <linux/usb.h>
-#include "hcd.h"
+#include "../core/hcd.h"
 #include "usb-uhci.h"
 #include "usb-uhci-debug.h"
 

drivers/usb/scanner/hpusbscsi.c

@@ -10,9 +10,9 @@
 #include <linux/usb.h>
 #include <asm/atomic.h>
 #include <linux/blk.h>
-#include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
-#include "../scsi/sd.h"
+#include "../../scsi/scsi.h"
+#include "../../scsi/hosts.h"
+#include "../../scsi/sd.h"
 
 #include "hpusbscsi.h"
 

drivers/usb/scanner/microtek.c

@@ -135,9 +135,9 @@
 
 #include <asm/atomic.h>
 #include <linux/blk.h>
-#include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
-#include "../scsi/sd.h"
+#include "../../scsi/scsi.h"
+#include "../../scsi/hosts.h"
+#include "../../scsi/sd.h"
 
 #include "microtek.h"