Module Name: src
Committed By: phx
Date: Sun Dec 19 14:46:10 UTC 2010
Modified Files:
src/sys/arch/amigappc/amigappc: machdep.c
Log Message:
Fixed serial RBF interrupt.
We have to call ser_fastint() instead of ser_intr().
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amigappc/amigappc/machdep.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/amigappc/amigappc/machdep.c
diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.46 src/sys/arch/amigappc/amigappc/machdep.c:1.47
--- src/sys/arch/amigappc/amigappc/machdep.c:1.46 Sun Dec 19 11:05:06 2010
+++ src/sys/arch/amigappc/amigappc/machdep.c Sun Dec 19 14:46:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.46 2010/12/19 11:05:06 phx Exp $ */
+/* $NetBSD: machdep.c,v 1.47 2010/12/19 14:46:10 phx Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2010/12/19 11:05:06 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2010/12/19 14:46:10 phx Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -68,7 +68,7 @@
extern void setup_amiga_intr(void);
#if NSER > 0
extern void ser_outintr(void);
-extern void serintr(void);
+extern void ser_fastint(void);
#endif
#if NFD > 0
extern void fdintr(int);
@@ -227,12 +227,9 @@
static int
lev5_intr(void *arg)
{
- unsigned short ireq;
- ireq = custom.intreqr;
- if (ireq & INTF_RBF)
- serintr();
- if (ireq & INTF_DSKSYNC)
+ ser_fastint();
+ if (custom.intreqr & INTF_DSKSYNC)
custom.intreq = INTF_DSKSYNC;
return 0;
}