diff options
| author | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
| commit | 95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch) | |
| tree | d6510e195bc06092a8057e34c6442eba4e77d09a /sys/dev/dec | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/dev/dec')
| -rw-r--r-- | sys/dev/dec/clockvar.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/dec_boot.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/dz.c | 21 | ||||
| -rw-r--r-- | sys/dev/dec/dzkbd.c | 10 | ||||
| -rw-r--r-- | sys/dev/dec/dzms.c | 10 | ||||
| -rw-r--r-- | sys/dev/dec/dzreg.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/dzvar.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/if_le_dec.c | 4 | ||||
| -rw-r--r-- | sys/dev/dec/lk201.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/lk201_ws.c | 4 | ||||
| -rw-r--r-- | sys/dev/dec/lk201reg.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/lk201var.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/mcclock.c | 4 | ||||
| -rw-r--r-- | sys/dev/dec/mcclock_pad32.c | 4 | ||||
| -rw-r--r-- | sys/dev/dec/mcclockvar.h | 2 | ||||
| -rw-r--r-- | sys/dev/dec/vsxxx.c | 4 | ||||
| -rw-r--r-- | sys/dev/dec/vsxxxvar.h | 2 |
17 files changed, 40 insertions, 39 deletions
diff --git a/sys/dev/dec/clockvar.h b/sys/dev/dec/clockvar.h index 14c05219fff..331a56a26fd 100644 --- a/sys/dev/dec/clockvar.h +++ b/sys/dev/dec/clockvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: clockvar.h,v 1.7 2005/02/27 00:26:59 perry Exp $ */ +/* $NetBSD: clockvar.h,v 1.8 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. diff --git a/sys/dev/dec/dec_boot.h b/sys/dev/dec/dec_boot.h index d8e86a4d483..642daffced5 100644 --- a/sys/dev/dec/dec_boot.h +++ b/sys/dev/dec/dec_boot.h @@ -1,4 +1,4 @@ -/* $NetBSD: dec_boot.h,v 1.6 2003/08/07 16:30:54 agc Exp $ */ +/* $NetBSD: dec_boot.h,v 1.7 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1992, 1993 diff --git a/sys/dev/dec/dz.c b/sys/dev/dec/dz.c index 5604eddfd9f..67300b946c2 100644 --- a/sys/dev/dec/dz.c +++ b/sys/dev/dec/dz.c @@ -1,4 +1,4 @@ -/* $NetBSD: dz.c,v 1.17 2005/09/06 21:40:39 kleink Exp $ */ +/* $NetBSD: dz.c,v 1.18 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.17 2005/09/06 21:40:39 kleink Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.18 2005/12/11 12:21:20 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -319,8 +319,9 @@ dzxint(void *arg) } int -dzopen(dev_t dev, int flag, int mode, struct proc *p) +dzopen(dev_t dev, int flag, int mode, struct lwp *l) { + struct proc *p = l->l_proc; struct tty *tp; int unit, line; struct dz_softc *sc; @@ -381,7 +382,7 @@ dzopen(dev_t dev, int flag, int mode, struct proc *p) /*ARGSUSED*/ int -dzclose(dev_t dev, int flag, int mode, struct proc *p) +dzclose(dev_t dev, int flag, int mode, struct lwp *l) { struct dz_softc *sc; struct tty *tp; @@ -431,10 +432,10 @@ dzwrite(dev_t dev, struct uio *uio, int flag) } int -dzpoll(dev, events, p) +dzpoll(dev, events, l) dev_t dev; int events; - struct proc *p; + struct lwp *l; { struct tty *tp; struct dz_softc *sc; @@ -442,12 +443,12 @@ dzpoll(dev, events, p) sc = dz_cd.cd_devs[DZ_I2C(minor(dev))]; tp = sc->sc_dz[DZ_PORT(minor(dev))].dz_tty; - return ((*tp->t_linesw->l_poll)(tp, events, p)); + return ((*tp->t_linesw->l_poll)(tp, events, l)); } /*ARGSUSED*/ int -dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) { struct dz_softc *sc; struct tty *tp; @@ -459,11 +460,11 @@ dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) sc = dz_cd.cd_devs[unit]; tp = sc->sc_dz[line].dz_tty; - error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p); + error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l); if (error >= 0) return (error); - error = ttioctl(tp, cmd, data, flag, p); + error = ttioctl(tp, cmd, data, flag, l); if (error >= 0) return (error); diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c index 830d1a35f87..84229c0d620 100644 --- a/sys/dev/dec/dzkbd.c +++ b/sys/dev/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzkbd.c,v 1.14 2005/02/27 00:26:59 perry Exp $ */ +/* $NetBSD: dzkbd.c,v 1.15 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.14 2005/02/27 00:26:59 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.15 2005/12/11 12:21:20 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,7 +98,7 @@ CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc), static int dzkbd_enable(void *, int); static void dzkbd_set_leds(void *, int); -static int dzkbd_ioctl(void *, u_long, caddr_t, int, struct proc *); +static int dzkbd_ioctl(void *, u_long, caddr_t, int, struct lwp *); const struct wskbd_accessops dzkbd_accessops = { dzkbd_enable, @@ -269,12 +269,12 @@ dzkbd_set_leds(v, leds) } static int -dzkbd_ioctl(v, cmd, data, flag, p) +dzkbd_ioctl(v, cmd, data, flag, l) void *v; u_long cmd; caddr_t data; int flag; - struct proc *p; + struct lwp *l; { struct dzkbd_softc *sc = (struct dzkbd_softc *)v; diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c index b545ac8b127..baa23f01c91 100644 --- a/sys/dev/dec/dzms.c +++ b/sys/dev/dec/dzms.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzms.c,v 1.12 2005/02/27 00:26:59 perry Exp $ */ +/* $NetBSD: dzms.c,v 1.13 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.12 2005/02/27 00:26:59 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.13 2005/12/11 12:21:20 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,7 +90,7 @@ CFATTACH_DECL(dzms, sizeof(struct dzms_softc), dzms_match, dzms_attach, NULL, NULL); static int dzms_enable(void *); -static int dzms_ioctl(void *, u_long, caddr_t, int, struct proc *); +static int dzms_ioctl(void *, u_long, caddr_t, int, struct lwp *); static void dzms_disable(void *); const struct wsmouse_accessops dzms_accessops = { @@ -177,12 +177,12 @@ dzms_disable(v) } static int -dzms_ioctl(v, cmd, data, flag, p) +dzms_ioctl(v, cmd, data, flag, l) void *v; u_long cmd; caddr_t data; int flag; - struct proc *p; + struct lwp *l; { if (cmd == WSMOUSEIO_GTYPE) { *(u_int *)data = WSMOUSE_TYPE_VSXXX; diff --git a/sys/dev/dec/dzreg.h b/sys/dev/dec/dzreg.h index ed9545479ab..b292f45047b 100644 --- a/sys/dev/dec/dzreg.h +++ b/sys/dev/dec/dzreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: dzreg.h,v 1.3 2003/12/13 23:02:33 ad Exp $ */ +/* $NetBSD: dzreg.h,v 1.4 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. * diff --git a/sys/dev/dec/dzvar.h b/sys/dev/dec/dzvar.h index e2f0dac6471..b0b49c7e214 100644 --- a/sys/dev/dec/dzvar.h +++ b/sys/dev/dec/dzvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: dzvar.h,v 1.7 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: dzvar.h,v 1.8 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/dev/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c index 380131d00d7..5dceb9906e1 100644 --- a/sys/dev/dec/if_le_dec.c +++ b/sys/dev/dec/if_le_dec.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_dec.c,v 1.15 2005/02/27 00:26:59 perry Exp $ */ +/* $NetBSD: if_le_dec.c,v 1.16 2005/12/11 12:21:20 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.15 2005/02/27 00:26:59 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.16 2005/12/11 12:21:20 christos Exp $"); #include "opt_inet.h" #include "bpfilter.h" diff --git a/sys/dev/dec/lk201.h b/sys/dev/dec/lk201.h index 7e93ac6025e..2c20603f699 100644 --- a/sys/dev/dec/lk201.h +++ b/sys/dev/dec/lk201.h @@ -1,4 +1,4 @@ -/* $NetBSD: lk201.h,v 1.8 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: lk201.h,v 1.9 2005/12/11 12:21:20 christos Exp $ */ /* diff --git a/sys/dev/dec/lk201_ws.c b/sys/dev/dec/lk201_ws.c index 87d629448de..5b0cdbee3e3 100644 --- a/sys/dev/dec/lk201_ws.c +++ b/sys/dev/dec/lk201_ws.c @@ -1,4 +1,4 @@ -/* $NetBSD: lk201_ws.c,v 1.6 2004/03/24 17:26:53 drochner Exp $ */ +/* $NetBSD: lk201_ws.c,v 1.7 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.6 2004/03/24 17:26:53 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.7 2005/12/11 12:21:20 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/dev/dec/lk201reg.h b/sys/dev/dec/lk201reg.h index 828f69da325..7c319ff6319 100644 --- a/sys/dev/dec/lk201reg.h +++ b/sys/dev/dec/lk201reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: lk201reg.h,v 1.2 2005/02/27 00:26:59 perry Exp $ */ +/* $NetBSD: lk201reg.h,v 1.3 2005/12/11 12:21:20 christos Exp $ */ /* * command keycodes for Digital LK200/LK400 series keyboards. diff --git a/sys/dev/dec/lk201var.h b/sys/dev/dec/lk201var.h index 924173813c3..df4d109fd8c 100644 --- a/sys/dev/dec/lk201var.h +++ b/sys/dev/dec/lk201var.h @@ -1,4 +1,4 @@ -/* $NetBSD: lk201var.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: lk201var.h,v 1.6 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1998 diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c index 0a2633e4641..7e2ee64dd54 100644 --- a/sys/dev/dec/mcclock.c +++ b/sys/dev/dec/mcclock.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock.c,v 1.16 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: mcclock.c,v 1.17 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.16 2005/02/04 02:10:36 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.17 2005/12/11 12:21:20 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/dev/dec/mcclock_pad32.c b/sys/dev/dec/mcclock_pad32.c index dd830617821..d7ea12311f0 100644 --- a/sys/dev/dec/mcclock_pad32.c +++ b/sys/dev/dec/mcclock_pad32.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock_pad32.c,v 1.12 2005/02/27 00:26:59 perry Exp $ */ +/* $NetBSD: mcclock_pad32.c,v 1.13 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.12 2005/02/27 00:26:59 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.13 2005/12/11 12:21:20 christos Exp $"); /* diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h index b974bf3fb1a..1fa5abba443 100644 --- a/sys/dev/dec/mcclockvar.h +++ b/sys/dev/dec/mcclockvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: mcclockvar.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: mcclockvar.h,v 1.6 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. diff --git a/sys/dev/dec/vsxxx.c b/sys/dev/dec/vsxxx.c index c9015c356cd..736a008703b 100644 --- a/sys/dev/dec/vsxxx.c +++ b/sys/dev/dec/vsxxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: vsxxx.c,v 1.5 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: vsxxx.c,v 1.6 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.5 2005/02/04 02:10:36 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.6 2005/12/11 12:21:20 christos Exp $"); /* * Common machinary for VSXXX mice and tablet diff --git a/sys/dev/dec/vsxxxvar.h b/sys/dev/dec/vsxxxvar.h index e4eeb157ff8..60782b9f540 100644 --- a/sys/dev/dec/vsxxxvar.h +++ b/sys/dev/dec/vsxxxvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vsxxxvar.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */ +/* $NetBSD: vsxxxvar.h,v 1.3 2005/12/11 12:21:20 christos Exp $ */ /* * Copyright (c) 1999 Tohru Nishimura. All rights reserved. |
