[src/trunk]: src/sys/dev/pci Split out some code so you can have cardbus ehci...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bef1da8ac97c
branches:  trunk
changeset: 520411:bef1da8ac97c
user:      augustss <augustss%NetBSD.org@localhost>
date:      Wed Jan 09 22:56:22 2002 +0000

description:
Split out some code so you can have cardbus ehci without pci.

diffstat:

 sys/dev/pci/ehci_pci.c |  23 +--------------
 sys/dev/pci/files.pci  |   4 ++-
 sys/dev/pci/usb_pci.c  |  75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 22 deletions(-)

diffs (145 lines):

diff -r 67e6e273726c -r bef1da8ac97c sys/dev/pci/ehci_pci.c
--- a/sys/dev/pci/ehci_pci.c    Wed Jan 09 22:33:53 2002 +0000
+++ b/sys/dev/pci/ehci_pci.c    Wed Jan 09 22:56:22 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci_pci.c,v 1.6 2001/11/13 07:48:42 lukem Exp $       */
+/*     $NetBSD: ehci_pci.c,v 1.7 2002/01/09 22:56:22 augustss Exp $    */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.6 2001/11/13 07:48:42 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.7 2002/01/09 22:56:22 augustss Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -82,9 +82,6 @@
        ehci_pci_detach, ehci_activate
 };
 
-static TAILQ_HEAD(, usb_pci) ehci_pci_alldevs =
-       TAILQ_HEAD_INITIALIZER(ehci_pci_alldevs);
-
 int
 ehci_pci_match(struct device *parent, struct cfdata *match, void *aux)
 {
@@ -226,19 +223,3 @@
        }
        return (0);
 }
-
-void
-usb_pci_add(struct usb_pci *up, struct pci_attach_args *pa, struct usbd_bus *bu)
-{
-       TAILQ_INSERT_TAIL(&ehci_pci_alldevs, up, next);
-       up->bus = pa->pa_bus;
-       up->device = pa->pa_device;
-       up->function = pa->pa_function;
-       up->usb = bu;
-}
-
-void
-usb_pci_rem(struct usb_pci *up)
-{
-       TAILQ_REMOVE(&ehci_pci_alldevs, up, next);
-}
diff -r 67e6e273726c -r bef1da8ac97c sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Wed Jan 09 22:33:53 2002 +0000
+++ b/sys/dev/pci/files.pci     Wed Jan 09 22:56:22 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.159 2002/01/07 18:05:33 jmcneill Exp $
+#      $NetBSD: files.pci,v 1.160 2002/01/09 22:56:22 augustss Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -385,6 +385,8 @@
 attach ehci at pci with ehci_pci
 file   dev/pci/ehci_pci.c              ehci_pci
 
+file   dev/pci/usb_pci.c               ehci_pci | ehci_cardbus
+
 # OHCI IEEE 1394 controller
 attach fwohci at pci with fwohci_pci
 file   dev/pci/fwohci_pci.c            fwohci_pci
diff -r 67e6e273726c -r bef1da8ac97c sys/dev/pci/usb_pci.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/pci/usb_pci.c     Wed Jan 09 22:56:22 2002 +0000
@@ -0,0 +1,75 @@
+/*     $NetBSD: usb_pci.c,v 1.1 2002/01/09 22:56:23 augustss Exp $     */
+
+/*
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (lennart%augustsson.net@localhost).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: usb_pci.c,v 1.1 2002/01/09 22:56:23 augustss Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/queue.h>
+#include <sys/proc.h>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/usb_pci.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
+
+#include <dev/usb/ehcireg.h>
+#include <dev/usb/ehcivar.h>
+
+static TAILQ_HEAD(, usb_pci) ehci_pci_alldevs =
+       TAILQ_HEAD_INITIALIZER(ehci_pci_alldevs);
+
+void
+usb_pci_add(struct usb_pci *up, struct pci_attach_args *pa, struct usbd_bus *bu)
+{
+       TAILQ_INSERT_TAIL(&ehci_pci_alldevs, up, next);
+       up->bus = pa->pa_bus;
+       up->device = pa->pa_device;
+       up->function = pa->pa_function;
+       up->usb = bu;
+}
+
+void
+usb_pci_rem(struct usb_pci *up)
+{
+       TAILQ_REMOVE(&ehci_pci_alldevs, up, next);
+}