From owner-svn-src-user@FreeBSD.ORG Sat Sep 25 01:25:48 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 97B281065674; Sat, 25 Sep 2010 01:25:48 +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 6C25F8FC17; Sat, 25 Sep 2010 01:25:48 +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 o8P1PmEJ045424; Sat, 25 Sep 2010 01:25:48 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8P1PmJB045422; Sat, 25 Sep 2010 01:25:48 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009250125.o8P1PmJB045422@svn.freebsd.org> From: Weongyo Jeong Date: Sat, 25 Sep 2010 01:25:48 +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: r213152 - 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: Sat, 25 Sep 2010 01:25:48 -0000 Author: weongyo Date: Sat Sep 25 01:25:48 2010 New Revision: 213152 URL: http://svn.freebsd.org/changeset/base/213152 Log: Renames `buf_res' to `res' for readability that in some places it named as `res' but in other places it named as `buf_res'. 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 Sat Sep 25 01:23:26 2010 (r213151) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Sat Sep 25 01:25:48 2010 (r213152) @@ -117,27 +117,27 @@ void usbd_copy_in(struct usb_page_cache *cache, usb_frlength_t offset, const void *ptr, usb_frlength_t len) { - struct usb_page_search buf_res; + struct usb_page_search res; while (len != 0) { - usbd_get_page(cache, offset, &buf_res); + usbd_get_page(cache, offset, &res); - if (buf_res.length > len) { - buf_res.length = len; + if (res.length > len) { + res.length = len; } /* Checks the buffer boundary */ - USB_ASSERT((char *)buf_res.buffer + buf_res.length <= + USB_ASSERT((char *)res.buffer + res.length <= (char *)cache->buffer + cache->buflen, - ("overflow is happened (%p %d/%p %d)", buf_res.buffer, - buf_res.length, cache->buffer, cache->buflen)); + ("overflow is happened (%p %d/%p %d)", res.buffer, + res.length, cache->buffer, cache->buflen)); - bcopy(ptr, buf_res.buffer, buf_res.length); + bcopy(ptr, res.buffer, res.length); - offset += buf_res.length; - len -= buf_res.length; - ptr = USB_ADD_BYTES(ptr, buf_res.length); + offset += res.length; + len -= res.length; + ptr = USB_ADD_BYTES(ptr, res.length); } } @@ -153,30 +153,30 @@ int usbd_copy_in_user(struct usb_page_cache *cache, usb_frlength_t offset, const void *ptr, usb_frlength_t len) { - struct usb_page_search buf_res; + struct usb_page_search res; int error; while (len != 0) { - usbd_get_page(cache, offset, &buf_res); + usbd_get_page(cache, offset, &res); - if (buf_res.length > len) { - buf_res.length = len; + if (res.length > len) { + res.length = len; } /* Checks the buffer boundary */ - USB_ASSERT((char *)buf_res.buffer + buf_res.length <= + USB_ASSERT((char *)res.buffer + res.length <= (char *)cache->buffer + cache->buflen, - ("overflow is happened (%p %d/%p %d)", buf_res.buffer, - buf_res.length, cache->buffer, cache->buflen)); + ("overflow is happened (%p %d/%p %d)", res.buffer, + res.length, cache->buffer, cache->buflen)); - error = copyin(ptr, buf_res.buffer, buf_res.length); + error = copyin(ptr, res.buffer, res.length); if (error) return (error); - offset += buf_res.length; - len -= buf_res.length; - ptr = USB_ADD_BYTES(ptr, buf_res.length); + offset += res.length; + len -= res.length; + ptr = USB_ADD_BYTES(ptr, res.length); } return (0); /* success */ }