From owner-svn-src-user@FreeBSD.ORG Tue Sep 21 00:14:00 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 C14451065670; Tue, 21 Sep 2010 00:14:00 +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 B0B258FC0A; Tue, 21 Sep 2010 00:14:00 +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 o8L0E0Ou072616; Tue, 21 Sep 2010 00:14:00 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8L0E0wl072612; Tue, 21 Sep 2010 00:14:00 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009210014.o8L0E0wl072612@svn.freebsd.org> From: Weongyo Jeong Date: Tue, 21 Sep 2010 00:14:00 +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: r212943 - 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: Tue, 21 Sep 2010 00:14:00 -0000 Author: weongyo Date: Tue Sep 21 00:14:00 2010 New Revision: 212943 URL: http://svn.freebsd.org/changeset/base/212943 Log: Renames two variable names of struct usb_page_cache. Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c user/weongyo/usb/sys/dev/usb/usb_busdma.h user/weongyo/usb/sys/dev/usb/usb_transfer.c Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_busdma.c Tue Sep 21 00:07:18 2010 (r212942) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Tue Sep 21 00:14:00 2010 (r212943) @@ -83,7 +83,7 @@ usbd_get_page(struct usb_page_cache *pc, struct usb_page *page; #if USB_HAVE_BUSDMA - if (pc->page_start) { + if (pc->pages != NULL) { /* Case 1 - something has been loaded into DMA */ @@ -97,7 +97,7 @@ usbd_get_page(struct usb_page_cache *pc, /* compute destination page */ - page = pc->page_start; + page = pc->pages; if (pc->ismultiseg) { @@ -428,10 +428,10 @@ usb_pc_common_mem_cb(void *arg, bus_dma_ if (error) goto done; - USB_ASSERT(nseg <= pc->npage, - ("too many segments (%d <= %d)", nseg, pc->npage)); + USB_ASSERT(nseg <= pc->npages, + ("too many segments (%d <= %d)", nseg, pc->npages)); - pg = pc->page_start; + pg = pc->pages; pg->physaddr = segs[0].ds_addr & ~(USB_PAGE_SIZE - 1); rem = segs[0].ds_addr & (USB_PAGE_SIZE - 1); pc->page_offset_buf = rem; @@ -519,8 +519,8 @@ usb_pc_alloc_mem(struct usb_page_cache * } /* setup page cache */ pc->buffer = ptr; - pc->page_start = pg; - pc->npage = npg; + pc->pages = pg; + pc->npages = npg; pc->page_offset_buf = 0; pc->page_offset_end = size; pc->map = map; @@ -553,8 +553,8 @@ usb_pc_alloc_mem(struct usb_page_cache * error: /* reset most of the page cache */ pc->buffer = NULL; - pc->page_start = NULL; - pc->npage = 0; + pc->pages = NULL; + pc->npages = 0; pc->page_offset_buf = 0; pc->page_offset_end = 0; pc->map = NULL; @@ -912,9 +912,9 @@ usb_bdma_work_loop(struct usb_xfer_queue * page will be stored. Also initialise the "isread" field of * the USB page caches. */ - xfer->frbuffers[0].page_start = pg; + xfer->frbuffers[0].pages = pg; /* XXX why +2 here? It looks it's a quirk */ - xfer->frbuffers[0].npage = (frlength_0 / USB_PAGE_SIZE) + 2; + xfer->frbuffers[0].npages = (frlength_0 / USB_PAGE_SIZE) + 2; info->dma_nframes = nframes; info->dma_currframe = 0; @@ -926,9 +926,9 @@ usb_bdma_work_loop(struct usb_xfer_queue while (--nframes > 0) { xfer->frbuffers[nframes].isread = isread; - xfer->frbuffers[nframes].page_start = pg; + xfer->frbuffers[nframes].pages = pg; /* XXX why +2 here? It looks it's a quirk */ - xfer->frbuffers[nframes].npage = + xfer->frbuffers[nframes].npages = (xfer->frlengths[nframes] / USB_PAGE_SIZE) + 2; pg += (xfer->frlengths[nframes] / USB_PAGE_SIZE); Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_busdma.h Tue Sep 21 00:07:18 2010 (r212942) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.h Tue Sep 21 00:14:00 2010 (r212943) @@ -87,8 +87,8 @@ struct usb_page_cache { #if USB_HAVE_BUSDMA bus_dma_tag_t tag; bus_dmamap_t map; - struct usb_page *page_start; - int npage; + struct usb_page *pages; /* the array pointer of DMA segments */ + int npages; /* numbers of DMA segments */ #endif struct usb_dma_parent_tag *tag_parent; /* always set */ void *buffer; /* virtual buffer pointer */ Modified: user/weongyo/usb/sys/dev/usb/usb_transfer.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_transfer.c Tue Sep 21 00:07:18 2010 (r212942) +++ user/weongyo/usb/sys/dev/usb/usb_transfer.c Tue Sep 21 00:14:00 2010 (r212943) @@ -284,8 +284,8 @@ usbd_transfer_setup_sub_malloc(struct us return (1); /* failure */ } pc->buffer = USB_ADD_BYTES(buf, y * size); - pc->page_start = pg; - pc->npage = 1; + pc->pages = pg; + pc->npages = 1; mtx_lock(pc->tag_parent->mtx); if (usb_pc_load_mem(pc, size, 1 /* synchronous */ )) {