From owner-p4-projects@FreeBSD.ORG Sun Nov 25 11:02:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88E8016A41A; Sun, 25 Nov 2007 11:02: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 41B7B16A480 for ; Sun, 25 Nov 2007 11:02:30 +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 B1B2213C458 for ; Sun, 25 Nov 2007 11:02:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAPB2Sp4079624 for ; Sun, 25 Nov 2007 11:02:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAPB2Sd6079621 for perforce@freebsd.org; Sun, 25 Nov 2007 11:02:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Nov 2007 11:02:28 GMT Message-Id: <200711251102.lAPB2Sd6079621@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 129496 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, 25 Nov 2007 11:02:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=129496 Change 129496 by hselasky@hselasky_laptop001 on 2007/11/25 11:02:11 Style change. Result from running "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#52 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#52 (text+ko) ==== @@ -1580,33 +1580,32 @@ if (xfer->flags_int.transferring) { return; } + /* call callback */ + usbd_callback_wrapper(xfer); - /* call callback */ - usbd_callback_wrapper(xfer); + /* + * wait for completion if polling is selected + */ + if (xfer->flags.use_polling) { + timeout = xfer->timeout + 1; + bus = xfer->udev->bus; - /* - * wait for completion if polling is selected - */ - if (xfer->flags.use_polling) { - timeout = xfer->timeout + 1; - bus = xfer->udev->bus; + while (xfer->flags_int.transferring) { + if (!timeout--) { + /* stop the transfer */ + usbd_transfer_stop(xfer); + break; + } + /* delay one millisecond */ + DELAY(1000); - while (xfer->flags_int.transferring) { - if (!timeout--) { - /* stop the transfer */ - usbd_transfer_stop(xfer); - break; - } - /* delay one millisecond */ - DELAY(1000); - - /* - * call the interrupt handler, which will - * call usbd_callback_wrapper(): - */ - (bus->methods->do_poll) (bus); - } + /* + * call the interrupt handler, which will + * call usbd_callback_wrapper(): + */ + (bus->methods->do_poll) (bus); } + } return; }