From owner-p4-projects@FreeBSD.ORG Sun Aug 2 13:50:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 987211065670; Sun, 2 Aug 2009 13:50:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B05AB106566C for ; Sun, 2 Aug 2009 13:50:37 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EBB68FC18 for ; Sun, 2 Aug 2009 13:50:37 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n72Dobqp005927 for ; Sun, 2 Aug 2009 13:50:37 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n72Dob0Y005925 for perforce@freebsd.org; Sun, 2 Aug 2009 13:50:37 GMT (envelope-from syl@FreeBSD.org) Date: Sun, 2 Aug 2009 13:50:37 GMT Message-Id: <200908021350.n72Dob0Y005925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 166930 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, 02 Aug 2009 13:50:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=166930 Change 166930 by syl@syl_rincewind on 2009/08/02 13:50:10 Factorise pipe methods for musb_otg. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.c#8 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.c#8 (text+ko) ==== @@ -1883,133 +1883,32 @@ USB_BUS_UNLOCK(&sc->sc_bus); } -/*------------------------------------------------------------------------* - * musbotg bulk support - *------------------------------------------------------------------------*/ -static void -musbotg_device_bulk_open(struct usb_xfer *xfer) -{ - return; -} +/* + * musbotg ctl/bulk/intr support + */ static void -musbotg_device_bulk_close(struct usb_xfer *xfer) +musbotg_device_dummy(struct usb_xfer *xfer) { - musbotg_device_done(xfer, USB_ERR_CANCELLED); + return ; } static void -musbotg_device_bulk_enter(struct usb_xfer *xfer) +musbotg_device_xxx_start(struct usb_xfer *xfer) { - return; -} - -static void -musbotg_device_bulk_start(struct usb_xfer *xfer) -{ - /* setup TDs */ musbotg_setup_standard_chain(xfer); musbotg_start_standard_chain(xfer); + return ; } -struct usb_pipe_methods musbotg_device_bulk_methods = -{ - .open = musbotg_device_bulk_open, - .close = musbotg_device_bulk_close, - .enter = musbotg_device_bulk_enter, - .start = musbotg_device_bulk_start, -}; - -/*------------------------------------------------------------------------* - * musbotg control support - *------------------------------------------------------------------------*/ static void -musbotg_device_ctrl_open(struct usb_xfer *xfer) -{ - return; -} - -static void -musbotg_device_ctrl_close(struct usb_xfer *xfer) +musbotg_device_xxx_close(struct usb_xfer *xfer) { musbotg_device_done(xfer, USB_ERR_CANCELLED); + return ; } static void -musbotg_device_ctrl_enter(struct usb_xfer *xfer) -{ - return; -} - -static void -musbotg_device_ctrl_start(struct usb_xfer *xfer) -{ - /* setup TDs */ - musbotg_setup_standard_chain(xfer); - musbotg_start_standard_chain(xfer); -} - -struct usb_pipe_methods musbotg_device_ctrl_methods = -{ - .open = musbotg_device_ctrl_open, - .close = musbotg_device_ctrl_close, - .enter = musbotg_device_ctrl_enter, - .start = musbotg_device_ctrl_start, -}; - -/*------------------------------------------------------------------------* - * musbotg interrupt support - *------------------------------------------------------------------------*/ -static void -musbotg_device_intr_open(struct usb_xfer *xfer) -{ - return; -} - -static void -musbotg_device_intr_close(struct usb_xfer *xfer) -{ - musbotg_device_done(xfer, USB_ERR_CANCELLED); -} - -static void -musbotg_device_intr_enter(struct usb_xfer *xfer) -{ - return; -} - -static void -musbotg_device_intr_start(struct usb_xfer *xfer) -{ - /* setup TDs */ - musbotg_setup_standard_chain(xfer); - musbotg_start_standard_chain(xfer); -} - -struct usb_pipe_methods musbotg_device_intr_methods = -{ - .open = musbotg_device_intr_open, - .close = musbotg_device_intr_close, - .enter = musbotg_device_intr_enter, - .start = musbotg_device_intr_start, -}; - -/*------------------------------------------------------------------------* - * musbotg full speed isochronous support - *------------------------------------------------------------------------*/ -static void -musbotg_device_isoc_open(struct usb_xfer *xfer) -{ - return; -} - -static void -musbotg_device_isoc_close(struct usb_xfer *xfer) -{ - musbotg_device_done(xfer, USB_ERR_CANCELLED); -} - -static void musbotg_device_isoc_enter(struct usb_xfer *xfer) { struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); @@ -2075,10 +1974,34 @@ musbotg_start_standard_chain(xfer); } +struct usb_pipe_methods musbotg_device_bulk_methods = +{ + .open = musbotg_device_dummy, + .enter = musbotg_device_dummy, + .close = musbotg_device_xxx_close, + .start = musbotg_device_xxx_start, +}; + +struct usb_pipe_methods musbotg_device_ctrl_methods = +{ + .open = musbotg_device_dummy, + .enter = musbotg_device_dummy, + .close = musbotg_device_ctrl_close, + .start = musbotg_device_ctrl_start, +}; + +struct usb_pipe_methods musbotg_device_intr_methods = +{ + .open = musbotg_device_dummy, + .enter = musbotg_device_dummy, + .close = musbotg_device_xxx_close, + .start = musbotg_device_xxx_start, +}; + struct usb_pipe_methods musbotg_device_isoc_methods = { - .open = musbotg_device_isoc_open, - .close = musbotg_device_isoc_close, + .open = musbotg_device_dummy, + .close = musbotg_device_xxx_close, .enter = musbotg_device_isoc_enter, .start = musbotg_device_isoc_start, };