summaryrefslogtreecommitdiff
path: root/sys/arch/hppa/dev/com_dino.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hppa/dev/com_dino.c')
-rw-r--r--sys/arch/hppa/dev/com_dino.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/hppa/dev/com_dino.c b/sys/arch/hppa/dev/com_dino.c
index 813ba2e6337..d1cac3c28c5 100644
--- a/sys/arch/hppa/dev/com_dino.c
+++ b/sys/arch/hppa/dev/com_dino.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_dino.c,v 1.3 2004/10/25 00:08:44 mickey Exp $ */
+/* $OpenBSD: com_dino.c,v 1.4 2007/07/15 19:25:49 kettenis Exp $ */
/*
* Copyright (c) 2004 Michael Shalayeff
@@ -92,17 +92,17 @@ com_dino_attach(parent, self, aux)
sc->sc_iot = ca->ca_iot;
sc->sc_iobase = (bus_addr_t)ca->ca_hpa + IOMOD_DEVOFFSET;
- if (sc->sc_iobase == CONADDR && comconsioh)
- sc->sc_ioh = comconsioh;
- else if (bus_space_map(sc->sc_iot, sc->sc_iobase, COM_NPORTS,
+ if (bus_space_map(sc->sc_iot, sc->sc_iobase, COM_NPORTS,
0, &sc->sc_ioh)) {
printf(": cannot map io space\n");
return;
}
- if (sc->sc_iobase != CONADDR) {
- /* regs->reset = 0xd0;
- DELAY(1000); */
+ if (PAGE0->mem_cons.pz_class == PCL_DUPLEX &&
+ PAGE0->mem_cons.pz_hpa == ca->ca_hpa) {
+ bus_space_unmap(sc->sc_iot, sc->sc_ioh, COM_NPORTS);
+ comcnattach(sc->sc_iot, sc->sc_iobase, comdefaultrate,
+ COM_DINO_FREQ, comconscflag);
}
/* select clock freq */