summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-11-16 21:37:03 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-11-16 21:37:03 +0000
commitb2eeddfe90f171b29bfc5f1550b4f045db063e0c (patch)
tree45f084e7524ec26d30b9bd504a368e241548ba8f /sys/arch/hp300/dev
parent0d1aa5f96a850ba0cf8fd63ad83371a0ff327735 (diff)
Mention ipl in dmesg, for consistency with other devices.
Diffstat (limited to 'sys/arch/hp300/dev')
-rw-r--r--sys/arch/hp300/dev/frodo.c9
-rw-r--r--sys/arch/hp300/dev/hil_intio.c8
2 files changed, 11 insertions, 6 deletions
diff --git a/sys/arch/hp300/dev/frodo.c b/sys/arch/hp300/dev/frodo.c
index 85c907c9526..fc19918f77d 100644
--- a/sys/arch/hp300/dev/frodo.c
+++ b/sys/arch/hp300/dev/frodo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: frodo.c,v 1.6 2005/11/12 23:09:14 miod Exp $ */
+/* $OpenBSD: frodo.c,v 1.7 2005/11/16 21:37:02 miod Exp $ */
/* $NetBSD: frodo.c,v 1.5 1999/07/31 21:15:20 thorpej Exp $ */
/*-
@@ -116,6 +116,8 @@ struct frodo_attach_args frodo_subdevs[] = {
{ NULL, 0, 0 },
};
+#define FRODO_IPL 5
+
int
frodomatch(parent, match, aux)
struct device *parent;
@@ -163,6 +165,7 @@ frodoattach(parent, self, aux)
sc->sc_regs = (volatile u_int8_t *)IIOV(ia->ia_addr);
+ printf(" ipl %d", FRODO_IPL);
if ((FRODO_READ(sc, FRODO_IISR) & FRODO_IISR_SERVICE) == 0)
printf(": service mode enabled");
printf("\n");
@@ -261,7 +264,7 @@ frodo_intr_establish(struct device *frdev, int line, struct isr *isr,
intr_disestablish(&sc->sc_isr);
sc->sc_isr.isr_func = frodointr;
sc->sc_isr.isr_arg = sc;
- sc->sc_isr.isr_ipl = 5;
+ sc->sc_isr.isr_ipl = FRODO_IPL;
sc->sc_isr.isr_priority = priority;
intr_establish(&sc->sc_isr, sc->sc_dev.dv_xname);
}
@@ -309,7 +312,7 @@ frodo_intr_disestablish(frdev, line)
intr_disestablish(&sc->sc_isr);
sc->sc_isr.isr_func = frodointr;
sc->sc_isr.isr_arg = sc;
- sc->sc_isr.isr_ipl = 5;
+ sc->sc_isr.isr_ipl = FRODO_IPL;
sc->sc_isr.isr_priority = newpri;
intr_establish(&sc->sc_isr, sc->sc_dev.dv_xname);
}
diff --git a/sys/arch/hp300/dev/hil_intio.c b/sys/arch/hp300/dev/hil_intio.c
index 42322fc35ec..0362f616779 100644
--- a/sys/arch/hp300/dev/hil_intio.c
+++ b/sys/arch/hp300/dev/hil_intio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil_intio.c,v 1.4 2005/04/22 11:56:19 miod Exp $ */
+/* $OpenBSD: hil_intio.c,v 1.5 2005/11/16 21:37:02 miod Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat.
@@ -97,12 +97,14 @@ hil_intio_attach(struct device *parent, struct device *self, void *aux)
hil_is_console = 0;
}
- hil_attach(sc, hil_is_console);
-
hil_isr.isr_func = hil_intr;
hil_isr.isr_arg = sc;
hil_isr.isr_ipl = 1;
hil_isr.isr_priority = IPL_TTY;
+
+ printf(" ipl %d", hil_isr.isr_ipl);
+
+ hil_attach(sc, hil_is_console);
intr_establish(&hil_isr, self->dv_xname);
startuphook_establish(hil_attach_deferred, sc);