[src/trunk]: src/sys/arch/hpcmips make this compile again.

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

details:   https://anonhg.NetBSD.org/src/rev/8f64657665d6
branches:  trunk
changeset: 518596:8f64657665d6
user:      uch <uch%NetBSD.org@localhost>
date:      Sun Dec 02 10:37:53 2001 +0000

description:
make this compile again.

diffstat:

 sys/arch/hpcmips/hpcmips/bus_space.c         |   9 ++++++++-
 sys/arch/hpcmips/include/bus_space_hpcmips.h |   3 ++-
 sys/arch/hpcmips/tx/txcsbus.c                |  14 +++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r 88d832cc3650 -r 8f64657665d6 sys/arch/hpcmips/hpcmips/bus_space.c
--- a/sys/arch/hpcmips/hpcmips/bus_space.c      Sun Dec 02 10:37:25 2001 +0000
+++ b/sys/arch/hpcmips/hpcmips/bus_space.c      Sun Dec 02 10:37:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.16 2001/11/22 14:22:30 takemura Exp $  */
+/*     $NetBSD: bus_space.c,v 1.17 2001/12/02 10:37:53 uch Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -159,6 +159,13 @@
 }
 
 struct bus_space_tag_hpcmips *
+hpcmips_system_bus_space_hpcmips()
+{
+
+       return (&__sys_bus_space);
+}
+
+struct bus_space_tag_hpcmips *
 hpcmips_alloc_bus_space_tag()
 {
 
diff -r 88d832cc3650 -r 8f64657665d6 sys/arch/hpcmips/include/bus_space_hpcmips.h
--- a/sys/arch/hpcmips/include/bus_space_hpcmips.h      Sun Dec 02 10:37:25 2001 +0000
+++ b/sys/arch/hpcmips/include/bus_space_hpcmips.h      Sun Dec 02 10:37:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space_hpcmips.h,v 1.2 2001/11/22 14:22:31 takemura Exp $   */
+/*     $NetBSD: bus_space_hpcmips.h,v 1.3 2001/12/02 10:37:54 uch Exp $        */
 
 /*-
  * Copyright (c) 2001 TAKEMRUA Shin. All rights reserved.
@@ -49,6 +49,7 @@
  * Hpcmips unique methods
  */
 bus_space_tag_t hpcmips_system_bus_space(void);
+struct bus_space_tag_hpcmips *hpcmips_system_bus_space_hpcmips(void);
 void hpcmips_init_bus_space(struct bus_space_tag_hpcmips *,
     struct bus_space_tag_hpcmips *, char *, u_int32_t, u_int32_t);
 struct bus_space_tag_hpcmips *hpcmips_alloc_bus_space_tag(void);
diff -r 88d832cc3650 -r 8f64657665d6 sys/arch/hpcmips/tx/txcsbus.c
--- a/sys/arch/hpcmips/tx/txcsbus.c     Sun Dec 02 10:37:25 2001 +0000
+++ b/sys/arch/hpcmips/tx/txcsbus.c     Sun Dec 02 10:37:53 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: txcsbus.c,v 1.6 2001/11/18 08:19:40 takemura Exp $ */
+/*     $NetBSD: txcsbus.c,v 1.7 2001/12/02 10:37:54 uch Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
        struct  device sc_dev;
        tx_chipset_tag_t sc_tc;
        /* chip select space tag */
-       bus_space_tag_t sc_cst[TX39_MAXCS];
+       struct bus_space_tag_hpcmips *sc_cst[TX39_MAXCS];
 };
 
 struct cfattach txcsbus_ca = {
@@ -240,7 +240,7 @@
        tx_chipset_tag_t tc = sc->sc_tc;
        int cs = csh->cs;
        int width = csh->cswidth;
-       bus_space_tag_t iot;
+       struct bus_space_tag_hpcmips *iot;
        txreg_t reg;
 
        if (!TX39_ISCS(cs) && !TX39_ISMCS(cs) && !TX39_ISCARD(cs)) {
@@ -249,13 +249,13 @@
 
        /* Already setuped chip select */
        if (sc->sc_cst[cs]) {
-               return (sc->sc_cst[cs]);
+               return (&sc->sc_cst[cs]->bst);
        }
 
        iot = hpcmips_alloc_bus_space_tag();
+       hpcmips_init_bus_space(iot, hpcmips_system_bus_space_hpcmips(),
+           __csmap[cs].cs_name, __csmap[cs].cs_addr, __csmap[cs].cs_size);
        sc->sc_cst[cs] = iot;
-       hpcmips_init_bus_space(iot, hpcmips_system_bus_space(),
-           __csmap[cs].cs_name, __csmap[cs].cs_addr, __csmap[cs].cs_size);
 
        /* CS bus-width (configurationable) */
        switch (width) {
@@ -341,5 +341,5 @@
                }
        }
 
-       return (iot);
+       return (&iot->bst);
 }