From owner-p4-projects@FreeBSD.ORG Sat Dec 15 17:38:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 247FE16A474; Sat, 15 Dec 2007 17:38:47 +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 D049616A4D6 for ; Sat, 15 Dec 2007 17:38:46 +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 B9F4913C4E8 for ; Sat, 15 Dec 2007 17:38:46 +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 lBFHckM9084937 for ; Sat, 15 Dec 2007 17:38:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFHcksM084934 for perforce@freebsd.org; Sat, 15 Dec 2007 17:38:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 17:38:46 GMT Message-Id: <200712151738.lBFHcksM084934@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 130964 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: Sat, 15 Dec 2007 17:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=130964 Change 130964 by hselasky@hselasky_laptop001 on 2007/12/15 17:38:18 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#72 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#77 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#72 (text+ko) ==== @@ -1970,40 +1970,39 @@ if (pc->page_start) { - /* Case 1 - something has been loaded into DMA */ + /* Case 1 - something has been loaded into DMA */ - if (pc->buffer) { + if (pc->buffer) { - /* Case 1a - Kernel Virtual Address */ + /* Case 1a - Kernel Virtual Address */ - res->buffer = USBD_ADD_BYTES(pc->buffer, offset); - } + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + } + offset += pc->page_offset_buf; - offset += pc->page_offset_buf; + /* compute destination page */ - /* compute destination page */ + page = pc->page_start; - page = pc->page_start; + page += (offset / USB_PAGE_SIZE); - page += (offset / USB_PAGE_SIZE); + offset %= USB_PAGE_SIZE; - offset %= USB_PAGE_SIZE; + res->length = USB_PAGE_SIZE - offset; + res->physaddr = page->physaddr + offset; + if (!pc->buffer) { - res->length = USB_PAGE_SIZE - offset; - res->physaddr = page->physaddr + offset; - if (!pc->buffer) { + /* Case 1b - Non Kernel Virtual Address */ - /* Case 1b - Non Kernel Virtual Address */ - - res->buffer = USBD_ADD_BYTES(page->buffer, offset); - } + res->buffer = USBD_ADD_BYTES(page->buffer, offset); + } } else { - /* Case 2 - Plain PIO */ + /* Case 2 - Plain PIO */ - res->buffer = USBD_ADD_BYTES(pc->buffer, offset); - res->length = 0-1; - res->physaddr = 0; + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + res->length = 0 - 1; + res->physaddr = 0; } return; } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#77 (text+ko) ==== @@ -219,7 +219,7 @@ struct usbd_page { bus_size_t physaddr; - void *buffer; /* non Kernel Virtual Address */ + void *buffer; /* non Kernel Virtual Address */ }; struct usbd_page_search {