[src/trunk]: src/sys/arch/sandpoint/sandpoint Replaced 16 by I8259_ICU in int...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/890a45cf117e
branches:  trunk
changeset: 772313:890a45cf117e
user:      phx <phx%NetBSD.org@localhost>
date:      Thu Dec 29 10:27:36 2011 +0000

description:
Replaced 16 by I8259_ICU in intr_establish().

diffstat:

 sys/arch/sandpoint/sandpoint/com_eumb.c |  9 +++++----
 sys/arch/sandpoint/sandpoint/satmgr.c   |  7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 3e87b31ed0d5 -r 890a45cf117e sys/arch/sandpoint/sandpoint/com_eumb.c
--- a/sys/arch/sandpoint/sandpoint/com_eumb.c   Thu Dec 29 04:25:49 2011 +0000
+++ b/sys/arch/sandpoint/sandpoint/com_eumb.c   Thu Dec 29 10:27:36 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com_eumb.c,v 1.7 2011/07/01 19:16:06 dyoung Exp $ */
+/* $NetBSD: com_eumb.c,v 1.8 2011/12/29 10:27:36 phx Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.7 2011/07/01 19:16:06 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.8 2011/12/29 10:27:36 phx Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -101,8 +101,9 @@
 
        com_attach_subr(sc);
 
-       intr_establish(epicirq + 16, IST_LEVEL, IPL_SERIAL, comintr, sc);
-       aprint_normal_dev(self, "interrupting at irq %d\n", epicirq + 16);
+       intr_establish(epicirq + I8259_ICU, IST_LEVEL, IPL_SERIAL, comintr, sc);
+       aprint_normal_dev(self, "interrupting at irq %d\n",
+           epicirq + I8259_ICU);
 }
 
 int
diff -r 3e87b31ed0d5 -r 890a45cf117e sys/arch/sandpoint/sandpoint/satmgr.c
--- a/sys/arch/sandpoint/sandpoint/satmgr.c     Thu Dec 29 04:25:49 2011 +0000
+++ b/sys/arch/sandpoint/sandpoint/satmgr.c     Thu Dec 29 10:27:36 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.13 2011/11/12 23:57:55 phx Exp $ */
+/* $NetBSD: satmgr.c,v 1.14 2011/12/29 10:27:36 phx Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -230,8 +230,9 @@
        sc->sc_btn_cnt = 0;
 
        epicirq = (eaa->eumb_unit == 0) ? 24 : 25;
-       intr_establish(epicirq + 16, IST_LEVEL, IPL_SERIAL, hwintr, sc);
-       aprint_normal_dev(self, "interrupting at irq %d\n", epicirq + 16);
+       intr_establish(epicirq + I8259_ICU, IST_LEVEL, IPL_SERIAL, hwintr, sc);
+       aprint_normal_dev(self, "interrupting at irq %d\n",
+           epicirq + I8259_ICU);
        sc->sc_si = softint_establish(SOFTINT_SERIAL, swintr, sc);
 
        CSR_WRITE(sc, IER, 0x7f); /* all but MSR */