Change sti attachment to pass an array of base addresses for the sti regions,

instead of using the rom mapping for region #0 and the device mapping for
region #1. This will allow sti devices on which regions may be relative to
different origins to attach (to be used very soon).

ok mickey@

3 files changed, 30 insertions, 14 deletions

diff --git a/sys/arch/hp300/dev/sti_sgc.c b/sys/arch/hp300/dev/sti_sgc.c
index 56f86728dac..33c6d70b840 100644
--- a/sys/arch/hp300/dev/sti_sgc.c
+++ b/sys/arch/hp300/dev/sti_sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti_sgc.c,v 1.9 2006/08/22 21:04:31 miod Exp $	*/
+/*	$OpenBSD: sti_sgc.c,v 1.10 2006/12/18 18:57:24 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -54,6 +54,10 @@ struct cfattach sti_sgc_ca = {
 	sizeof(struct sti_softc), sti_sgc_match, sti_sgc_attach
 };
 
+/* Console data */
+struct sti_screen stifb_cn;
+bus_addr_t stifb_cn_bases[STI_REGION_MAX];
+
 int
 sti_sgc_match(struct device *parent, void *match, void *aux)
 {
@@ -77,26 +81,27 @@ sti_sgc_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct sti_softc *sc = (void *)self;
 	struct sgc_attach_args *saa = aux;
+	bus_addr_t base;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	u_int romend;
+	int i;
 
 	/*
 	 * If we already probed it succesfully as a console device, go ahead,
 	 * since we will not be able to bus_space_map() again.
 	 */
 	if (SGC_SLOT_TO_CONSCODE(saa->saa_slot) == conscode) {
-		extern struct sti_screen stifb_cn;
-
 		sc->sc_flags |= STI_CONSOLE | STI_ATTACHED;
 		sc->sc_scr = &stifb_cn;
+		bcopy(stifb_cn_bases, sc->bases, sizeof(sc->bases));
 
 		sti_describe(sc);
 	} else {
 		iot = HP300_BUS_TAG(HP300_BUS_SGC, saa->saa_slot);
-		sc->base = (bus_addr_t)sgc_slottopa(saa->saa_slot);
+		base = (bus_addr_t)sgc_slottopa(saa->saa_slot);
 
-		if (bus_space_map(iot, sc->base, PAGE_SIZE, 0, &ioh)) {
+		if (bus_space_map(iot, base, PAGE_SIZE, 0, &ioh)) {
 			printf(": can't map frame buffer");
 			return;
 		}
@@ -108,13 +113,16 @@ sti_sgc_attach(struct device *parent, struct device *self, void *aux)
 
 		bus_space_unmap(iot, ioh, PAGE_SIZE);
 
-		if (bus_space_map(iot, sc->base, romend, 0, &ioh)) {
+		if (bus_space_map(iot, base, romend, 0, &ioh)) {
 			printf(": can't map frame buffer");
 			return;
 		}
 
 		sc->memt = sc->iot = iot;
 		sc->romh = ioh;
+		sc->bases[0] = sc->romh;
+		for (i = 1; i < STI_REGION_MAX; i++)
+			sc->bases[i] = base;
 
 		sti_attach_common(sc, STI_CODEBASE_M68K);
 	}
@@ -168,9 +176,9 @@ sti_console_scan(int slot)
 void
 sticninit()
 {
-	extern struct sti_screen stifb_cn;
 	bus_space_tag_t iot;
 	bus_addr_t base;
+	int i;
 
 	/*
 	 * We are not interested by the *first* console pass.
@@ -181,7 +189,11 @@ sticninit()
 	iot = HP300_BUS_TAG(HP300_BUS_SGC, CONSCODE_TO_SGC_SLOT(conscode));
 	base = (bus_addr_t)sgc_slottopa(CONSCODE_TO_SGC_SLOT(conscode));
 
-	sti_cnattach(&stifb_cn, iot, base, STI_CODEBASE_M68K);
+	/* stifb_cn_bases[0] will be fixed in sti_cnattach() */
+	for (i = 0; i < STI_REGION_MAX; i++)
+		stifb_cn_bases[i] = base;
+
+	sti_cnattach(&stifb_cn, iot, stifb_cn_bases, STI_CODEBASE_M68K);
 	sti_clear(&stifb_cn);
 
 	/*
diff --git a/sys/arch/hp300/hp300/wscons_machdep.c b/sys/arch/hp300/hp300/wscons_machdep.c
index ea700592f65..8a97876dde8 100644
--- a/sys/arch/hp300/hp300/wscons_machdep.c
+++ b/sys/arch/hp300/hp300/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.7 2006/04/14 21:05:44 miod Exp $	*/
+/*	$OpenBSD: wscons_machdep.c,v 1.8 2006/12/18 18:57:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -97,7 +97,6 @@ struct diofb diofb_cn;
 #include <dev/ic/stivar.h>
 extern	int sti_console_scan(int);
 extern	void sticninit(void);
-struct sti_screen stifb_cn;
 #endif
 
 extern caddr_t internalhpib;
diff --git a/sys/arch/hppa/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c
index ed70920aa16..4729b8e9e1f 100644
--- a/sys/arch/hppa/dev/sti_sgc.c
+++ b/sys/arch/hppa/dev/sti_sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti_sgc.c,v 1.33 2006/11/30 11:25:11 mickey Exp $	*/
+/*	$OpenBSD: sti_sgc.c,v 1.34 2006/12/18 18:57:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -63,8 +63,9 @@ char sti_sgc_opt[] = { 0x17, 0x20, 0x30, 0x40, 0x70, 0xc0, 0xd0 };
 
 extern struct cfdriver sti_cd;
 
-int sti_sgc_probe(struct device *, void *, void *);
-void sti_sgc_attach(struct device *, struct device *, void *);
+int	sti_sgc_probe(struct device *, void *, void *);
+void	sti_sgc_attach(struct device *, struct device *, void *);
+paddr_t	sti_sgc_getrom(int, struct confargs *);
 
 struct cfattach sti_gedoens_ca = {
 	sizeof(struct sti_softc), sti_sgc_probe, sti_sgc_attach
@@ -201,9 +202,9 @@ sti_sgc_attach(parent, self, aux)
 	paddr_t rom;
 	u_int32_t romlen;
 	int rv;
+	int i;
 
 	sc->memt = sc->iot = ca->ca_iot;
-	sc->base = ca->ca_hpa;
 
 	/* we stashed rom addr/len into the last slot during probe */
 	rom = ca->ca_addrs[ca->ca_naddrs - 1].addr;
@@ -217,6 +218,10 @@ sti_sgc_attach(parent, self, aux)
 		}
 	}
 
+	sc->bases[0] = sc->romh;
+	for (i = 1; i < STI_REGION_MAX; i++)
+		sc->bases[i] = ca->ca_hpa;
+
 #ifdef	HP7300LC_CPU
 	/* PCXL2: enable accel i/o for this space */
 	if (cpu_type == hpcxl2)