From owner-p4-projects@FreeBSD.ORG Wed Jul 15 19:14:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0CC81065674; Wed, 15 Jul 2009 19:14:33 +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 60883106566B for ; Wed, 15 Jul 2009 19:14:33 +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 4EDDE8FC16 for ; Wed, 15 Jul 2009 19:14:33 +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 n6FJEXdd030666 for ; Wed, 15 Jul 2009 19:14:33 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6FJEXEt030664 for perforce@freebsd.org; Wed, 15 Jul 2009 19:14:33 GMT (envelope-from syl@FreeBSD.org) Date: Wed, 15 Jul 2009 19:14:33 GMT Message-Id: <200907151914.n6FJEXEt030664@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 166147 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, 15 Jul 2009 19:14:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=166147 Change 166147 by syl@syl_atuin on 2009/07/15 19:14:09 Fix compilation errors. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.c#11 edit .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#7 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.c#11 (text+ko) ==== @@ -73,6 +73,7 @@ #endif static void s3c24dci_device_done(struct usb_xfer *, usb_error_t); +static void s3c24dci_start_standard_chain(struct usb_xfer *xfer); /* * This driver dont support DMA for the mement. DMA seems to not be @@ -165,7 +166,7 @@ { struct usb_xfer *xfer = arg; - DPRINTFN("xfer=%p\n", xfer); + DPRINTF("xfer=%p\n", xfer); USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); @@ -238,7 +239,6 @@ } static void -static void s3c24dci_standard_done(struct usb_xfer *xfer) { usb_error_t err = 0; @@ -268,7 +268,7 @@ } } - if (xfer->flags_int.control_xfer && + if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { err = s3c24dci_standard_done_sub(xfer); } @@ -279,7 +279,6 @@ static uint8_t s3c24dci_xfer_do_fifo(struct usb_xfer *xfer) { - struct s3c24dci_softc *sc; struct s3c24dci_td *td; DPRINTFN(9, "\n"); @@ -292,6 +291,9 @@ } if (((void *)td) == xfer->td_transfer_last) { goto done; + } + if (td->error) { + goto done; } else if (td->remainder > 0) { /* * We had a short transfer. If there is no alternate @@ -300,16 +302,18 @@ if (!td->alt_next) { goto done; } - /* - * Fetch the next transfer descriptor and transfer - * some flags to the next transfer descriptor. - */ - td = td->obj_next; - xfer->td_transfer_cache = td; } - return (1); + /* + * Fetch the next transfer descriptor and transfer + * some flags to the next transfer descriptor. + */ + td = td->obj_next; + xfer->td_transfer_cache = td; + } + return (1); done: - s3c24dci_standard_done(xfer); + s3c24dci_standard_done(xfer); + return (0); } static void @@ -319,7 +323,7 @@ /* poll one time */ if (s3c24dci_xfer_do_fifo(xfer)) { - struct at91dci_softc *sc = S3C24_DCI_BUS2SC(xfer->xroot->bus); + struct s3c24dci_softc *sc = S3C24_DCI_BUS2SC(xfer->xroot->bus); uint8_t ep_no = xfer->endpointno & UE_ADDR; uint32_t ittmp; ==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#7 (text+ko) ==== @@ -177,7 +177,7 @@ struct s3c24dci_td; -typedef uint8_t (*s3c24dci_cmd_t)(struct s3c24dci_td *td); +typedef uint8_t (s3c24dci_cmd_t)(struct s3c24dci_td *td); struct s3c24dci_td { bus_space_tag_t io_tag;