summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-12-11 12:16:03 +0000
committerchristos <christos@NetBSD.org>2005-12-11 12:16:03 +0000
commit95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch)
treed6510e195bc06092a8057e34c6442eba4e77d09a /sys/arch/atari/dev
parent4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff)
merge ktrace-lwp.
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/atari5380.c4
-rw-r--r--sys/arch/atari/dev/clock.c12
-rw-r--r--sys/arch/atari/dev/clockioctl.h2
-rw-r--r--sys/arch/atari/dev/dma.c4
-rw-r--r--sys/arch/atari/dev/event.c10
-rw-r--r--sys/arch/atari/dev/event_var.h4
-rw-r--r--sys/arch/atari/dev/fd.c16
-rw-r--r--sys/arch/atari/dev/font_8x16.c4
-rw-r--r--sys/arch/atari/dev/font_8x8.c4
-rw-r--r--sys/arch/atari/dev/grf.c26
-rw-r--r--sys/arch/atari/dev/grfabs.c4
-rw-r--r--sys/arch/atari/dev/grfabs_et.c4
-rw-r--r--sys/arch/atari/dev/grfabs_fal.c4
-rw-r--r--sys/arch/atari/dev/grfabs_reg.h2
-rw-r--r--sys/arch/atari/dev/grfabs_tt.c4
-rw-r--r--sys/arch/atari/dev/grfioctl.h2
-rw-r--r--sys/arch/atari/dev/grfvar.h2
-rw-r--r--sys/arch/atari/dev/hdfd.c18
-rw-r--r--sys/arch/atari/dev/hdfdreg.h2
-rw-r--r--sys/arch/atari/dev/ite.c32
-rw-r--r--sys/arch/atari/dev/ite_cc.c18
-rw-r--r--sys/arch/atari/dev/ite_et.c18
-rw-r--r--sys/arch/atari/dev/iteioctl.h2
-rw-r--r--sys/arch/atari/dev/itevar.h4
-rw-r--r--sys/arch/atari/dev/kbd.c18
-rw-r--r--sys/arch/atari/dev/kbdmap.c4
-rw-r--r--sys/arch/atari/dev/kbdmap.h2
-rw-r--r--sys/arch/atari/dev/kbdreg.h2
-rw-r--r--sys/arch/atari/dev/lpt.c16
-rw-r--r--sys/arch/atari/dev/md_root.c18
-rw-r--r--sys/arch/atari/dev/ms.c24
-rw-r--r--sys/arch/atari/dev/ncr5380.c4
-rw-r--r--sys/arch/atari/dev/ncr5380reg.h2
-rw-r--r--sys/arch/atari/dev/ncr5380var.h2
-rw-r--r--sys/arch/atari/dev/nvram.c4
-rw-r--r--sys/arch/atari/dev/ser.c30
-rw-r--r--sys/arch/atari/dev/view.c18
-rw-r--r--sys/arch/atari/dev/viewvar.h4
-rw-r--r--sys/arch/atari/dev/vuid_event.h2
-rw-r--r--sys/arch/atari/dev/wdc_mb.c4
-rw-r--r--sys/arch/atari/dev/wskbdmap_atari.c4
-rw-r--r--sys/arch/atari/dev/ym2149.c4
-rw-r--r--sys/arch/atari/dev/ym2149reg.h2
-rw-r--r--sys/arch/atari/dev/zs.c30
-rw-r--r--sys/arch/atari/dev/zsvar.h2
45 files changed, 199 insertions, 199 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c
index 36109351a3f..7db50a590eb 100644
--- a/sys/arch/atari/dev/atari5380.c
+++ b/sys/arch/atari/dev/atari5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.37 2005/06/04 14:42:36 he Exp $ */
+/* $NetBSD: atari5380.c,v 1.38 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.37 2005/06/04 14:42:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.38 2005/12/11 12:16:54 christos Exp $");
#include "opt_atariscsi.h"
diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c
index 7d3fb489c29..2ab062498bf 100644
--- a/sys/arch/atari/dev/clock.c
+++ b/sys/arch/atari/dev/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.35 2005/06/04 14:42:36 he Exp $ */
+/* $NetBSD: clock.c,v 1.36 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.35 2005/06/04 14:42:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.36 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -501,10 +501,10 @@ gettod()
* RTC-device support *
***********************************************************************/
int
-rtcopen(dev, flag, mode, p)
+rtcopen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
struct clock_softc *sc;
@@ -522,11 +522,11 @@ rtcopen(dev, flag, mode, p)
}
int
-rtcclose(dev, flag, mode, p)
+rtcclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
struct clock_softc *sc = clock_cd.cd_devs[unit];
diff --git a/sys/arch/atari/dev/clockioctl.h b/sys/arch/atari/dev/clockioctl.h
index b2d4cbae370..19a99b48a3a 100644
--- a/sys/arch/atari/dev/clockioctl.h
+++ b/sys/arch/atari/dev/clockioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clockioctl.h,v 1.2 2003/08/07 16:26:58 agc Exp $ */
+/* $NetBSD: clockioctl.h,v 1.3 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/arch/atari/dev/dma.c b/sys/arch/atari/dev/dma.c
index 538ee875e2a..b11724eff32 100644
--- a/sys/arch/atari/dev/dma.c
+++ b/sys/arch/atari/dev/dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.16 2003/07/15 01:19:48 lukem Exp $ */
+/* $NetBSD: dma.c,v 1.17 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.16 2003/07/15 01:19:48 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.17 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/atari/dev/event.c b/sys/arch/atari/dev/event.c
index b5c83b3d6c0..63f1fc35fe2 100644
--- a/sys/arch/atari/dev/event.c
+++ b/sys/arch/atari/dev/event.c
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.9 2003/08/07 16:26:58 agc Exp $ */
+/* $NetBSD: event.c,v 1.10 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.9 2003/08/07 16:26:58 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.10 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -148,10 +148,10 @@ ev_read(ev, uio, flags)
}
int
-ev_poll(ev, events, p)
+ev_poll(ev, events, l)
register struct evvar *ev;
int events;
- struct proc *p;
+ struct lwp *l;
{
int revents = 0;
int s = splev();
@@ -160,7 +160,7 @@ ev_poll(ev, events, p)
if (ev->ev_get != ev->ev_put)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &ev->ev_sel);
+ selrecord(l, &ev->ev_sel);
}
splx(s);
return (revents);
diff --git a/sys/arch/atari/dev/event_var.h b/sys/arch/atari/dev/event_var.h
index 0cef2e1780e..7d1b4457b67 100644
--- a/sys/arch/atari/dev/event_var.h
+++ b/sys/arch/atari/dev/event_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.4 2003/08/07 16:26:58 agc Exp $ */
+/* $NetBSD: event_var.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@ struct evvar {
void ev_init __P((struct evvar *));
void ev_fini __P((struct evvar *));
int ev_read __P((struct evvar *, struct uio *, int));
-int ev_poll __P((struct evvar *, int, struct proc *));
+int ev_poll __P((struct evvar *, int, struct lwp *));
int ev_kqfilter __P((struct evvar *, struct knote *));
/*
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index 91f937be135..f1c61014efa 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.51 2005/10/15 17:29:10 yamt Exp $ */
+/* $NetBSD: fd.c,v 1.52 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51 2005/10/15 17:29:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.52 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -412,12 +412,12 @@ void *auxp;
}
int
-fdioctl(dev, cmd, addr, flag, p)
+fdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
int flag;
caddr_t addr;
-struct proc *p;
+struct lwp *l;
{
struct fd_softc *sc;
@@ -463,10 +463,10 @@ struct proc *p;
* partition 1: 780Kb
*/
int
-fdopen(dev, flags, devtype, proc)
+fdopen(dev, flags, devtype, l)
dev_t dev;
int flags, devtype;
-struct proc *proc;
+struct lwp *l;
{
struct fd_softc *sc;
int sps;
@@ -565,10 +565,10 @@ struct proc *proc;
}
int
-fdclose(dev, flags, devtype, proc)
+fdclose(dev, flags, devtype, l)
dev_t dev;
int flags, devtype;
-struct proc *proc;
+struct lwp *l;
{
struct fd_softc *sc;
diff --git a/sys/arch/atari/dev/font_8x16.c b/sys/arch/atari/dev/font_8x16.c
index 25a1dcc9bc5..448c29d614a 100644
--- a/sys/arch/atari/dev/font_8x16.c
+++ b/sys/arch/atari/dev/font_8x16.c
@@ -1,4 +1,4 @@
-/* $NetBSD: font_8x16.c,v 1.3 2003/07/15 01:19:48 lukem Exp $ */
+/* $NetBSD: font_8x16.c,v 1.4 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: font_8x16.c,v 1.3 2003/07/15 01:19:48 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: font_8x16.c,v 1.4 2005/12/11 12:16:54 christos Exp $");
#include <atari/dev/font.h>
diff --git a/sys/arch/atari/dev/font_8x8.c b/sys/arch/atari/dev/font_8x8.c
index 55d7471184b..8dddcc55454 100644
--- a/sys/arch/atari/dev/font_8x8.c
+++ b/sys/arch/atari/dev/font_8x8.c
@@ -1,4 +1,4 @@
-/* $NetBSD: font_8x8.c,v 1.3 2003/07/15 01:19:49 lukem Exp $ */
+/* $NetBSD: font_8x8.c,v 1.4 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: font_8x8.c,v 1.3 2003/07/15 01:19:49 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: font_8x8.c,v 1.4 2005/12/11 12:16:54 christos Exp $");
#include <atari/dev/font.h>
diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c
index 53eb1ceaeb8..42444eb0dd5 100644
--- a/sys/arch/atari/dev/grf.c
+++ b/sys/arch/atari/dev/grf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.34 2004/03/25 10:17:19 leo Exp $ */
+/* $NetBSD: grf.c,v 1.35 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.34 2004/03/25 10:17:19 leo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.35 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -200,10 +200,10 @@ const char *name;
/*ARGSUSED*/
int
-grfopen(dev, flags, devtype, p)
+grfopen(dev, flags, devtype, l)
dev_t dev;
int flags, devtype;
- struct proc *p;
+ struct lwp *l;
{
struct grf_softc *gp;
@@ -226,11 +226,11 @@ grfopen(dev, flags, devtype, p)
/*ARGSUSED*/
int
-grfclose(dev, flags, mode, p)
+grfclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct grf_softc *gp;
@@ -242,12 +242,12 @@ grfclose(dev, flags, mode, p)
/*ARGSUSED*/
int
-grfioctl(dev, cmd, data, flag, p)
+grfioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
int flag;
caddr_t data;
-struct proc *p;
+struct lwp *l;
{
struct grf_softc *gp;
int error;
@@ -299,7 +299,7 @@ struct proc *p;
* view code.
*/
return((*view_cdevsw.d_ioctl)(gp->g_viewdev, cmd, data, flag,
- p));
+ l));
error = EINVAL;
break;
@@ -425,7 +425,7 @@ struct grf_softc *gp;
gi = &gp->g_display;
(*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGBMAP, (caddr_t)&bm,
- 0, NOPROC);
+ 0, NOLWP);
gp->g_data = (caddr_t) 0xDeadBeaf; /* not particularly clean.. */
@@ -439,7 +439,7 @@ struct grf_softc *gp;
gi->gd_vgabase = bm.vga_base;
if((*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGSIZE, (caddr_t)&vs, 0,
- NOPROC)) {
+ NOLWP)) {
/*
* fill in some default values...
* XXX: Should _never_ happen
@@ -482,11 +482,11 @@ void *arg;
*/
grf_viewsync(gp);
(*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCDISPLAY,
- NULL, 0, NOPROC);
+ NULL, 0, NOLWP);
return(0);
case GM_GRFOFF:
(*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCREMOVE,
- NULL, 0, NOPROC);
+ NULL, 0, NOLWP);
return(0);
case GM_GRFCONFIG:
default:
diff --git a/sys/arch/atari/dev/grfabs.c b/sys/arch/atari/dev/grfabs.c
index b8546618281..b2cafa78bdc 100644
--- a/sys/arch/atari/dev/grfabs.c
+++ b/sys/arch/atari/dev/grfabs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs.c,v 1.12 2003/07/15 01:19:49 lukem Exp $ */
+/* $NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.12 2003/07/15 01:19:49 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/atari/dev/grfabs_et.c b/sys/arch/atari/dev/grfabs_et.c
index dddb3dc2ed7..3df7e3e6d6e 100644
--- a/sys/arch/atari/dev/grfabs_et.c
+++ b/sys/arch/atari/dev/grfabs_et.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_et.c,v 1.23 2004/02/13 11:36:11 wiz Exp $ */
+/* $NetBSD: grfabs_et.c,v 1.24 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.23 2004/02/13 11:36:11 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.24 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/sys/arch/atari/dev/grfabs_fal.c b/sys/arch/atari/dev/grfabs_fal.c
index cacaeb1d520..eb606234532 100644
--- a/sys/arch/atari/dev/grfabs_fal.c
+++ b/sys/arch/atari/dev/grfabs_fal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_fal.c,v 1.17 2003/07/15 01:19:49 lukem Exp $ */
+/* $NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Thomas Gerner.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.17 2003/07/15 01:19:49 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp $");
#ifdef FALCON_VIDEO
/*
diff --git a/sys/arch/atari/dev/grfabs_reg.h b/sys/arch/atari/dev/grfabs_reg.h
index 5d2980fbbe7..e37428de773 100644
--- a/sys/arch/atari/dev/grfabs_reg.h
+++ b/sys/arch/atari/dev/grfabs_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_reg.h,v 1.12 2005/06/04 14:42:36 he Exp $ */
+/* $NetBSD: grfabs_reg.h,v 1.13 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
diff --git a/sys/arch/atari/dev/grfabs_tt.c b/sys/arch/atari/dev/grfabs_tt.c
index 755ffbf8f2c..04b2e50a60d 100644
--- a/sys/arch/atari/dev/grfabs_tt.c
+++ b/sys/arch/atari/dev/grfabs_tt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_tt.c,v 1.14 2003/07/15 01:19:50 lukem Exp $ */
+/* $NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.14 2003/07/15 01:19:50 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp $");
#ifdef TT_VIDEO
/*
diff --git a/sys/arch/atari/dev/grfioctl.h b/sys/arch/atari/dev/grfioctl.h
index a272321f2e1..c54cdc45643 100644
--- a/sys/arch/atari/dev/grfioctl.h
+++ b/sys/arch/atari/dev/grfioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.5 2004/05/18 20:08:51 he Exp $ */
+/* $NetBSD: grfioctl.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/arch/atari/dev/grfvar.h b/sys/arch/atari/dev/grfvar.h
index d136eac226c..b6211d37734 100644
--- a/sys/arch/atari/dev/grfvar.h
+++ b/sys/arch/atari/dev/grfvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfvar.h,v 1.8 2003/08/07 16:26:59 agc Exp $ */
+/* $NetBSD: grfvar.h,v 1.9 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index c24a6e07b1d..ae7f617ae7a 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.46 2005/10/15 17:29:10 yamt Exp $ */
+/* $NetBSD: hdfd.c,v 1.47 2005/12/11 12:16:54 christos Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.46 2005/10/15 17:29:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.47 2005/12/11 12:16:54 christos Exp $");
#include "opt_ddb.h"
@@ -828,11 +828,11 @@ out_fdc(x)
}
int
-fdopen(dev, flags, mode, p)
+fdopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int unit;
struct fd_softc *fd;
@@ -861,11 +861,11 @@ fdopen(dev, flags, mode, p)
}
int
-fdclose(dev, flags, mode, p)
+fdclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd = hdfd_cd.cd_devs[FDUNIT(dev)];
@@ -1333,12 +1333,12 @@ fdcretry(fdc)
}
int
-fdioctl(dev, cmd, addr, flag, p)
+fdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd;
struct disklabel buffer;
@@ -1502,7 +1502,7 @@ fdioctl(dev, cmd, addr, flag, p)
fd_formb->fd_formb_secsize(i) = fd->sc_type->secsize;
}
- error = fdformat(dev, fd_formb, p);
+ error = fdformat(dev, fd_formb, l->l_proc);
free(fd_formb, M_TEMP);
return error;
diff --git a/sys/arch/atari/dev/hdfdreg.h b/sys/arch/atari/dev/hdfdreg.h
index 4604c0aab5b..8821f5f533c 100644
--- a/sys/arch/atari/dev/hdfdreg.h
+++ b/sys/arch/atari/dev/hdfdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfdreg.h,v 1.5 2003/08/07 16:27:00 agc Exp $ */
+/* $NetBSD: hdfdreg.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index 23d8eccce54..0c5ddebaea1 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.47 2005/09/06 21:40:37 kleink Exp $ */
+/* $NetBSD: ite.c,v 1.48 2005/12/11 12:16:54 christos 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.47 2005/09/06 21:40:37 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.48 2005/12/11 12:16:54 christos Exp $");
#include "opt_ddb.h"
@@ -415,10 +415,10 @@ iteinit(dev)
}
int
-iteopen(dev, mode, devtype, p)
+iteopen(dev, mode, devtype, l)
dev_t dev;
int mode, devtype;
- struct proc *p;
+ struct lwp *l;
{
struct ite_softc *ip;
struct tty *tp;
@@ -442,7 +442,7 @@ iteopen(dev, mode, devtype, p)
else tp = ip->tp;
if ((tp->t_state & (TS_ISOPEN | TS_XCLUDE)) == (TS_ISOPEN | TS_XCLUDE)
- && suser(p->p_ucred, &p->p_acflag) != 0)
+ && suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
if ((ip->flags & ITE_ACTIVE) == 0) {
ite_on(dev, 0);
@@ -488,10 +488,10 @@ bad:
}
int
-iteclose(dev, flag, mode, p)
+iteclose(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct tty *tp;
@@ -533,17 +533,17 @@ itewrite(dev, uio, flag)
}
int
-itepoll(dev, events, p)
+itepoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct tty *tp;
tp = getitesp(dev)->tp;
KDASSERT(tp);
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
struct tty *
@@ -554,12 +554,12 @@ itetty(dev)
}
int
-iteioctl(dev, cmd, addr, flag, p)
+iteioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
int flag;
caddr_t addr;
- struct proc *p;
+ struct lwp *l;
{
struct iterepeat *irp;
struct ite_softc *ip;
@@ -575,11 +575,11 @@ iteioctl(dev, cmd, addr, flag, p)
KDASSERT(tp);
- error = (*tp->t_linesw->l_ioctl) (tp, cmd, addr, flag, p);
+ error = (*tp->t_linesw->l_ioctl) (tp, cmd, addr, flag, l);
if(error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, addr, flag, p);
+ error = ttioctl(tp, cmd, addr, flag, l);
if (error != EPASSTHROUGH)
return (error);
@@ -644,7 +644,7 @@ iteioctl(dev, cmd, addr, flag, p)
kbd_bell_gparms(&ib->volume, &ib->pitch, &ib->msec);
return 0;
}
- return (ip->itexx_ioctl)(ip, cmd, addr, flag, p);
+ return (ip->itexx_ioctl)(ip, cmd, addr, flag, l);
}
void
@@ -760,7 +760,7 @@ int unit;
* Now make it visible
*/
(*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, VIOCDISPLAY, NULL,
- 0, NOPROC);
+ 0, NOLWP);
/*
* Make sure the cursor's there too....
diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c
index 0a2b3c46be2..10ee4b09cb1 100644
--- a/sys/arch/atari/dev/ite_cc.c
+++ b/sys/arch/atari/dev/ite_cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_cc.c,v 1.22 2003/07/15 01:19:50 lukem Exp $ */
+/* $NetBSD: ite_cc.c,v 1.23 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.22 2003/07/15 01:19:50 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.23 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -93,7 +93,7 @@ extern font_info font_info_8x16;
static void view_init __P((struct ite_softc *));
static void view_deinit __P((struct ite_softc *));
static int itecc_ioctl __P((struct ite_softc *, u_long, caddr_t, int,
- struct proc *));
+ struct lwp *));
static int ite_newsize __P((struct ite_softc *, struct itewinsize *));
static void cursor32 __P((struct ite_softc *, int));
static void putc8 __P((struct ite_softc *, int, int, int, int));
@@ -389,7 +389,7 @@ struct itewinsize *winsz;
vs.depth = winsz->depth;
error = (*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, VIOCSSIZE,
- (caddr_t)&vs, 0, NOPROC);
+ (caddr_t)&vs, 0, NOLWP);
view = viewview(ip->grf->g_viewdev);
/*
@@ -457,12 +457,12 @@ struct itewinsize *winsz;
}
int
-itecc_ioctl(ip, cmd, addr, flag, p)
+itecc_ioctl(ip, cmd, addr, flag, l)
struct ite_softc *ip;
u_long cmd;
caddr_t addr;
int flag;
-struct proc *p;
+struct lwp *l;
{
struct winsize ws;
struct itewinsize *is;
@@ -489,18 +489,18 @@ struct proc *p;
* XXX this is messy, but works
*/
(*ite_cdevsw.d_ioctl)(ip->grf->g_itedev, TIOCSWINSZ,
- (caddr_t)&ws, 0, p);
+ (caddr_t)&ws, 0, l);
}
break;
case VIOCSCMAP:
case VIOCGCMAP:
/*
- * XXX watchout for that NOPROC. its not really the kernel
+ * XXX watchout for that NOLWP. its not really the kernel
* XXX talking these two commands don't use the proc pointer
* XXX though.
*/
error = (*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, cmd, addr,
- flag, NOPROC);
+ flag, NOLWP);
break;
default:
error = EPASSTHROUGH;
diff --git a/sys/arch/atari/dev/ite_et.c b/sys/arch/atari/dev/ite_et.c
index 75388454811..e7f7e131b71 100644
--- a/sys/arch/atari/dev/ite_et.c
+++ b/sys/arch/atari/dev/ite_et.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_et.c,v 1.17 2003/07/15 01:19:50 lukem Exp $ */
+/* $NetBSD: ite_et.c,v 1.18 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.17 2003/07/15 01:19:50 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.18 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ static void grfet_iteinit __P((struct grf_softc *));
static void view_init __P((struct ite_softc *));
static void view_deinit __P((struct ite_softc *));
static int iteet_ioctl __P((struct ite_softc *, u_long, caddr_t, int,
- struct proc *));
+ struct lwp *));
static int ite_newsize __P((struct ite_softc *, struct itewinsize *));
static void et_inittextmode __P((struct ite_softc *, et_sv_reg_t *, int));
void et_cursor __P((struct ite_softc *ip, int flag));
@@ -369,7 +369,7 @@ struct itewinsize *winsz;
vs.depth = winsz->depth;
error = (*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, VIOCSSIZE,
- (caddr_t)&vs, 0, NOPROC);
+ (caddr_t)&vs, 0, NOLWP);
view = viewview(ip->grf->g_viewdev);
/*
@@ -401,12 +401,12 @@ struct itewinsize *winsz;
}
int
-iteet_ioctl(ip, cmd, addr, flag, p)
+iteet_ioctl(ip, cmd, addr, flag, l)
struct ite_softc *ip;
u_long cmd;
caddr_t addr;
int flag;
-struct proc *p;
+struct lwp *l;
{
struct winsize ws;
struct itewinsize *is;
@@ -433,18 +433,18 @@ struct proc *p;
* XXX this is messy, but works
*/
(*ite_cdevsw.d_ioctl)(ip->grf->g_itedev, TIOCSWINSZ,
- (caddr_t)&ws, 0, p);
+ (caddr_t)&ws, 0, l);
}
break;
case VIOCSCMAP:
case VIOCGCMAP:
/*
- * XXX watchout for that NOPROC. its not really the kernel
+ * XXX watchout for that NOLWP. its not really the kernel
* XXX talking these two commands don't use the proc pointer
* XXX though.
*/
error = (*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, cmd, addr,
- flag, NOPROC);
+ flag, NOLWP);
break;
default:
error = EPASSTHROUGH;
diff --git a/sys/arch/atari/dev/iteioctl.h b/sys/arch/atari/dev/iteioctl.h
index a25b0e18636..15c5306c060 100644
--- a/sys/arch/atari/dev/iteioctl.h
+++ b/sys/arch/atari/dev/iteioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iteioctl.h,v 1.5 2004/05/19 08:44:20 he Exp $ */
+/* $NetBSD: iteioctl.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/arch/atari/dev/itevar.h b/sys/arch/atari/dev/itevar.h
index 15354dacff4..de466649948 100644
--- a/sys/arch/atari/dev/itevar.h
+++ b/sys/arch/atari/dev/itevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: itevar.h,v 1.10 2005/01/19 02:13:02 chs Exp $ */
+/* $NetBSD: itevar.h,v 1.11 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -94,7 +94,7 @@ struct ite_softc {
int cury;
int save_cury;
int (*itexx_ioctl) __P((struct ite_softc *, u_long,
- caddr_t, int, struct proc *));
+ caddr_t, int, struct lwp *));
};
enum ite_flags {
diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c
index b37172289d4..0768e9383a3 100644
--- a/sys/arch/atari/dev/kbd.c
+++ b/sys/arch/atari/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.28 2004/03/25 10:17:19 leo Exp $ */
+/* $NetBSD: kbd.c,v 1.29 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.28 2004/03/25 10:17:19 leo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.29 2005/12/11 12:16:54 christos Exp $");
#include "mouse.h"
#include "ite.h"
@@ -138,7 +138,7 @@ const struct cdevsw kbd_cdevsw = {
/* accessops */
static int kbd_enable(void *, int);
static void kbd_set_leds(void *, int);
-static int kbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int kbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
/* console ops */
static void kbd_getc(void *, u_int *, int *);
@@ -272,18 +272,18 @@ kbdenable()
splx(s);
}
-int kbdopen(dev_t dev, int flags, int mode, struct proc *p)
+int kbdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
if (kbd_softc.k_events.ev_io)
return EBUSY;
- kbd_softc.k_events.ev_io = p;
+ kbd_softc.k_events.ev_io = l->l_proc;
ev_init(&kbd_softc.k_events);
return (0);
}
int
-kbdclose(dev_t dev, int flags, int mode, struct proc *p)
+kbdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
/* Turn off event mode, dump the queue */
kbd_softc.k_event_mode = 0;
@@ -299,7 +299,7 @@ kbdread(dev_t dev, struct uio *uio, int flags)
}
int
-kbdioctl(dev_t dev,u_long cmd,register caddr_t data,int flag,struct proc *p)
+kbdioctl(dev_t dev,u_long cmd,register caddr_t data,int flag,struct lwp *l)
{
register struct kbd_softc *k = &kbd_softc;
struct kbdbell *kb;
@@ -358,9 +358,9 @@ kbdioctl(dev_t dev,u_long cmd,register caddr_t data,int flag,struct proc *p)
}
int
-kbdpoll (dev_t dev, int events, struct proc *p)
+kbdpoll (dev_t dev, int events, struct lwp *l)
{
- return ev_poll (&kbd_softc.k_events, events, p);
+ return ev_poll (&kbd_softc.k_events, events, l);
}
int
diff --git a/sys/arch/atari/dev/kbdmap.c b/sys/arch/atari/dev/kbdmap.c
index 3b65a57705d..cf220cb2a07 100644
--- a/sys/arch/atari/dev/kbdmap.c
+++ b/sys/arch/atari/dev/kbdmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdmap.c,v 1.4 2003/07/15 01:19:51 lukem Exp $ */
+/* $NetBSD: kbdmap.c,v 1.5 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbdmap.c,v 1.4 2003/07/15 01:19:51 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbdmap.c,v 1.5 2005/12/11 12:16:54 christos Exp $");
#include <atari/dev/kbdmap.h>
diff --git a/sys/arch/atari/dev/kbdmap.h b/sys/arch/atari/dev/kbdmap.h
index 038c072868a..3dcbb5a041d 100644
--- a/sys/arch/atari/dev/kbdmap.h
+++ b/sys/arch/atari/dev/kbdmap.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdmap.h,v 1.5 2004/05/18 20:08:51 he Exp $ */
+/* $NetBSD: kbdmap.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1993 Markus Wild
diff --git a/sys/arch/atari/dev/kbdreg.h b/sys/arch/atari/dev/kbdreg.h
index 5b532185d00..ece80910a7f 100644
--- a/sys/arch/atari/dev/kbdreg.h
+++ b/sys/arch/atari/dev/kbdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdreg.h,v 1.4 2004/05/18 20:08:51 he Exp $ */
+/* $NetBSD: kbdreg.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c
index fd53651d9c9..db7394569be 100644
--- a/sys/arch/atari/dev/lpt.c
+++ b/sys/arch/atari/dev/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.23 2003/07/15 01:19:51 lukem Exp $ */
+/* $NetBSD: lpt.c,v 1.24 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.23 2003/07/15 01:19:51 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.24 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -179,10 +179,10 @@ void *auxp;
* Reset the printer, then wait until it's selected and not busy.
*/
int
-lpopen(dev, flag, mode, p)
+lpopen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = LPTUNIT(dev);
u_char flags = LPTFLAGS(dev);
@@ -257,11 +257,11 @@ lptwakeup(arg)
* Close the device, and free the local line buffer.
*/
int
-lpclose(dev, flag, mode, p)
+lpclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = LPTUNIT(dev);
struct lpt_softc *sc = lp_cd.cd_devs[unit];
@@ -426,12 +426,12 @@ int sr;
}
int
-lpioctl(dev, cmd, data, flag, p)
+lpioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int error = 0;
diff --git a/sys/arch/atari/dev/md_root.c b/sys/arch/atari/dev/md_root.c
index 582bb336488..6f470701b69 100644
--- a/sys/arch/atari/dev/md_root.c
+++ b/sys/arch/atari/dev/md_root.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.19 2003/07/15 01:19:51 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.20 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ struct read_info {
};
-static int loaddisk __P((struct md_conf *, dev_t ld_dev, struct proc *));
+static int loaddisk __P((struct md_conf *, dev_t ld_dev, struct lwp *));
static int ramd_norm_read __P((struct read_info *));
#ifdef support_compression
@@ -142,7 +142,7 @@ struct md_conf *md;
if(md->md_addr == NULL)
return;
if(ri->ramd_flag & RAMD_LOAD) {
- if (loaddisk(md, ri->ramd_dev, curproc)) {
+ if (loaddisk(md, ri->ramd_dev, curlwp)) {
free(md->md_addr, M_DEVBUF);
md->md_addr = NULL;
return;
@@ -152,10 +152,10 @@ struct md_conf *md;
}
static int
-loaddisk(md, ld_dev, proc)
+loaddisk(md, ld_dev, lwp)
struct md_conf *md;
dev_t ld_dev;
-struct proc *proc;
+struct lwp *lwp;
{
struct buf buf;
int error;
@@ -175,7 +175,7 @@ struct proc *proc;
buf.b_flags = B_BUSY;
buf.b_dev = ld_dev;
buf.b_error = 0;
- buf.b_proc = proc;
+ buf.b_proc = lwp->l_proc;
/*
* Setup read_info:
@@ -192,9 +192,9 @@ struct proc *proc;
/*
* Open device and try to get some statistics.
*/
- if((error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, proc)) != 0)
+ if((error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, lwp)) != 0)
return(error);
- if(bdp->d_ioctl(ld_dev, DIOCGDINFO, (caddr_t)&dl, FREAD, proc) == 0) {
+ if(bdp->d_ioctl(ld_dev, DIOCGDINFO, (caddr_t)&dl, FREAD, lwp) == 0) {
/* Read on a cylinder basis */
rs.chunk = dl.d_secsize * dl.d_secpercyl;
rs.media_sz = dl.d_secperunit * dl.d_secsize;
@@ -207,7 +207,7 @@ struct proc *proc;
#endif /* support_compression */
error = ramd_norm_read(&rs);
- bdp->d_close(ld_dev,FREAD | FNONBLOCK, 0, proc);
+ bdp->d_close(ld_dev,FREAD | FNONBLOCK, 0, lwp);
return(error);
}
diff --git a/sys/arch/atari/dev/ms.c b/sys/arch/atari/dev/ms.c
index 5324815e7ed..fd242603c3f 100644
--- a/sys/arch/atari/dev/ms.c
+++ b/sys/arch/atari/dev/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.15 2003/09/21 19:16:52 jdolecek Exp $ */
+/* $NetBSD: ms.c,v 1.16 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.15 2003/09/21 19:16:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.16 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -306,10 +306,10 @@ out:
}
int
-msopen(dev, flags, mode, p)
+msopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
-struct proc *p;
+struct lwp *l;
{
u_char report_ms_joy[] = { 0x14, 0x08 };
struct ms_softc *ms;
@@ -324,7 +324,7 @@ struct proc *p;
if (ms->ms_events.ev_io)
return(EBUSY);
- ms->ms_events.ev_io = p;
+ ms->ms_events.ev_io = l->l_proc;
ms->ms_dx = ms->ms_dy = 0;
ms->ms_buttons = 0;
ms->ms_bq[0].id = ms->ms_bq[1].id = 0;
@@ -339,10 +339,10 @@ struct proc *p;
}
int
-msclose(dev, flags, mode, p)
+msclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
-struct proc *p;
+struct lwp *l;
{
u_char disable_ms_joy[] = { 0x12, 0x1a };
int unit;
@@ -373,12 +373,12 @@ int flags;
}
int
-msioctl(dev, cmd, data, flag, p)
+msioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
register caddr_t data;
int flag;
-struct proc *p;
+struct lwp *l;
{
struct ms_softc *ms;
int unit;
@@ -419,15 +419,15 @@ struct proc *p;
}
int
-mspoll(dev, events, p)
+mspoll(dev, events, l)
dev_t dev;
int events;
-struct proc *p;
+struct lwp *l;
{
struct ms_softc *ms;
ms = &ms_softc[minor(dev)];
- return(ev_poll(&ms->ms_events, events, p));
+ return(ev_poll(&ms->ms_events, events, l));
}
int
diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c
index 2c0c8737d72..6929e97ded4 100644
--- a/sys/arch/atari/dev/ncr5380.c
+++ b/sys/arch/atari/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380.c,v 1.49 2005/06/04 14:42:36 he Exp $ */
+/* $NetBSD: ncr5380.c,v 1.50 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.49 2005/06/04 14:42:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.50 2005/12/11 12:16:54 christos Exp $");
/*
* Bit mask of targets you want debugging to be shown
diff --git a/sys/arch/atari/dev/ncr5380reg.h b/sys/arch/atari/dev/ncr5380reg.h
index 3bccdf0389e..17dc8d652b5 100644
--- a/sys/arch/atari/dev/ncr5380reg.h
+++ b/sys/arch/atari/dev/ncr5380reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380reg.h,v 1.18 2005/06/04 14:42:36 he Exp $ */
+/* $NetBSD: ncr5380reg.h,v 1.19 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
diff --git a/sys/arch/atari/dev/ncr5380var.h b/sys/arch/atari/dev/ncr5380var.h
index 1cb7f20692d..b9139c8c6ec 100644
--- a/sys/arch/atari/dev/ncr5380var.h
+++ b/sys/arch/atari/dev/ncr5380var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380var.h,v 1.5 2005/06/04 14:42:36 he Exp $ */
+/* $NetBSD: ncr5380var.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
diff --git a/sys/arch/atari/dev/nvram.c b/sys/arch/atari/dev/nvram.c
index 86a148aab4d..04df23c7262 100644
--- a/sys/arch/atari/dev/nvram.c
+++ b/sys/arch/atari/dev/nvram.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.c,v 1.10 2003/07/15 01:19:52 lukem Exp $ */
+/* $NetBSD: nvram.c,v 1.11 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.10 2003/07/15 01:19:52 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.11 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c
index 20d757b788f..0ad20b2f20a 100644
--- a/sys/arch/atari/dev/ser.c
+++ b/sys/arch/atari/dev/ser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.26 2005/09/06 21:40:37 kleink Exp $ */
+/* $NetBSD: ser.c,v 1.27 2005/12/11 12:16:54 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.26 2005/09/06 21:40:37 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.27 2005/12/11 12:16:54 christos Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -372,10 +372,10 @@ serstatus(sc, str)
#endif /* SER_DEBUG */
int
-seropen(dev, flag, mode, p)
+seropen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = SERUNIT(dev);
struct ser_softc *sc;
@@ -397,7 +397,7 @@ seropen(dev, flag, mode, p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -498,10 +498,10 @@ bad:
}
int
-serclose(dev, flag, mode, p)
+serclose(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = SERUNIT(dev);
struct ser_softc *sc = ser_cd.cd_devs[unit];
@@ -551,15 +551,15 @@ serwrite(dev, uio, flag)
}
int
-serpoll(dev, events, p)
+serpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct ser_softc *sc = ser_cd.cd_devs[SERUNIT(dev)];
struct tty *tp = sc->sc_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
struct tty *
@@ -573,23 +573,23 @@ sertty(dev)
}
int
-serioctl(dev, cmd, data, flag, p)
+serioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = SERUNIT(dev);
struct ser_softc *sc = ser_cd.cd_devs[unit];
struct tty *tp = sc->sc_tty;
int error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
@@ -615,7 +615,7 @@ serioctl(dev, cmd, data, flag, p)
break;
case TIOCSFLAGS:
- error = suser(p->p_ucred, &p->p_acflag);
+ error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag);
if (error)
return (error);
sc->sc_swflags = *(int *)data;
diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c
index e1ed1ab0a3a..5148b6efe04 100644
--- a/sys/arch/atari/dev/view.c
+++ b/sys/arch/atari/dev/view.c
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.22 2003/07/15 01:19:52 lukem Exp $ */
+/* $NetBSD: view.c,v 1.23 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.22 2003/07/15 01:19:52 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.23 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,11 +301,11 @@ colormap_t *ucm;
/*ARGSUSED*/
int
-viewopen(dev, flags, mode, p)
+viewopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
-struct proc *p;
+struct lwp *l;
{
dimen_t size;
struct view_softc *vu;
@@ -337,11 +337,11 @@ struct proc *p;
/*ARGSUSED*/
int
-viewclose (dev, flags, mode, p)
+viewclose (dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct view_softc *vu;
@@ -359,12 +359,12 @@ viewclose (dev, flags, mode, p)
/*ARGSUSED*/
int
-viewioctl (dev, cmd, data, flag, p)
+viewioctl (dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
-struct proc *p;
+struct lwp *l;
{
struct view_softc *vu;
bmap_t *bm;
@@ -389,7 +389,7 @@ struct proc *p;
case VIOCGBMAP:
bm = (bmap_t *)data;
bcopy(vu->view->bitmap, bm, sizeof(bmap_t));
- if (p != NOPROC) {
+ if (l != NOLWP) {
bm->plane = NULL;
bm->hw_address = NULL;
bm->regs = NULL;
diff --git a/sys/arch/atari/dev/viewvar.h b/sys/arch/atari/dev/viewvar.h
index f8b50ca9ab0..9125756b12d 100644
--- a/sys/arch/atari/dev/viewvar.h
+++ b/sys/arch/atari/dev/viewvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: viewvar.h,v 1.5 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: viewvar.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -37,7 +37,7 @@
* refered to by open/close/ioctl. This device serves as
* a interface to graphics. */
-#define NOPROC ((struct proc *)-1) /* XXX */
+#define NOLWP ((struct lwp *)-1) /* XXX */
struct view_softc {
struct view_size size;
diff --git a/sys/arch/atari/dev/vuid_event.h b/sys/arch/atari/dev/vuid_event.h
index f6ae6c8f9cf..45aa38e2fc9 100644
--- a/sys/arch/atari/dev/vuid_event.h
+++ b/sys/arch/atari/dev/vuid_event.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vuid_event.h,v 1.3 2004/05/18 20:08:51 he Exp $ */
+/* $NetBSD: vuid_event.h,v 1.4 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/arch/atari/dev/wdc_mb.c b/sys/arch/atari/dev/wdc_mb.c
index b191f30c10b..fdc40f819a4 100644
--- a/sys/arch/atari/dev/wdc_mb.c
+++ b/sys/arch/atari/dev/wdc_mb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_mb.c,v 1.25 2005/05/10 20:28:35 jdc Exp $ */
+/* $NetBSD: wdc_mb.c,v 1.26 2005/12/11 12:16:54 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.25 2005/05/10 20:28:35 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.26 2005/12/11 12:16:54 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/arch/atari/dev/wskbdmap_atari.c b/sys/arch/atari/dev/wskbdmap_atari.c
index ccab4066b5a..e97c0f751b9 100644
--- a/sys/arch/atari/dev/wskbdmap_atari.c
+++ b/sys/arch/atari/dev/wskbdmap_atari.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_atari.c,v 1.2 2004/03/13 17:23:32 bjh21 Exp $ */
+/* $NetBSD: wskbdmap_atari.c,v 1.3 2005/12/11 12:16:54 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_atari.c,v 1.2 2004/03/13 17:23:32 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_atari.c,v 1.3 2005/12/11 12:16:54 christos Exp $");
#include <sys/types.h>
#include <dev/wscons/wsksymdef.h>
diff --git a/sys/arch/atari/dev/ym2149.c b/sys/arch/atari/dev/ym2149.c
index 6f03e01fba4..44ef53441d8 100644
--- a/sys/arch/atari/dev/ym2149.c
+++ b/sys/arch/atari/dev/ym2149.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym2149.c,v 1.3 2003/07/15 01:19:52 lukem Exp $ */
+/* $NetBSD: ym2149.c,v 1.4 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym2149.c,v 1.3 2003/07/15 01:19:52 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym2149.c,v 1.4 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/atari/dev/ym2149reg.h b/sys/arch/atari/dev/ym2149reg.h
index b03fdacadd7..e16d66b7675 100644
--- a/sys/arch/atari/dev/ym2149reg.h
+++ b/sys/arch/atari/dev/ym2149reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ym2149reg.h,v 1.4 2005/06/04 14:30:10 he Exp $ */
+/* $NetBSD: ym2149reg.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c
index f312584b497..ce652a4d10e 100644
--- a/sys/arch/atari/dev/zs.c
+++ b/sys/arch/atari/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.44 2005/09/06 21:40:37 kleink Exp $ */
+/* $NetBSD: zs.c,v 1.45 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.44 2005/09/06 21:40:37 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.45 2005/12/11 12:16:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -362,11 +362,11 @@ void *aux;
* Open a zs serial port.
*/
int
-zsopen(dev, flags, mode, p)
+zsopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
-struct proc *p;
+struct lwp *l;
{
register struct tty *tp;
register struct zs_chanstate *cs;
@@ -402,7 +402,7 @@ struct proc *p;
if ((tp->t_state & TS_ISOPEN) &&
(tp->t_state & TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -464,11 +464,11 @@ bad:
* Close a zs serial port.
*/
int
-zsclose(dev, flags, mode, p)
+zsclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
-struct proc *p;
+struct lwp *l;
{
register struct zs_chanstate *cs;
register struct tty *tp;
@@ -535,10 +535,10 @@ int flags;
}
int
-zspoll(dev, events, p)
+zspoll(dev, events, l)
dev_t dev;
int events;
-struct proc *p;
+struct lwp *l;
{
register struct zs_chanstate *cs;
register struct zs_softc *zi;
@@ -550,7 +550,7 @@ struct proc *p;
cs = &zi->zi_cs[unit & 1];
tp = cs->cs_ttyp;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
struct tty *
@@ -856,12 +856,12 @@ again:
}
int
-zsioctl(dev, cmd, data, flag, p)
+zsioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
-struct proc *p;
+struct lwp *l;
{
int unit = ZS_UNIT(dev);
struct zs_softc *zi = zs_cd.cd_devs[unit >> 1];
@@ -869,11 +869,11 @@ struct proc *p;
register int error, s;
register struct zs_chanstate *cs = &zi->zi_cs[unit & 1];
- error = tp->t_linesw->l_ioctl(tp, cmd, data, flag, p);
+ error = tp->t_linesw->l_ioctl(tp, cmd, data, flag, l);
if(error != EPASSTHROUGH)
return(error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if(error !=EPASSTHROUGH)
return (error);
@@ -907,7 +907,7 @@ struct proc *p;
case TIOCSFLAGS: {
int userbits = 0;
- error = suser(p->p_ucred, &p->p_acflag);
+ error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag);
if(error != 0)
return (EPERM);
diff --git a/sys/arch/atari/dev/zsvar.h b/sys/arch/atari/dev/zsvar.h
index f76e28c2157..a88f5f4f742 100644
--- a/sys/arch/atari/dev/zsvar.h
+++ b/sys/arch/atari/dev/zsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: zsvar.h,v 1.8 2004/03/25 10:17:19 leo Exp $ */
+/* $NetBSD: zsvar.h,v 1.9 2005/12/11 12:16:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993