summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-07-09 20:51:58 +0000
committerad <ad@NetBSD.org>2007-07-09 20:51:58 +0000
commit88ab7da936c561aba9ff7492617ffb08f8d08ece (patch)
treed9d78b17ff651178241606f2e7766abdd0f15137 /sys/arch/atari/dev
parent317bac119f13240650ea6882854b381cf1024fa1 (diff)
Merge some of the less invasive changes from the vmlocking branch:
- kthread, callout, devsw API changes - select()/poll() improvements - miscellaneous MT safety improvements
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/fd.c6
-rw-r--r--sys/arch/atari/dev/hdfd.c12
-rw-r--r--sys/arch/atari/dev/ite.c13
-rw-r--r--sys/arch/atari/dev/lpt.c6
-rw-r--r--sys/arch/atari/dev/ser.c6
5 files changed, 25 insertions, 18 deletions
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index 60b2db4292f..62a93fdd633 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.56 2007/03/06 14:03:07 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.57 2007/07/09 20:52:07 ad Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2007/03/06 14:03:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.57 2007/07/09 20:52:07 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -389,7 +389,7 @@ void *auxp;
sc = (struct fd_softc *)dp;
- callout_init(&sc->sc_motor_ch);
+ callout_init(&sc->sc_motor_ch, 0);
/*
* Find out if an Ajax chip might be installed. Set the default
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index c58a92c3a3f..c62b6f4cdce 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.55 2007/03/06 14:45:31 tsutsui Exp $ */
+/* $NetBSD: hdfd.c,v 1.56 2007/07/09 20:52:07 ad Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.55 2007/03/06 14:45:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.56 2007/07/09 20:52:07 ad Exp $");
#include "opt_ddb.h"
@@ -431,8 +431,8 @@ fdcattach(parent, self, aux)
printf("\n");
- callout_init(&fdc->sc_timo_ch);
- callout_init(&fdc->sc_intr_ch);
+ callout_init(&fdc->sc_timo_ch, 0);
+ callout_init(&fdc->sc_intr_ch, 0);
if (intr_establish(22, USER_VEC|FAST_VEC, 0,
(hw_ifun_t)(has_fifo ? mfp_hdfd_fifo : mfp_hdfd_nf),
@@ -525,8 +525,8 @@ fdattach(parent, self, aux)
struct fd_type *type = fa->fa_deftype;
int drive = fa->fa_drive;
- callout_init(&fd->sc_motoron_ch);
- callout_init(&fd->sc_motoroff_ch);
+ callout_init(&fd->sc_motoron_ch, 0);
+ callout_init(&fd->sc_motoroff_ch, 0);
/* XXX Allow `flags' to override device type? */
diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index a3d4a69cff8..a8cc270885e 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.54 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: ite.c,v 1.55 2007/07/09 20:52:07 ad Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.54 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.55 2007/07/09 20:52:07 ad Exp $");
#include "opt_ddb.h"
@@ -919,7 +919,7 @@ enum caller caller;
static u_int last_char;
static u_char tout_pending;
-static struct callout repeat_ch = CALLOUT_INITIALIZER;
+static callout_t repeat_ch;
/*ARGSUSED*/
static void
@@ -942,6 +942,13 @@ enum caller caller;
u_char code, *str, up, mask;
struct key key;
int s, i;
+ static bool again;
+
+ if (!again) {
+ /* XXX */
+ callout_init(&repeat_ch, 0);
+ again = true;
+ }
if(kbd_ite == NULL)
return;
diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c
index e2727bbed0c..eaf0e99cdbe 100644
--- a/sys/arch/atari/dev/lpt.c
+++ b/sys/arch/atari/dev/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.25 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: lpt.c,v 1.26 2007/07/09 20:52:08 ad Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.25 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.26 2007/07/09 20:52:08 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,7 +172,7 @@ void *auxp;
printf("\n");
- callout_init(&sc->sc_wakeup_ch);
+ callout_init(&sc->sc_wakeup_ch, 0);
}
/*
diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c
index 5363e0fdf73..6acbe1eb009 100644
--- a/sys/arch/atari/dev/ser.c
+++ b/sys/arch/atari/dev/ser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.33 2007/03/04 05:59:41 christos Exp $ */
+/* $NetBSD: ser.c,v 1.34 2007/07/09 20:52:08 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.33 2007/03/04 05:59:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.34 2007/07/09 20:52:08 ad Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -323,7 +323,7 @@ void *auxp;
MFP->mf_imrb &= ~(IB_SCTS|IB_SDCD);
MFP->mf_imra &= ~(IA_RRDY|IA_RERR|IA_TRDY|IA_TERR);
- callout_init(&sc->sc_diag_ch);
+ callout_init(&sc->sc_diag_ch, 0);
#if SERCONSOLE > 0
/*