From owner-svn-src-user@FreeBSD.ORG Wed Sep 22 01:20:06 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1322F106564A; Wed, 22 Sep 2010 01:20:06 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 024458FC14; Wed, 22 Sep 2010 01:20:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8M1K5lH012279; Wed, 22 Sep 2010 01:20:05 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8M1K5NE012277; Wed, 22 Sep 2010 01:20:05 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009220120.o8M1K5NE012277@svn.freebsd.org> From: Weongyo Jeong Date: Wed, 22 Sep 2010 01:20:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212987 - user/weongyo/usb/sys/dev/usb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2010 01:20:06 -0000 Author: weongyo Date: Wed Sep 22 01:20:05 2010 New Revision: 212987 URL: http://svn.freebsd.org/changeset/base/212987 Log: Changes the style to access pc->pages information based on the array index to make easy to check the maximum boundary of the array. Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_busdma.c Wed Sep 22 00:54:50 2010 (r212986) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Wed Sep 22 01:20:05 2010 (r212987) @@ -82,6 +82,7 @@ usbd_get_page(struct usb_page_cache *pc, struct usb_page_search *res) { struct usb_page *page; + int index; #if USB_HAVE_BUSDMA if (pc->pages != NULL) { @@ -93,18 +94,19 @@ usbd_get_page(struct usb_page_cache *pc, offset += pc->page_offset_buf; /* compute destination page */ page = pc->pages; + index = 0; if (pc->ismultiseg) { - page += (offset / USB_PAGE_SIZE); + index += (offset / USB_PAGE_SIZE); offset %= USB_PAGE_SIZE; res->length = USB_PAGE_SIZE - offset; - res->physaddr = page->physaddr + offset; + res->physaddr = page[index].physaddr + offset; } else { res->length = 0 - 1; - res->physaddr = page->physaddr + offset; + res->physaddr = page[index].physaddr + offset; } if (!pc->buffer) { /* Case 1b - Non Kernel Virtual Address */ - res->buffer = USB_ADD_BYTES(page->buffer, offset); + res->buffer = USB_ADD_BYTES(page[index].buffer, offset); } return; }