From owner-svn-src-user@FreeBSD.ORG Sat Sep 11 01:51:46 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 703F7106566B; Sat, 11 Sep 2010 01:51:46 +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 5FF0B8FC16; Sat, 11 Sep 2010 01:51:46 +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 o8B1pkCU014791; Sat, 11 Sep 2010 01:51:46 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8B1pkJe014782; Sat, 11 Sep 2010 01:51:46 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009110151.o8B1pkJe014782@svn.freebsd.org> From: Weongyo Jeong Date: Sat, 11 Sep 2010 01:51:46 +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: r212451 - in 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Sep 2010 01:51:46 -0000 Author: weongyo Date: Sat Sep 11 01:51:45 2010 New Revision: 212451 URL: http://svn.freebsd.org/changeset/base/212451 Log: Renames usb_bus_mem_sub_callback_t to usb_bus_mem_callback_t because usb_bus_mem_callback_t is removed at the previous commit. Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c user/weongyo/usb/sys/dev/usb/controller/ehci.h user/weongyo/usb/sys/dev/usb/controller/ohci.c user/weongyo/usb/sys/dev/usb/controller/ohci.h user/weongyo/usb/sys/dev/usb/controller/uhci.c user/weongyo/usb/sys/dev/usb/controller/uhci.h user/weongyo/usb/sys/dev/usb/usb_bus.h user/weongyo/usb/sys/dev/usb/usb_controller.h Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ehci.c Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/controller/ehci.c Sat Sep 11 01:51:45 2010 (r212451) @@ -149,7 +149,7 @@ struct ehci_std_temp { }; void -ehci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_callback_t *func) +ehci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_callback_t *func) { ehci_softc_t *sc = EHCI_BUS2SC(bus); uint32_t i; Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ehci.h Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/controller/ehci.h Sat Sep 11 01:51:45 2010 (r212451) @@ -444,6 +444,6 @@ void ehci_suspend(struct ehci_softc *sc) void ehci_resume(struct ehci_softc *sc); void ehci_shutdown(ehci_softc_t *sc); void ehci_interrupt(ehci_softc_t *sc); -void ehci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_sub_callback_t *); +void ehci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_callback_t *); #endif /* _EHCI_H_ */ Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ohci.c Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/controller/ohci.c Sat Sep 11 01:51:45 2010 (r212451) @@ -143,7 +143,7 @@ ohci_get_hcca(ohci_softc_t *sc) } void -ohci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_callback_t *func) +ohci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_callback_t *func) { struct ohci_softc *sc = OHCI_BUS2SC(bus); uint32_t i; Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ohci.h Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/controller/ohci.h Sat Sep 11 01:51:45 2010 (r212451) @@ -261,6 +261,6 @@ void ohci_detach(struct ohci_softc *sc); void ohci_suspend(ohci_softc_t *sc); void ohci_resume(ohci_softc_t *sc); void ohci_interrupt(ohci_softc_t *sc); -void ohci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_sub_callback_t *); +void ohci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_callback_t *); #endif /* _OHCI_H_ */ Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/uhci.c Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/controller/uhci.c Sat Sep 11 01:51:45 2010 (r212451) @@ -165,7 +165,7 @@ static uint8_t uhci_check_transfer(struc static void uhci_root_intr(uhci_softc_t *sc); void -uhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_callback_t *func) +uhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_callback_t *func) { struct uhci_softc *sc = UHCI_BUS2SC(bus); uint32_t i; Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/uhci.h Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/controller/uhci.h Sat Sep 11 01:51:45 2010 (r212451) @@ -247,6 +247,6 @@ void uhci_suspend(uhci_softc_t *sc); void uhci_resume(uhci_softc_t *sc); void uhci_reset(uhci_softc_t *sc); void uhci_interrupt(uhci_softc_t *sc); -void uhci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_sub_callback_t *); +void uhci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_callback_t *); #endif /* _UHCI_H_ */ Modified: user/weongyo/usb/sys/dev/usb/usb_bus.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_bus.h Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/usb_bus.h Sat Sep 11 01:51:45 2010 (r212451) @@ -86,7 +86,7 @@ struct usb_bus { struct usb_bus_methods *methods; /* filled by HC driver */ struct usb_device **devices; - void (*busmem_func)(struct usb_bus *, usb_bus_mem_sub_callback_t *); + void (*busmem_func)(struct usb_bus *, usb_bus_mem_callback_t *); usb_power_mask_t hw_power_state; /* see USB_HW_POWER_XXX */ usb_size_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; Modified: user/weongyo/usb/sys/dev/usb/usb_controller.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_controller.h Sat Sep 11 01:49:05 2010 (r212450) +++ user/weongyo/usb/sys/dev/usb/usb_controller.h Sat Sep 11 01:51:45 2010 (r212451) @@ -45,7 +45,7 @@ struct usb_endpoint_descriptor; /* typedefs */ -typedef void (usb_bus_mem_sub_callback_t)(struct usb_bus *, +typedef void (usb_bus_mem_callback_t)(struct usb_bus *, struct usb_page_cache *, struct usb_page *, usb_size_t, usb_size_t);