diff options
| author | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
| commit | 53524e44efd7c7176da8dc8190a698b2fe184db1 (patch) | |
| tree | 68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/dev/dec | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/dev/dec')
| -rw-r--r-- | sys/dev/dec/dz.c | 12 | ||||
| -rw-r--r-- | sys/dev/dec/dzkbd.c | 8 | ||||
| -rw-r--r-- | sys/dev/dec/dzms.c | 8 | ||||
| -rw-r--r-- | sys/dev/dec/dzvar.h | 6 | ||||
| -rw-r--r-- | sys/dev/dec/vsxxx.c | 8 |
5 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/dec/dz.c b/sys/dev/dec/dz.c index 488129dff88..2f687e9e5fb 100644 --- a/sys/dev/dec/dz.c +++ b/sys/dev/dec/dz.c @@ -1,4 +1,4 @@ -/* $NetBSD: dz.c,v 1.24 2006/10/03 12:50:12 he Exp $ */ +/* $NetBSD: dz.c,v 1.25 2007/03/04 06:01:45 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.24 2006/10/03 12:50:12 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.25 2007/03/04 06:01:45 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -235,7 +235,7 @@ dzrint(void *arg) cn_check_magic(tp->t_dev, mcc, dz_cnm_state); if (!(tp->t_state & TS_ISOPEN)) { - wakeup((caddr_t)&tp->t_rawq); + wakeup((void *)&tp->t_rawq); continue; } @@ -370,7 +370,7 @@ dzopen(dev_t dev, int flag, int mode, struct lwp *l) while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) && !(tp->t_state & TS_CARR_ON)) { tp->t_wopen++; - error = ttysleep(tp, (caddr_t)&tp->t_rawq, + error = ttysleep(tp, (void *)&tp->t_rawq, TTIPRI | PCATCH, ttopen, 0); tp->t_wopen--; if (error) @@ -450,7 +450,7 @@ dzpoll(dev, events, l) /*ARGSUSED*/ int -dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) +dzioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { struct dz_softc *sc; struct tty *tp; @@ -549,7 +549,7 @@ dzstart(struct tty *tp) if (cl->c_cc <= tp->t_lowat) { if (tp->t_state & TS_ASLEEP) { tp->t_state &= ~TS_ASLEEP; - wakeup((caddr_t)cl); + wakeup((void *)cl); } selwakeup(&tp->t_wsel); } diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c index 8c6e0bd5b48..aa546bd936c 100644 --- a/sys/dev/dec/dzkbd.c +++ b/sys/dev/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzkbd.c,v 1.16 2006/03/29 06:28:38 thorpej Exp $ */ +/* $NetBSD: dzkbd.c,v 1.17 2007/03/04 06:01:45 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.16 2006/03/29 06:28:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.17 2007/03/04 06:01:45 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 lwp *); +static int dzkbd_ioctl(void *, u_long, void *, int, struct lwp *); const struct wskbd_accessops dzkbd_accessops = { dzkbd_enable, @@ -272,7 +272,7 @@ static int dzkbd_ioctl(v, cmd, data, flag, l) void *v; u_long cmd; - caddr_t data; + void *data; int flag; struct lwp *l; { diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c index 347405a4d36..7fff7869b5e 100644 --- a/sys/dev/dec/dzms.c +++ b/sys/dev/dec/dzms.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzms.c,v 1.15 2006/11/12 19:00:43 plunky Exp $ */ +/* $NetBSD: dzms.c,v 1.16 2007/03/04 06:01:45 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.15 2006/11/12 19:00:43 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.16 2007/03/04 06:01:45 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 lwp *); +static int dzms_ioctl(void *, u_long, void *, int, struct lwp *); static void dzms_disable(void *); const struct wsmouse_accessops dzms_accessops = { @@ -180,7 +180,7 @@ static int dzms_ioctl(v, cmd, data, flag, l) void *v; u_long cmd; - caddr_t data; + void *data; int flag; struct lwp *l; { diff --git a/sys/dev/dec/dzvar.h b/sys/dev/dec/dzvar.h index b0b49c7e214..edc217fa549 100644 --- a/sys/dev/dec/dzvar.h +++ b/sys/dev/dec/dzvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: dzvar.h,v 1.8 2005/12/11 12:21:20 christos Exp $ */ +/* $NetBSD: dzvar.h,v 1.9 2007/03/04 06:01:45 christos Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -100,8 +100,8 @@ struct dz_softc { int (*dz_catch)(void *, int); /* Fast catch recv */ struct tty * dz_tty; /* what we work on */ #ifdef notyet - caddr_t dz_mem; /* pointers to clist output */ - caddr_t dz_end; /* allowing pdma action */ + void * dz_mem; /* pointers to clist output */ + void * dz_end; /* allowing pdma action */ #endif } sc_dz[NDZLINE]; }; diff --git a/sys/dev/dec/vsxxx.c b/sys/dev/dec/vsxxx.c index cf802bbee59..b6f7f59b974 100644 --- a/sys/dev/dec/vsxxx.c +++ b/sys/dev/dec/vsxxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: vsxxx.c,v 1.7 2006/11/12 19:00:43 plunky Exp $ */ +/* $NetBSD: vsxxx.c,v 1.8 2007/03/04 06:01:45 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.7 2006/11/12 19:00:43 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.8 2007/03/04 06:01:45 christos Exp $"); /* * Common machinary for VSXXX mice and tablet @@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.7 2006/11/12 19:00:43 plunky Exp $"); extern struct cfdriver vsms_cd; static int vsxxx_enable(void *); -static int vsxxx_ioctl(void *, u_long, caddr_t, int, struct proc *); +static int vsxxx_ioctl(void *, u_long, void *, int, struct proc *); static void vsxxx_disable(void *); struct wsmouse_accessops vsxxx_accessops = { /* EXPORT */ @@ -107,7 +107,7 @@ static int vsxxx_ioctl(v, cmd, data, flag, p) void *v; u_long cmd; - caddr_t data; + void *data; int flag; struct proc *p; { |
