summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2013-01-27 20:16:50 +0000
committerian <ian@FreeBSD.org>2013-01-27 20:16:50 +0000
commit351c1f2f285769e4e015c935093a7b1febb9ea13 (patch)
treedcada766386706b69349b11ea049c789c4d0b1e2
parent2e285a3dfe9feefa40485bbd4f04676edc6d0967 (diff)
downloadFreeBSD-src-351c1f2f285769e4e015c935093a7b1febb9ea13.zip
FreeBSD-src-351c1f2f285769e4e015c935093a7b1febb9ea13.tar.gz
Restore the irq number to the display string; I fumbled this in the previous
commit while trying to make the code internally self-consistant. Approved by: cognet (mentor) Obtained from: Christoph Mallon
-rw-r--r--sys/arm/arm/intr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index ab68066..062b10a 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -72,9 +72,10 @@ arm_intrnames_init(void)
{
int i;
- for (i = 0; i < NIRQ; ++i)
+ for (i = 0; i < NIRQ; ++i) {
snprintf(&intrnames[i * INTRNAME_LEN], INTRNAME_LEN, "%-*s",
INTRNAME_LEN - 1, "");
+ }
}
void
@@ -94,8 +95,8 @@ arm_setup_irqhandler(const char *name, driver_filter_t *filt,
if (error)
return;
intr_events[irq] = event;
- snprintf(&intrnames[irq * INTRNAME_LEN], INTRNAME_LEN, "%-*s",
- INTRNAME_LEN - 1, name);
+ snprintf(&intrnames[irq * INTRNAME_LEN], INTRNAME_LEN,
+ "irq%d: %-*s", irq, INTRNAME_LEN - 1, name);
}
intr_event_add_handler(event, name, filt, hand, arg,
intr_priority(flags), flags, cookiep);
OpenPOWER on IntegriCloud