summaryrefslogtreecommitdiff
path: root/sys/dev/sun
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/dev/sun
parent4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff)
merge ktrace-lwp.
Diffstat (limited to 'sys/dev/sun')
-rw-r--r--sys/dev/sun/Makefile2
-rw-r--r--sys/dev/sun/bt_subr.c4
-rw-r--r--sys/dev/sun/btreg.h2
-rw-r--r--sys/dev/sun/btvar.h2
-rw-r--r--sys/dev/sun/bwtwo.c12
-rw-r--r--sys/dev/sun/bwtworeg.h2
-rw-r--r--sys/dev/sun/bwtwovar.h2
-rw-r--r--sys/dev/sun/cgsix.c10
-rw-r--r--sys/dev/sun/cgsixreg.h2
-rw-r--r--sys/dev/sun/cgsixvar.h2
-rw-r--r--sys/dev/sun/cgthree.c12
-rw-r--r--sys/dev/sun/cgthreereg.h2
-rw-r--r--sys/dev/sun/cgthreevar.h2
-rw-r--r--sys/dev/sun/disklabel.h2
-rw-r--r--sys/dev/sun/disksubr.c4
-rw-r--r--sys/dev/sun/eeprom.h2
-rw-r--r--sys/dev/sun/event.c10
-rw-r--r--sys/dev/sun/event_var.h4
-rw-r--r--sys/dev/sun/fb.c28
-rw-r--r--sys/dev/sun/fbio.h2
-rw-r--r--sys/dev/sun/fbvar.h10
-rw-r--r--sys/dev/sun/files.sun2
-rw-r--r--sys/dev/sun/idprom.h2
-rw-r--r--sys/dev/sun/kbd.c24
-rw-r--r--sys/dev/sun/kbd_ms_ttyvar.h2
-rw-r--r--sys/dev/sun/kbd_reg.h2
-rw-r--r--sys/dev/sun/kbd_tables.c4
-rw-r--r--sys/dev/sun/kbd_xlate.h2
-rw-r--r--sys/dev/sun/kbd_zs.c4
-rw-r--r--sys/dev/sun/kbdsun.c4
-rw-r--r--sys/dev/sun/kbdsunvar.h2
-rw-r--r--sys/dev/sun/kbdvar.h2
-rw-r--r--sys/dev/sun/kbio.h2
-rw-r--r--sys/dev/sun/ms.c24
-rw-r--r--sys/dev/sun/ms_zs.c4
-rw-r--r--sys/dev/sun/msvar.h2
-rw-r--r--sys/dev/sun/pfour_subr.c4
-rw-r--r--sys/dev/sun/pfourreg.h2
-rw-r--r--sys/dev/sun/sunkbd.c8
-rw-r--r--sys/dev/sun/sunms.c14
-rw-r--r--sys/dev/sun/vuid_event.h2
-rw-r--r--sys/dev/sun/wskbdmap_sun.c4
42 files changed, 117 insertions, 117 deletions
diff --git a/sys/dev/sun/Makefile b/sys/dev/sun/Makefile
index 27fbe67417f..c903cc756bc 100644
--- a/sys/dev/sun/Makefile
+++ b/sys/dev/sun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/20 02:01:30 thorpej Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/11 12:23:56 christos Exp $
INCSDIR= /usr/include/dev/sun
diff --git a/sys/dev/sun/bt_subr.c b/sys/dev/sun/bt_subr.c
index a200065c4d0..530415c05d1 100644
--- a/sys/dev/sun/bt_subr.c
+++ b/sys/dev/sun/bt_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_subr.c,v 1.8 2003/11/13 03:09:29 chs Exp $ */
+/* $NetBSD: bt_subr.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.8 2003/11/13 03:09:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/btreg.h b/sys/dev/sun/btreg.h
index bae1be90523..c44760f6d07 100644
--- a/sys/dev/sun/btreg.h
+++ b/sys/dev/sun/btreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btreg.h,v 1.2 2003/08/07 16:31:22 agc Exp $ */
+/* $NetBSD: btreg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
diff --git a/sys/dev/sun/btvar.h b/sys/dev/sun/btvar.h
index c9a32b7290a..0533c1badfe 100644
--- a/sys/dev/sun/btvar.h
+++ b/sys/dev/sun/btvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btvar.h,v 1.2 2003/08/07 16:31:22 agc Exp $ */
+/* $NetBSD: btvar.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
diff --git a/sys/dev/sun/bwtwo.c b/sys/dev/sun/bwtwo.c
index 2d4a27d2bf0..d1031e50d51 100644
--- a/sys/dev/sun/bwtwo.c
+++ b/sys/dev/sun/bwtwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.13 2005/06/03 22:06:24 tsutsui Exp $ */
+/* $NetBSD: bwtwo.c,v 1.14 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.13 2005/06/03 22:06:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.14 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,10 +215,10 @@ bwtwoattach(sc, name, isconsole)
}
int
-bwtwoopen(dev, flags, mode, p)
+bwtwoopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
@@ -229,12 +229,12 @@ bwtwoopen(dev, flags, mode, p)
}
int
-bwtwoioctl(dev, cmd, data, flags, p)
+bwtwoioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct bwtwo_softc *sc = bwtwo_cd.cd_devs[minor(dev)];
diff --git a/sys/dev/sun/bwtworeg.h b/sys/dev/sun/bwtworeg.h
index f0749189eb9..e2955564935 100644
--- a/sys/dev/sun/bwtworeg.h
+++ b/sys/dev/sun/bwtworeg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtworeg.h,v 1.2 2003/08/07 16:31:23 agc Exp $ */
+/* $NetBSD: bwtworeg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/bwtwovar.h b/sys/dev/sun/bwtwovar.h
index 36e4b2c6ee5..09141246d97 100644
--- a/sys/dev/sun/bwtwovar.h
+++ b/sys/dev/sun/bwtwovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwovar.h,v 1.4 2005/06/03 22:06:24 tsutsui Exp $ */
+/* $NetBSD: bwtwovar.h,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 46789a5e0b1..167e9b0175b 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.27 2005/06/28 20:55:21 macallan Exp $ */
+/* $NetBSD: cgsix.c,v 1.28 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.27 2005/06/28 20:55:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.28 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -741,7 +741,7 @@ cg6attach(struct cgsix_softc *sc, const char *name, int isconsole)
int
-cgsixopen(dev_t dev, int flags, int mode, struct proc *p)
+cgsixopen(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -751,7 +751,7 @@ cgsixopen(dev_t dev, int flags, int mode, struct proc *p)
}
int
-cgsixclose(dev_t dev, int flags, int mode, struct proc *p)
+cgsixclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cgsix_softc *sc = cgsix_cd.cd_devs[minor(dev)];
@@ -770,7 +770,7 @@ cgsixclose(dev_t dev, int flags, int mode, struct proc *p)
}
int
-cgsixioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+cgsixioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct cgsix_softc *sc = cgsix_cd.cd_devs[minor(dev)];
union cursor_cmap tcm;
diff --git a/sys/dev/sun/cgsixreg.h b/sys/dev/sun/cgsixreg.h
index 9c3f31dbf63..e7a4c23af62 100644
--- a/sys/dev/sun/cgsixreg.h
+++ b/sys/dev/sun/cgsixreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsixreg.h,v 1.6 2005/05/16 14:29:11 macallan Exp $ */
+/* $NetBSD: cgsixreg.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
diff --git a/sys/dev/sun/cgsixvar.h b/sys/dev/sun/cgsixvar.h
index d987772c94a..0b17a124d77 100644
--- a/sys/dev/sun/cgsixvar.h
+++ b/sys/dev/sun/cgsixvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsixvar.h,v 1.6 2005/06/04 04:41:40 tsutsui Exp $ */
+/* $NetBSD: cgsixvar.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/cgthree.c b/sys/dev/sun/cgthree.c
index e58be10a965..89816ae46fd 100644
--- a/sys/dev/sun/cgthree.c
+++ b/sys/dev/sun/cgthree.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.11 2005/06/04 04:37:21 tsutsui Exp $ */
+/* $NetBSD: cgthree.c,v 1.12 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.11 2005/06/04 04:37:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.12 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,10 +162,10 @@ cgthreeattach(sc, name, isconsole)
int
-cgthreeopen(dev, flags, mode, p)
+cgthreeopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
@@ -175,12 +175,12 @@ cgthreeopen(dev, flags, mode, p)
}
int
-cgthreeioctl(dev, cmd, data, flags, p)
+cgthreeioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct cgthree_softc *sc = cgthree_cd.cd_devs[minor(dev)];
struct fbgattr *fba;
diff --git a/sys/dev/sun/cgthreereg.h b/sys/dev/sun/cgthreereg.h
index a6e9af0ef52..d4dec1c4b54 100644
--- a/sys/dev/sun/cgthreereg.h
+++ b/sys/dev/sun/cgthreereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthreereg.h,v 1.2 2003/08/07 16:31:23 agc Exp $ */
+/* $NetBSD: cgthreereg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/cgthreevar.h b/sys/dev/sun/cgthreevar.h
index fa04d592fd4..12567761fc6 100644
--- a/sys/dev/sun/cgthreevar.h
+++ b/sys/dev/sun/cgthreevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthreevar.h,v 1.3 2005/06/04 04:37:21 tsutsui Exp $ */
+/* $NetBSD: cgthreevar.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/disklabel.h b/sys/dev/sun/disklabel.h
index c58fa375fea..fa6dceabbf2 100644
--- a/sys/dev/sun/disklabel.h
+++ b/sys/dev/sun/disklabel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2003/08/07 16:31:23 agc Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c
index be1a26a49f9..70cf1f543ef 100644
--- a/sys/dev/sun/disksubr.c
+++ b/sys/dev/sun/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.6 2005/05/31 00:47:54 christos Exp $ */
+/* $NetBSD: disksubr.c,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.6 2005/05/31 00:47:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.7 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/eeprom.h b/sys/dev/sun/eeprom.h
index 10ea1cc788d..f79b700b6e4 100644
--- a/sys/dev/sun/eeprom.h
+++ b/sys/dev/sun/eeprom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eeprom.h,v 1.1 2005/06/19 20:23:48 thorpej Exp $ */
+/* $NetBSD: eeprom.h,v 1.2 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/event.c b/sys/dev/sun/event.c
index 46b043013d6..de620facccb 100644
--- a/sys/dev/sun/event.c
+++ b/sys/dev/sun/event.c
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.17 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: event.c,v 1.18 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.17 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.18 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -153,16 +153,16 @@ ev_read(ev, uio, flags)
}
int
-ev_poll(ev, events, p)
+ev_poll(ev, events, l)
struct evvar *ev;
int events;
- struct proc *p;
+ struct lwp *l;
{
int s = splev(), revents = 0;
if (events & (POLLIN | POLLRDNORM)) {
if (ev->ev_get == ev->ev_put)
- selrecord(p, &ev->ev_sel);
+ selrecord(l, &ev->ev_sel);
else
revents |= events & (POLLIN | POLLRDNORM);
}
diff --git a/sys/dev/sun/event_var.h b/sys/dev/sun/event_var.h
index 26fb7a3e9a6..57899afc306 100644
--- a/sys/dev/sun/event_var.h
+++ b/sys/dev/sun/event_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: event_var.h,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -75,7 +75,7 @@ struct evvar {
void ev_init(struct evvar *);
void ev_fini(struct evvar *);
int ev_read(struct evvar *, struct uio *, int);
-int ev_poll(struct evvar *, int, struct proc *);
+int ev_poll(struct evvar *, int, struct lwp *);
int ev_kqfilter(struct evvar *, struct knote *);
/*
diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c
index e0e5322231f..39ddff49c8a 100644
--- a/sys/dev/sun/fb.c
+++ b/sys/dev/sun/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.22 2005/10/08 00:46:44 macallan Exp $ */
+/* $NetBSD: fb.c,v 1.23 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.22 2005/10/08 00:46:44 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.23 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,10 +207,10 @@ fb_attach(fb, isconsole)
}
int
-fbopen(dev, flags, mode, p)
+fbopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -223,14 +223,14 @@ fbopen(dev, flags, mode, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_open)(makedev(0, nunit), flags,
- mode, p);
+ mode, l);
}
int
-fbclose(dev, flags, mode, p)
+fbclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -243,16 +243,16 @@ fbclose(dev, flags, mode, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_close)(makedev(0, nunit), flags,
- mode, p);
+ mode, l);
}
int
-fbioctl(dev, cmd, data, flags, p)
+fbioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -265,14 +265,14 @@ fbioctl(dev, cmd, data, flags, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_ioctl)(makedev(0, nunit), cmd,
- data, flags, p);
+ data, flags, l);
}
int
-fbpoll(dev, events, p)
+fbpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -285,7 +285,7 @@ fbpoll(dev, events, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_poll)(makedev(0, nunit), events,
- p);
+ l);
}
int
diff --git a/sys/dev/sun/fbio.h b/sys/dev/sun/fbio.h
index 25a6a413578..b60e98f2bf1 100644
--- a/sys/dev/sun/fbio.h
+++ b/sys/dev/sun/fbio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbio.h,v 1.6 2005/10/15 15:41:22 macallan Exp $ */
+/* $NetBSD: fbio.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
diff --git a/sys/dev/sun/fbvar.h b/sys/dev/sun/fbvar.h
index fab6cdbac8e..ee2f435bd2c 100644
--- a/sys/dev/sun/fbvar.h
+++ b/sys/dev/sun/fbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbvar.h,v 1.9 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: fbvar.h,v 1.10 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -54,10 +54,10 @@
struct fbdriver {
/* device unblank function (force kernel output to display) */
void (*fbd_unblank)(struct device *);
- int (*fbd_open)(dev_t, int, int, struct proc *);
- int (*fbd_close)(dev_t, int, int, struct proc *);
- int (*fbd_ioctl)(dev_t, u_long, caddr_t, int, struct proc *);
- int (*fbd_poll)(dev_t, int, struct proc *);
+ int (*fbd_open)(dev_t, int, int, struct lwp *);
+ int (*fbd_close)(dev_t, int, int, struct lwp *);
+ int (*fbd_ioctl)(dev_t, u_long, caddr_t, int, struct lwp *);
+ int (*fbd_poll)(dev_t, int, struct lwp *);
paddr_t (*fbd_mmap)(dev_t, off_t, int);
int (*fbd_kqfilter)(dev_t, struct knote *);
#ifdef notyet
diff --git a/sys/dev/sun/files.sun b/sys/dev/sun/files.sun
index 1b85a09bceb..d00269e869c 100644
--- a/sys/dev/sun/files.sun
+++ b/sys/dev/sun/files.sun
@@ -1,4 +1,4 @@
-# $NetBSD: files.sun,v 1.9 2005/02/25 16:03:09 martin Exp $
+# $NetBSD: files.sun,v 1.10 2005/12/11 12:23:56 christos Exp $
#
# Configuration file for devices found on Sun machines.
#
diff --git a/sys/dev/sun/idprom.h b/sys/dev/sun/idprom.h
index 9a28e5c5808..cce20fb33ff 100644
--- a/sys/dev/sun/idprom.h
+++ b/sys/dev/sun/idprom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: idprom.h,v 1.1 2005/06/19 20:00:28 thorpej Exp $ */
+/* $NetBSD: idprom.h,v 1.2 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c
index a6b46e1fa0d..8ae48459c68 100644
--- a/sys/dev/sun/kbd.c
+++ b/sys/dev/sun/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.52 2005/09/28 21:36:23 martin Exp $ */
+/* $NetBSD: kbd.c,v 1.53 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.52 2005/09/28 21:36:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.53 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,10 +167,10 @@ static void kbd_input_event(struct kbd_softc *, int);
* setup event channel, clear ASCII repeat stuff.
*/
int
-kbdopen(dev, flags, mode, p)
+kbdopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
int error, unit;
@@ -197,7 +197,7 @@ kbdopen(dev, flags, mode, p)
/* exclusive open required for /dev/kbd */
if (k->k_events.ev_io)
return (EBUSY);
- k->k_events.ev_io = p;
+ k->k_events.ev_io = l->l_proc;
/* stop pending autorepeat of console input */
if (k->k_repeating) {
@@ -225,10 +225,10 @@ kbdopen(dev, flags, mode, p)
* unless it is supplying console input.
*/
int
-kbdclose(dev, flags, mode, p)
+kbdclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
@@ -260,15 +260,15 @@ kbdread(dev, uio, flags)
int
-kbdpoll(dev, events, p)
+kbdpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
k = kbd_cd.cd_devs[minor(dev)];
- return (ev_poll(&k->k_events, events, p));
+ return (ev_poll(&k->k_events, events, l));
}
int
@@ -283,12 +283,12 @@ kbdkqfilter(dev, kn)
}
int
-kbdioctl(dev, cmd, data, flag, p)
+kbdioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
struct kbd_state *ks;
diff --git a/sys/dev/sun/kbd_ms_ttyvar.h b/sys/dev/sun/kbd_ms_ttyvar.h
index 5cc5b0f661b..9f1eb77f1e7 100644
--- a/sys/dev/sun/kbd_ms_ttyvar.h
+++ b/sys/dev/sun/kbd_ms_ttyvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_ms_ttyvar.h,v 1.3 2005/05/30 22:17:11 christos Exp $ */
+/* $NetBSD: kbd_ms_ttyvar.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbd_reg.h b/sys/dev/sun/kbd_reg.h
index 23eec8d2524..f520f65a14a 100644
--- a/sys/dev/sun/kbd_reg.h
+++ b/sys/dev/sun/kbd_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_reg.h,v 1.4 2005/02/20 20:04:46 heas Exp $ */
+/* $NetBSD: kbd_reg.h,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbd_tables.c b/sys/dev/sun/kbd_tables.c
index 4fa6131bec4..184355f9a70 100644
--- a/sys/dev/sun/kbd_tables.c
+++ b/sys/dev/sun/kbd_tables.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_tables.c,v 1.8 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: kbd_tables.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1996 Gordon W. Ross
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_tables.c,v 1.8 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_tables.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/types.h>
diff --git a/sys/dev/sun/kbd_xlate.h b/sys/dev/sun/kbd_xlate.h
index 35ae7faa852..8d23f8442a6 100644
--- a/sys/dev/sun/kbd_xlate.h
+++ b/sys/dev/sun/kbd_xlate.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_xlate.h,v 1.6 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: kbd_xlate.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbd_zs.c b/sys/dev/sun/kbd_zs.c
index 93038cef91a..4ee2bff9dab 100644
--- a/sys/dev/sun/kbd_zs.c
+++ b/sys/dev/sun/kbd_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_zs.c,v 1.19 2005/04/28 15:03:48 martin Exp $ */
+/* $NetBSD: kbd_zs.c,v 1.20 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.19 2005/04/28 15:03:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.20 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbdsun.c b/sys/dev/sun/kbdsun.c
index 8b532bd5251..427bfe7242c 100644
--- a/sys/dev/sun/kbdsun.c
+++ b/sys/dev/sun/kbdsun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsun.c,v 1.8 2005/05/30 22:17:03 christos Exp $ */
+/* $NetBSD: kbdsun.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/* NetBSD: kbd.c,v 1.29 2001/11/13 06:54:32 lukem Exp */
/*
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbdsun.c,v 1.8 2005/05/30 22:17:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbdsun.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbdsunvar.h b/sys/dev/sun/kbdsunvar.h
index 41bca4b4a29..09d81609d82 100644
--- a/sys/dev/sun/kbdsunvar.h
+++ b/sys/dev/sun/kbdsunvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsunvar.h,v 1.4 2005/02/20 22:17:28 heas Exp $ */
+/* $NetBSD: kbdsunvar.h,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbdvar.h b/sys/dev/sun/kbdvar.h
index e20042840b6..70c5b8f7a70 100644
--- a/sys/dev/sun/kbdvar.h
+++ b/sys/dev/sun/kbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdvar.h,v 1.17 2005/05/16 18:28:28 martin Exp $ */
+/* $NetBSD: kbdvar.h,v 1.18 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbio.h b/sys/dev/sun/kbio.h
index 18dc17900c3..513e2ac7fb8 100644
--- a/sys/dev/sun/kbio.h
+++ b/sys/dev/sun/kbio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.2 2003/08/07 16:31:26 agc Exp $ */
+/* $NetBSD: kbio.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/ms.c b/sys/dev/sun/ms.c
index a72a7cde6b2..a8f0f7c8283 100644
--- a/sys/dev/sun/ms.c
+++ b/sys/dev/sun/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.29 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ms.c,v 1.30 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.29 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.30 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,10 +101,10 @@ const struct cdevsw ms_cdevsw = {
****************************************************************/
int
-msopen(dev, flags, mode, p)
+msopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
int unit;
@@ -126,7 +126,7 @@ msopen(dev, flags, mode, p)
if (err)
return (err);
}
- ms->ms_events.ev_io = p;
+ ms->ms_events.ev_io = l->l_proc;
ev_init(&ms->ms_events); /* may cause sleep */
ms->ms_ready = 1; /* start accepting events */
@@ -134,10 +134,10 @@ msopen(dev, flags, mode, p)
}
int
-msclose(dev, flags, mode, p)
+msclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
@@ -168,12 +168,12 @@ msread(dev, uio, flags)
}
int
-msioctl(dev, cmd, data, flag, p)
+msioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
@@ -213,15 +213,15 @@ msioctl(dev, cmd, data, flag, 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_cd.cd_devs[minor(dev)];
- return (ev_poll(&ms->ms_events, events, p));
+ return (ev_poll(&ms->ms_events, events, l));
}
int
diff --git a/sys/dev/sun/ms_zs.c b/sys/dev/sun/ms_zs.c
index 9418948c7bd..5ddc0e16f4c 100644
--- a/sys/dev/sun/ms_zs.c
+++ b/sys/dev/sun/ms_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_zs.c,v 1.12 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ms_zs.c,v 1.13 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.12 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.13 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/msvar.h b/sys/dev/sun/msvar.h
index 0af11bcb2e5..a427441356e 100644
--- a/sys/dev/sun/msvar.h
+++ b/sys/dev/sun/msvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: msvar.h,v 1.6 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: msvar.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/pfour_subr.c b/sys/dev/sun/pfour_subr.c
index a3fe9b6dc45..cb03957a029 100644
--- a/sys/dev/sun/pfour_subr.c
+++ b/sys/dev/sun/pfour_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pfour_subr.c,v 1.4 2003/10/28 16:25:29 chs Exp $ */
+/* $NetBSD: pfour_subr.c,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pfour_subr.c,v 1.4 2003/10/28 16:25:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pfour_subr.c,v 1.5 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/pfourreg.h b/sys/dev/sun/pfourreg.h
index 33112311cbf..fbc8c13cbb4 100644
--- a/sys/dev/sun/pfourreg.h
+++ b/sys/dev/sun/pfourreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pfourreg.h,v 1.2 2003/12/10 12:06:25 agc Exp $ */
+/* $NetBSD: pfourreg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/sunkbd.c b/sys/dev/sun/sunkbd.c
index 42954d1c5a9..2e1e726d280 100644
--- a/sys/dev/sun/sunkbd.c
+++ b/sys/dev/sun/sunkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunkbd.c,v 1.22 2005/11/27 05:35:52 thorpej Exp $ */
+/* $NetBSD: sunkbd.c,v 1.23 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.22 2005/11/27 05:35:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.23 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -218,7 +218,7 @@ sunkbdiopen(dev, flags)
{
struct kbd_sun_softc *k = (void *) dev;
struct tty *tp = (struct tty *)k->k_priv;
- struct proc *p = curproc ? curproc : &proc0;
+ struct lwp *l = curlwp ? curlwp : &lwp0;
struct termios t;
const struct cdevsw *cdev;
int error;
@@ -229,7 +229,7 @@ sunkbdiopen(dev, flags)
/* Open the lower device */
if ((error = (*cdev->d_open)(tp->t_dev, O_NONBLOCK|flags,
- 0/* ignored? */, p)) != 0)
+ 0/* ignored? */, l)) != 0)
return (error);
/* Now configure it for the console. */
diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c
index d0ee48373fb..c9160b2264e 100644
--- a/sys/dev/sun/sunms.c
+++ b/sys/dev/sun/sunms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunms.c,v 1.20 2005/11/27 05:35:52 thorpej Exp $ */
+/* $NetBSD: sunms.c,v 1.21 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.20 2005/11/27 05:35:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.21 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@ struct linesw sunms_disc = {
};
int sunms_enable(void *);
-int sunms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int sunms_ioctl(void *, u_long, caddr_t, int, struct lwp *);
void sunms_disable(void *);
const struct wsmouse_accessops sunms_accessops = {
@@ -199,7 +199,7 @@ sunmsiopen(dev, flags)
{
struct ms_softc *ms = (void *) dev;
struct tty *tp = (struct tty *)ms->ms_cs;
- struct proc *p = curproc ? curproc : &proc0;
+ struct lwp *l = curlwp ? curlwp : &lwp0;
struct termios t;
const struct cdevsw *cdev;
int error;
@@ -210,7 +210,7 @@ sunmsiopen(dev, flags)
/* Open the lower device */
if ((error = (*cdev->d_open)(tp->t_dev, O_NONBLOCK|flags,
- 0/* ignored? */, p)) != 0)
+ 0/* ignored? */, l)) != 0)
return (error);
/* Now configure it for the console. */
@@ -239,12 +239,12 @@ sunmsinput(c, tp)
}
int
-sunms_ioctl(v, cmd, data, flag, p)
+sunms_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
/* struct ms_softc *sc = v; */
diff --git a/sys/dev/sun/vuid_event.h b/sys/dev/sun/vuid_event.h
index 792a7ca498d..a337757856a 100644
--- a/sys/dev/sun/vuid_event.h
+++ b/sys/dev/sun/vuid_event.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vuid_event.h,v 1.2 2003/08/07 16:31:27 agc Exp $ */
+/* $NetBSD: vuid_event.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/wskbdmap_sun.c b/sys/dev/sun/wskbdmap_sun.c
index 7c5e4daf56e..cdf6751cccf 100644
--- a/sys/dev/sun/wskbdmap_sun.c
+++ b/sys/dev/sun/wskbdmap_sun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_sun.c,v 1.11 2005/08/25 06:55:03 jdc Exp $ */
+/* $NetBSD: wskbdmap_sun.c,v 1.12 2005/12/11 12:23:56 christos Exp $ */
/* $OpenBSD: sunkbd.c,v 1.9 2002/09/08 23:22:00 miod Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_sun.c,v 1.11 2005/08/25 06:55:03 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_sun.c,v 1.12 2005/12/11 12:23:56 christos Exp $");
#include <sys/types.h>
#include <dev/wscons/wsksymdef.h>