From owner-svn-src-user@FreeBSD.ORG Sat Sep 11 01:27:11 2010 Return-Path: <owner-svn-src-user@FreeBSD.ORG> 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 0C35A1065693; Sat, 11 Sep 2010 01:27:11 +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 F08C28FC08; Sat, 11 Sep 2010 01:27:10 +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 o8B1RAVQ011157; Sat, 11 Sep 2010 01:27:10 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8B1RAel011155; Sat, 11 Sep 2010 01:27:10 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009110127.o8B1RAel011155@svn.freebsd.org> From: Weongyo Jeong <weongyo@FreeBSD.org> Date: Sat, 11 Sep 2010 01:27:10 +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: r212449 - user/weongyo/usb/sys/dev/usb/controller 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" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 11 Sep 2010 01:27:11 -0000 Author: weongyo Date: Sat Sep 11 01:27:10 2010 New Revision: 212449 URL: http://svn.freebsd.org/changeset/base/212449 Log: style(9) Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sat Sep 11 01:26:40 2010 (r212448) +++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sat Sep 11 01:27:10 2010 (r212449) @@ -476,6 +476,7 @@ static void usb_bus_mem_flush_all_cb(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, usb_size_t size, usb_size_t align) { + usb_pc_cpu_flush(pc); } #endif @@ -487,6 +488,7 @@ usb_bus_mem_flush_all_cb(struct usb_bus void usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_callback_t *func) { + if (func != NULL) (*func)(bus, usb_bus_mem_flush_all_cb); } @@ -500,6 +502,7 @@ static void usb_bus_mem_alloc_all_cb(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, usb_size_t size, usb_size_t align) { + /* need to initialize the page cache */ pc->tag_parent = bus->dma_parent_tag; @@ -519,6 +522,7 @@ uint8_t usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb_bus_mem_callback_t *func) { + bus->alloc_failed = 0; mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent), @@ -556,6 +560,7 @@ static void usb_bus_mem_free_all_cb(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, usb_size_t size, usb_size_t align) { + usb_pc_free_mem(pc); } #endif @@ -566,6 +571,7 @@ usb_bus_mem_free_all_cb(struct usb_bus * void usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_callback_t *func) { + #if USB_HAVE_BUSDMA if (func != NULL) (*func)(bus, usb_bus_mem_free_all_cb);