Module Name: src
Committed By: phx
Date: Thu Dec 29 10:27:36 UTC 2011
Modified Files:
src/sys/arch/sandpoint/sandpoint: com_eumb.c satmgr.c
Log Message:
Replaced 16 by I8259_ICU in intr_establish().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sandpoint/sandpoint/com_eumb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sandpoint/sandpoint/satmgr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/sandpoint/com_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.7 src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.8
--- src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.7 Fri Jul 1 19:16:06 2011
+++ src/sys/arch/sandpoint/sandpoint/com_eumb.c Thu Dec 29 10:27:36 2011
@@ -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_eumb_attach(device_t parent, device_
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
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.13 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.14
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.13 Sat Nov 12 23:57:55 2011
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Thu Dec 29 10:27:36 2011
@@ -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 @@ satmgr_attach(device_t parent, device_t
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 */
