From owner-p4-projects@FreeBSD.ORG Sun May 28 12:40:43 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 E9FD416AF95; Sun, 28 May 2006 12:40:42 +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 99AA016AFB1; Sun, 28 May 2006 12:40:41 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8BA343D4C; Sun, 28 May 2006 12:40:40 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 4482E46C60; Sun, 28 May 2006 08:40:40 -0400 (EDT) Date: Sun, 28 May 2006 13:40:40 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Hans Petter Selasky In-Reply-To: <200605272150.k4RLo9Aw026648@repoman.freebsd.org> Message-ID: <20060528133943.N79162@fledge.watson.org> References: <200605272150.k4RLo9Aw026648@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 97970 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: Sun, 28 May 2006 12:40:49 -0000 On Sat, 27 May 2006, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=97970 > > Change 97970 by hselasky@hselasky_mini_itx on 2006/05/27 21:49:24 > > Copied old USB files into "/sys/dev/usb.old" for reference. Prepared > "/sys/conf/files" for new USB system. For future reference, you might want to instead add an additional entry in the branch definition for your branch such that the FreeBSD vendor USB code is merged to that directory in your branch. That way the usb.old tree would continue to track changes from the FreeBSD vendor tree when you integrate. You can still set this up, but it might require slight massaging during the first integration. Robert N M Watson > > Affected files ... > > .. //depot/projects/usb/src/sys/conf/files#2 edit > .. //depot/projects/usb/src/sys/dev/usb.old/FILES#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/dsbr100io.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehci_pci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehcireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehcivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/hid.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/hid.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_aue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_auereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_axe.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_axereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cdce.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cdcereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cuereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_kue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_kuereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_rue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_ruereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_udav.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_udavreg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_ural.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_uralreg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_uralvar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/kue_fw.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohci_pci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohcireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohcivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/rio500_usb.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/sl811hs.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/sl811hsreg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/sl811hsvar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/slhci_pccard.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ubsa.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ubser.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ubser.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ucom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ucomvar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ucycom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/udbp.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/udbp.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ufm.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ufoma.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uftdi.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uftdireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ugen.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ugraphire_rdesc.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhci_pci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhcireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhcivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhid.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhub.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ukbd.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ulpt.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/umass.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/umct.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/umodem.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ums.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uplcom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/urio.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_ethersubr.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_ethersubr.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_if.m#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_mem.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_mem.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_port.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_quirks.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_quirks.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_subr.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbcdc.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdevs#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi_util.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi_util.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbhid.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uscanner.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uvisor.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uvscom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uxb360gp_rdesc.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/FILES#2 delete > .. //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehci.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehcivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/hid.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/hid.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/kue_fw.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohci.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohcireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohcivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/sl811hs.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/sl811hsreg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/sl811hsvar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/slhci_pccard.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ubser.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ubser.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ucom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/udbp.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/udbp.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ufm.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uftdireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ugen.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ugraphire_rdesc.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhci.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhcireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhcivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhid.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhub.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/umass.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/umct.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/umodem.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ums.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/urio.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_mem.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_mem.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#1 add > .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#1 add > .. //depot/projects/usb/src/sys/dev/usb/usbcdc.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uxb360gp_rdesc.h#2 delete > > Differences ... > > ==== //depot/projects/usb/src/sys/conf/files#2 (text+ko) ==== > > @@ -974,8 +974,23 @@ > dev/ubsec/ubsec.c optional ubsec > # > # USB support > +dev/usb/uhci.c optional uhci > +dev/usb/uhci_pci.c optional uhci > +dev/usb/ohci.c optional ohci > +dev/usb/ohci_pci.c optional ohci > dev/usb/ehci.c optional ehci > -dev/usb/ehci_pci.c optional ehci pci > +dev/usb/ehci_pci.c optional ehci > +dev/usb/uhub.c optional usb > +dev/usb/usb.c optional usb > +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/ugen.c optional ugen > +# > +# USB support (not merged) > dev/usb/hid.c optional usb > dev/usb/if_aue.c optional aue > dev/usb/if_axe.c optional axe > @@ -985,8 +1000,6 @@ > dev/usb/if_ural.c optional ural > dev/usb/if_rue.c optional rue > dev/usb/if_udav.c optional udav > -dev/usb/ohci.c optional ohci > -dev/usb/ohci_pci.c optional ohci pci > dev/usb/sl811hs.c optional slhci > dev/usb/slhci_pccard.c optional slhci pccard > dev/usb/ubsa.c optional ubsa ucom > @@ -997,11 +1010,7 @@ > dev/usb/ufoma.c optional ufoma ucom > dev/usb/ufm.c optional ufm > dev/usb/uftdi.c optional uftdi ucom > -dev/usb/ugen.c optional ugen > -dev/usb/uhci.c optional uhci > -dev/usb/uhci_pci.c optional uhci pci > dev/usb/uhid.c optional uhid > -dev/usb/uhub.c optional usb > dev/usb/ukbd.c optional ukbd > dev/usb/ulpt.c optional ulpt > dev/usb/umass.c optional umass > @@ -1010,17 +1019,11 @@ > dev/usb/ums.c optional ums > dev/usb/uplcom.c optional uplcom ucom > dev/usb/urio.c optional urio > -dev/usb/usb.c optional usb > -dev/usb/usb_ethersubr.c optional usb > -dev/usb/usb_if.m optional usb > -dev/usb/usb_mem.c optional usb > -dev/usb/usb_quirks.c optional usb > -dev/usb/usb_subr.c optional usb > -dev/usb/usbdi.c optional usb > -dev/usb/usbdi_util.c optional usb > dev/usb/uscanner.c optional uscanner > dev/usb/uvisor.c optional uvisor ucom > dev/usb/uvscom.c optional uvscom ucom > +# End of USB support > +# > dev/utopia/idtphy.c optional utopia > dev/utopia/suni.c optional utopia > dev/utopia/utopia.c optional utopia >