[src/trunk]: src/sys/dev/cardbus make a kernel with the combination ohci@card...

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

details:   https://anonhg.NetBSD.org/src/rev/be5ea96cee64
branches:  trunk
changeset: 544096:be5ea96cee64
user:      drochner <drochner%NetBSD.org@localhost>
date:      Tue Mar 11 11:59:31 2003 +0000

description:
make a kernel with the combination ohci@cardbus + ehci@pci link

diffstat:

 sys/dev/cardbus/files.cardbus  |   6 +++---
 sys/dev/cardbus/ohci_cardbus.c |  12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 885371ec5e86 -r be5ea96cee64 sys/dev/cardbus/files.cardbus
--- a/sys/dev/cardbus/files.cardbus     Tue Mar 11 11:03:23 2003 +0000
+++ b/sys/dev/cardbus/files.cardbus     Tue Mar 11 11:59:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.cardbus,v 1.18 2001/11/28 10:21:21 lukem Exp $
+#      $NetBSD: files.cardbus,v 1.19 2003/03/11 11:59:31 drochner Exp $
 #
 # files.cardbus
 #
@@ -47,10 +47,10 @@
 file   dev/cardbus/ohci_cardbus.c      ohci_cardbus
 
 #
-# OHCI USB controller
+# EHCI USB controller
 #
 attach ehci at cardbus with ehci_cardbus
-file   dev/cardbus/ehci_cardbus.c      ehci_cardbus
+file   dev/cardbus/ehci_cardbus.c      ehci_cardbus needs-flag
 
 #
 # OHCI IEEE 1394 controller
diff -r 885371ec5e86 -r be5ea96cee64 sys/dev/cardbus/ohci_cardbus.c
--- a/sys/dev/cardbus/ohci_cardbus.c    Tue Mar 11 11:03:23 2003 +0000
+++ b/sys/dev/cardbus/ohci_cardbus.c    Tue Mar 11 11:59:31 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci_cardbus.c,v 1.14 2002/10/02 16:33:43 thorpej Exp $        */
+/*     $NetBSD: ohci_cardbus.c,v 1.15 2003/03/11 11:59:31 drochner Exp $       */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,9 +45,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.14 2002/10/02 16:33:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.15 2003/03/11 11:59:31 drochner Exp $");
 
-#include "ehci.h"
+#include "ehci_cardbus.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,7 +80,7 @@
 
 struct ohci_cardbus_softc {
        ohci_softc_t            sc;
-#if NEHCI > 0
+#if NEHCI_CARDBUS > 0
        struct usb_cardbus      sc_cardbus;
 #endif
        cardbus_chipset_tag_t   sc_cc;
@@ -187,7 +187,7 @@
                return;
        }
 
-#if NEHCI > 0
+#if NEHCI_CARDBUS > 0
        usb_cardbus_add(&sc->sc_cardbus, ca, &sc->sc.sc_bus);
 #endif
 
@@ -215,7 +215,7 @@
                    sc->sc.ioh, sc->sc.sc_size);
                sc->sc.sc_size = 0;
        }
-#if NEHCI > 0
+#if NEHCI_CARDBUS > 0
        usb_cardbus_rem(&sc->sc_cardbus);
 #endif
        return (0);