diff options
| -rw-r--r-- | sys/arch/sparc64/dev/central.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/fhc.c | 23 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/fhc_central.c | 10 |
3 files changed, 5 insertions, 32 deletions
diff --git a/sys/arch/sparc64/dev/central.c b/sys/arch/sparc64/dev/central.c index 5bf2b7d5177..1afcbb7f273 100644 --- a/sys/arch/sparc64/dev/central.c +++ b/sys/arch/sparc64/dev/central.c @@ -1,4 +1,4 @@ -/* $OpenBSD: central.c,v 1.1 2004/09/22 21:31:51 jason Exp $ */ +/* $OpenBSD: central.c,v 1.2 2004/09/23 16:26:59 jason Exp $ */ /* * Copyright (c) 2004 Jason L. Wright (jason@thought.net) @@ -193,7 +193,7 @@ _central_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t addr, paddr = offset - sc->sc_range[i].coffset; paddr += sc->sc_range[i].poffset; paddr |= ((bus_addr_t)sc->sc_range[i].pspace << 32); - return ((*t->parent->sparc_bus_map)(t, t0, paddr, + return ((*t->parent->sparc_bus_map)(t->parent, t0, paddr, size, flags, hp)); } diff --git a/sys/arch/sparc64/dev/fhc.c b/sys/arch/sparc64/dev/fhc.c index 34c4c46e702..c803c2abbc6 100644 --- a/sys/arch/sparc64/dev/fhc.c +++ b/sys/arch/sparc64/dev/fhc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fhc.c,v 1.1 2004/09/22 21:44:45 jason Exp $ */ +/* $OpenBSD: fhc.c,v 1.2 2004/09/23 16:26:59 jason Exp $ */ /* * Copyright (c) 2004 Jason L. Wright (jason@thought.net) @@ -63,14 +63,6 @@ fhc_attach(struct fhc_softc *sc) getprop(sc->sc_node, "ranges", sizeof(struct fhc_range), &sc->sc_nrange, (void **)&sc->sc_range); -#if 0 - for (node = 0; node < sc->sc_nrange; node++) - printf("%d: cs %08x co %08x ps %08x po %08x sz %08x\n", - node, sc->sc_range[node].cspace, - sc->sc_range[node].coffset, sc->sc_range[node].pspace, - sc->sc_range[node].poffset, sc->sc_range[node].size); -#endif - node0 = firstchild(sc->sc_node); for (node = node0; node; node = nextsibling(node)) { struct fhc_attach_args fa; @@ -87,17 +79,7 @@ fhc_attach(struct fhc_softc *sc) getprop(node, "reg", sizeof(struct fhc_reg), &fa.fa_nreg, (void **)&fa.fa_reg); -#if 0 - printf("%s registers:\n", fa.fa_name); - for (i = 0; i < fa.fa_nreg; i++) { - printf(" %d slot 0x%x offset 0x%x size 0x%x\n", i, - fa.fa_reg[i].fbr_slot, - fa.fa_reg[i].fbr_offset, - fa.fa_reg[i].fbr_size); - } - (void)config_found(&sc->sc_dv, (void *)&fa, fhc_print); -#endif if (fa.fa_name != NULL) free(fa.fa_name, M_DEVBUF); @@ -188,8 +170,7 @@ _fhc_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t addr, paddr += sc->sc_range[i].poffset; paddr |= ((bus_addr_t)sc->sc_range[i].pspace << 32); - printf("[fhc %llx]", (unsigned long long)paddr); - return ((*t->parent->sparc_bus_map)(t, t0, paddr, + return ((*t->parent->sparc_bus_map)(t->parent, t0, paddr, size, flags, hp)); } diff --git a/sys/arch/sparc64/dev/fhc_central.c b/sys/arch/sparc64/dev/fhc_central.c index c72fc9150ea..41f6f45be27 100644 --- a/sys/arch/sparc64/dev/fhc_central.c +++ b/sys/arch/sparc64/dev/fhc_central.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fhc_central.c,v 1.1 2004/09/22 21:44:45 jason Exp $ */ +/* $OpenBSD: fhc_central.c,v 1.2 2004/09/23 16:26:59 jason Exp $ */ /* * Copyright (c) 2004 Jason L. Wright (jason@thought.net). @@ -67,18 +67,10 @@ fhc_central_attach(parent, self, aux) { struct fhc_softc *sc = (struct fhc_softc *)self; struct central_attach_args *ca = aux; - int i; sc->sc_node = ca->ca_node; sc->sc_bt = ca->ca_bustag; - for (i = 0; i < ca->ca_nreg; i++) { - printf("\n r%d slot %08x offset %08x size %08x\n", i, - ca->ca_reg[i].cbr_slot, - ca->ca_reg[i].cbr_offset, - ca->ca_reg[i].cbr_size); - } - if (central_bus_map(sc->sc_bt, ca->ca_reg[0].cbr_slot, ca->ca_reg[0].cbr_offset, ca->ca_reg[0].cbr_size, 0, &sc->sc_preg)) { |