[src/trunk]: src/sys/arch/arm26/podulebus Podulebus convergence:

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

details:   https://anonhg.NetBSD.org/src/rev/62ca148dd255
branches:  trunk
changeset: 507246:62ca148dd255
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Mar 17 21:56:06 2001 +0000

description:
Podulebus convergence:
pa_memc_[th] -> pa_mod_[th]
Add pa_easi_*
Add pa_*_base
Add pa_slot_flags to indicate whether EASI is supported.

diffstat:

 sys/arch/arm26/podulebus/asc.c       |   4 ++--
 sys/arch/arm26/podulebus/if_ea.c     |   6 +++---
 sys/arch/arm26/podulebus/if_eh.c     |  12 ++++++------
 sys/arch/arm26/podulebus/podulebus.c |  17 ++++++++++++-----
 sys/arch/arm26/podulebus/podulebus.h |  20 +++++++++++++++++---
 5 files changed, 40 insertions(+), 19 deletions(-)

diffs (175 lines):

diff -r 849d2d402cbe -r 62ca148dd255 sys/arch/arm26/podulebus/asc.c
--- a/sys/arch/arm26/podulebus/asc.c    Sat Mar 17 20:56:31 2001 +0000
+++ b/sys/arch/arm26/podulebus/asc.c    Sat Mar 17 21:56:06 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc.c,v 1.4 2001/03/17 20:34:43 bjh21 Exp $    */
+/*     $NetBSD: asc.c,v 1.5 2001/03/17 21:56:06 bjh21 Exp $    */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -150,7 +150,7 @@
         * eveything is a valid dma address
         */
        sbic->sc_dmamask = 0;
-       sbic->sc_sbicp = (sbic_regmap_p) (pa->pa_memc_h + ASC_SBIC);
+       sbic->sc_sbicp = (sbic_regmap_p) (pa->pa_mod_base + ASC_SBIC);
        sbic->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 143;
 
        sbic->sc_adapter.scsipi_cmd = asc_scsicmd;
diff -r 849d2d402cbe -r 62ca148dd255 sys/arch/arm26/podulebus/if_ea.c
--- a/sys/arch/arm26/podulebus/if_ea.c  Sat Mar 17 20:56:31 2001 +0000
+++ b/sys/arch/arm26/podulebus/if_ea.c  Sat Mar 17 21:56:06 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ea.c,v 1.24 2001/03/17 20:34:43 bjh21 Exp $ */
+/* $NetBSD: if_ea.c,v 1.25 2001/03/17 21:56:06 bjh21 Exp $ */
 
 /*
  * Copyright (c) 2000 Ben Harris
@@ -38,7 +38,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: if_ea.c,v 1.24 2001/03/17 20:34:43 bjh21 Exp $");
+__RCSID("$NetBSD: if_ea.c,v 1.25 2001/03/17 21:56:06 bjh21 Exp $");
 
 #include <sys/device.h>
 #include <sys/socket.h>
@@ -120,7 +120,7 @@
 /*     dprintf(("Attaching %s...\n", sc->sc_dev.dv_xname));*/
 
        /* Set the address of the controller for easy access */
-       bus_space_shift(pa->pa_memc_t, pa->pa_memc_h, EA_8005_SHIFT,
+       bus_space_shift(pa->pa_mod_t, pa->pa_mod_h, EA_8005_SHIFT,
                        &sc->sc_8005.sc_iot, &sc->sc_8005.sc_ioh);
 
        /* Get the Ethernet address from the device description string. */
diff -r 849d2d402cbe -r 62ca148dd255 sys/arch/arm26/podulebus/if_eh.c
--- a/sys/arch/arm26/podulebus/if_eh.c  Sat Mar 17 20:56:31 2001 +0000
+++ b/sys/arch/arm26/podulebus/if_eh.c  Sat Mar 17 21:56:06 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eh.c,v 1.14 2001/03/17 20:34:43 bjh21 Exp $ */
+/* $NetBSD: if_eh.c,v 1.15 2001/03/17 21:56:07 bjh21 Exp $ */
 
 /*-
  * Copyright (c) 2000 Ben Harris
@@ -53,7 +53,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.14 2001/03/17 20:34:43 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.15 2001/03/17 21:56:07 bjh21 Exp $");
 
 #include <sys/systm.h>
 #include <sys/device.h>
@@ -215,11 +215,11 @@
        }
 
        /* Set up bus spaces */
-       dsc->sc_regt = pa->pa_memc_t;
-       bus_space_subregion(dsc->sc_regt, pa->pa_memc_h, EH_DP8390, 0x10,
+       dsc->sc_regt = pa->pa_mod_t;
+       bus_space_subregion(dsc->sc_regt, pa->pa_mod_h, EH_DP8390, 0x10,
            &dsc->sc_regh);
-       sc->sc_datat = pa->pa_memc_t;
-       bus_space_subregion(sc->sc_datat, pa->pa_memc_h, EH_DATA, 1,
+       sc->sc_datat = pa->pa_mod_t;
+       bus_space_subregion(sc->sc_datat, pa->pa_mod_h, EH_DATA, 1,
            &sc->sc_datah);
        sc->sc_ctlt = pa->pa_fast_t;
        bus_space_subregion(sc->sc_ctlt, pa->pa_fast_h, EH_CTRL, 1,
diff -r 849d2d402cbe -r 62ca148dd255 sys/arch/arm26/podulebus/podulebus.c
--- a/sys/arch/arm26/podulebus/podulebus.c      Sat Mar 17 20:56:31 2001 +0000
+++ b/sys/arch/arm26/podulebus/podulebus.c      Sat Mar 17 21:56:06 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.8 2001/01/23 23:58:32 bjh21 Exp $ */
+/* $NetBSD: podulebus.c,v 1.9 2001/03/17 21:56:07 bjh21 Exp $ */
 
 /*-
  * Copyright (c) 2000 Ben Harris
@@ -30,7 +30,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: podulebus.c,v 1.8 2001/01/23 23:58:32 bjh21 Exp $");
+__RCSID("$NetBSD: podulebus.c,v 1.9 2001/03/17 21:56:07 bjh21 Exp $");
 
 #include <sys/device.h>
 #include <sys/malloc.h>
@@ -138,12 +138,18 @@
                                    slotnum * PODULE_GAP, PODULE_GAP,
                                    &pa.pa_sync_h);
                /* XXX This is a hack! */
-               pa.pa_memc_t = 2;
-               bus_space_subregion(pa.pa_memc_t,
+               pa.pa_mod_t = 2;
+               bus_space_subregion(pa.pa_mod_t,
                    (bus_space_handle_t)MEMC_IO_BASE, slotnum * PODULE_GAP,
-                   PODULE_GAP, &pa.pa_memc_h);
+                   PODULE_GAP, &pa.pa_mod_h);
                bus_space_read_region_1(id_bst, id_bsh, 0,
                                        extecid, EXTECID_SIZE);
+               /* XXX If you thought that was a hack... */
+               pa.pa_mod_base = pa.pa_mod_h;
+               pa.pa_fast_base = pa.pa_fast_h;
+               pa.pa_medium_base = pa.pa_medium_h;
+               pa.pa_slow_base = pa.pa_slow_h;
+               pa.pa_sync_base = pa.pa_sync_h;
                pa.pa_ecid = ecid;
                pa.pa_flags1 = extecid[EXTECID_F1];
                pa.pa_manufacturer = (extecid[EXTECID_MLO] |
@@ -164,6 +170,7 @@
                                                          CHUNK_DEV_DESCR);
                        }
                }
+               pa.pa_slotflags = 0;
                config_found_sm(self, &pa,
                                podulebus_print, podulebus_submatch);
                if (pa.pa_chunks)
diff -r 849d2d402cbe -r 62ca148dd255 sys/arch/arm26/podulebus/podulebus.h
--- a/sys/arch/arm26/podulebus/podulebus.h      Sat Mar 17 20:56:31 2001 +0000
+++ b/sys/arch/arm26/podulebus/podulebus.h      Sat Mar 17 21:56:06 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.h,v 1.4 2001/01/23 22:08:00 bjh21 Exp $ */
+/* $NetBSD: podulebus.h,v 1.5 2001/03/17 21:56:07 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -52,8 +52,11 @@
 };
 
 struct podulebus_attach_args {
-       bus_space_tag_t         pa_memc_t;
-       bus_space_handle_t      pa_memc_h;
+       /* bus_space references for the (many) podule spaces */
+       bus_space_tag_t         pa_easi_t;
+       bus_space_handle_t      pa_easi_h;
+       bus_space_tag_t         pa_mod_t;
+       bus_space_handle_t      pa_mod_h;
        bus_space_tag_t         pa_fast_t;
        bus_space_handle_t      pa_fast_h;
        bus_space_tag_t         pa_medium_t;
@@ -62,6 +65,15 @@
        bus_space_handle_t      pa_slow_h;
        bus_space_tag_t         pa_sync_t;
        bus_space_handle_t      pa_sync_h;
+
+       /* Same things as raw addresses (arm32 compat) */
+       u_int   pa_easi_base;
+       u_int   pa_mod_base;
+       u_int   pa_fast_base;
+       u_int   pa_medium_base;
+       u_int   pa_slow_base;
+       u_int   pa_sync_base;
+
        int     pa_slotnum;
        int     pa_ecid;
        int     pa_flags1;
@@ -71,6 +83,8 @@
        int     pa_nchunks;
        char    *pa_descr;
        void    *pa_loader;
+       int     pa_slotflags;
+#define PA_SLOT_EASI   0x01    /* EASI space available */
 };
 
 #define IS_PODULE(pa, man, prod)       \