From owner-p4-projects@FreeBSD.ORG Wed Aug 30 19:41:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EC4416A4E6; Wed, 30 Aug 2006 19:41:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D50E16A4DA for ; Wed, 30 Aug 2006 19:41:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE36443D5A for ; Wed, 30 Aug 2006 19:41:44 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7UJfiNs018216 for ; Wed, 30 Aug 2006 19:41:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7UJfid9018213 for perforce@freebsd.org; Wed, 30 Aug 2006 19:41:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 30 Aug 2006 19:41:44 GMT Message-Id: <200608301941.k7UJfid9018213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 105350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2006 19:41:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=105350 Change 105350 by hselasky@hselasky_mini_itx on 2006/08/30 19:41:34 Remove "usb_ethersubr.[ch]", hence these routines are not used any more. Fix compilation of the "usb" module. Update "conf/files". Affected files ... .. //depot/projects/usb/src/sys/conf/files#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.c#5 delete .. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.h#4 delete .. //depot/projects/usb/src/sys/modules/usb/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#6 (text+ko) ==== @@ -985,7 +985,6 @@ dev/usb/usb_requests.c optional usb dev/usb/usb_subr.c optional usb dev/usb/usb_transfer.c optional usb -dev/usb/usb_ethersubr.c optional usb dev/usb/usb_if.m optional usb dev/usb/usb_quirks.c optional usb dev/usb/usb_hid.c optional usb @@ -994,8 +993,6 @@ dev/usb/ulpt.c optional ulpt dev/usb/ums.c optional ums dev/usb/ukbd.c optional ukbd -# -# USB support (not merged) dev/usb/if_aue.c optional aue dev/usb/if_axe.c optional axe dev/usb/if_cdce.c optional cdce @@ -1004,6 +1001,9 @@ dev/usb/if_ural.c optional ural dev/usb/if_rue.c optional rue dev/usb/if_udav.c optional udav +dev/usb/ufm.c optional ufm +# +# USB support (not merged) dev/usb/sl811hs.c optional slhci dev/usb/slhci_pccard.c optional slhci pccard dev/usb/ubsa.c optional ubsa ucom @@ -1012,7 +1012,6 @@ dev/usb/ucycom.c optional ucycom ucom dev/usb/udbp.c optional udbp dev/usb/ufoma.c optional ufoma ucom -dev/usb/ufm.c optional ufm dev/usb/uftdi.c optional uftdi ucom dev/usb/uhid.c optional uhid dev/usb/umass.c optional umass ==== //depot/projects/usb/src/sys/modules/usb/Makefile#2 (text+ko) ==== @@ -5,23 +5,21 @@ .PATH: $S/dev/usb $S/pci KMOD= usb -SRCS= bus_if.h device_if.h usb_if.h usb_if.c \ +SRCS= bus_if.h device_if.h usb_if.h usb_if.c vnode_if.h \ opt_usb.h \ - hid.c hid.h usbhid.h \ uhub.c \ - usb.c usb.h \ - usb_mem.c usb_mem.h \ - usb_port.h \ + usbdevs.h usbdevs_data.h \ + usb.c usb.h usb_port.h \ + usb_cdev.c \ + usb_hid.c usb_hid.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 + usb_requests.c \ + usb_subr.c usb_subr.h \ + usb_transfer.c \ -SRCS+= uhci_pci.c uhci.c uhcireg.h uhcivar.h -SRCS+= ohci_pci.c ohci.c ohcireg.h ohcivar.h -SRCS+= ehci_pci.c ehci.c ehcireg.h ehcivar.h +SRCS+= uhci_pci.c uhci.c uhci.h +SRCS+= ohci_pci.c ohci.c ohci.h +SRCS+= ehci_pci.c ehci.c ehci.h SRCS+= opt_bus.h pci_if.h .include