From owner-svn-src-user@FreeBSD.ORG Sun Oct 10 22:11:39 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 23EC3106566B; Sun, 10 Oct 2010 22:11:39 +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 ECDAD8FC18; Sun, 10 Oct 2010 22:11:38 +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 o9AMBc6e094495; Sun, 10 Oct 2010 22:11:38 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9AMBceD094491; Sun, 10 Oct 2010 22:11:38 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201010102211.o9AMBceD094491@svn.freebsd.org> From: Weongyo Jeong Date: Sun, 10 Oct 2010 22:11:38 +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: r213676 - 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: Sun, 10 Oct 2010 22:11:39 -0000 Author: weongyo Date: Sun Oct 10 22:11:38 2010 New Revision: 213676 URL: http://svn.freebsd.org/changeset/base/213676 Log: Reverts r213675 that already the device tree knows how to find it using devclass_find(9). Pointed by: yongari Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c 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/usb_controller.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sun Oct 10 21:40:35 2010 (r213675) +++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sun Oct 10 22:11:38 2010 (r213676) @@ -72,8 +72,6 @@ static void usb_bus_mem_free_all(struct /* static variables */ -static TAILQ_HEAD(, usb_bus) usb_bus_head; - #ifdef USB_DEBUG static int usb_ctrl_debug = 0; @@ -542,9 +540,6 @@ usb_bus_struct_init(struct usb_bus *bus, /* get all DMA memory */ if (usb_bus_mem_alloc_all(bus, USB_GET_DMA_TAG(dev))) return (ENOMEM); - - TAILQ_INSERT_TAIL(&usb_bus_head, bus, bus_link); - return (0); } @@ -552,31 +547,6 @@ void usb_bus_struct_fini(struct usb_bus *bus) { - TAILQ_REMOVE(&usb_bus_head, bus, bus_link); - usb_bus_mem_free_all(bus); mtx_destroy(&bus->bus_mtx); } - -struct usb_bus * -usb_bus_find(const char *name) -{ - struct usb_bus *bus; - const char *nameunit; - - TAILQ_FOREACH(bus, &usb_bus_head, bus_link) { - nameunit = device_get_nameunit(bus->bdev); - if (!strncmp(nameunit, name, strlen(nameunit))) - return (bus); - } - return (NULL); -} - -static void -usb_bus_first(void *arg) -{ - - TAILQ_INIT(&usb_bus_head); -} - -SYSINIT(usb_bus_first, SI_SUB_KLD, SI_ORDER_FIRST, usb_bus_first, NULL); Modified: user/weongyo/usb/sys/dev/usb/usb_bus.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_bus.h Sun Oct 10 21:40:35 2010 (r213675) +++ user/weongyo/usb/sys/dev/usb/usb_bus.h Sun Oct 10 22:11:38 2010 (r213676) @@ -103,8 +103,6 @@ struct usb_bus { struct usb_temp_setup temp_setup[1]; uint8_t data[255]; } scratch[1]; - - TAILQ_ENTRY(usb_bus) bus_link; }; #endif /* _USB_BUS_H_ */ Modified: user/weongyo/usb/sys/dev/usb/usb_controller.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_controller.h Sun Oct 10 21:40:35 2010 (r213675) +++ user/weongyo/usb/sys/dev/usb/usb_controller.h Sun Oct 10 22:11:38 2010 (r213676) @@ -199,7 +199,6 @@ int usb_bus_struct_init(struct usb_bus void (*busmem_func)(struct usb_bus *, usb_bus_mem_callback_t *)); void usb_bus_struct_fini(struct usb_bus *bus); -struct usb_bus *usb_bus_find(const char *name); void usb_bus_mem_flush_all(struct usb_bus *bus); uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr);