From owner-svn-src-head@FreeBSD.ORG Wed May 27 16:16:57 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E21D106566C; Wed, 27 May 2009 16:16:57 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 594F18FC0C; Wed, 27 May 2009 16:16:57 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RGGv0v003028; Wed, 27 May 2009 16:16:57 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4RGGu6Q003019; Wed, 27 May 2009 16:16:56 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200905271616.n4RGGu6Q003019@svn.freebsd.org> From: Andrew Thompson Date: Wed, 27 May 2009 16:16:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192901 - in head: . etc/mtree include sys/arm/at91 sys/arm/conf sys/arm/xscale/ixp425 sys/conf sys/legacy usr.bin/kdump X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 16:16:57 -0000 Author: thompsa Date: Wed May 27 16:16:56 2009 New Revision: 192901 URL: http://svn.freebsd.org/changeset/base/192901 Log: Delete the old USB stack. The new stack has settled in and has all the drivers/functionality and then some. Deleted: head/sys/arm/at91/ohci_atmelarm.c head/sys/legacy/ Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.include.dist head/include/Makefile head/sys/arm/conf/AVILA head/sys/arm/xscale/ixp425/files.ixp425 head/sys/conf/files head/sys/conf/kern.pre.mk head/usr.bin/kdump/mkioctls Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed May 27 15:46:22 2009 (r192900) +++ head/ObsoleteFiles.inc Wed May 27 16:16:56 2009 (r192901) @@ -14,6 +14,39 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090527: removal of legacy USB stack +OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h +OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/hid.h +OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h +OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h +OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h +OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h +OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h +OLD_FILES+=usr/include/legacy/dev/usb/ubser.h +OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h +OLD_FILES+=usr/include/legacy/dev/usb/udbp.h +OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h +OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/usb.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h +OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h +OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h +OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h +OLD_DIRS+=usr/include/legacy/dev/usb +OLD_DIRS+=usr/include/legacy/dev +OLD_DIRS+=usr/include/legacy # 20090522: removal of University of Michigan NFSv4 client OLD_FILES+=etc/rc.d/idmapd OLD_FILES+=sbin/idmapd Modified: head/etc/mtree/BSD.include.dist ============================================================================== --- head/etc/mtree/BSD.include.dist Wed May 27 15:46:22 2009 (r192900) +++ head/etc/mtree/BSD.include.dist Wed May 27 16:16:56 2009 (r192901) @@ -197,12 +197,6 @@ .. kadm5 .. - legacy - dev - usb - .. - .. - .. libmilter .. lwres Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Wed May 27 15:46:22 2009 (r192900) +++ head/include/Makefile Wed May 27 16:16:56 2009 (r192901) @@ -54,7 +54,7 @@ LSUBDIRS= cam/scsi \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs -LSUBSUBDIRS= dev/mpt/mpilib legacy/dev/usb +LSUBSUBDIRS= dev/mpt/mpilib .if ${MACHINE_ARCH} == "powerpc" _dev_powermac_nvram= dev/powermac_nvram Modified: head/sys/arm/conf/AVILA ============================================================================== --- head/sys/arm/conf/AVILA Wed May 27 15:46:22 2009 (r192900) +++ head/sys/arm/conf/AVILA Wed May 27 16:16:56 2009 (r192901) @@ -132,15 +132,14 @@ device ath_ar5416 options AH_SUPPORT_AR5416 device ath_ar9160 -makeoptions WITH_LEGACY -device ousb +device usb #options USB_DEBUG -device oohci -device oehci -device oumass +device ohci +device ehci +device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) -#device oural -#device ozyd +#device ural +#device zyd #device wlan_amrr Modified: head/sys/arm/xscale/ixp425/files.ixp425 ============================================================================== --- head/sys/arm/xscale/ixp425/files.ixp425 Wed May 27 15:46:22 2009 (r192900) +++ head/sys/arm/xscale/ixp425/files.ixp425 Wed May 27 16:16:56 2009 (r192901) @@ -47,4 +47,3 @@ IxNpeMicrocode.dat optional npe_fw \ arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # dev/usb/controller/ehci_ixp4xx.c optional ehci usb -legacy/dev/usb/ehci_ixp4xx.c optional oehci ousb Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed May 27 15:46:22 2009 (r192900) +++ head/sys/conf/files Wed May 27 16:16:56 2009 (r192901) @@ -80,12 +80,12 @@ teken_state.h optional sc \ compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \ no-obj no-implicit-rule before-depend \ clean "teken_state.h" -usbdevs.h optional usb | ousb \ +usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ no-obj no-implicit-rule before-depend \ clean "usbdevs.h" -usbdevs_data.h optional usb | ousb \ +usbdevs_data.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \ no-obj no-implicit-rule before-depend \ @@ -503,7 +503,6 @@ dev/ata/chipsets/ata-via.c optional ata dev/ata/ata-disk.c optional atadisk dev/ata/ata-raid.c optional ataraid dev/ata/ata-usb.c optional atausb usb -legacy/dev/ata/ata-usb.c optional atausb ousb dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist @@ -1421,8 +1420,6 @@ dev/sound/pcm/sound.c optional sound dev/sound/pcm/vchan.c optional sound dev/sound/usb/uaudio.c optional snd_uaudio usb dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb -legacy/dev/sound/usb/uaudio.c optional snd_uaudio ousb -legacy/dev/sound/usb/uaudio_pcm.c optional snd_uaudio ousb dev/sound/midi/midi.c optional sound dev/sound/midi/mpu401.c optional sound dev/sound/midi/mpu_if.m optional sound @@ -1502,51 +1499,6 @@ dev/uart/uart_subr.c optional uart dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # -# USB support -legacy/dev/usb/ehci.c optional oehci -legacy/dev/usb/ehci_ddb.c optional oehci -legacy/dev/usb/ehci_pci.c optional oehci pci -legacy/dev/usb/hid.c optional ousb -legacy/dev/usb/ohci.c optional oohci -legacy/dev/usb/ohci_pci.c optional oohci pci -legacy/dev/usb/sl811hs.c optional oslhci -legacy/dev/usb/slhci_pccard.c optional oslhci pccard -legacy/dev/usb/uark.c optional ouark -legacy/dev/usb/u3g.c optional ou3g -legacy/dev/usb/ubsa.c optional oubsa -legacy/dev/usb/ubser.c optional oubser -legacy/dev/usb/ucom.c optional oucom -legacy/dev/usb/ucycom.c optional oucycom -legacy/dev/usb/udbp.c optional oudbp -legacy/dev/usb/ufoma.c optional oufoma -legacy/dev/usb/ufm.c optional oufm -legacy/dev/usb/uftdi.c optional ouftdi -legacy/dev/usb/ugen.c optional ougen -legacy/dev/usb/uhci.c optional ouhci -legacy/dev/usb/uhci_pci.c optional ouhci pci -legacy/dev/usb/uhid.c optional ouhid -legacy/dev/usb/uhub.c optional ousb -legacy/dev/usb/uipaq.c optional ouipaq -legacy/dev/usb/ukbd.c optional oukbd -legacy/dev/usb/ulpt.c optional oulpt -legacy/dev/usb/umass.c optional oumass -legacy/dev/usb/umct.c optional oumct -legacy/dev/usb/umodem.c optional oumodem -legacy/dev/usb/ums.c optional oums -legacy/dev/usb/uplcom.c optional ouplcom -legacy/dev/usb/urio.c optional ourio -legacy/dev/usb/usb.c optional ousb -legacy/dev/usb/usb_if.m optional ousb -legacy/dev/usb/usb_mem.c optional ousb -legacy/dev/usb/usb_quirks.c optional ousb -legacy/dev/usb/usb_subr.c optional ousb -legacy/dev/usb/usbdi.c optional ousb -legacy/dev/usb/usbdi_util.c optional ousb -legacy/dev/usb/uscanner.c optional ouscanner -legacy/dev/usb/uslcom.c optional ouslcom -legacy/dev/usb/uvisor.c optional ouvisor -legacy/dev/usb/uvscom.c optional ouvscom -# # USB controller drivers # dev/usb/controller/at91dci.c optional at91dci @@ -2252,8 +2204,6 @@ netgraph/atm/uni/ng_uni.c optional ngatm netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4 -netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt ousb -netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw ousb netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Wed May 27 15:46:22 2009 (r192900) +++ head/sys/conf/kern.pre.mk Wed May 27 16:16:56 2009 (r192901) @@ -53,11 +53,7 @@ C_DIALECT= -std=c99 NOSTDINC= -nostdinc .endif -.if defined(WITH_LEGACY) -LEGACY_INC= -I$S/legacy -.endif - -INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. ${LEGACY_INC} -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. Modified: head/usr.bin/kdump/mkioctls ============================================================================== --- head/usr.bin/kdump/mkioctls Wed May 27 15:46:22 2009 (r192900) +++ head/usr.bin/kdump/mkioctls Wed May 27 16:16:56 2009 (r192901) @@ -18,14 +18,11 @@ fi LC_ALL=C; export LC_ALL -# include subdirs to exclude from the search -exclude="^legacy/.*" - # Build a list of headers that have ioctls in them. # XXX should we use an ANSI cpp? ioctl_includes=` cd $1 - find -H -s * -name '*.h' \! -regex $exclude | + find -H -s * -name '*.h' | xargs egrep -l \ '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | awk '{printf("#include <%s>\\\\n", $1)}'