Module Name: src
Committed By: cliff
Date: Sun Mar 21 21:23:32 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_com.c
Log Message:
- pass obio_tmsk to rmixl_intr_establish
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/arch/mips/rmi/rmixl_com.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/mips/rmi/rmixl_com.c
diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.10 src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.11
--- src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.10 Wed Jan 20 20:48:12 2010
+++ src/sys/arch/mips/rmi/rmixl_com.c Sun Mar 21 21:23:32 2010
@@ -1,4 +1,4 @@
-/* $Id: rmixl_com.c,v 1.1.2.10 2010/01/20 20:48:12 matt Exp $ */
+/* $Id: rmixl_com.c,v 1.1.2.11 2010/03/21 21:23:32 cliff Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.10 2010/01/20 20:48:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.11 2010/03/21 21:23:32 cliff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,9 +119,10 @@
#include <mips/cpuregs.h>
+#include <mips/rmi/rmixlvar.h>
+#include <mips/rmi/rmixl_intr.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixl_comvar.h>
-#include <mips/rmi/rmixlvar.h>
#include "opt_com.h"
@@ -284,8 +285,8 @@
com_attach_subr(sc);
- rmixl_intr_establish(obio->obio_intr, IPL_SERIAL,
- RMIXL_INTR_LEVEL, RMIXL_INTR_HIGH, comintr, sc);
+ rmixl_intr_establish(obio->obio_intr, obio->obio_tmsk,
+ IPL_SERIAL, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH, comintr, sc);
}
