From 3975e3a1eac3dd9077dc4523a8def1606ff1559c Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Mon, 23 Feb 2009 18:16:17 +0000 Subject: [PATCH] Move usb to a graveyard location under sys/legacy/dev, it is intended that the new USB2 stack will fully replace this for 8.0. Remove kernel modules, a subsequent commit will update conf/files. Unhook usbdevs from the build. --- sys/compat/ndis/kern_ndis.c | 4 +- sys/compat/ndis/kern_windrv.c | 4 +- sys/compat/ndis/subr_ndis.c | 4 +- sys/compat/ndis/subr_usbd.c | 10 ++--- sys/dev/if_ndis/if_ndis.c | 4 +- sys/dev/if_ndis/if_ndis_pccard.c | 4 +- sys/dev/if_ndis/if_ndis_pci.c | 4 +- sys/dev/if_ndis/if_ndis_usb.c | 8 ++-- sys/{ => legacy}/dev/usb/FILES | 0 sys/{ => legacy}/dev/usb/dsbr100io.h | 0 sys/{ => legacy}/dev/usb/ehci.c | 0 sys/{ => legacy}/dev/usb/ehci_ddb.c | 0 sys/{ => legacy}/dev/usb/ehci_ixp4xx.c | 0 sys/{ => legacy}/dev/usb/ehci_mbus.c | 0 sys/{ => legacy}/dev/usb/ehci_pci.c | 0 sys/{ => legacy}/dev/usb/ehcireg.h | 0 sys/{ => legacy}/dev/usb/ehcivar.h | 0 sys/{ => legacy}/dev/usb/hid.c | 0 sys/{ => legacy}/dev/usb/hid.h | 0 sys/{ => legacy}/dev/usb/if_aue.c | 0 sys/{ => legacy}/dev/usb/if_auereg.h | 0 sys/{ => legacy}/dev/usb/if_axe.c | 0 sys/{ => legacy}/dev/usb/if_axereg.h | 0 sys/{ => legacy}/dev/usb/if_cdce.c | 0 sys/{ => legacy}/dev/usb/if_cdcereg.h | 0 sys/{ => legacy}/dev/usb/if_cue.c | 0 sys/{ => legacy}/dev/usb/if_cuereg.h | 0 sys/{ => legacy}/dev/usb/if_kue.c | 0 sys/{ => legacy}/dev/usb/if_kuereg.h | 0 sys/{ => legacy}/dev/usb/if_rue.c | 0 sys/{ => legacy}/dev/usb/if_ruereg.h | 0 sys/{ => legacy}/dev/usb/if_rum.c | 0 sys/{ => legacy}/dev/usb/if_rumreg.h | 0 sys/{ => legacy}/dev/usb/if_rumvar.h | 0 sys/{ => legacy}/dev/usb/if_udav.c | 0 sys/{ => legacy}/dev/usb/if_udavreg.h | 0 sys/{ => legacy}/dev/usb/if_upgt.c | 0 sys/{ => legacy}/dev/usb/if_upgtvar.h | 0 sys/{ => legacy}/dev/usb/if_ural.c | 0 sys/{ => legacy}/dev/usb/if_uralreg.h | 0 sys/{ => legacy}/dev/usb/if_uralvar.h | 0 sys/{ => legacy}/dev/usb/if_urtw.c | 0 sys/{ => legacy}/dev/usb/if_urtwreg.h | 0 sys/{ => legacy}/dev/usb/if_urtwvar.h | 0 sys/{ => legacy}/dev/usb/if_zyd.c | 0 sys/{ => legacy}/dev/usb/if_zydfw.h | 0 sys/{ => legacy}/dev/usb/if_zydreg.h | 0 sys/{ => legacy}/dev/usb/kue_fw.h | 0 sys/{ => legacy}/dev/usb/ohci.c | 0 sys/{ => legacy}/dev/usb/ohci_pci.c | 0 sys/{ => legacy}/dev/usb/ohcireg.h | 0 sys/{ => legacy}/dev/usb/ohcivar.h | 0 sys/{ => legacy}/dev/usb/rio500_usb.h | 0 sys/{ => legacy}/dev/usb/rt2573_ucode.h | 0 sys/{ => legacy}/dev/usb/sl811hs.c | 0 sys/{ => legacy}/dev/usb/sl811hsreg.h | 0 sys/{ => legacy}/dev/usb/sl811hsvar.h | 0 sys/{ => legacy}/dev/usb/slhci_pccard.c | 0 sys/{ => legacy}/dev/usb/u3g.c | 0 sys/{ => legacy}/dev/usb/uark.c | 0 sys/{ => legacy}/dev/usb/ubsa.c | 0 sys/{ => legacy}/dev/usb/ubser.c | 0 sys/{ => legacy}/dev/usb/ubser.h | 0 sys/{ => legacy}/dev/usb/uchcom.c | 0 sys/{ => legacy}/dev/usb/ucom.c | 0 sys/{ => legacy}/dev/usb/ucomvar.h | 0 sys/{ => legacy}/dev/usb/ucycom.c | 0 sys/{ => legacy}/dev/usb/udbp.c | 0 sys/{ => legacy}/dev/usb/udbp.h | 0 sys/{ => legacy}/dev/usb/ufm.c | 0 sys/{ => legacy}/dev/usb/ufoma.c | 0 sys/{ => legacy}/dev/usb/uftdi.c | 0 sys/{ => legacy}/dev/usb/uftdireg.h | 0 sys/{ => legacy}/dev/usb/ugen.c | 0 sys/{ => legacy}/dev/usb/ugraphire_rdesc.h | 0 sys/{ => legacy}/dev/usb/uhci.c | 0 sys/{ => legacy}/dev/usb/uhci_pci.c | 0 sys/{ => legacy}/dev/usb/uhcireg.h | 0 sys/{ => legacy}/dev/usb/uhcivar.h | 0 sys/{ => legacy}/dev/usb/uhid.c | 0 sys/{ => legacy}/dev/usb/uhub.c | 0 sys/{ => legacy}/dev/usb/uipaq.c | 0 sys/{ => legacy}/dev/usb/ukbd.c | 0 sys/{ => legacy}/dev/usb/ulpt.c | 0 sys/{ => legacy}/dev/usb/umass.c | 0 sys/{ => legacy}/dev/usb/umct.c | 0 sys/{ => legacy}/dev/usb/umodem.c | 0 sys/{ => legacy}/dev/usb/ums.c | 0 sys/{ => legacy}/dev/usb/uplcom.c | 0 sys/{ => legacy}/dev/usb/urio.c | 0 sys/{ => legacy}/dev/usb/usb.c | 0 sys/{ => legacy}/dev/usb/usb.h | 0 sys/{ => legacy}/dev/usb/usb_ethersubr.c | 0 sys/{ => legacy}/dev/usb/usb_ethersubr.h | 0 sys/{ => legacy}/dev/usb/usb_if.m | 0 sys/{ => legacy}/dev/usb/usb_mem.c | 0 sys/{ => legacy}/dev/usb/usb_mem.h | 0 sys/{ => legacy}/dev/usb/usb_port.h | 0 sys/{ => legacy}/dev/usb/usb_quirks.c | 0 sys/{ => legacy}/dev/usb/usb_quirks.h | 0 sys/{ => legacy}/dev/usb/usb_subr.c | 0 sys/{ => legacy}/dev/usb/usbcdc.h | 0 sys/{ => legacy}/dev/usb/usbdevs | 0 sys/{ => legacy}/dev/usb/usbdi.c | 0 sys/{ => legacy}/dev/usb/usbdi.h | 0 sys/{ => legacy}/dev/usb/usbdi_util.c | 0 sys/{ => legacy}/dev/usb/usbdi_util.h | 0 sys/{ => legacy}/dev/usb/usbdivar.h | 0 sys/{ => legacy}/dev/usb/usbhid.h | 0 sys/{ => legacy}/dev/usb/uscanner.c | 0 sys/{ => legacy}/dev/usb/uslcom.c | 0 sys/{ => legacy}/dev/usb/uvisor.c | 0 sys/{ => legacy}/dev/usb/uvscom.c | 0 sys/{ => legacy}/dev/usb/uxb360gp_rdesc.h | 0 sys/modules/Makefile | 47 ---------------------- sys/modules/aue/Makefile | 10 ----- sys/modules/axe/Makefile | 10 ----- sys/modules/cdce/Makefile | 10 ----- sys/modules/cue/Makefile | 10 ----- sys/modules/ehci/Makefile | 13 ------ sys/modules/kue/Makefile | 10 ----- sys/modules/ohci/Makefile | 13 ------ sys/modules/rue/Makefile | 10 ----- sys/modules/rum/Makefile | 8 ---- sys/modules/slhci/Makefile | 12 ------ sys/modules/u3g/Makefile | 12 ------ sys/modules/uark/Makefile | 8 ---- sys/modules/ubsa/Makefile | 9 ----- sys/modules/ucom/Makefile | 9 ----- sys/modules/udav/Makefile | 9 ----- sys/modules/udbp/Makefile | 10 ----- sys/modules/ufm/Makefile | 7 ---- sys/modules/ufoma/Makefile | 8 ---- sys/modules/uftdi/Makefile | 9 ----- sys/modules/ugen/Makefile | 8 ---- sys/modules/uhci/Makefile | 13 ------ sys/modules/uhid/Makefile | 8 ---- sys/modules/uipaq/Makefile | 9 ----- sys/modules/ukbd/Makefile | 17 -------- sys/modules/ulpt/Makefile | 8 ---- sys/modules/umass/Makefile | 10 ----- sys/modules/umct/Makefile | 9 ----- sys/modules/umodem/Makefile | 8 ---- sys/modules/ums/Makefile | 8 ---- sys/modules/upgt/Makefile | 10 ----- sys/modules/uplcom/Makefile | 10 ----- sys/modules/ural/Makefile | 8 ---- sys/modules/urio/Makefile | 10 ----- sys/modules/urtw/Makefile | 9 ----- sys/modules/usb/Makefile | 22 ---------- sys/modules/uscanner/Makefile | 8 ---- sys/modules/uslcom/Makefile | 10 ----- sys/modules/uvisor/Makefile | 9 ----- sys/modules/uvscom/Makefile | 10 ----- sys/modules/zyd/Makefile | 10 ----- usr.sbin/Makefile | 2 +- 156 files changed, 22 insertions(+), 470 deletions(-) rename sys/{ => legacy}/dev/usb/FILES (100%) rename sys/{ => legacy}/dev/usb/dsbr100io.h (100%) rename sys/{ => legacy}/dev/usb/ehci.c (100%) rename sys/{ => legacy}/dev/usb/ehci_ddb.c (100%) rename sys/{ => legacy}/dev/usb/ehci_ixp4xx.c (100%) rename sys/{ => legacy}/dev/usb/ehci_mbus.c (100%) rename sys/{ => legacy}/dev/usb/ehci_pci.c (100%) rename sys/{ => legacy}/dev/usb/ehcireg.h (100%) rename sys/{ => legacy}/dev/usb/ehcivar.h (100%) rename sys/{ => legacy}/dev/usb/hid.c (100%) rename sys/{ => legacy}/dev/usb/hid.h (100%) rename sys/{ => legacy}/dev/usb/if_aue.c (100%) rename sys/{ => legacy}/dev/usb/if_auereg.h (100%) rename sys/{ => legacy}/dev/usb/if_axe.c (100%) rename sys/{ => legacy}/dev/usb/if_axereg.h (100%) rename sys/{ => legacy}/dev/usb/if_cdce.c (100%) rename sys/{ => legacy}/dev/usb/if_cdcereg.h (100%) rename sys/{ => legacy}/dev/usb/if_cue.c (100%) rename sys/{ => legacy}/dev/usb/if_cuereg.h (100%) rename sys/{ => legacy}/dev/usb/if_kue.c (100%) rename sys/{ => legacy}/dev/usb/if_kuereg.h (100%) rename sys/{ => legacy}/dev/usb/if_rue.c (100%) rename sys/{ => legacy}/dev/usb/if_ruereg.h (100%) rename sys/{ => legacy}/dev/usb/if_rum.c (100%) rename sys/{ => legacy}/dev/usb/if_rumreg.h (100%) rename sys/{ => legacy}/dev/usb/if_rumvar.h (100%) rename sys/{ => legacy}/dev/usb/if_udav.c (100%) rename sys/{ => legacy}/dev/usb/if_udavreg.h (100%) rename sys/{ => legacy}/dev/usb/if_upgt.c (100%) rename sys/{ => legacy}/dev/usb/if_upgtvar.h (100%) rename sys/{ => legacy}/dev/usb/if_ural.c (100%) rename sys/{ => legacy}/dev/usb/if_uralreg.h (100%) rename sys/{ => legacy}/dev/usb/if_uralvar.h (100%) rename sys/{ => legacy}/dev/usb/if_urtw.c (100%) rename sys/{ => legacy}/dev/usb/if_urtwreg.h (100%) rename sys/{ => legacy}/dev/usb/if_urtwvar.h (100%) rename sys/{ => legacy}/dev/usb/if_zyd.c (100%) rename sys/{ => legacy}/dev/usb/if_zydfw.h (100%) rename sys/{ => legacy}/dev/usb/if_zydreg.h (100%) rename sys/{ => legacy}/dev/usb/kue_fw.h (100%) rename sys/{ => legacy}/dev/usb/ohci.c (100%) rename sys/{ => legacy}/dev/usb/ohci_pci.c (100%) rename sys/{ => legacy}/dev/usb/ohcireg.h (100%) rename sys/{ => legacy}/dev/usb/ohcivar.h (100%) rename sys/{ => legacy}/dev/usb/rio500_usb.h (100%) rename sys/{ => legacy}/dev/usb/rt2573_ucode.h (100%) rename sys/{ => legacy}/dev/usb/sl811hs.c (100%) rename sys/{ => legacy}/dev/usb/sl811hsreg.h (100%) rename sys/{ => legacy}/dev/usb/sl811hsvar.h (100%) rename sys/{ => legacy}/dev/usb/slhci_pccard.c (100%) rename sys/{ => legacy}/dev/usb/u3g.c (100%) rename sys/{ => legacy}/dev/usb/uark.c (100%) rename sys/{ => legacy}/dev/usb/ubsa.c (100%) rename sys/{ => legacy}/dev/usb/ubser.c (100%) rename sys/{ => legacy}/dev/usb/ubser.h (100%) rename sys/{ => legacy}/dev/usb/uchcom.c (100%) rename sys/{ => legacy}/dev/usb/ucom.c (100%) rename sys/{ => legacy}/dev/usb/ucomvar.h (100%) rename sys/{ => legacy}/dev/usb/ucycom.c (100%) rename sys/{ => legacy}/dev/usb/udbp.c (100%) rename sys/{ => legacy}/dev/usb/udbp.h (100%) rename sys/{ => legacy}/dev/usb/ufm.c (100%) rename sys/{ => legacy}/dev/usb/ufoma.c (100%) rename sys/{ => legacy}/dev/usb/uftdi.c (100%) rename sys/{ => legacy}/dev/usb/uftdireg.h (100%) rename sys/{ => legacy}/dev/usb/ugen.c (100%) rename sys/{ => legacy}/dev/usb/ugraphire_rdesc.h (100%) rename sys/{ => legacy}/dev/usb/uhci.c (100%) rename sys/{ => legacy}/dev/usb/uhci_pci.c (100%) rename sys/{ => legacy}/dev/usb/uhcireg.h (100%) rename sys/{ => legacy}/dev/usb/uhcivar.h (100%) rename sys/{ => legacy}/dev/usb/uhid.c (100%) rename sys/{ => legacy}/dev/usb/uhub.c (100%) rename sys/{ => legacy}/dev/usb/uipaq.c (100%) rename sys/{ => legacy}/dev/usb/ukbd.c (100%) rename sys/{ => legacy}/dev/usb/ulpt.c (100%) rename sys/{ => legacy}/dev/usb/umass.c (100%) rename sys/{ => legacy}/dev/usb/umct.c (100%) rename sys/{ => legacy}/dev/usb/umodem.c (100%) rename sys/{ => legacy}/dev/usb/ums.c (100%) rename sys/{ => legacy}/dev/usb/uplcom.c (100%) rename sys/{ => legacy}/dev/usb/urio.c (100%) rename sys/{ => legacy}/dev/usb/usb.c (100%) rename sys/{ => legacy}/dev/usb/usb.h (100%) rename sys/{ => legacy}/dev/usb/usb_ethersubr.c (100%) rename sys/{ => legacy}/dev/usb/usb_ethersubr.h (100%) rename sys/{ => legacy}/dev/usb/usb_if.m (100%) rename sys/{ => legacy}/dev/usb/usb_mem.c (100%) rename sys/{ => legacy}/dev/usb/usb_mem.h (100%) rename sys/{ => legacy}/dev/usb/usb_port.h (100%) rename sys/{ => legacy}/dev/usb/usb_quirks.c (100%) rename sys/{ => legacy}/dev/usb/usb_quirks.h (100%) rename sys/{ => legacy}/dev/usb/usb_subr.c (100%) rename sys/{ => legacy}/dev/usb/usbcdc.h (100%) rename sys/{ => legacy}/dev/usb/usbdevs (100%) rename sys/{ => legacy}/dev/usb/usbdi.c (100%) rename sys/{ => legacy}/dev/usb/usbdi.h (100%) rename sys/{ => legacy}/dev/usb/usbdi_util.c (100%) rename sys/{ => legacy}/dev/usb/usbdi_util.h (100%) rename sys/{ => legacy}/dev/usb/usbdivar.h (100%) rename sys/{ => legacy}/dev/usb/usbhid.h (100%) rename sys/{ => legacy}/dev/usb/uscanner.c (100%) rename sys/{ => legacy}/dev/usb/uslcom.c (100%) rename sys/{ => legacy}/dev/usb/uvisor.c (100%) rename sys/{ => legacy}/dev/usb/uvscom.c (100%) rename sys/{ => legacy}/dev/usb/uxb360gp_rdesc.h (100%) delete mode 100644 sys/modules/aue/Makefile delete mode 100644 sys/modules/axe/Makefile delete mode 100644 sys/modules/cdce/Makefile delete mode 100644 sys/modules/cue/Makefile delete mode 100644 sys/modules/ehci/Makefile delete mode 100644 sys/modules/kue/Makefile delete mode 100644 sys/modules/ohci/Makefile delete mode 100644 sys/modules/rue/Makefile delete mode 100644 sys/modules/rum/Makefile delete mode 100644 sys/modules/slhci/Makefile delete mode 100644 sys/modules/u3g/Makefile delete mode 100644 sys/modules/uark/Makefile delete mode 100644 sys/modules/ubsa/Makefile delete mode 100644 sys/modules/ucom/Makefile delete mode 100644 sys/modules/udav/Makefile delete mode 100644 sys/modules/udbp/Makefile delete mode 100644 sys/modules/ufm/Makefile delete mode 100644 sys/modules/ufoma/Makefile delete mode 100644 sys/modules/uftdi/Makefile delete mode 100644 sys/modules/ugen/Makefile delete mode 100644 sys/modules/uhci/Makefile delete mode 100644 sys/modules/uhid/Makefile delete mode 100644 sys/modules/uipaq/Makefile delete mode 100644 sys/modules/ukbd/Makefile delete mode 100644 sys/modules/ulpt/Makefile delete mode 100644 sys/modules/umass/Makefile delete mode 100644 sys/modules/umct/Makefile delete mode 100644 sys/modules/umodem/Makefile delete mode 100644 sys/modules/ums/Makefile delete mode 100644 sys/modules/upgt/Makefile delete mode 100644 sys/modules/uplcom/Makefile delete mode 100644 sys/modules/ural/Makefile delete mode 100644 sys/modules/urio/Makefile delete mode 100644 sys/modules/urtw/Makefile delete mode 100644 sys/modules/usb/Makefile delete mode 100644 sys/modules/uscanner/Makefile delete mode 100644 sys/modules/uslcom/Makefile delete mode 100644 sys/modules/uvisor/Makefile delete mode 100644 sys/modules/uvscom/Makefile delete mode 100644 sys/modules/zyd/Makefile diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c index e65734c9683..39d40eafed1 100644 --- a/sys/compat/ndis/kern_ndis.c +++ b/sys/compat/ndis/kern_ndis.c @@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include #include diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c index b42ff45c0db..37bbbaf0a0d 100644 --- a/sys/compat/ndis/kern_windrv.c +++ b/sys/compat/ndis/kern_windrv.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #include #endif -#include -#include +#include +#include #include #include diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c index ac9d8daac71..029eebb1e5b 100644 --- a/sys/compat/ndis/subr_ndis.c +++ b/sys/compat/ndis/subr_ndis.c @@ -95,8 +95,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include #include diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c index 0c47c1b5d58..305cfc5f800 100644 --- a/sys/compat/ndis/subr_usbd.c +++ b/sys/compat/ndis/subr_usbd.c @@ -56,11 +56,11 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "usbdevs.h" #include diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 0005db45850..d20308f0fc5 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -74,8 +74,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include #include diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c index 7eb4cd66944..d84550a8153 100644 --- a/sys/dev/if_ndis/if_ndis_pccard.c +++ b/sys/dev/if_ndis/if_ndis_pccard.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include -#include -#include +#include +#include #include #include diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c index c03c50224db..afadd8ab27c 100644 --- a/sys/dev/if_ndis/if_ndis_pci.c +++ b/sys/dev/if_ndis/if_ndis_pci.c @@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include #include diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c index b206982dad1..1de308db48e 100644 --- a/sys/dev/if_ndis/if_ndis_usb.c +++ b/sys/dev/if_ndis/if_ndis_usb.c @@ -52,10 +52,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "usbdevs.h" #include diff --git a/sys/dev/usb/FILES b/sys/legacy/dev/usb/FILES similarity index 100% rename from sys/dev/usb/FILES rename to sys/legacy/dev/usb/FILES diff --git a/sys/dev/usb/dsbr100io.h b/sys/legacy/dev/usb/dsbr100io.h similarity index 100% rename from sys/dev/usb/dsbr100io.h rename to sys/legacy/dev/usb/dsbr100io.h diff --git a/sys/dev/usb/ehci.c b/sys/legacy/dev/usb/ehci.c similarity index 100% rename from sys/dev/usb/ehci.c rename to sys/legacy/dev/usb/ehci.c diff --git a/sys/dev/usb/ehci_ddb.c b/sys/legacy/dev/usb/ehci_ddb.c similarity index 100% rename from sys/dev/usb/ehci_ddb.c rename to sys/legacy/dev/usb/ehci_ddb.c diff --git a/sys/dev/usb/ehci_ixp4xx.c b/sys/legacy/dev/usb/ehci_ixp4xx.c similarity index 100% rename from sys/dev/usb/ehci_ixp4xx.c rename to sys/legacy/dev/usb/ehci_ixp4xx.c diff --git a/sys/dev/usb/ehci_mbus.c b/sys/legacy/dev/usb/ehci_mbus.c similarity index 100% rename from sys/dev/usb/ehci_mbus.c rename to sys/legacy/dev/usb/ehci_mbus.c diff --git a/sys/dev/usb/ehci_pci.c b/sys/legacy/dev/usb/ehci_pci.c similarity index 100% rename from sys/dev/usb/ehci_pci.c rename to sys/legacy/dev/usb/ehci_pci.c diff --git a/sys/dev/usb/ehcireg.h b/sys/legacy/dev/usb/ehcireg.h similarity index 100% rename from sys/dev/usb/ehcireg.h rename to sys/legacy/dev/usb/ehcireg.h diff --git a/sys/dev/usb/ehcivar.h b/sys/legacy/dev/usb/ehcivar.h similarity index 100% rename from sys/dev/usb/ehcivar.h rename to sys/legacy/dev/usb/ehcivar.h diff --git a/sys/dev/usb/hid.c b/sys/legacy/dev/usb/hid.c similarity index 100% rename from sys/dev/usb/hid.c rename to sys/legacy/dev/usb/hid.c diff --git a/sys/dev/usb/hid.h b/sys/legacy/dev/usb/hid.h similarity index 100% rename from sys/dev/usb/hid.h rename to sys/legacy/dev/usb/hid.h diff --git a/sys/dev/usb/if_aue.c b/sys/legacy/dev/usb/if_aue.c similarity index 100% rename from sys/dev/usb/if_aue.c rename to sys/legacy/dev/usb/if_aue.c diff --git a/sys/dev/usb/if_auereg.h b/sys/legacy/dev/usb/if_auereg.h similarity index 100% rename from sys/dev/usb/if_auereg.h rename to sys/legacy/dev/usb/if_auereg.h diff --git a/sys/dev/usb/if_axe.c b/sys/legacy/dev/usb/if_axe.c similarity index 100% rename from sys/dev/usb/if_axe.c rename to sys/legacy/dev/usb/if_axe.c diff --git a/sys/dev/usb/if_axereg.h b/sys/legacy/dev/usb/if_axereg.h similarity index 100% rename from sys/dev/usb/if_axereg.h rename to sys/legacy/dev/usb/if_axereg.h diff --git a/sys/dev/usb/if_cdce.c b/sys/legacy/dev/usb/if_cdce.c similarity index 100% rename from sys/dev/usb/if_cdce.c rename to sys/legacy/dev/usb/if_cdce.c diff --git a/sys/dev/usb/if_cdcereg.h b/sys/legacy/dev/usb/if_cdcereg.h similarity index 100% rename from sys/dev/usb/if_cdcereg.h rename to sys/legacy/dev/usb/if_cdcereg.h diff --git a/sys/dev/usb/if_cue.c b/sys/legacy/dev/usb/if_cue.c similarity index 100% rename from sys/dev/usb/if_cue.c rename to sys/legacy/dev/usb/if_cue.c diff --git a/sys/dev/usb/if_cuereg.h b/sys/legacy/dev/usb/if_cuereg.h similarity index 100% rename from sys/dev/usb/if_cuereg.h rename to sys/legacy/dev/usb/if_cuereg.h diff --git a/sys/dev/usb/if_kue.c b/sys/legacy/dev/usb/if_kue.c similarity index 100% rename from sys/dev/usb/if_kue.c rename to sys/legacy/dev/usb/if_kue.c diff --git a/sys/dev/usb/if_kuereg.h b/sys/legacy/dev/usb/if_kuereg.h similarity index 100% rename from sys/dev/usb/if_kuereg.h rename to sys/legacy/dev/usb/if_kuereg.h diff --git a/sys/dev/usb/if_rue.c b/sys/legacy/dev/usb/if_rue.c similarity index 100% rename from sys/dev/usb/if_rue.c rename to sys/legacy/dev/usb/if_rue.c diff --git a/sys/dev/usb/if_ruereg.h b/sys/legacy/dev/usb/if_ruereg.h similarity index 100% rename from sys/dev/usb/if_ruereg.h rename to sys/legacy/dev/usb/if_ruereg.h diff --git a/sys/dev/usb/if_rum.c b/sys/legacy/dev/usb/if_rum.c similarity index 100% rename from sys/dev/usb/if_rum.c rename to sys/legacy/dev/usb/if_rum.c diff --git a/sys/dev/usb/if_rumreg.h b/sys/legacy/dev/usb/if_rumreg.h similarity index 100% rename from sys/dev/usb/if_rumreg.h rename to sys/legacy/dev/usb/if_rumreg.h diff --git a/sys/dev/usb/if_rumvar.h b/sys/legacy/dev/usb/if_rumvar.h similarity index 100% rename from sys/dev/usb/if_rumvar.h rename to sys/legacy/dev/usb/if_rumvar.h diff --git a/sys/dev/usb/if_udav.c b/sys/legacy/dev/usb/if_udav.c similarity index 100% rename from sys/dev/usb/if_udav.c rename to sys/legacy/dev/usb/if_udav.c diff --git a/sys/dev/usb/if_udavreg.h b/sys/legacy/dev/usb/if_udavreg.h similarity index 100% rename from sys/dev/usb/if_udavreg.h rename to sys/legacy/dev/usb/if_udavreg.h diff --git a/sys/dev/usb/if_upgt.c b/sys/legacy/dev/usb/if_upgt.c similarity index 100% rename from sys/dev/usb/if_upgt.c rename to sys/legacy/dev/usb/if_upgt.c diff --git a/sys/dev/usb/if_upgtvar.h b/sys/legacy/dev/usb/if_upgtvar.h similarity index 100% rename from sys/dev/usb/if_upgtvar.h rename to sys/legacy/dev/usb/if_upgtvar.h diff --git a/sys/dev/usb/if_ural.c b/sys/legacy/dev/usb/if_ural.c similarity index 100% rename from sys/dev/usb/if_ural.c rename to sys/legacy/dev/usb/if_ural.c diff --git a/sys/dev/usb/if_uralreg.h b/sys/legacy/dev/usb/if_uralreg.h similarity index 100% rename from sys/dev/usb/if_uralreg.h rename to sys/legacy/dev/usb/if_uralreg.h diff --git a/sys/dev/usb/if_uralvar.h b/sys/legacy/dev/usb/if_uralvar.h similarity index 100% rename from sys/dev/usb/if_uralvar.h rename to sys/legacy/dev/usb/if_uralvar.h diff --git a/sys/dev/usb/if_urtw.c b/sys/legacy/dev/usb/if_urtw.c similarity index 100% rename from sys/dev/usb/if_urtw.c rename to sys/legacy/dev/usb/if_urtw.c diff --git a/sys/dev/usb/if_urtwreg.h b/sys/legacy/dev/usb/if_urtwreg.h similarity index 100% rename from sys/dev/usb/if_urtwreg.h rename to sys/legacy/dev/usb/if_urtwreg.h diff --git a/sys/dev/usb/if_urtwvar.h b/sys/legacy/dev/usb/if_urtwvar.h similarity index 100% rename from sys/dev/usb/if_urtwvar.h rename to sys/legacy/dev/usb/if_urtwvar.h diff --git a/sys/dev/usb/if_zyd.c b/sys/legacy/dev/usb/if_zyd.c similarity index 100% rename from sys/dev/usb/if_zyd.c rename to sys/legacy/dev/usb/if_zyd.c diff --git a/sys/dev/usb/if_zydfw.h b/sys/legacy/dev/usb/if_zydfw.h similarity index 100% rename from sys/dev/usb/if_zydfw.h rename to sys/legacy/dev/usb/if_zydfw.h diff --git a/sys/dev/usb/if_zydreg.h b/sys/legacy/dev/usb/if_zydreg.h similarity index 100% rename from sys/dev/usb/if_zydreg.h rename to sys/legacy/dev/usb/if_zydreg.h diff --git a/sys/dev/usb/kue_fw.h b/sys/legacy/dev/usb/kue_fw.h similarity index 100% rename from sys/dev/usb/kue_fw.h rename to sys/legacy/dev/usb/kue_fw.h diff --git a/sys/dev/usb/ohci.c b/sys/legacy/dev/usb/ohci.c similarity index 100% rename from sys/dev/usb/ohci.c rename to sys/legacy/dev/usb/ohci.c diff --git a/sys/dev/usb/ohci_pci.c b/sys/legacy/dev/usb/ohci_pci.c similarity index 100% rename from sys/dev/usb/ohci_pci.c rename to sys/legacy/dev/usb/ohci_pci.c diff --git a/sys/dev/usb/ohcireg.h b/sys/legacy/dev/usb/ohcireg.h similarity index 100% rename from sys/dev/usb/ohcireg.h rename to sys/legacy/dev/usb/ohcireg.h diff --git a/sys/dev/usb/ohcivar.h b/sys/legacy/dev/usb/ohcivar.h similarity index 100% rename from sys/dev/usb/ohcivar.h rename to sys/legacy/dev/usb/ohcivar.h diff --git a/sys/dev/usb/rio500_usb.h b/sys/legacy/dev/usb/rio500_usb.h similarity index 100% rename from sys/dev/usb/rio500_usb.h rename to sys/legacy/dev/usb/rio500_usb.h diff --git a/sys/dev/usb/rt2573_ucode.h b/sys/legacy/dev/usb/rt2573_ucode.h similarity index 100% rename from sys/dev/usb/rt2573_ucode.h rename to sys/legacy/dev/usb/rt2573_ucode.h diff --git a/sys/dev/usb/sl811hs.c b/sys/legacy/dev/usb/sl811hs.c similarity index 100% rename from sys/dev/usb/sl811hs.c rename to sys/legacy/dev/usb/sl811hs.c diff --git a/sys/dev/usb/sl811hsreg.h b/sys/legacy/dev/usb/sl811hsreg.h similarity index 100% rename from sys/dev/usb/sl811hsreg.h rename to sys/legacy/dev/usb/sl811hsreg.h diff --git a/sys/dev/usb/sl811hsvar.h b/sys/legacy/dev/usb/sl811hsvar.h similarity index 100% rename from sys/dev/usb/sl811hsvar.h rename to sys/legacy/dev/usb/sl811hsvar.h diff --git a/sys/dev/usb/slhci_pccard.c b/sys/legacy/dev/usb/slhci_pccard.c similarity index 100% rename from sys/dev/usb/slhci_pccard.c rename to sys/legacy/dev/usb/slhci_pccard.c diff --git a/sys/dev/usb/u3g.c b/sys/legacy/dev/usb/u3g.c similarity index 100% rename from sys/dev/usb/u3g.c rename to sys/legacy/dev/usb/u3g.c diff --git a/sys/dev/usb/uark.c b/sys/legacy/dev/usb/uark.c similarity index 100% rename from sys/dev/usb/uark.c rename to sys/legacy/dev/usb/uark.c diff --git a/sys/dev/usb/ubsa.c b/sys/legacy/dev/usb/ubsa.c similarity index 100% rename from sys/dev/usb/ubsa.c rename to sys/legacy/dev/usb/ubsa.c diff --git a/sys/dev/usb/ubser.c b/sys/legacy/dev/usb/ubser.c similarity index 100% rename from sys/dev/usb/ubser.c rename to sys/legacy/dev/usb/ubser.c diff --git a/sys/dev/usb/ubser.h b/sys/legacy/dev/usb/ubser.h similarity index 100% rename from sys/dev/usb/ubser.h rename to sys/legacy/dev/usb/ubser.h diff --git a/sys/dev/usb/uchcom.c b/sys/legacy/dev/usb/uchcom.c similarity index 100% rename from sys/dev/usb/uchcom.c rename to sys/legacy/dev/usb/uchcom.c diff --git a/sys/dev/usb/ucom.c b/sys/legacy/dev/usb/ucom.c similarity index 100% rename from sys/dev/usb/ucom.c rename to sys/legacy/dev/usb/ucom.c diff --git a/sys/dev/usb/ucomvar.h b/sys/legacy/dev/usb/ucomvar.h similarity index 100% rename from sys/dev/usb/ucomvar.h rename to sys/legacy/dev/usb/ucomvar.h diff --git a/sys/dev/usb/ucycom.c b/sys/legacy/dev/usb/ucycom.c similarity index 100% rename from sys/dev/usb/ucycom.c rename to sys/legacy/dev/usb/ucycom.c diff --git a/sys/dev/usb/udbp.c b/sys/legacy/dev/usb/udbp.c similarity index 100% rename from sys/dev/usb/udbp.c rename to sys/legacy/dev/usb/udbp.c diff --git a/sys/dev/usb/udbp.h b/sys/legacy/dev/usb/udbp.h similarity index 100% rename from sys/dev/usb/udbp.h rename to sys/legacy/dev/usb/udbp.h diff --git a/sys/dev/usb/ufm.c b/sys/legacy/dev/usb/ufm.c similarity index 100% rename from sys/dev/usb/ufm.c rename to sys/legacy/dev/usb/ufm.c diff --git a/sys/dev/usb/ufoma.c b/sys/legacy/dev/usb/ufoma.c similarity index 100% rename from sys/dev/usb/ufoma.c rename to sys/legacy/dev/usb/ufoma.c diff --git a/sys/dev/usb/uftdi.c b/sys/legacy/dev/usb/uftdi.c similarity index 100% rename from sys/dev/usb/uftdi.c rename to sys/legacy/dev/usb/uftdi.c diff --git a/sys/dev/usb/uftdireg.h b/sys/legacy/dev/usb/uftdireg.h similarity index 100% rename from sys/dev/usb/uftdireg.h rename to sys/legacy/dev/usb/uftdireg.h diff --git a/sys/dev/usb/ugen.c b/sys/legacy/dev/usb/ugen.c similarity index 100% rename from sys/dev/usb/ugen.c rename to sys/legacy/dev/usb/ugen.c diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/legacy/dev/usb/ugraphire_rdesc.h similarity index 100% rename from sys/dev/usb/ugraphire_rdesc.h rename to sys/legacy/dev/usb/ugraphire_rdesc.h diff --git a/sys/dev/usb/uhci.c b/sys/legacy/dev/usb/uhci.c similarity index 100% rename from sys/dev/usb/uhci.c rename to sys/legacy/dev/usb/uhci.c diff --git a/sys/dev/usb/uhci_pci.c b/sys/legacy/dev/usb/uhci_pci.c similarity index 100% rename from sys/dev/usb/uhci_pci.c rename to sys/legacy/dev/usb/uhci_pci.c diff --git a/sys/dev/usb/uhcireg.h b/sys/legacy/dev/usb/uhcireg.h similarity index 100% rename from sys/dev/usb/uhcireg.h rename to sys/legacy/dev/usb/uhcireg.h diff --git a/sys/dev/usb/uhcivar.h b/sys/legacy/dev/usb/uhcivar.h similarity index 100% rename from sys/dev/usb/uhcivar.h rename to sys/legacy/dev/usb/uhcivar.h diff --git a/sys/dev/usb/uhid.c b/sys/legacy/dev/usb/uhid.c similarity index 100% rename from sys/dev/usb/uhid.c rename to sys/legacy/dev/usb/uhid.c diff --git a/sys/dev/usb/uhub.c b/sys/legacy/dev/usb/uhub.c similarity index 100% rename from sys/dev/usb/uhub.c rename to sys/legacy/dev/usb/uhub.c diff --git a/sys/dev/usb/uipaq.c b/sys/legacy/dev/usb/uipaq.c similarity index 100% rename from sys/dev/usb/uipaq.c rename to sys/legacy/dev/usb/uipaq.c diff --git a/sys/dev/usb/ukbd.c b/sys/legacy/dev/usb/ukbd.c similarity index 100% rename from sys/dev/usb/ukbd.c rename to sys/legacy/dev/usb/ukbd.c diff --git a/sys/dev/usb/ulpt.c b/sys/legacy/dev/usb/ulpt.c similarity index 100% rename from sys/dev/usb/ulpt.c rename to sys/legacy/dev/usb/ulpt.c diff --git a/sys/dev/usb/umass.c b/sys/legacy/dev/usb/umass.c similarity index 100% rename from sys/dev/usb/umass.c rename to sys/legacy/dev/usb/umass.c diff --git a/sys/dev/usb/umct.c b/sys/legacy/dev/usb/umct.c similarity index 100% rename from sys/dev/usb/umct.c rename to sys/legacy/dev/usb/umct.c diff --git a/sys/dev/usb/umodem.c b/sys/legacy/dev/usb/umodem.c similarity index 100% rename from sys/dev/usb/umodem.c rename to sys/legacy/dev/usb/umodem.c diff --git a/sys/dev/usb/ums.c b/sys/legacy/dev/usb/ums.c similarity index 100% rename from sys/dev/usb/ums.c rename to sys/legacy/dev/usb/ums.c diff --git a/sys/dev/usb/uplcom.c b/sys/legacy/dev/usb/uplcom.c similarity index 100% rename from sys/dev/usb/uplcom.c rename to sys/legacy/dev/usb/uplcom.c diff --git a/sys/dev/usb/urio.c b/sys/legacy/dev/usb/urio.c similarity index 100% rename from sys/dev/usb/urio.c rename to sys/legacy/dev/usb/urio.c diff --git a/sys/dev/usb/usb.c b/sys/legacy/dev/usb/usb.c similarity index 100% rename from sys/dev/usb/usb.c rename to sys/legacy/dev/usb/usb.c diff --git a/sys/dev/usb/usb.h b/sys/legacy/dev/usb/usb.h similarity index 100% rename from sys/dev/usb/usb.h rename to sys/legacy/dev/usb/usb.h diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/legacy/dev/usb/usb_ethersubr.c similarity index 100% rename from sys/dev/usb/usb_ethersubr.c rename to sys/legacy/dev/usb/usb_ethersubr.c diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/legacy/dev/usb/usb_ethersubr.h similarity index 100% rename from sys/dev/usb/usb_ethersubr.h rename to sys/legacy/dev/usb/usb_ethersubr.h diff --git a/sys/dev/usb/usb_if.m b/sys/legacy/dev/usb/usb_if.m similarity index 100% rename from sys/dev/usb/usb_if.m rename to sys/legacy/dev/usb/usb_if.m diff --git a/sys/dev/usb/usb_mem.c b/sys/legacy/dev/usb/usb_mem.c similarity index 100% rename from sys/dev/usb/usb_mem.c rename to sys/legacy/dev/usb/usb_mem.c diff --git a/sys/dev/usb/usb_mem.h b/sys/legacy/dev/usb/usb_mem.h similarity index 100% rename from sys/dev/usb/usb_mem.h rename to sys/legacy/dev/usb/usb_mem.h diff --git a/sys/dev/usb/usb_port.h b/sys/legacy/dev/usb/usb_port.h similarity index 100% rename from sys/dev/usb/usb_port.h rename to sys/legacy/dev/usb/usb_port.h diff --git a/sys/dev/usb/usb_quirks.c b/sys/legacy/dev/usb/usb_quirks.c similarity index 100% rename from sys/dev/usb/usb_quirks.c rename to sys/legacy/dev/usb/usb_quirks.c diff --git a/sys/dev/usb/usb_quirks.h b/sys/legacy/dev/usb/usb_quirks.h similarity index 100% rename from sys/dev/usb/usb_quirks.h rename to sys/legacy/dev/usb/usb_quirks.h diff --git a/sys/dev/usb/usb_subr.c b/sys/legacy/dev/usb/usb_subr.c similarity index 100% rename from sys/dev/usb/usb_subr.c rename to sys/legacy/dev/usb/usb_subr.c diff --git a/sys/dev/usb/usbcdc.h b/sys/legacy/dev/usb/usbcdc.h similarity index 100% rename from sys/dev/usb/usbcdc.h rename to sys/legacy/dev/usb/usbcdc.h diff --git a/sys/dev/usb/usbdevs b/sys/legacy/dev/usb/usbdevs similarity index 100% rename from sys/dev/usb/usbdevs rename to sys/legacy/dev/usb/usbdevs diff --git a/sys/dev/usb/usbdi.c b/sys/legacy/dev/usb/usbdi.c similarity index 100% rename from sys/dev/usb/usbdi.c rename to sys/legacy/dev/usb/usbdi.c diff --git a/sys/dev/usb/usbdi.h b/sys/legacy/dev/usb/usbdi.h similarity index 100% rename from sys/dev/usb/usbdi.h rename to sys/legacy/dev/usb/usbdi.h diff --git a/sys/dev/usb/usbdi_util.c b/sys/legacy/dev/usb/usbdi_util.c similarity index 100% rename from sys/dev/usb/usbdi_util.c rename to sys/legacy/dev/usb/usbdi_util.c diff --git a/sys/dev/usb/usbdi_util.h b/sys/legacy/dev/usb/usbdi_util.h similarity index 100% rename from sys/dev/usb/usbdi_util.h rename to sys/legacy/dev/usb/usbdi_util.h diff --git a/sys/dev/usb/usbdivar.h b/sys/legacy/dev/usb/usbdivar.h similarity index 100% rename from sys/dev/usb/usbdivar.h rename to sys/legacy/dev/usb/usbdivar.h diff --git a/sys/dev/usb/usbhid.h b/sys/legacy/dev/usb/usbhid.h similarity index 100% rename from sys/dev/usb/usbhid.h rename to sys/legacy/dev/usb/usbhid.h diff --git a/sys/dev/usb/uscanner.c b/sys/legacy/dev/usb/uscanner.c similarity index 100% rename from sys/dev/usb/uscanner.c rename to sys/legacy/dev/usb/uscanner.c diff --git a/sys/dev/usb/uslcom.c b/sys/legacy/dev/usb/uslcom.c similarity index 100% rename from sys/dev/usb/uslcom.c rename to sys/legacy/dev/usb/uslcom.c diff --git a/sys/dev/usb/uvisor.c b/sys/legacy/dev/usb/uvisor.c similarity index 100% rename from sys/dev/usb/uvisor.c rename to sys/legacy/dev/usb/uvisor.c diff --git a/sys/dev/usb/uvscom.c b/sys/legacy/dev/usb/uvscom.c similarity index 100% rename from sys/dev/usb/uvscom.c rename to sys/legacy/dev/usb/uvscom.c diff --git a/sys/dev/usb/uxb360gp_rdesc.h b/sys/legacy/dev/usb/uxb360gp_rdesc.h similarity index 100% rename from sys/dev/usb/uxb360gp_rdesc.h rename to sys/legacy/dev/usb/uxb360gp_rdesc.h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index a8e1f2b78e9..d10bbcb6efe 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -30,9 +30,7 @@ SUBDIR= ${_3dfx} \ ${_asr} \ ata \ ath \ - aue \ ${_auxio} \ - axe \ bce \ bfe \ bge \ @@ -47,7 +45,6 @@ SUBDIR= ${_3dfx} \ ${_cbb} \ cd9660 \ cd9660_iconv \ - cdce \ ${_ce} \ ${_ciss} \ ${_cm} \ @@ -63,7 +60,6 @@ SUBDIR= ${_3dfx} \ ${_cryptodev} \ ${_cs} \ ${_ctau} \ - cue \ cxgb \ ${_cyclic} \ dc \ @@ -76,7 +72,6 @@ SUBDIR= ${_3dfx} \ ${_dtrace} \ dummynet \ ${_ed} \ - ehci \ ${_elink} \ ${_em} \ en \ @@ -145,7 +140,6 @@ SUBDIR= ${_3dfx} \ ${_k8temp} \ kbdmux \ krpc \ - kue \ le \ lge \ libalias \ @@ -205,7 +199,6 @@ SUBDIR= ${_3dfx} \ ${_nwfs} \ ${_nxge} \ ${_opensolaris} \ - ohci \ ${_padlock} \ patm \ ${_pccard} \ @@ -232,8 +225,6 @@ SUBDIR= ${_3dfx} \ re \ reiserfs \ rl \ - rue \ - rum \ ${_s3} \ ${_safe} \ ${_sbni} \ @@ -243,7 +234,6 @@ SUBDIR= ${_3dfx} \ sdhci \ sem \ sf \ - slhci \ sis \ sk \ ${_smbfs} \ @@ -271,43 +261,13 @@ SUBDIR= ${_3dfx} \ twe \ tx \ txp \ - u3g \ - uark \ uart \ - ubsa \ ubsec \ - ucom \ - udav \ - udbp \ udf \ udf_iconv \ - ufm \ ${_ufs} \ - ufoma \ - uftdi \ - ugen \ - uhci \ - uhid \ - uipaq \ - ukbd \ - ulpt \ - umass \ - umct \ - umodem \ - ums \ unionfs \ - ${_upgt} \ - uplcom \ - ural \ - urio \ - ${_urtw} \ - usb \ - usb2 \ - uscanner \ - uslcom \ utopia \ - uvisor \ - uvscom \ ${_vesa} \ vge \ vkbd \ @@ -331,7 +291,6 @@ SUBDIR= ${_3dfx} \ xl \ ${_zfs} \ zlib \ - zyd .if ${MACHINE_ARCH} != "powerpc" _syscons= syscons @@ -440,8 +399,6 @@ _stg= stg _streams= streams _svr4= svr4 _tmpfs= tmpfs -_upgt= upgt -_urtw= urtw _wi= wi _xe= xe .if ${MK_ZFS} != "no" || defined(ALL_MODULES) @@ -572,8 +529,6 @@ _speaker= speaker _sppp= sppp _tmpfs= tmpfs _twa= twa -_upgt= upgt -_urtw= urtw _wi= wi _wpi= wpi _wpifw= wpifw @@ -624,7 +579,6 @@ _an= an _bm= bm _nvram= powermac_nvram _smbfs= smbfs -_upgt= upgt .endif .if ${MACHINE_ARCH} == "sparc64" @@ -633,7 +587,6 @@ _em= em _i2c= i2c _igb= igb _sound= sound -_upgt= upgt .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile deleted file mode 100644 index c8b3890db2b..00000000000 --- a/sys/modules/aue/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= if_aue -SRCS= if_aue.c opt_usb.h device_if.h bus_if.h -SRCS+= miibus_if.h usbdevs.h - -.include diff --git a/sys/modules/axe/Makefile b/sys/modules/axe/Makefile deleted file mode 100644 index 4d82d5ab6a7..00000000000 --- a/sys/modules/axe/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= if_axe -SRCS= if_axe.c opt_usb.h device_if.h bus_if.h -SRCS+= miibus_if.h usbdevs.h - -.include diff --git a/sys/modules/cdce/Makefile b/sys/modules/cdce/Makefile deleted file mode 100644 index 9942ded5c96..00000000000 --- a/sys/modules/cdce/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= if_cdce -SRCS= if_cdce.c opt_usb.h device_if.h bus_if.h -SRCS+= usbdevs.h - -.include diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile deleted file mode 100644 index ae31329ad95..00000000000 --- a/sys/modules/cue/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= if_cue -SRCS= if_cue.c opt_usb.h device_if.h bus_if.h -SRCS+= miibus_if.h usbdevs.h - -.include diff --git a/sys/modules/ehci/Makefile b/sys/modules/ehci/Makefile deleted file mode 100644 index 2acf37b0027..00000000000 --- a/sys/modules/ehci/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. - -.PATH: $S/dev/usb $S/pci - -KMOD= ehci -SRCS= bus_if.h device_if.h \ - opt_usb.h \ - ehci_pci.c ehci.c ehcireg.h ehcivar.h \ - pci_if.h - -.include diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile deleted file mode 100644 index d5271d1f16b..00000000000 --- a/sys/modules/kue/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= if_kue -SRCS= if_kue.c opt_usb.h device_if.h bus_if.h -SRCS+= miibus_if.h usbdevs.h - -.include diff --git a/sys/modules/ohci/Makefile b/sys/modules/ohci/Makefile deleted file mode 100644 index 59fcf76773b..00000000000 --- a/sys/modules/ohci/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. - -.PATH: $S/dev/usb $S/pci - -KMOD= ohci -SRCS= bus_if.h device_if.h \ - opt_usb.h \ - ohci_pci.c ohci.c ohcireg.h ohcivar.h \ - pci_if.h - -.include diff --git a/sys/modules/rue/Makefile b/sys/modules/rue/Makefile deleted file mode 100644 index 1837eff1a4a..00000000000 --- a/sys/modules/rue/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= if_rue -SRCS= if_rue.c opt_usb.h device_if.h bus_if.h -SRCS+= miibus_if.h usbdevs.h - -.include diff --git a/sys/modules/rum/Makefile b/sys/modules/rum/Makefile deleted file mode 100644 index ae9b8cc7e58..00000000000 --- a/sys/modules/rum/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD = if_rum -SRCS = if_rum.c opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/slhci/Makefile b/sys/modules/slhci/Makefile deleted file mode 100644 index 422cf7794e4..00000000000 --- a/sys/modules/slhci/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= slhci -SRCS= sl811hs.c slhci_pccard.c - -SRCS+= bus_if.h device_if.h card_if.h power_if.h \ - usbdevs.h pccarddevs.h \ - opt_slhci.h opt_usb.h \ - -.include diff --git a/sys/modules/u3g/Makefile b/sys/modules/u3g/Makefile deleted file mode 100644 index b2e1ffdfce8..00000000000 --- a/sys/modules/u3g/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= u3g -SRCS= opt_usb.h opt_u3g.h \ - device_if.h bus_if.h \ - usbdevs.h \ - ucomvar.h \ - u3g.c - -.include diff --git a/sys/modules/uark/Makefile b/sys/modules/uark/Makefile deleted file mode 100644 index 703cc851505..00000000000 --- a/sys/modules/uark/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= uark -SRCS= uark.c opt_usb.h bus_if.h device_if.h usbdevs.h - -.include diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile deleted file mode 100644 index 1d7eb766fef..00000000000 --- a/sys/modules/ubsa/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= ubsa -SRCS= ubsa.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/ucom/Makefile b/sys/modules/ucom/Makefile deleted file mode 100644 index bbd5c21dbf2..00000000000 --- a/sys/modules/ucom/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= ucom -SRCS= ucom.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/udav/Makefile b/sys/modules/udav/Makefile deleted file mode 100644 index fd7acf93694..00000000000 --- a/sys/modules/udav/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb -KMOD= if_udav -SRCS= if_udav.c opt_usb.h device_if.h bus_if.h opt_inet.h -SRCS+= miibus_if.h usbdevs.h - -.include diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile deleted file mode 100644 index aeeac7cb4b9..00000000000 --- a/sys/modules/udbp/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= udbp -SRCS= bus_if.h device_if.h \ - opt_usb.h opt_netgraph.h \ - udbp.c usbdevs.h - -.include diff --git a/sys/modules/ufm/Makefile b/sys/modules/ufm/Makefile deleted file mode 100644 index 28bbc90e3a0..00000000000 --- a/sys/modules/ufm/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb -KMOD= ufm -SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ufm.c dsbr100io.h usbdevs.h - -.include diff --git a/sys/modules/ufoma/Makefile b/sys/modules/ufoma/Makefile deleted file mode 100644 index e89819c8a4e..00000000000 --- a/sys/modules/ufoma/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= ufoma -SRCS= bus_if.h device_if.h opt_usb.h ufoma.c usbdevs.h - -.include diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile deleted file mode 100644 index 65cb10782f5..00000000000 --- a/sys/modules/uftdi/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= uftdi -SRCS= uftdi.c uftdireg.h opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile deleted file mode 100644 index d024a3a396d..00000000000 --- a/sys/modules/ugen/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= ugen -SRCS= bus_if.h device_if.h opt_usb.h ugen.c usbdevs.h - -.include diff --git a/sys/modules/uhci/Makefile b/sys/modules/uhci/Makefile deleted file mode 100644 index b7c766623fc..00000000000 --- a/sys/modules/uhci/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. - -.PATH: $S/dev/usb $S/pci - -KMOD= uhci -SRCS= bus_if.h device_if.h \ - opt_usb.h \ - uhci_pci.c uhci.c uhcireg.h uhcivar.h \ - pci_if.h - -.include diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile deleted file mode 100644 index 31c5a17ec2b..00000000000 --- a/sys/modules/uhid/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= uhid -SRCS= bus_if.h device_if.h opt_usb.h uhid.c usbdevs.h - -.include diff --git a/sys/modules/uipaq/Makefile b/sys/modules/uipaq/Makefile deleted file mode 100644 index d8378fa22e3..00000000000 --- a/sys/modules/uipaq/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= uipaq -SRCS= uipaq.c opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile deleted file mode 100644 index 331e72911bd..00000000000 --- a/sys/modules/ukbd/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= ukbd -SRCS= bus_if.h device_if.h opt_compat.h opt_usb.h opt_kbd.h opt_ukbd.h \ - usbdevs.h ukbd.c - -.if !defined(KERNBUILDDIR) -opt_compat.h: - echo "#define COMPAT_FREEBSD6 1" > ${.TARGET} - -opt_kbd.h: - echo "#define KBD_INSTALL_CDEV 1" > ${.TARGET} -.endif - -.include diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile deleted file mode 100644 index c7d51c30f9f..00000000000 --- a/sys/modules/ulpt/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= ulpt -SRCS= bus_if.h device_if.h opt_usb.h ulpt.c usbdevs.h - -.include diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile deleted file mode 100644 index 4af29fe9097..00000000000 --- a/sys/modules/umass/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= umass -SRCS= bus_if.h device_if.h \ - opt_usb.h opt_cam.h opt_scsi.h \ - umass.c usbdevs.h - -.include diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile deleted file mode 100644 index ccd775f4ba6..00000000000 --- a/sys/modules/umct/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= umct -SRCS= umct.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile deleted file mode 100644 index 458a2c3cfaf..00000000000 --- a/sys/modules/umodem/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= umodem -SRCS= bus_if.h device_if.h opt_usb.h umodem.c usbdevs.h - -.include diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile deleted file mode 100644 index fee38430c2e..00000000000 --- a/sys/modules/ums/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= ums -SRCS= bus_if.h device_if.h opt_usb.h ums.c usbdevs.h - -.include diff --git a/sys/modules/upgt/Makefile b/sys/modules/upgt/Makefile deleted file mode 100644 index ae40e48d45f..00000000000 --- a/sys/modules/upgt/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Conexant/Intersil PrismGT SoftMAC(GW3887) USB devices -# -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD = if_upgt -SRCS = if_upgt.c opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/uplcom/Makefile b/sys/modules/uplcom/Makefile deleted file mode 100644 index 36115ccca43..00000000000 --- a/sys/modules/uplcom/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= uplcom -SRCS= uplcom.c ucomvar.h opt_usb.h opt_uplcom.h \ - device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/ural/Makefile b/sys/modules/ural/Makefile deleted file mode 100644 index 7076e811fb0..00000000000 --- a/sys/modules/ural/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD = if_ural -SRCS = if_ural.c opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile deleted file mode 100644 index 0221c5d1a10..00000000000 --- a/sys/modules/urio/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -MAINTAINER= Iwasa Kazmi - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= urio -SRCS= bus_if.h device_if.h opt_usb.h urio.c usbdevs.h - -.include diff --git a/sys/modules/urtw/Makefile b/sys/modules/urtw/Makefile deleted file mode 100644 index 3857e4a87c6..00000000000 --- a/sys/modules/urtw/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD = if_urtw -SRCS = if_urtw.c if_urtwvar.h if_urtwreg.h opt_usb.h device_if.h \ - bus_if.h usbdevs.h - -.include diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile deleted file mode 100644 index 9f9cdbc247b..00000000000 --- a/sys/modules/usb/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. - -.PATH: $S/dev/usb $S/pci - -KMOD= usb -SRCS= bus_if.h device_if.h usb_if.h usb_if.c \ - opt_usb.h \ - hid.c hid.h usbhid.h \ - uhub.c \ - usb.c usb.h \ - usb_mem.c usb_mem.h \ - usb_port.h \ - usb_quirks.c usb_quirks.h \ - usb_subr.c \ - usbdevs.h usbdevs_data.h \ - usbdi.c usbdi.h usbdivar.h \ - usbdi_util.c usbdi_util.h \ - usb_ethersubr.c usbdevs.h - -.include diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile deleted file mode 100644 index fa348565933..00000000000 --- a/sys/modules/uscanner/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD= uscanner -SRCS= bus_if.h device_if.h opt_usb.h uscanner.c usbdevs.h - -.include diff --git a/sys/modules/uslcom/Makefile b/sys/modules/uslcom/Makefile deleted file mode 100644 index e5dc96c1fac..00000000000 --- a/sys/modules/uslcom/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= uslcom -SRCS= uslcom.c opt_usb.h \ - device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/uvisor/Makefile b/sys/modules/uvisor/Makefile deleted file mode 100644 index feb74df9acb..00000000000 --- a/sys/modules/uvisor/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= uvisor -SRCS= uvisor.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/uvscom/Makefile b/sys/modules/uvscom/Makefile deleted file mode 100644 index ceb1959df1f..00000000000 --- a/sys/modules/uvscom/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -S= ${.CURDIR}/../.. -.PATH: $S/dev/usb - -KMOD= uvscom -SRCS= uvscom.c ucomvar.h opt_usb.h opt_uvscom.h \ - device_if.h bus_if.h usbdevs.h - -.include diff --git a/sys/modules/zyd/Makefile b/sys/modules/zyd/Makefile deleted file mode 100644 index 95a7be8c5ea..00000000000 --- a/sys/modules/zyd/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# ZyDAS Loadable Kernel Module -# -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/usb - -KMOD = if_zyd -SRCS = if_zyd.c opt_usb.h device_if.h bus_if.h usbdevs.h - -.include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 5a4efcc1549..c9fefd80bff 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -406,7 +406,7 @@ _crunch= crunch .endif .if ${MK_USB} != "no" -_usbdevs= usbdevs +#_usbdevs= usbdevs _usbconfig= usbconfig .endif