svn commit: r188939 - in head: sys/compat/ndis sys/dev/if_ndis
sys/dev/usb sys/legacy sys/legacy/dev sys/legacy/dev/usb
sys/modules sys/modules/aue sys/modules/axe sys/modules/cdce
sys/modules/cue ...
Andrew Thompson
thompsa at FreeBSD.org
Mon Feb 23 10:16:19 PST 2009
Author: thompsa
Date: Mon Feb 23 18:16:17 2009
New Revision: 188939
URL: http://svn.freebsd.org/changeset/base/188939
Log:
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.
Added:
head/sys/legacy/
head/sys/legacy/dev/
head/sys/legacy/dev/usb/ (props changed)
- copied from r188820, head/sys/dev/usb/
Deleted:
head/sys/dev/usb/
head/sys/modules/aue/
head/sys/modules/axe/
head/sys/modules/cdce/
head/sys/modules/cue/
head/sys/modules/ehci/
head/sys/modules/kue/
head/sys/modules/ohci/
head/sys/modules/rue/
head/sys/modules/rum/
head/sys/modules/slhci/
head/sys/modules/u3g/
head/sys/modules/uark/
head/sys/modules/ubsa/
head/sys/modules/ucom/
head/sys/modules/udav/
head/sys/modules/udbp/
head/sys/modules/ufm/
head/sys/modules/ufoma/
head/sys/modules/uftdi/
head/sys/modules/ugen/
head/sys/modules/uhci/
head/sys/modules/uhid/
head/sys/modules/uipaq/
head/sys/modules/ukbd/
head/sys/modules/ulpt/
head/sys/modules/umass/
head/sys/modules/umct/
head/sys/modules/umodem/
head/sys/modules/ums/
head/sys/modules/upgt/
head/sys/modules/uplcom/
head/sys/modules/ural/
head/sys/modules/urio/
head/sys/modules/urtw/
head/sys/modules/usb/
head/sys/modules/uscanner/
head/sys/modules/uslcom/
head/sys/modules/uvisor/
head/sys/modules/uvscom/
head/sys/modules/zyd/
Modified:
head/sys/compat/ndis/kern_ndis.c
head/sys/compat/ndis/kern_windrv.c
head/sys/compat/ndis/subr_ndis.c
head/sys/compat/ndis/subr_usbd.c
head/sys/dev/if_ndis/if_ndis.c
head/sys/dev/if_ndis/if_ndis_pccard.c
head/sys/dev/if_ndis/if_ndis_pci.c
head/sys/dev/if_ndis/if_ndis_usb.c
head/sys/modules/Makefile
head/usr.sbin/Makefile
Modified: head/sys/compat/ndis/kern_ndis.c
==============================================================================
--- head/sys/compat/ndis/kern_ndis.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/compat/ndis/kern_ndis.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_ioctl.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
#include <compat/ndis/pe_var.h>
#include <compat/ndis/cfg_var.h>
Modified: head/sys/compat/ndis/kern_windrv.c
==============================================================================
--- head/sys/compat/ndis/kern_windrv.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/compat/ndis/kern_windrv.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
#include <machine/segments.h>
#endif
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
#include <compat/ndis/pe_var.h>
#include <compat/ndis/cfg_var.h>
Modified: head/sys/compat/ndis/subr_ndis.c
==============================================================================
--- head/sys/compat/ndis/subr_ndis.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/compat/ndis/subr_ndis.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -95,8 +95,8 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
#include <compat/ndis/pe_var.h>
#include <compat/ndis/cfg_var.h>
Modified: head/sys/compat/ndis/subr_usbd.c
==============================================================================
--- head/sys/compat/ndis/subr_usbd.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/compat/ndis/subr_usbd.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -56,11 +56,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_ioctl.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_quirks.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
+#include <legacy/dev/usb/usbdi_util.h>
+#include <legacy/dev/usb/usbdivar.h>
+#include <legacy/dev/usb/usb_quirks.h>
#include "usbdevs.h"
#include <compat/ndis/pe_var.h>
Modified: head/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/dev/if_ndis/if_ndis.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -74,8 +74,8 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
#include <compat/ndis/pe_var.h>
#include <compat/ndis/cfg_var.h>
Modified: head/sys/dev/if_ndis/if_ndis_pccard.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis_pccard.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/dev/if_ndis/if_ndis_pccard.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_var.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
#include <compat/ndis/pe_var.h>
#include <compat/ndis/cfg_var.h>
Modified: head/sys/dev/if_ndis/if_ndis_pci.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis_pci.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/dev/if_ndis/if_ndis_pci.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
#include <compat/ndis/pe_var.h>
#include <compat/ndis/cfg_var.h>
Modified: head/sys/dev/if_ndis/if_ndis_usb.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis_usb.c Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/dev/if_ndis/if_ndis_usb.c Mon Feb 23 18:16:17 2009 (r188939)
@@ -52,10 +52,10 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
+#include <legacy/dev/usb/usbdi_util.h>
+#include <legacy/dev/usb/usbdivar.h>
#include "usbdevs.h"
#include <net80211/ieee80211_var.h>
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Mon Feb 23 15:39:24 2009 (r188938)
+++ head/sys/modules/Makefile Mon Feb 23 18:16:17 2009 (r188939)
@@ -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
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Mon Feb 23 15:39:24 2009 (r188938)
+++ head/usr.sbin/Makefile Mon Feb 23 18:16:17 2009 (r188939)
@@ -406,7 +406,7 @@ _crunch= crunch
.endif
.if ${MK_USB} != "no"
-_usbdevs= usbdevs
+#_usbdevs= usbdevs
_usbconfig= usbconfig
.endif
More information about the svn-src-head
mailing list