Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
drochner 2003-03-11 11:59:31 +00:00
parent a6fda7bcfb
commit f4f1e00d62
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/cardbus/files.cardbus
View File

@ -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 # files.cardbus
# #
@ -47,10 +47,10 @@ attach ohci at cardbus with ohci_cardbus
file dev/cardbus/ohci_cardbus.c ohci_cardbus file dev/cardbus/ohci_cardbus.c ohci_cardbus
# #
# OHCI USB controller # EHCI USB controller
# #
attach ehci at cardbus with ehci_cardbus 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 # OHCI IEEE 1394 controller

12
sys/dev/cardbus/ohci_cardbus.c
View File

@ -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. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -45,9 +45,9 @@
*/ */
#include <sys/cdefs.h> #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/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -80,7 +80,7 @@ int ohci_cardbus_detach(device_ptr_t, int);
struct ohci_cardbus_softc { struct ohci_cardbus_softc {
ohci_softc_t sc; ohci_softc_t sc;
#if NEHCI > 0 #if NEHCI_CARDBUS > 0
struct usb_cardbus sc_cardbus; struct usb_cardbus sc_cardbus;
#endif #endif
cardbus_chipset_tag_t sc_cc; cardbus_chipset_tag_t sc_cc;
@ -187,7 +187,7 @@ XXX (ct->ct_cf->cardbus_mem_open)(cc, 0, iob, iob + 0x40);
return; return;
} }
#if NEHCI > 0 #if NEHCI_CARDBUS > 0
usb_cardbus_add(&sc->sc_cardbus, ca, &sc->sc.sc_bus); usb_cardbus_add(&sc->sc_cardbus, ca, &sc->sc.sc_bus);
#endif #endif
@ -215,7 +215,7 @@ ohci_cardbus_detach(device_ptr_t self, int flags)
sc->sc.ioh, sc->sc.sc_size); sc->sc.ioh, sc->sc.sc_size);
sc->sc.sc_size = 0; sc->sc.sc_size = 0;
} }
#if NEHCI > 0 #if NEHCI_CARDBUS > 0
usb_cardbus_rem(&sc->sc_cardbus); usb_cardbus_rem(&sc->sc_cardbus);
#endif #endif
return (0); return (0);