summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2000-10-25 21:24:08 +0000
committerjhb <jhb@FreeBSD.org>2000-10-25 21:24:08 +0000
commita2d3e81fbe6eddfa397bde10d42c945ad42762dc (patch)
treeb2188d97f1d55bae5f7bd3a918eb5a8f5791e42b /sys
parent9a534580a41b7a27ccdec44cc503b64a6d9086c2 (diff)
downloadFreeBSD-src-a2d3e81fbe6eddfa397bde10d42c945ad42762dc.zip
FreeBSD-src-a2d3e81fbe6eddfa397bde10d42c945ad42762dc.tar.gz
Catch up to the new software interrupt code.
Noticed by: phk
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/rc/rc.c7
-rw-r--r--sys/i386/isa/rc.c7
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index fc35bd5..11da8ac 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -39,6 +39,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/tty.h>
#include <sys/proc.h>
@@ -184,7 +185,7 @@ static int rc_modctl __P((struct rc_chans *, int, int));
static void rc_start __P((struct tty *));
static void rc_stop __P((struct tty *, int rw));
static int rc_param __P((struct tty *, struct termios *));
-static swihand_t rcpoll;
+static void rcpoll __P((void *));
static void rc_reinit __P((struct rc_softc *));
#ifdef RCDEBUG
static void printrcflags();
@@ -559,7 +560,7 @@ out:
}
/* Handle delayed events. */
-void rcpoll()
+void rcpoll(void *arg)
{
register struct rc_chans *rc;
register struct rc_softc *rcb;
@@ -1423,7 +1424,7 @@ rc_wakeup(chan)
int s;
s = splsofttty();
- rcpoll();
+ rcpoll(NULL);
splx(s);
}
}
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index fc35bd5..11da8ac 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -39,6 +39,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/tty.h>
#include <sys/proc.h>
@@ -184,7 +185,7 @@ static int rc_modctl __P((struct rc_chans *, int, int));
static void rc_start __P((struct tty *));
static void rc_stop __P((struct tty *, int rw));
static int rc_param __P((struct tty *, struct termios *));
-static swihand_t rcpoll;
+static void rcpoll __P((void *));
static void rc_reinit __P((struct rc_softc *));
#ifdef RCDEBUG
static void printrcflags();
@@ -559,7 +560,7 @@ out:
}
/* Handle delayed events. */
-void rcpoll()
+void rcpoll(void *arg)
{
register struct rc_chans *rc;
register struct rc_softc *rcb;
@@ -1423,7 +1424,7 @@ rc_wakeup(chan)
int s;
s = splsofttty();
- rcpoll();
+ rcpoll(NULL);
splx(s);
}
}
OpenPOWER on IntegriCloud