From owner-svn-src-all@FreeBSD.ORG Thu Oct 9 19:22:00 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEFEE1065687; Thu, 9 Oct 2008 19:22:00 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC5488FC1A; Thu, 9 Oct 2008 19:22:00 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m99JM0Pk069379; Thu, 9 Oct 2008 19:22:00 GMT (envelope-from n_hibma@svn.freebsd.org) Received: (from n_hibma@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m99JM0F1069368; Thu, 9 Oct 2008 19:22:00 GMT (envelope-from n_hibma@svn.freebsd.org) Message-Id: <200810091922.m99JM0F1069368@svn.freebsd.org> From: Nick Hibma Date: Thu, 9 Oct 2008 19:22:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183728 - in head/sys: dev/usb modules modules/ehci modules/ohci modules/slhci modules/uhci X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2008 19:22:01 -0000 Author: n_hibma Date: Thu Oct 9 19:22:00 2008 New Revision: 183728 URL: http://svn.freebsd.org/changeset/base/183728 Log: Add modules for the HCI part of USB. This is convenient when having a UHCI controller in your laptop but inserting a (OHCI-based) Option Cardbus card. Added: head/sys/modules/ehci/ head/sys/modules/ehci/Makefile (contents, props changed) head/sys/modules/ohci/ head/sys/modules/ohci/Makefile (contents, props changed) head/sys/modules/uhci/ head/sys/modules/uhci/Makefile (contents, props changed) Modified: head/sys/dev/usb/ehci_pci.c head/sys/dev/usb/ohci_pci.c head/sys/dev/usb/slhci_pccard.c head/sys/dev/usb/uhci_pci.c head/sys/modules/Makefile head/sys/modules/slhci/Makefile Modified: head/sys/dev/usb/ehci_pci.c ============================================================================== --- head/sys/dev/usb/ehci_pci.c Thu Oct 9 18:06:28 2008 (r183727) +++ head/sys/dev/usb/ehci_pci.c Thu Oct 9 19:22:00 2008 (r183728) @@ -623,3 +623,4 @@ static devclass_t ehci_devclass; DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0); DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0); +MODULE_DEPEND(ehci, usb, 1, 1, 1); Modified: head/sys/dev/usb/ohci_pci.c ============================================================================== --- head/sys/dev/usb/ohci_pci.c Thu Oct 9 18:06:28 2008 (r183727) +++ head/sys/dev/usb/ohci_pci.c Thu Oct 9 19:22:00 2008 (r183728) @@ -408,3 +408,4 @@ static devclass_t ohci_devclass; DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0); DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0); +MODULE_DEPEND(ohci, usb, 1, 1, 1); Modified: head/sys/dev/usb/slhci_pccard.c ============================================================================== --- head/sys/dev/usb/slhci_pccard.c Thu Oct 9 18:06:28 2008 (r183727) +++ head/sys/dev/usb/slhci_pccard.c Thu Oct 9 19:22:00 2008 (r183728) @@ -199,6 +199,8 @@ static driver_t slhci_pccard_driver = { slhci_pccard_methods, sizeof(struct slhci_softc), }; + devclass_t slhci_devclass; -MODULE_DEPEND(slhci, usb, 1, 1, 1); + DRIVER_MODULE(slhci, pccard, slhci_pccard_driver, slhci_devclass, 0, 0); +MODULE_DEPEND(slhci, usb, 1, 1, 1); Modified: head/sys/dev/usb/uhci_pci.c ============================================================================== --- head/sys/dev/usb/uhci_pci.c Thu Oct 9 18:06:28 2008 (r183727) +++ head/sys/dev/usb/uhci_pci.c Thu Oct 9 19:22:00 2008 (r183728) @@ -515,3 +515,4 @@ static devclass_t uhci_devclass; DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0); DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0); +MODULE_DEPEND(uhci, usb, 1, 1, 1); Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Thu Oct 9 18:06:28 2008 (r183727) +++ head/sys/modules/Makefile Thu Oct 9 19:22:00 2008 (r183728) @@ -79,6 +79,7 @@ SUBDIR= ${_3dfx} \ ${_dtrace} \ dummynet \ ${_ed} \ + ehci \ ${_elink} \ ${_em} \ en \ @@ -205,6 +206,7 @@ SUBDIR= ${_3dfx} \ ${_nwfs} \ ${_nxge} \ ${_opensolaris} \ + ohci \ ${_padlock} \ patm \ ${_pccard} \ @@ -241,6 +243,7 @@ SUBDIR= ${_3dfx} \ ${_scsi_low} \ sem \ sf \ + slhci \ sis \ sk \ ${_smbfs} \ @@ -280,6 +283,7 @@ SUBDIR= ${_3dfx} \ ufoma \ uftdi \ ugen \ + uhci \ uhid \ uipaq \ ukbd \ Added: head/sys/modules/ehci/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/ehci/Makefile Thu Oct 9 19:22:00 2008 (r183728) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +S= ${.CURDIR}/../.. + +.PATH: $S/dev/usb $S/pci + +KMOD= ehci +SRCS= bus_if.h device_if.h \ + opt_usb.h \ + ehci_pci.c ehci.c ehcireg.h ehcivar.h \ + pci_if.h + +.include Added: head/sys/modules/ohci/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/ohci/Makefile Thu Oct 9 19:22:00 2008 (r183728) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +S= ${.CURDIR}/../.. + +.PATH: $S/dev/usb $S/pci + +KMOD= ohci +SRCS= bus_if.h device_if.h \ + opt_usb.h \ + ohci_pci.c ohci.c ohcireg.h ohcivar.h \ + pci_if.h + +.include Modified: head/sys/modules/slhci/Makefile ============================================================================== --- head/sys/modules/slhci/Makefile Thu Oct 9 18:06:28 2008 (r183727) +++ head/sys/modules/slhci/Makefile Thu Oct 9 19:22:00 2008 (r183728) @@ -5,6 +5,8 @@ KMOD= slhci SRCS= sl811hs.c slhci_pccard.c -SRCS+= opt_slhci.h opt_usb.h device_if.h bus_if.h usbdevs.h card_if.h power_if.h pccarddevs.h +SRCS+= bus_if.h device_if.h card_if.h power_if.h \ + usbdevs.h pccarddevs.h \ + opt_slhci.h opt_usb.h \ .include Added: head/sys/modules/uhci/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/uhci/Makefile Thu Oct 9 19:22:00 2008 (r183728) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +S= ${.CURDIR}/../.. + +.PATH: $S/dev/usb $S/pci + +KMOD= uhci +SRCS= bus_if.h device_if.h \ + opt_usb.h \ + uhci_pci.c uhci.c uhcireg.h uhcivar.h \ + pci_if.h + +.include