From owner-p4-projects@FreeBSD.ORG Tue Sep 2 18:45:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C02A1065672; Tue, 2 Sep 2008 18:45:30 +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 F39EC106564A for ; Tue, 2 Sep 2008 18:45:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E40108FC27 for ; Tue, 2 Sep 2008 18:45:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82IjTd3057071 for ; Tue, 2 Sep 2008 18:45:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82IjTVB057069 for perforce@freebsd.org; Tue, 2 Sep 2008 18:45:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Sep 2008 18:45:29 GMT Message-Id: <200809021845.m82IjTVB057069@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 149073 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: Tue, 02 Sep 2008 18:45:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=149073 Change 149073 by hselasky@hselasky_laptop001 on 2008/09/02 18:45:23 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#15 (text+ko) ==== @@ -108,7 +108,6 @@ if (pipe == NULL) { pipe = pipe_first; } - switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: if (pipe->edesc && @@ -123,38 +122,38 @@ case USB_ST_SETUP: tr_setup: - if (pipe == pipe_end) { - pipe = pipe_first; - } - if (pipe->edesc && - pipe->is_stalled) { + if (pipe == pipe_end) { + pipe = pipe_first; + } + if (pipe->edesc && + pipe->is_stalled) { - /* setup a clear-stall packet */ + /* setup a clear-stall packet */ - req.bmRequestType = UT_WRITE_ENDPOINT; - req.bRequest = UR_CLEAR_FEATURE; - USETW(req.wValue, UF_ENDPOINT_HALT); - req.wIndex[0] = pipe->edesc->bEndpointAddress; - req.wIndex[1] = 0; - USETW(req.wLength, 0); + req.bmRequestType = UT_WRITE_ENDPOINT; + req.bRequest = UR_CLEAR_FEATURE; + USETW(req.wValue, UF_ENDPOINT_HALT); + req.wIndex[0] = pipe->edesc->bEndpointAddress; + req.wIndex[1] = 0; + USETW(req.wLength, 0); - /* copy in the transfer */ + /* copy in the transfer */ - usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); + usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); - /* set length */ - xfer->frlengths[0] = sizeof(req); - xfer->nframes = 1; - mtx_unlock(xfer->usb2_mtx); + /* set length */ + xfer->frlengths[0] = sizeof(req); + xfer->nframes = 1; + mtx_unlock(xfer->usb2_mtx); - usb2_start_hardware(xfer); + usb2_start_hardware(xfer); - mtx_lock(xfer->usb2_mtx); - break; - } - pipe++; - if (--to) - goto tr_setup; + mtx_lock(xfer->usb2_mtx); + break; + } + pipe++; + if (--to) + goto tr_setup; break; default: