running in emulated wizd mode, convert caddr_t to void *.

This commit is contained in:
dogcow 2007-03-07 00:41:16 +00:00
parent a0f301859f
commit c1a14b53bd
20 changed files with 64 additions and 64 deletions

View File

@ -1,4 +1,4 @@
.\" $NetBSD: ip6.4,v 1.24 2006/12/23 09:24:57 wiz Exp $
.\" $NetBSD: ip6.4,v 1.25 2007/03/07 00:41:16 dogcow Exp $
.\" $KAME: ip6.4,v 1.23 2005/01/11 05:56:25 itojun Exp $
.\" $OpenBSD: ip6.4,v 1.21 2005/01/06 03:50:46 itojun Exp $
.\"
@ -579,7 +579,7 @@ m.msg_name = \*[Am]from; /* sockaddr_in6 of peer */
m.msg_namelen = sizeof(from);
m.msg_iov = iov;
m.msg_iovlen = 1;
m.msg_control = (caddr_t)buf; /* buffer for control messages */
m.msg_control = buf; /* buffer for control messages */
m.msg_controllen = sizeof(buf);
/*

View File

@ -1,4 +1,4 @@
.\" $NetBSD: netintro.4,v 1.21 2006/09/10 21:11:01 wiz Exp $
.\" $NetBSD: netintro.4,v 1.22 2007/03/07 00:41:16 dogcow Exp $
.\"
.\" Copyright (c) 1983, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@ -192,7 +192,7 @@ struct ifreq {
struct sockaddr ifru_broadaddr;
short ifru_flags;
int ifru_metric;
caddr_t ifru_data;
void *ifru_data;
} ifr_ifru;
#define ifr_addr ifr_ifru.ifru_addr /* address */
#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */
@ -317,7 +317,7 @@ struct ifaliasreq {
struct ifconf {
int ifc_len; /* size of associated buffer */
union {
caddr_t ifcu_buf;
void *ifcu_buf;
struct ifreq *ifcu_req;
} ifc_ifcu;
#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */

View File

@ -1,4 +1,4 @@
.\" $NetBSD: systrace.4,v 1.14 2006/11/24 19:46:58 christos Exp $
.\" $NetBSD: systrace.4,v 1.15 2007/03/07 00:41:16 dogcow Exp $
.\" $OpenBSD: systrace.4,v 1.2 2002/06/03 15:44:17 mpech Exp $
.\"
.\" Copyright (c) 2002 CubeSoft Communications, Inc.
@ -293,7 +293,7 @@ struct systrace_replace {
uint16_t strr_seqnr;
int16_t reserved;
int32_t strr_nrepl; /* # of arguments to replace */
caddr_t strr_base; /* Base user memory */
void *strr_base; /* Base user memory */
size_t strr_len; /* Length of memory */
int32_t strr_argind[SYSTR_MAXARGS]; /* Argument indexes */
size_t strr_off[SYSTR_MAXARGS]; /* Argumen offsets */

View File

@ -1,4 +1,4 @@
.\" $NetBSD: link.5,v 1.20 2004/10/04 19:12:52 rumble Exp $
.\" $NetBSD: link.5,v 1.21 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -287,14 +287,14 @@ These structures are only used at run-time and do not occur within
the text or data segment of an executable or shared library.
.Bd -literal -offset indent
struct so_map {
caddr_t som_addr;
void *som_addr;
char *som_path;
struct so_map *som_next;
struct sod *som_sod;
caddr_t som_sodbase;
void *som_sodbase;
u_int som_write : 1;
struct _dynamic *som_dynamic;
caddr_t som_spd;
void *som_spd;
};
.Ed
.Bl -tag -width som_dynamic
@ -397,7 +397,7 @@ struct rt_symbol {
struct nzlist *rt_sp;
struct rt_symbol *rt_next;
struct rt_symbol *rt_link;
caddr_t rt_srcaddr;
void *rt_srcaddr;
struct so_map *rt_smp;
};
.Ed
@ -492,7 +492,7 @@ struct crt_ldso {
int crt_ldfd;
struct _dynamic *crt_dp;
char **crt_ep;
caddr_t crt_bp;
void *crt_bp;
char *crt_prog;
char *crt_ldso;
char *crt_ldentry;

View File

@ -1,4 +1,4 @@
.\" $NetBSD: audio.9,v 1.36 2006/03/11 11:52:17 wiz Exp $
.\" $NetBSD: audio.9,v 1.37 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -504,7 +504,7 @@ should be called with the argument
Once started the transfer may be stopped using
.Va halt_input .
Return 0 on success, otherwise an error code.
.It Dv int dev_ioctl(void *hdl, u_long cmd, caddr_t addr,
.It Dv int dev_ioctl(void *hdl, u_long cmd, void *addr,
.Pp
.Dv "int flag, struct lwp *l)"
.Pp

View File

@ -1,4 +1,4 @@
.\" $NetBSD: extent.9,v 1.26 2003/06/30 12:14:34 wiz Exp $
.\" $NetBSD: extent.9,v 1.27 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -51,7 +51,7 @@
.In sys/malloc.h
.In sys/extent.h
.Ft struct extent *
.Fn extent_create "char *name" "u_long start" "u_long end" "int mtype" "caddr_t storage" "size_t storagesize" "int flags"
.Fn extent_create "char *name" "u_long start" "u_long end" "int mtype" "void *storage" "size_t storagesize" "int flags"
.Ft void
.Fn extent_destroy "struct extent *ex"
.Ft int

View File

@ -1,4 +1,4 @@
.\" $NetBSD: file.9,v 1.9 2006/10/04 11:35:47 pooka Exp $
.\" $NetBSD: file.9,v 1.10 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 2002, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -83,9 +83,9 @@ struct file {
struct uio *uio, kauth_cred_t cred, int flags);
int (*fo_write)(struct file *fp, off_t *offset,
struct uio *uio, kauth_cred_t cred, int flags);
int (*fo_ioctl)(struct file *fp, u_long com, caddr_t data,
int (*fo_ioctl)(struct file *fp, u_long com, void *data,
struct lwp *l);
int (*fo_fcntl)(struct file *fp, u_int com, caddr_t data,
int (*fo_fcntl)(struct file *fp, u_int com, void *data,
struct lwp *l);
int (*fo_poll)(struct file *fp, int events,
struct lwp *l);
@ -94,7 +94,7 @@ struct file {
int (*fo_close)(struct file *fp, struct lwp *l);
} *f_ops;
off_t f_offset;
caddr_t f_data; /* descriptor data */
void *f_data; /* descriptor data */
};
.Ed
.Pp

View File

@ -1,4 +1,4 @@
.\" $NetBSD: ieee80211_ioctl.9,v 1.4 2006/09/17 12:13:02 wiz Exp $
.\" $NetBSD: ieee80211_ioctl.9,v 1.5 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 2004 Bruce M. Simpson <bms@spc.org>
.\" Copyright (c) 2004 Darron Broad <darron@kewl.org>
@ -38,11 +38,11 @@
.In net80211/ieee80211_proto.h
.In net80211/ieee80211_ioctl.h
.Ft int
.Fn ieee80211_cfgget "struct ieee80211com *ic" "u_long cmd" "caddr_t data"
.Fn ieee80211_cfgget "struct ieee80211com *ic" "u_long cmd" "void *data"
.Ft int
.Fn ieee80211_cfgset "struct ieee80211com *ic" "u_long cmd" "caddr_t data"
.Fn ieee80211_cfgset "struct ieee80211com *ic" "u_long cmd" "void *data"
.Ft int
.Fn ieee80211_ioctl "struct ieee80211com *ic" "u_long cmd" "caddr_t data"
.Fn ieee80211_ioctl "struct ieee80211com *ic" "u_long cmd" "void *data"
.Sh DESCRIPTION
These
functions are typically invoked by drivers in response to requests

View File

@ -1,4 +1,4 @@
.\" $NetBSD: ioctl.9,v 1.23 2006/09/17 15:00:07 plunky Exp $
.\" $NetBSD: ioctl.9,v 1.24 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -263,7 +263,7 @@ error = ioctl(s, FOOICTL, \*[Am]a);
.Pp
Within the ioctl()-routine of the driver, it can be then accessed like
.Bd -literal -offset indent
driver_ioctl(..., u_long cmd, caddr_t data)
driver_ioctl(..., u_long cmd, void *data)
{
...
switch (cmd) {

View File

@ -1,4 +1,4 @@
.\" $NetBSD: isa.9,v 1.15 2006/01/29 03:09:19 rpaulo Exp $
.\" $NetBSD: isa.9,v 1.16 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -91,9 +91,9 @@
"bus_size_t size"
.Ft int
.Fn isa_dmamem_map "isa_chipset_tag_t ic" "int chan" "bus_addr_t addr" \
"bus_size_t size" "caddr_t *kvap" "int flags"
"bus_size_t size" "void **kvap" "int flags"
.Ft void
.Fn isa_dmamem_unmap "isa_chipset_tag_t ic" "int chan" "caddr_t kva" \
.Fn isa_dmamem_unmap "isa_chipset_tag_t ic" "int chan" "void *kva" \
"size_t size"
.Ft void *
.Fn isa_malloc "isa_chipset_tag_t ic" "int chan" "size_t size" \

View File

@ -1,4 +1,4 @@
.\" $NetBSD: mbuf.9,v 1.43 2006/07/30 00:25:24 wiz Exp $
.\" $NetBSD: mbuf.9,v 1.44 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -91,11 +91,11 @@
.Ft struct mbuf *
.Fn m_copypacket "struct mbuf *m" "int how"
.Ft void
.Fn m_copydata "struct mbuf *m" "int off" "int len" "caddr_t cp"
.Fn m_copydata "struct mbuf *m" "int off" "int len" "void *cp"
.Ft void
.Fn m_copyback "struct mbuf *m0" "int off" "int len" "caddr_t cp"
.Fn m_copyback "struct mbuf *m0" "int off" "int len" "void *cp"
.Ft struct mbuf *
.Fn m_copyback_cow "struct mbuf *m0" "int off" "int len" "caddr_t cp" "int how"
.Fn m_copyback_cow "struct mbuf *m0" "int off" "int len" "void *cp" "int how"
.Ft int
.Fn m_makewritable "struct mbuf **mp" "int off" "int len" "int how"
.Ft void
@ -127,7 +127,7 @@
.Ft void
.Fn MEXTMALLOC "struct mbuf *m" "int len" "int how"
.Ft void
.Fn MEXTADD "struct mbuf *m" "caddr_t buf" "int size" "int type" "void (*free)(struct mbuf *, caddr_t, size_t, void *)" "void *arg"
.Fn MEXTADD "struct mbuf *m" "void *buf" "int size" "int type" "void (*free)(struct mbuf *, caddr_t, size_t, void *)" "void *arg"
.Ft void
.Fn MCLGET "struct mbuf *m" "int how"
.Ft void
@ -314,7 +314,7 @@ from caller.
Copies an entire packet, including header (which must be present).
This function is an optimization of the common case
.Li m_copym(m, 0, Dv M_COPYALL, Fa how ) .
.It Fn m_copydata "struct mbuf *m" "int off" "int len" "caddr_t cp"
.It Fn m_copydata "struct mbuf *m" "int off" "int len" "void *cp"
Copies
.Fa len
bytes data from mbuf chain
@ -324,7 +324,7 @@ into the buffer
starting
.Fa off
bytes from the beginning.
.It Fn m_copyback "struct mbuf *m0" "int off" "int len" "caddr_t cp"
.It Fn m_copyback "struct mbuf *m0" "int off" "int len" "void *cp"
Copies
.Fa len
bytes data from buffer
@ -341,7 +341,7 @@ by checking the resulting length of the chain in that case.
It is an error to use
.Fn m_copyback
on read-only mbufs.
.It Fn m_copyback_cow "struct mbuf *m0" "int off" "int len" "caddr_t cp" \
.It Fn m_copyback_cow "struct mbuf *m0" "int off" "int len" "void *cp" \
"int how"
Copies
.Fa len
@ -586,7 +586,7 @@ The flag
.Dv M_EXT
is set upon success.
Implemented as a macro.
.It Fn MEXTADD "struct mbuf *m" "caddr_t buf" "int size" "int type" "void (*free)(struct mbuf *, caddr_t, size_t, void *)" "void *arg"
.It Fn MEXTADD "struct mbuf *m" "void *buf" "int size" "int type" "void (*free)(struct mbuf *, caddr_t, size_t, void *)" "void *arg"
Adds pre-allocated external storage
.Fa buf
to a normal mbuf

View File

@ -1,5 +1,5 @@
.\" $OpenBSD: crypto.9,v 1.25 2003/07/11 13:47:41 jmc Exp $
.\" $NetBSD: opencrypto.9,v 1.3 2004/04/23 11:00:06 keihan Exp $
.\" $NetBSD: opencrypto.9,v 1.4 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" The author of this man page is Angelos D. Keromytis (angelos@cis.upenn.edu)
.\"
@ -68,7 +68,7 @@ struct cryptoini {
int cri_alg;
int cri_klen;
int cri_rnd;
caddr_t cri_key;
void *cri_key;
u_int8_t cri_iv[EALG_MAX_BLOCK_LEN];
struct cryptoini *cri_next;
};
@ -89,15 +89,15 @@ struct cryptop {
int crp_olen;
int crp_etype;
int crp_flags;
caddr_t crp_buf;
caddr_t crp_opaque;
void *crp_buf;
void *crp_opaque;
struct cryptodesc *crp_desc;
int (*crp_callback)(struct cryptop *);
caddr_t crp_mac;
void *crp_mac;
};
struct crparam {
caddr_t crp_p;
void *crp_p;
u_int crp_nbits;
};

View File

@ -1,4 +1,4 @@
.\" $NetBSD: ras.9,v 1.7 2006/01/16 00:01:47 rpaulo Exp $
.\" $NetBSD: ras.9,v 1.8 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -46,8 +46,8 @@
.In sys/types.h
.In sys/proc.h
.In sys/ras.h
.Ft caddr_t
.Fn ras_lookup "struct proc *p" "caddr_t addr"
.Ft void
*.Fn ras_lookup "struct proc *p" "void *addr"
.Ft int
.Fn ras_fork "struct proc *p1" "struct proc *p2"
.Ft int

View File

@ -1,4 +1,4 @@
.\" $NetBSD: ucom.9,v 1.13 2005/12/26 19:48:13 perry Exp $
.\" $NetBSD: ucom.9,v 1.14 2007/03/07 00:41:17 dogcow Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -136,7 +136,7 @@ struct ucom_methods {
#define UCOM_SET_BREAK 3
int (*ucom_param)(void *sc, int portno, struct termios *);
int (*ucom_ioctl)(void *sc, int portno, u_long cmd,
caddr_t data, int flag, struct lwp *l);
void *data, int flag, struct lwp *l);
int (*ucom_open)(void *sc, int portno);
void (*ucom_close)(void *sc, int portno);
void (*ucom_read)(void *sc, int portno, u_char **ptr,
@ -162,7 +162,7 @@ Set the speed, number of data bit, stop bits, and parity of a port
according to the
.Xr termios 4
struct.
.It Fn "int (*ucom_ioctl)" "void *sc, int portno, u_long cmd, caddr_t data, int flag, struct lwp *l"
.It Fn "int (*ucom_ioctl)" "void *sc, int portno, u_long cmd, void *data, int flag, struct lwp *l"
implements any non-standard
.Xr ioctl 2
that a device needs.

View File

@ -1,4 +1,4 @@
.\" $NetBSD: uvm.9,v 1.81 2007/02/17 08:49:39 wiz Exp $
.\" $NetBSD: uvm.9,v 1.82 2007/03/07 00:41:18 dogcow Exp $
.\"
.\" Copyright (c) 1998 Matthew R. Green
.\" All rights reserved.
@ -882,11 +882,11 @@ and should match what was used for previous call to
.Pp
.Ft boolean_t
.br
.Fn uvm_chgkprot "caddr_t addr" "size_t len" "int rw" ;
.Fn uvm_chgkprot "void *addr" "size_t len" "int rw" ;
.Pp
.Ft void
.br
.Fn uvm_kernacc "caddr_t addr" "size_t len" "int rw" ;
.Fn uvm_kernacc "void *addr" "size_t len" "int rw" ;
.Pp
.Ft int
.br

View File

@ -1,4 +1,4 @@
.\" $NetBSD: vfsops.9,v 1.28 2007/01/21 15:42:36 hannken Exp $
.\" $NetBSD: vfsops.9,v 1.29 2007/03/07 00:41:18 dogcow Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -67,7 +67,7 @@
.Fn VFS_ROOT "struct mount *mp" "struct vnode **vpp"
.Ft int
.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" \
"caddr_t arg" "struct lwp *l"
"void *arg" "struct lwp *l"
.Ft int
.Fn VFS_STATVFS "struct mount *mp" "struct statvfs *sbp" "struct lwp *l"
.Ft int

View File

@ -1,4 +1,4 @@
.\" $NetBSD: vnsubr.9,v 1.29 2007/02/16 17:23:59 hannken Exp $
.\" $NetBSD: vnsubr.9,v 1.30 2007/03/07 00:41:18 dogcow Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -81,7 +81,7 @@
.Fn vn_open "struct nameidata *ndp" "int fmode" "int cmode"
.Ft int
.Fo vn_rdwr
.Fa "enum uio_rw rw" "struct vnode *vp" "caddr_t base"
.Fa "enum uio_rw rw" "struct vnode *vp" "void *base"
.Fa "int len" "off_t offset" "enum uio_seg segflg" "int ioflg"
.Fa "kauth_cred_t cred" "size_t *aresid" "struct lwp *l"
.Fc

View File

@ -1,4 +1,4 @@
.\" $NetBSD: wsdisplay.9,v 1.19 2006/04/15 17:54:34 jmmv Exp $
.\" $NetBSD: wsdisplay.9,v 1.20 2007/03/07 00:41:18 dogcow Exp $
.\"
.\" Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -110,7 +110,7 @@ child device.
It has the following members:
.Bd -literal
int (*ioctl)(void *v, void *vs, u_long cmd,
caddr_t data, int flag, struct lwp *l);
void *data, int flag, struct lwp *l);
paddr_t (*mmap)(void *v, void *vs, off_t off, int prot);
int (*alloc_screen)(void *,
const struct wsscreen_descr *, void **,

View File

@ -1,4 +1,4 @@
.\" $NetBSD: wskbd.9,v 1.12 2005/12/20 19:53:15 rpaulo Exp $
.\" $NetBSD: wskbd.9,v 1.13 2007/03/07 00:41:18 dogcow Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -87,7 +87,7 @@ It has the following members:
.Bd -literal
int (*enable)(void *, int);
void (*set_leds)(void *, int);
int (*ioctl)(void *v, u_long cmd, caddr_t data,
int (*ioctl)(void *v, u_long cmd, void *data,
int flag, struct lwp *l);
.Ed
.Pp

View File

@ -1,4 +1,4 @@
.\" $NetBSD: wsmouse.9,v 1.14 2006/11/19 00:20:02 wiz Exp $
.\" $NetBSD: wsmouse.9,v 1.15 2007/03/07 00:41:19 dogcow Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -71,7 +71,7 @@ child device.
It has the following members:
.Bd -literal
int (*enable)(void *);
int (*ioctl)(void *v, u_long cmd, caddr_t data,
int (*ioctl)(void *v, u_long cmd, void *data,
int flag, struct lwp *l);
void (*disable)(void *);
.Ed