[src/trunk]: src/sys/dev/pci Do pccbb_chipinit() after YENTA register space a...

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

details:   https://anonhg.NetBSD.org/src/rev/b1f7678ce36b
branches:  trunk
changeset: 481265:b1f7678ce36b
user:      haya <haya%NetBSD.org@localhost>
date:      Tue Jan 25 09:36:43 2000 +0000

description:
Do pccbb_chipinit() after YENTA register space allocation.
Add TI PCI 1451 PCI-CardBus entry.

diffstat:

 sys/dev/pci/pccbb.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 424aaec2db68 -r b1f7678ce36b sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Tue Jan 25 09:33:12 2000 +0000
+++ b/sys/dev/pci/pccbb.c       Tue Jan 25 09:36:43 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pccbb.c,v 1.18 2000/01/25 06:16:34 chopps Exp $        */
+/*     $NetBSD: pccbb.c,v 1.19 2000/01/25 09:36:43 haya Exp $  */
 
 /*
  * Copyright (c) 1998 and 1999 HAYAKAWA Koichi.  All rights reserved.
@@ -309,6 +309,8 @@
      PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
   {MAKEID(PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1450), "TI1450", CB_TI12XX,
      PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
+  {MAKEID(PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1451), "TI1421", CB_TI12XX,
+     PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
 
   /* Ricoh chips */
   {MAKEID(PCI_VENDOR_RICOH, PCI_PRODUCT_RICOH_Rx5C475), "Rx5C475",
@@ -502,9 +504,6 @@
 
   sc->sc_pcmcia_flags = flags; /* set PCMCIA facility */
 
-  /* bus bridge initialisation */
-  pccbb_chipinit(sc);
-
   shutdownhook_establish(pccbb_shutdown, sc);
 
 #if __NetBSD_Version__ > 103060000
@@ -570,6 +569,9 @@
 #endif
   }
 
+  /* bus bridge initialisation */
+  pccbb_chipinit(sc);
+
   base_memt = sc->sc_base_memt;        /* socket regs memory tag */
   base_memh = sc->sc_base_memh;        /* socket regs memory handle */