Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Add an entry for Toshiba ToPIC100 CardBus-PCI br...



details:   https://anonhg.NetBSD.org/src/rev/8cf12c0b915d
branches:  trunk
changeset: 480424:8cf12c0b915d
user:      haya <haya%NetBSD.org@localhost>
date:      Wed Jan 12 09:23:26 2000 +0000

description:
Add an entry for Toshiba ToPIC100 CardBus-PCI bridge.
Maintainance for 3Com multi-function, 16-bit pcmcia card.

diffstat:

 sys/dev/pci/pccbb.c |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r 952973a399d9 -r 8cf12c0b915d sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Wed Jan 12 09:11:42 2000 +0000
+++ b/sys/dev/pci/pccbb.c       Wed Jan 12 09:23:26 2000 +0000
@@ -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 @@
      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 @@
      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 @@
   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;
 }



Home | Main Index | Thread Index | Old Index