summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorhaya <haya@NetBSD.org>2000-01-12 09:23:26 +0000
committerhaya <haya@NetBSD.org>2000-01-12 09:23:26 +0000
commit27214a2c93205bd3184c596c2907920a6bf64343 (patch)
treecfe55ca957db417abca2f63cc9d727602c152ed4 /sys/dev
parentd978274ade1307a57cd5bf8ba95a871cc1a48a67 (diff)
Add an entry for Toshiba ToPIC100 CardBus-PCI bridge.
Maintainance for 3Com multi-function, 16-bit pcmcia card.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pccbb.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 05dcccb15b5..e8e5ee7d17c 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.9 1999/12/20 08:11:42 haya Exp $ */
+/* $NetBSD: pccbb.c,v 1.10 2000/01/12 09:23:26 haya Exp $ */
/*
* Copyright (c) 1998 and 1999 HAYAKAWA Koichi. All rights reserved.
@@ -334,6 +334,8 @@ struct yenta_chipinfo {
CB_TOPIC95B, PCCBB_PCMCIA_MEM_32},
{MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC97), "ToPIC97",
CB_TOPIC97, PCCBB_PCMCIA_MEM_32},
+ {MAKEID(PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_ToPIC100), "ToPIC100",
+ CB_TOPIC97, PCCBB_PCMCIA_MEM_32},
/* Cirrus Logic products */
{MAKEID(PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_PD6832), "CL-PD683X",
@@ -812,6 +814,9 @@ pccbb_pcmcia_attach_setup(sc, paa)
struct pcmciabus_attach_args *paa;
{
struct pcic_handle *ph = &sc->sc_pcmcia_h;
+#if rbus
+ rbus_tag_t rb;
+#endif
/* initialise pcmcia part in pccbb_softc */
ph->ph_parent = (struct device *)sc;
@@ -834,6 +839,11 @@ pccbb_pcmcia_attach_setup(sc, paa)
paa->pch = ph;
paa->iobase = 0; /* I don't use them */
paa->iosize = 0;
+#if rbus
+ rb = ((struct pccbb_softc *)(ph->ph_parent))->sc_rbus_iot;
+ paa->iobase = rb->rb_start + rb->rb_offset;
+ paa->iosize = rb->rb_end - rb->rb_start;
+#endif
return;
}