From fd18408b9a4d9c0b69bff9f0663b85561c8c99d8 Mon Sep 17 00:00:00 2001 From: perry Date: Mon, 26 Dec 2005 19:40:14 +0000 Subject: [PATCH] u_intN_t -> uintN_t --- lib/libarch/i386/i386_pmc_info.2 | 16 ++-- lib/libc/db/man/hash.3 | 4 +- lib/libc/gen/arc4random.3 | 4 +- lib/libc/gen/bswap.3 | 14 +-- lib/libc/gen/randomid.3 | 6 +- lib/libc/hash/rmd160/rmd160.3 | 4 +- lib/libc/hash/sha1/sha1.3 | 4 +- lib/libc/hash/sha2/sha2.3 | 32 +++---- lib/libc/inet/inet6_option_space.3 | 10 +- lib/libc/net/inet6_option_space.3 | 10 +- lib/libc/net/nsdispatch.3 | 4 +- lib/libc/net/rcmd.3 | 4 +- lib/libc/rpc/rpc.3 | 12 +-- lib/libc/sys/getdents.2 | 8 +- lib/libc/sys/stat.2 | 6 +- lib/libradius/libradius.3 | 10 +- share/man/man4/agp.4 | 12 +-- share/man/man4/atalk.4 | 6 +- share/man/man4/bpf.4 | 18 ++-- share/man/man4/envsys.4 | 10 +- share/man/man4/icmp6.4 | 14 +-- share/man/man4/ieee80211.4 | 4 +- share/man/man4/ip6.4 | 32 +++---- share/man/man4/man4.dreamcast/maple.4 | 14 +-- share/man/man4/radio.4 | 8 +- share/man/man4/rnd.4 | 30 +++--- share/man/man4/st.4 | 10 +- share/man/man4/systrace.4 | 8 +- share/man/man4/usb.4 | 24 ++--- share/man/man5/core.5 | 14 +-- share/man/man5/dir.5 | 8 +- share/man/man5/fs.5 | 6 +- share/man/man5/types.5 | 18 ++-- share/man/man9/arc4random.9 | 4 +- share/man/man9/bus_space.9 | 106 +++++++++++----------- share/man/man9/cred.9 | 6 +- share/man/man9/disk.9 | 12 +-- share/man/man9/ethersubr.9 | 8 +- share/man/man9/evcnt.9 | 4 +- share/man/man9/humanize_number.9 | 6 +- share/man/man9/ioasic.9 | 4 +- share/man/man9/isapnp.9 | 14 +-- share/man/man9/man9.i386/bios32_service.9 | 4 +- share/man/man9/pcmcia.9 | 18 ++-- share/man/man9/ppi.9 | 6 +- share/man/man9/rnd.9 | 14 +-- share/man/man9/scsipi.9 | 10 +- share/man/man9/ucom.9 | 10 +- share/man/man9/usbdi.9 | 44 ++++----- share/man/man9/wdc.9 | 22 ++--- 50 files changed, 338 insertions(+), 338 deletions(-) diff --git a/lib/libarch/i386/i386_pmc_info.2 b/lib/libarch/i386/i386_pmc_info.2 index b965bba47f4b..ebd010a68b6a 100644 --- a/lib/libarch/i386/i386_pmc_info.2 +++ b/lib/libarch/i386/i386_pmc_info.2 @@ -1,4 +1,4 @@ -.\" $NetBSD: i386_pmc_info.2,v 1.9 2003/06/27 11:51:07 wiz Exp $ +.\" $NetBSD: i386_pmc_info.2,v 1.10 2005/12/26 19:40:14 perry Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -104,11 +104,11 @@ has the following structure: .Bd -literal struct i386_pmc_startstop_args { int counter; - u_int64_t val; - u_int8_t event; - u_int8_t unit; - u_int8_t compare; - u_int8_t flags; + uint64_t val; + uint8_t event; + uint8_t unit; + uint8_t compare; + uint8_t flags; }; .Ed .Pp @@ -143,8 +143,8 @@ having the following structure: .Bd -literal struct i386_pmc_read_args { int counter; - u_int64_t val; - u_int64_t time; + uint64_t val; + uint64_t time; }; .Ed .Pp diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3 index ac3de1e3f9a9..5a821304b2c7 100644 --- a/lib/libc/db/man/hash.3 +++ b/lib/libc/db/man/hash.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: hash.3,v 1.10 2003/08/07 16:42:43 agc Exp $ +.\" $NetBSD: hash.3,v 1.11 2005/12/26 19:40:14 perry Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -60,7 +60,7 @@ typedef struct { u_int ffactor; u_int nelem; u_int cachesize; - u_int32_t (*hash)(const void *, size_t); + uint32_t (*hash)(const void *, size_t); int lorder; } HASHINFO; .Ed diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3 index a66b42ae1303..702ad788d0dc 100644 --- a/lib/libc/gen/arc4random.3 +++ b/lib/libc/gen/arc4random.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: arc4random.3,v 1.6 2003/04/16 13:34:35 wiz Exp $ +.\" $NetBSD: arc4random.3,v 1.7 2005/12/26 19:40:14 perry Exp $ .\" $OpenBSD: arc4random.3,v 1.17 2000/12/21 14:07:41 aaron Exp $ .\" .\" Copyright 1997 Niels Provos @@ -43,7 +43,7 @@ .Lb libc .Sh SYNOPSIS .In stdlib.h -.Ft u_int32_t +.Ft uint32_t .Fn arc4random "void" .Ft void .Fn arc4random_stir "void" diff --git a/lib/libc/gen/bswap.3 b/lib/libc/gen/bswap.3 index 13d8a046309c..dc074e6f747d 100644 --- a/lib/libc/gen/bswap.3 +++ b/lib/libc/gen/bswap.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: bswap.3,v 1.9 2003/10/05 17:48:49 bouyer Exp $ +.\" $NetBSD: bswap.3,v 1.10 2005/12/26 19:40:14 perry Exp $ .\" .\" Copyright (c) 1998 Manuel Bouyer. .\" @@ -37,12 +37,12 @@ .Sh SYNOPSIS .In sys/types.h .In machine/bswap.h -.Ft u_int16_t -.Fn bswap16 "u_int16_t" -.Ft u_int32_t -.Fn bswap32 "u_int32_t" -.Ft u_int64_t -.Fn bswap64 "u_int64_t" +.Ft uint16_t +.Fn bswap16 "uint16_t" +.Ft uint32_t +.Fn bswap32 "uint32_t" +.Ft uint64_t +.Fn bswap64 "uint64_t" .Sh DESCRIPTION The .Fn bswap16 , diff --git a/lib/libc/gen/randomid.3 b/lib/libc/gen/randomid.3 index be16d9a2a397..4713e066cd5d 100644 --- a/lib/libc/gen/randomid.3 +++ b/lib/libc/gen/randomid.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: randomid.3,v 1.5 2003/12/10 05:22:18 itojun Exp $ +.\" $NetBSD: randomid.3,v 1.6 2005/12/26 19:40:14 perry Exp $ .\" .\" Copyright (C) 2003 WIDE Project. .\" All rights reserved. @@ -38,7 +38,7 @@ .Sh SYNOPSIS .In sys/types.h .In randomid.h -.Ft u_int32_t +.Ft uint32_t .Fn randomid "randomid_t ctx" .Ft randomid_t .Fn randomid_new "int bits" "long timeo" @@ -113,7 +113,7 @@ It must not be shared among multiple data streams with different usage. #include \*[Lt]sys/types.h\*[Gt] #include \*[Lt]randomid.h\*[Gt] -u_int32_t +uint32_t genid(void) { static randomid_t ctx = NULL; diff --git a/lib/libc/hash/rmd160/rmd160.3 b/lib/libc/hash/rmd160/rmd160.3 index 32beeb3e63be..7af3f248d1d1 100644 --- a/lib/libc/hash/rmd160/rmd160.3 +++ b/lib/libc/hash/rmd160/rmd160.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: rmd160.3,v 1.1 2005/09/24 19:07:00 elad Exp $ +.\" $NetBSD: rmd160.3,v 1.2 2005/12/26 19:40:14 perry Exp $ .\" $OpenBSD: rmd160.3,v 1.12 2000/04/18 03:01:29 aaron Exp $ .\" .\" Copyright (c) 1997 Todd C. Miller @@ -51,7 +51,7 @@ .Ft void .Fn RMD160Final "u_char digest[20]" "RMD160_CTX *context" .Ft void -.Fn RMD160Transform "u_int32_t state[5]" "const u_int32_t block[16]" +.Fn RMD160Transform "uint32_t state[5]" "const uint32_t block[16]" .Ft "char *" .Fn RMD160End "RMD160_CTX *context" "char *buf" .Ft "char *" diff --git a/lib/libc/hash/sha1/sha1.3 b/lib/libc/hash/sha1/sha1.3 index 79cbb0d81777..c6446a0a9eb9 100644 --- a/lib/libc/hash/sha1/sha1.3 +++ b/lib/libc/hash/sha1/sha1.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: sha1.3,v 1.1 2005/09/24 19:07:00 elad Exp $ +.\" $NetBSD: sha1.3,v 1.2 2005/12/26 19:40:14 perry Exp $ .\" $OpenBSD: sha1.3,v 1.9 1998/03/07 22:18:12 millert Exp $ .\" .\" Copyright (c) 1997 Todd C. Miller @@ -52,7 +52,7 @@ .Ft void .Fn SHA1Final "u_char digest[20]" "SHA1_CTX *context" .Ft void -.Fn SHA1Transform "u_int32_t state[5]" "u_char buffer[64]" +.Fn SHA1Transform "uint32_t state[5]" "u_char buffer[64]" .Ft "char *" .Fn SHA1End "SHA1_CTX *context" "char *buf" .Ft "char *" diff --git a/lib/libc/hash/sha2/sha2.3 b/lib/libc/hash/sha2/sha2.3 index cf4eaf779aec..9e4fb0db52ae 100644 --- a/lib/libc/hash/sha2/sha2.3 +++ b/lib/libc/hash/sha2/sha2.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: sha2.3,v 1.3 2005/11/22 10:12:23 tron Exp $ +.\" $NetBSD: sha2.3,v 1.4 2005/12/26 19:40:15 perry Exp $ .\" $OpenBSD: sha2.3,v 1.11 2004/06/22 01:57:29 jfb Exp $ .\" .\" Copyright (c) 2003, 2004 Todd C. Miller @@ -41,13 +41,13 @@ .Ft void .Fn SHA256_Init "SHA256_CTX *context" .Ft void -.Fn SHA256_Update "SHA256_CTX *context" "const u_int8_t *data" "size_t len" +.Fn SHA256_Update "SHA256_CTX *context" "const uint8_t *data" "size_t len" .Ft void .Fn SHA256_Pad "SHA256_CTX *context" .Ft void -.Fn SHA256_Final "u_int8_t digest[SHA256_DIGEST_LENGTH]" "SHA256_CTX *context" +.Fn SHA256_Final "uint8_t digest[SHA256_DIGEST_LENGTH]" "SHA256_CTX *context" .Ft void -.Fn SHA256_Transform "u_int32_t state[8]" "const u_int8_t buffer[SHA256_BLOCK_LENGTH]" +.Fn SHA256_Transform "uint32_t state[8]" "const uint8_t buffer[SHA256_BLOCK_LENGTH]" .Ft "char *" .Fn SHA256_End "SHA256_CTX *context" "char *buf" .Ft "char *" @@ -55,17 +55,17 @@ .Ft "char *" .Fn SHA256_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length" .Ft "char *" -.Fn SHA256_Data "u_int8_t *data" "size_t len" "char *buf" +.Fn SHA256_Data "uint8_t *data" "size_t len" "char *buf" .Ft void .Fn SHA384_Init "SHA384_CTX *context" .Ft void -.Fn SHA384_Update "SHA384_CTX *context" "const u_int8_t *data" "size_t len" +.Fn SHA384_Update "SHA384_CTX *context" "const uint8_t *data" "size_t len" .Ft void .Fn SHA384_Pad "SHA384_CTX *context" .Ft void -.Fn SHA384_Final "u_int8_t digest[SHA384_DIGEST_LENGTH]" "SHA384_CTX *context" +.Fn SHA384_Final "uint8_t digest[SHA384_DIGEST_LENGTH]" "SHA384_CTX *context" .Ft void -.Fn SHA384_Transform "u_int64_t state[8]" "const u_int8_t buffer[SHA384_BLOCK_LENGTH]" +.Fn SHA384_Transform "uint64_t state[8]" "const uint8_t buffer[SHA384_BLOCK_LENGTH]" .Ft "char *" .Fn SHA384_End "SHA384_CTX *context" "char *buf" .Ft "char *" @@ -73,17 +73,17 @@ .Ft "char *" .Fn SHA384_FileChunk "char *filename" "char *buf" "off_t offset" "off_t length" .Ft "char *" -.Fn SHA384_Data "u_int8_t *data" "size_t len" "char *buf" +.Fn SHA384_Data "uint8_t *data" "size_t len" "char *buf" .Ft void .Fn SHA512_Init "SHA512_CTX *context" .Ft void -.Fn SHA512_Update "SHA512_CTX *context" "const u_int8_t *data" "size_t len" +.Fn SHA512_Update "SHA512_CTX *context" "const uint8_t *data" "size_t len" .Ft void .Fn SHA512_Pad "SHA512_CTX *context" .Ft void -.Fn SHA512_Final "u_int8_t digest[SHA512_DIGEST_LENGTH]" "SHA512_CTX *context" +.Fn SHA512_Final "uint8_t digest[SHA512_DIGEST_LENGTH]" "SHA512_CTX *context" .Ft void -.Fn SHA512_Transform "u_int64_t state[8]" "const u_int8_t buffer[SHA512_BLOCK_LENGTH]" +.Fn SHA512_Transform "uint64_t state[8]" "const uint8_t buffer[SHA512_BLOCK_LENGTH]" .Ft "char *" .Fn SHA512_End "SHA512_CTX *context" "char *buf" .Ft "char *" @@ -91,7 +91,7 @@ .Ft "char *" .Fn SHA512_FileChunk "char *filename" "char *buf" "off_t offset" "off_t length" .Ft "char *" -.Fn SHA512_Data "u_int8_t *data" "size_t len" "char *buf" +.Fn SHA512_Data "uint8_t *data" "size_t len" "char *buf" .Sh DESCRIPTION The SHA2 functions implement the NIST Secure Hash Standard, FIPS PUB 180-2. @@ -225,14 +225,14 @@ which is .Dq 0xba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad . .Bd -literal -offset indent SHA256_CTX ctx; -u_int8_t results[SHA256_DIGEST_LENGTH]; +uint8_t results[SHA256_DIGEST_LENGTH]; char *buf; int n; buf = "abc"; n = strlen(buf); SHA256_Init(\*[Am]ctx); -SHA256_Update(\*[Am]ctx, (u_int8_t *)buf, n); +SHA256_Update(\*[Am]ctx, (uint8_t *)buf, n); SHA256_Final(results, \*[Am]ctx); /* Print the digest as one long hex value */ @@ -245,7 +245,7 @@ putchar('\en'); Alternately, the helper functions could be used in the following way: .Bd -literal -offset indent SHA256_CTX ctx; -u_int8_t output[SHA256_DIGEST_STRING_LENGTH]; +uint8_t output[SHA256_DIGEST_STRING_LENGTH]; char *buf = "abc"; printf("0x%s\en", SHA256_Data(buf, strlen(buf), output)); diff --git a/lib/libc/inet/inet6_option_space.3 b/lib/libc/inet/inet6_option_space.3 index 7f1c20516b18..a89ed5da50fd 100644 --- a/lib/libc/inet/inet6_option_space.3 +++ b/lib/libc/inet/inet6_option_space.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: inet6_option_space.3,v 1.1 2004/05/20 23:13:02 christos Exp $ +.\" $NetBSD: inet6_option_space.3,v 1.2 2005/12/26 19:40:15 perry Exp $ .\" $KAME: inet6_option_space.3,v 1.7 2000/05/17 14:32:13 itojun Exp $ .\" .\" Copyright (c) 1983, 1987, 1991, 1993 @@ -48,13 +48,13 @@ .Ft "int" .Fn inet6_option_init "void *bp" "struct cmsghdr **cmsgp" "int type" .Ft "int" -.Fn inet6_option_append "struct cmsghdr *cmsg" "const u_int8_t *typep" "int multx" "int plusy" -.Ft "u_int8_t *" +.Fn inet6_option_append "struct cmsghdr *cmsg" "const uint8_t *typep" "int multx" "int plusy" +.Ft "uint8_t *" .Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy" .Ft "int" -.Fn inet6_option_next "const struct cmsghdr *cmsg" "u_int8_t **tptrp" +.Fn inet6_option_next "const struct cmsghdr *cmsg" "uint8_t **tptrp" .Ft "int" -.Fn inet6_option_find "const struct cmsghdr *cmsg" "u_int8_t **tptrp" "int type" +.Fn inet6_option_find "const struct cmsghdr *cmsg" "uint8_t **tptrp" "int type" .\" .Sh DESCRIPTION .\" diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3 index ef1ee584f3df..1b2490ab676f 100644 --- a/lib/libc/net/inet6_option_space.3 +++ b/lib/libc/net/inet6_option_space.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: inet6_option_space.3,v 1.15 2004/12/20 18:30:26 christos Exp $ +.\" $NetBSD: inet6_option_space.3,v 1.16 2005/12/26 19:40:15 perry Exp $ .\" $KAME: inet6_option_space.3,v 1.7 2000/05/17 14:32:13 itojun Exp $ .\" .\" Copyright (c) 1983, 1987, 1991, 1993 @@ -48,13 +48,13 @@ .Ft "int" .Fn inet6_option_init "void *bp" "struct cmsghdr **cmsgp" "int type" .Ft "int" -.Fn inet6_option_append "struct cmsghdr *cmsg" "const u_int8_t *typep" "int multx" "int plusy" -.Ft "u_int8_t *" +.Fn inet6_option_append "struct cmsghdr *cmsg" "const uint8_t *typep" "int multx" "int plusy" +.Ft "uint8_t *" .Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy" .Ft "int" -.Fn inet6_option_next "const struct cmsghdr *cmsg" "u_int8_t **tptrp" +.Fn inet6_option_next "const struct cmsghdr *cmsg" "uint8_t **tptrp" .Ft "int" -.Fn inet6_option_find "const struct cmsghdr *cmsg" "u_int8_t **tptrp" "int type" +.Fn inet6_option_find "const struct cmsghdr *cmsg" "uint8_t **tptrp" "int type" .\" .Sh DESCRIPTION .\" diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3 index 6eccec1deab2..95b760014073 100644 --- a/lib/libc/net/nsdispatch.3 +++ b/lib/libc/net/nsdispatch.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: nsdispatch.3,v 1.22 2004/09/29 09:20:19 wiz Exp $ +.\" $NetBSD: nsdispatch.3,v 1.23 2005/12/26 19:40:15 perry Exp $ .\" .\" Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -137,7 +137,7 @@ structures, which have the following format: .Bd -literal -offset indent typedef struct { const char *src; - u_int32_t flags; + uint32_t flags; } ns_src; .Ed .Pp diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3 index 2aa95c291c8a..229b3a3ca27a 100644 --- a/lib/libc/net/rcmd.3 +++ b/lib/libc/net/rcmd.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: rcmd.3,v 1.26 2005/03/31 15:45:53 christos Exp $ +.\" $NetBSD: rcmd.3,v 1.27 2005/12/26 19:40:15 perry Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -60,7 +60,7 @@ .Ft int .Fn rresvport_af "int *port" "int family" .Ft int -.Fn iruserok "u_int32_t raddr" "int superuser" "const char *ruser" "const char *luser" +.Fn iruserok "uint32_t raddr" "int superuser" "const char *ruser" "const char *luser" .Ft int .Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser" .Ft int diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3 index 1f29ca2e6709..9d2362889155 100644 --- a/lib/libc/rpc/rpc.3 +++ b/lib/libc/rpc/rpc.3 @@ -1,6 +1,6 @@ .\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4 .\" Copyright 1989 AT&T -.\" $NetBSD: rpc.3,v 1.18 2003/06/27 15:33:24 wiz Exp $ +.\" $NetBSD: rpc.3,v 1.19 2005/12/26 19:40:15 perry Exp $ .Dd May 7, 1993 .Dt RPC 3 .Os @@ -117,11 +117,11 @@ file. .Ss Derived Types The derived types used in the RPC interfaces are defined as follows: .Bd -literal - typedef u_int32_t rpcprog_t; - typedef u_int32_t rpcvers_t; - typedef u_int32_t rpcproc_t; - typedef u_int32_t rpcprot_t; - typedef u_int32_t rpcport_t; + typedef uint32_t rpcprog_t; + typedef uint32_t rpcvers_t; + typedef uint32_t rpcproc_t; + typedef uint32_t rpcprot_t; + typedef uint32_t rpcport_t; typedef int32_t rpc_inline_t; .Ed .Ss Data Structures diff --git a/lib/libc/sys/getdents.2 b/lib/libc/sys/getdents.2 index 704a2bb09c70..44eda3a97b2f 100644 --- a/lib/libc/sys/getdents.2 +++ b/lib/libc/sys/getdents.2 @@ -1,4 +1,4 @@ -.\" $NetBSD: getdents.2,v 1.17 2005/09/05 21:58:38 yamt Exp $ +.\" $NetBSD: getdents.2,v 1.18 2005/12/26 19:40:15 perry Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -66,9 +66,9 @@ The data in the buffer is a series of structures each containing the following entries: .Bd -literal -offset indent ino_t d_fileno; -u_int16_t d_reclen; -u_int16_t d_namlen; -u_int8_t d_type; +uint16_t d_reclen; +uint16_t d_namlen; +uint8_t d_type; char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2 index 95b71c54a6b2..b367e6d24177 100644 --- a/lib/libc/sys/stat.2 +++ b/lib/libc/sys/stat.2 @@ -1,4 +1,4 @@ -.\" $NetBSD: stat.2,v 1.34 2005/06/14 12:10:02 peter Exp $ +.\" $NetBSD: stat.2,v 1.35 2005/12/26 19:40:15 perry Exp $ .\" .\" Copyright (c) 1980, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -106,8 +106,8 @@ struct stat { off_t st_size; /* file size, in bytes */ blkcnt_t st_blocks; /* blocks allocated for file */ blksize_t st_blksize; /* optimal file sys I/O ops blocksize */ - u_int32_t st_flags; /* user defined flags for file */ - u_int32_t st_gen; /* file generation number */ + uint32_t st_flags; /* user defined flags for file */ + uint32_t st_gen; /* file generation number */ #if defined(_NETBSD_SOURCE) struct timespec st_birthtimespec; /* time of inode creation */ #else diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3 index 79b33f474823..b86c0c8e185c 100644 --- a/lib/libradius/libradius.3 +++ b/lib/libradius/libradius.3 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: /repoman/r/ncvs/src/lib/libradius/libradius.3,v 1.17 2004/04/27 15:00:29 ru Exp $ -.\" $NetBSD: libradius.3,v 1.1.1.1 2005/02/19 23:56:31 manu Exp $ +.\" $NetBSD: libradius.3,v 1.2 2005/12/26 19:40:15 perry Exp $ .\" .Dd April 27, 2004 .Dt LIBRADIUS 3 @@ -49,14 +49,14 @@ .Fn rad_create_request "struct rad_handle *h" "int code" .Ft "struct in_addr" .Fn rad_cvt_addr "const void *data" -.Ft u_int32_t +.Ft uint32_t .Fn rad_cvt_int "const void *data" .Ft char * .Fn rad_cvt_string "const void *data" "size_t len" .Ft int .Fn rad_get_attr "struct rad_handle *h" "const void **data" "size_t *len" .Ft int -.Fn rad_get_vendor_attr "u_int32_t *vendor" "const void **data" "size_t *len" +.Fn rad_get_vendor_attr "uint32_t *vendor" "const void **data" "size_t *len" .Ft int .Fn rad_init_send_request "struct rad_handle *h" "int *fd" "struct timeval *tv" .Ft int @@ -64,7 +64,7 @@ .Ft int .Fn rad_put_attr "struct rad_handle *h" "int type" "const void *data" "size_t len" .Ft int -.Fn rad_put_int "struct rad_handle *h" "int type" "u_int32_t value" +.Fn rad_put_int "struct rad_handle *h" "int type" "uint32_t value" .Ft int .Fn rad_put_string "struct rad_handle *h" "int type" "const char *str" .Ft int @@ -74,7 +74,7 @@ .Ft int .Fn rad_put_vendor_attr "struct rad_handle *h" "int vendor" "int type" "const void *data" "size_t len" .Ft int -.Fn rad_put_vendor_int "struct rad_handle *h" "int vendor" "int type" "u_int32_t value" +.Fn rad_put_vendor_int "struct rad_handle *h" "int vendor" "int type" "uint32_t value" .Ft int .Fn rad_put_vendor_string "struct rad_handle *h" "int vendor" "int type" "const char *str" .Ft ssize_t diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4 index 2b497ac61d22..9dbef50e4c98 100644 --- a/share/man/man4/agp.4 +++ b/share/man/man4/agp.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: agp.4,v 1.10 2003/05/14 07:59:00 wiz Exp $ +.\" $NetBSD: agp.4,v 1.11 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -89,8 +89,8 @@ structure as defined in \*[Lt]sys/agpio.h\*[Gt]: .Bd -literal typedef struct _agp_info { agp_version version; /* version of the driver */ - u_int32_t bridge_id; /* bridge vendor/device */ - u_int32_t agp_mode; /* mode info of bridge */ + uint32_t bridge_id; /* bridge vendor/device */ + uint32_t agp_mode; /* mode info of bridge */ off_t aper_base; /* base of aperture */ size_t aper_size; /* size of aperture */ size_t pg_total; /* max pages (swap + system) */ @@ -108,7 +108,7 @@ Set up AGP, using the members in the structure as defined in \*[Lt]sys/agpio.h\*[Gt]: .Bd -literal typedef struct _agp_setup { - u_int32_t agp_mode; /* mode info of bridge */ + uint32_t agp_mode; /* mode info of bridge */ } agp_setup; .Ed .It Dv AGPIOC_ALLOCATE @@ -119,7 +119,7 @@ structure as defined in \*[Lt]sys/agpio.h\*[Gt]: typedef struct _agp_allocate { int key; /* tag of allocation */ size_t pg_count; /* number of pages */ - u_int32_t type; /* 0 == normal, other devspec */ + uint32_t type; /* 0 == normal, other devspec */ paddr_t physical; /* device specific (some devices * need a phys address of the * actual page behind the gatt @@ -145,7 +145,7 @@ structure as defined in \*[Lt]sys/agpio.h\*[Gt]: .Bd -literal typedef struct _agp_unbind { int key; /* tag of allocation */ - u_int32_t priority; /* priority for paging out */ + uint32_t priority; /* priority for paging out */ } agp_unbind; .Ed .El diff --git a/share/man/man4/atalk.4 b/share/man/man4/atalk.4 index 38819f5b8538..85a35670c862 100644 --- a/share/man/man4/atalk.4 +++ b/share/man/man4/atalk.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: atalk.4,v 1.17 2004/05/11 22:42:47 wiz Exp $ +.\" $NetBSD: atalk.4,v 1.18 2005/12/26 19:48:12 perry Exp $ .\" .\" This file is derived from the atalk.4 man page in the Netatalk 1.4b2 .\" distribution. That distribution is covered by the following copyright: @@ -72,9 +72,9 @@ Sockets in the AppleTalk protocol family use the following address structure: .Bd -literal -offset indent struct sockaddr_at { - u_int8_t sat_len; + uint8_t sat_len; sa_family_t sat_family; - u_int8_t sat_port; + uint8_t sat_port; struct at_addr sat_addr; union { struct netrange r_netrange; diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index e48b5f659255..02b4aca509d2 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -1,6 +1,6 @@ .\" -*- nroff -*- .\" -.\" $NetBSD: bpf.4,v 1.35 2005/12/14 22:50:07 rpaulo Exp $ +.\" $NetBSD: bpf.4,v 1.36 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1990, 1991, 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -209,10 +209,10 @@ indicating no timeout. Returns the following structure of packet statistics: .Bd -literal -offset indent struct bpf_stat { - u_int64_t bs_recv; - u_int64_t bs_drop; - u_int64_t bs_capt; - u_int64_t bs_padding[13]; + uint64_t bs_recv; + uint64_t bs_drop; + uint64_t bs_capt; + uint64_t bs_padding[13]; }; .Ed .Pp @@ -346,9 +346,9 @@ The following structure is prepended to each packet returned by .Bd -literal -offset indent struct bpf_hdr { struct timeval bh_tstamp; - u_int32_t bh_caplen; - u_int32_t bh_datalen; - u_int16_t bh_hdrlen; + uint32_t bh_caplen; + uint32_t bh_datalen; + uint16_t bh_hdrlen; }; .Ed .Pp @@ -420,7 +420,7 @@ and implicit program counter. The following structure defines the instruction format: .Bd -literal -offset indent struct bpf_insn { - u_int16_t code; + uint16_t code; u_char jt; u_char jf; int32_t k; diff --git a/share/man/man4/envsys.4 b/share/man/man4/envsys.4 index 0def326807c8..d25c69281501 100644 --- a/share/man/man4/envsys.4 +++ b/share/man/man4/envsys.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: envsys.4,v 1.16 2004/05/11 22:55:00 wiz Exp $ +.\" $NetBSD: envsys.4,v 1.17 2005/12/26 19:48:12 perry Exp $ .\" .\" .\" Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -150,13 +150,13 @@ This command makes use of: typedef struct envsys_tre_data { u_int sensor; union { /* all data is given */ - u_int32_t data_us; /* in microKelvins, */ + uint32_t data_us; /* in microKelvins, */ int32_t data_s; /* rpms, volts, amps, */ } cur, min, max, avg; /* ohms, watts, etc */ /* see units below */ - u_int32_t warnflags; /* warning flags */ - u_int32_t validflags; /* sensor valid flags */ + uint32_t warnflags; /* warning flags */ + uint32_t validflags; /* sensor valid flags */ u_int units; /* type of sensor */ } envsys_tre_data_t; .Ed @@ -233,7 +233,7 @@ typedef struct envsys_basic_info { char desc[33]; /* sensor description */ u_int rfact; /* for volts, (int)(factor x 10^4) */ u_int rpms; /* for fans */ - u_int32_t validflags; /* sensor valid flags */ + uint32_t validflags; /* sensor valid flags */ } envsys_basic_info_t; .Ed .Pp diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4 index 28b1325d11b3..7cf106d472d5 100644 --- a/share/man/man4/icmp6.4 +++ b/share/man/man4/icmp6.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: icmp6.4,v 1.13 2005/01/11 06:01:41 itojun Exp $ +.\" $NetBSD: icmp6.4,v 1.14 2005/12/26 19:48:12 perry Exp $ .\" $KAME: icmp6.4,v 1.6 2004/12/27 05:30:56 itojun Exp $ .\" $OpenBSD: icmp6.4,v 1.19 2004/12/23 20:33:03 jaredy Exp $ .\" @@ -138,13 +138,13 @@ This header corresponds to the structure and has the following definition: .Bd -literal -offset indent struct icmp6_hdr { - u_int8_t icmp6_type; /* type field */ - u_int8_t icmp6_code; /* code field */ - u_int16_t icmp6_cksum; /* checksum field */ + uint8_t icmp6_type; /* type field */ + uint8_t icmp6_code; /* code field */ + uint16_t icmp6_cksum; /* checksum field */ union { - u_int32_t icmp6_un_data32[1]; /* type-specific */ - u_int16_t icmp6_un_data16[2]; /* type-specific */ - u_int8_t icmp6_un_data8[4]; /* type-specific */ + uint32_t icmp6_un_data32[1]; /* type-specific */ + uint16_t icmp6_un_data16[2]; /* type-specific */ + uint8_t icmp6_un_data8[4]; /* type-specific */ } icmp6_dataun; } __packed; diff --git a/share/man/man4/ieee80211.4 b/share/man/man4/ieee80211.4 index 46d60f2eb5fe..a44a5b2f33b6 100644 --- a/share/man/man4/ieee80211.4 +++ b/share/man/man4/ieee80211.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: ieee80211.4,v 1.2 2005/04/25 12:28:10 wiz Exp $ +.\" $NetBSD: ieee80211.4,v 1.3 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2001 .\" The Aerospace Corporation. All rights reserved. @@ -64,7 +64,7 @@ This structure is defined as follows: .Bd -literal struct ieee80211req { char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */ - u_int16_t i_type; /* req type */ + uint16_t i_type; /* req type */ int16_t i_val; /* Index or simple value */ int16_t i_len; /* Index or simple value */ void *i_data; /* Extra data */ diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4 index 25df62c8eac8..dd22b8a619cf 100644 --- a/share/man/man4/ip6.4 +++ b/share/man/man4/ip6.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: ip6.4,v 1.20 2005/01/11 06:01:41 itojun Exp $ +.\" $NetBSD: ip6.4,v 1.21 2005/12/26 19:48:12 perry 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 $ .\" @@ -73,12 +73,12 @@ The header has the following definition: struct ip6_hdr { union { struct ip6_hdrctl { - u_int32_t ip6_un1_flow; /* 20 bits of flow ID */ - u_int16_t ip6_un1_plen; /* payload length */ - u_int8_t ip6_un1_nxt; /* next header */ - u_int8_t ip6_un1_hlim; /* hop limit */ + uint32_t ip6_un1_flow; /* 20 bits of flow ID */ + uint16_t ip6_un1_plen; /* payload length */ + uint8_t ip6_un1_nxt; /* next header */ + uint8_t ip6_un1_hlim; /* hop limit */ } ip6_un1; - u_int8_t ip6_un2_vfc; /* version and class */ + uint8_t ip6_un2_vfc; /* version and class */ } ip6_ctlun; struct in6_addr ip6_src; /* source address */ struct in6_addr ip6_dst; /* destination address */ @@ -119,8 +119,8 @@ The IPv6 header may be followed by any number of extension headers that start with the following generic definition: .Bd -literal -offset indent struct ip6_ext { - u_int8_t ip6e_nxt; - u_int8_t ip6e_len; + uint8_t ip6e_nxt; + uint8_t ip6e_len; } __packed; .Ed .Ss Options @@ -279,8 +279,8 @@ The option is stored in the following structure in the ancillary data returned: .Bd -literal struct ip6_hbh { - u_int8_t ip6h_nxt; /* next header */ - u_int8_t ip6h_len; /* length in units of 8 octets */ + uint8_t ip6h_nxt; /* next header */ + uint8_t ip6h_len; /* length in units of 8 octets */ /* followed by options */ } __packed; .Ed @@ -299,8 +299,8 @@ The option is stored in the following structure in the ancillary data returned: .Bd -literal struct ip6_dest { - u_int8_t ip6d_nxt; /* next header */ - u_int8_t ip6d_len; /* length in units of 8 octets */ + uint8_t ip6d_nxt; /* next header */ + uint8_t ip6d_len; /* length in units of 8 octets */ /* followed by options */ } __packed; .Ed @@ -319,10 +319,10 @@ The header is stored in the following structure in the ancillary data returned: .Bd -literal struct ip6_rthdr { - u_int8_t ip6r_nxt; /* next header */ - u_int8_t ip6r_len; /* length in units of 8 octets */ - u_int8_t ip6r_type; /* routing type */ - u_int8_t ip6r_segleft; /* segments left */ + uint8_t ip6r_nxt; /* next header */ + uint8_t ip6r_len; /* length in units of 8 octets */ + uint8_t ip6r_type; /* routing type */ + uint8_t ip6r_segleft; /* segments left */ /* followed by routing-type-specific data */ } __packed; .Ed diff --git a/share/man/man4/man4.dreamcast/maple.4 b/share/man/man4/man4.dreamcast/maple.4 index 6f435210ea14..96bedc990500 100644 --- a/share/man/man4/man4.dreamcast/maple.4 +++ b/share/man/man4/man4.dreamcast/maple.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: maple.4,v 1.3 2003/06/27 18:19:29 wiz Exp $ +.\" $NetBSD: maple.4,v 1.4 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,14 +57,14 @@ calls apply to Maple bus devices. Read, from the kernel, the device information of the device. .Bd -literal -offset indent struct maple_devinfo { - u_int32_t di_func; - u_int32_t di_function_data[3]; - u_int8_t di_area_code; - u_int8_t di_connector_direction; + uint32_t di_func; + uint32_t di_function_data[3]; + uint8_t di_area_code; + uint8_t di_connector_direction; char di_product_name[30]; char di_product_license[60]; - u_int16_t di_standby_power; - u_int16_t di_max_power; + uint16_t di_standby_power; + uint16_t di_max_power; }; .Ed .El diff --git a/share/man/man4/radio.4 b/share/man/man4/radio.4 index 6ba3c0dcc23b..4fbac46d6f35 100644 --- a/share/man/man4/radio.4 +++ b/share/man/man4/radio.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: radio.4,v 1.10 2003/12/16 11:31:04 wiz Exp $ +.\" $NetBSD: radio.4,v 1.11 2005/12/26 19:48:12 perry Exp $ .\" $RuOBSD: radio.4,v 1.4 2001/10/26 05:38:43 form Exp $ .\" $OpenBSD: radio.4,v 1.3 2001/12/05 10:58:54 mickey Exp $ .\" @@ -72,8 +72,8 @@ struct radio_info { int stereo; int rfreq; /* reference frequency */ int lock; /* locking field strength */ - u_int32_t freq; /* in kHz */ - u_int32_t caps; /* card capabilities */ + uint32_t freq; /* in kHz */ + uint32_t caps; /* card capabilities */ #define RADIO_CAPS_DETECT_STEREO (1\*[Lt]\*[Lt]0) #define RADIO_CAPS_DETECT_SIGNAL (1\*[Lt]\*[Lt]1) #define RADIO_CAPS_SET_MONO (1\*[Lt]\*[Lt]2) @@ -82,7 +82,7 @@ struct radio_info { #define RADIO_CAPS_REFERENCE_FREQ (1\*[Lt]\*[Lt]5) #define RADIO_CAPS_LOCK_SENSITIVITY (1\*[Lt]\*[Lt]6) #define RADIO_CARD_TYPE (0xFF\*[Lt]\*[Lt]16) - u_int32_t info; + uint32_t info; #define RADIO_INFO_STEREO (1\*[Lt]\*[Lt]0) #define RADIO_INFO_SIGNAL (1\*[Lt]\*[Lt]1) }; diff --git a/share/man/man4/rnd.4 b/share/man/man4/rnd.4 index f0759ddeae97..2031e333e560 100644 --- a/share/man/man4/rnd.4 +++ b/share/man/man4/rnd.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: rnd.4,v 1.11 2002/08/20 00:48:31 enami Exp $ +.\" $NetBSD: rnd.4,v 1.12 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1997 Michael Graff .\" All rights reserved. @@ -89,12 +89,12 @@ timing information and other state for that source. .Bd -literal -offset indent typedef struct { char name[16]; - u_int32_t last_time; - u_int32_t last_delta; - u_int32_t last_delta2; - u_int32_t total; - u_int32_t type; - u_int32_t flags; + uint32_t last_time; + uint32_t last_delta; + uint32_t last_delta2; + uint32_t total; + uint32_t type; + uint32_t flags; } rndsource_t; .Ed .Pp @@ -150,14 +150,14 @@ file, along with the data types and constants. .Pp .Bl -tag -width RNDADDTOENTCNT .It Dv RNDGETENTCNT -.Pq Li "u_int32_t" +.Pq Li "uint32_t" Return the current entropy count (in bits). .It Dv RNDGETSRCNUM .Pq Li "rndstat_t" .Bd -literal -offset indent typedef struct { - u_int32_t start; - u_int32_t count; + uint32_t start; + uint32_t count; rndsource_t source[RND_MAXSTATCOUNT]; } rndstat_t; .Ed @@ -186,9 +186,9 @@ Return the device state for a named device. .Bd -literal -offset indent typedef struct { char name[16]; - u_int32_t type; - u_int32_t flags; - u_int32_t mask; + uint32_t type; + uint32_t flags; + uint32_t mask; } rndctl_t; .Ed .Pp @@ -213,8 +213,8 @@ are to be set or cleared. .Pq Li "rnddata_t" .Bd -literal -offset indent typedef struct { - u_int32_t len; - u_int32_t entropy; + uint32_t len; + uint32_t entropy; u_char data[RND_POOLWORDS * 4]; } rnddata_t; .Ed diff --git a/share/man/man4/st.4 b/share/man/man4/st.4 index e9f541bad957..7291457de716 100644 --- a/share/man/man4/st.4 +++ b/share/man/man4/st.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: st.4,v 1.23 2003/06/27 18:46:33 wiz Exp $ +.\" $NetBSD: st.4,v 1.24 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1996 .\" Julian Elischer . All rights reserved. @@ -408,18 +408,18 @@ Enable or disable EARLY WARNING at EOM behaviour (using the count as a boolean value). .El .It Dv MTIOCRDSPOS -.Pq Li "u_int32_t" +.Pq Li "uint32_t" Read device logical block position. Not all drives support this option. .It Dv MTIOCRDHPOS -.Pq Li "u_int32_t" +.Pq Li "uint32_t" Read device hardware block position. Not all drives support this option. .It Dv MTIOCSLOCATE -.Pq Li "u_int32_t" +.Pq Li "uint32_t" Position the tape to the specified device logical block position. .It Dv MTIOCHLOCATE -.Pq Li "u_int32_t" +.Pq Li "uint32_t" Position the tape to the specified hardware block position. Not all drives support this option. .El diff --git a/share/man/man4/systrace.4 b/share/man/man4/systrace.4 index 06b83733c8a5..578857a1452a 100644 --- a/share/man/man4/systrace.4 +++ b/share/man/man4/systrace.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: systrace.4,v 1.12 2005/07/01 17:13:32 wiz Exp $ +.\" $NetBSD: systrace.4,v 1.13 2005/12/26 19:48:12 perry Exp $ .\" $OpenBSD: systrace.4,v 1.2 2002/06/03 15:44:17 mpech Exp $ .\" .\" Copyright (c) 2002 CubeSoft Communications, Inc. @@ -87,7 +87,7 @@ struct str_message { #define SYSTR_MSG_EXECVE 7 #define SYSTR_MSG_SCRIPTNAME 8 pid_t msg_pid; - u_int16_t msg_seqnr; /* answer has to match seqnr */ + uint16_t msg_seqnr; /* answer has to match seqnr */ int16_t msg_policy; union { struct str_msg_emul msg_emul; @@ -193,7 +193,7 @@ message what to do with a system call that was assigned a policy of .Bd -literal struct systrace_answer { pid_t stra_pid; /* PID of process being traced */ - u_int16_t stra_seqnr; + uint16_t stra_seqnr; int16_t reserved; uid_t stra_seteuid; gid_t stra_setegid; @@ -290,7 +290,7 @@ by the monitoring process. .Bd -literal struct systrace_replace { pid_t strr_pid; - u_int16_t strr_seqnr; + uint16_t strr_seqnr; int16_t reserved; int32_t strr_nrepl; /* # of arguments to replace */ caddr_t strr_base; /* Base user memory */ diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4 index 7320c97425cb..8dc0310c9763 100644 --- a/share/man/man4/usb.4 +++ b/share/man/man4/usb.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: usb.4,v 1.79 2005/09/10 22:25:58 wiz Exp $ +.\" $NetBSD: usb.4,v 1.80 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -311,28 +311,28 @@ be filled by information about the device on that address. Should no such device exist an error is reported. .Bd -literal struct usb_device_info { - u_int8_t udi_bus; - u_int8_t udi_addr; + uint8_t udi_bus; + uint8_t udi_addr; usb_event_cookie_t udi_cookie; char udi_product[USB_MAX_ENCODED_STRING_LEN]; char udi_vendor[USB_MAX_ENCODED_STRING_LEN]; char udi_release[8]; char udi_serial[USB_MAX_ENCODED_STRING_LEN]; - u_int16_t udi_productNo; - u_int16_t udi_vendorNo; - u_int16_t udi_releaseNo; - u_int8_t udi_class; - u_int8_t udi_subclass; - u_int8_t udi_protocol; - u_int8_t udi_config; - u_int8_t udi_speed; + uint16_t udi_productNo; + uint16_t udi_vendorNo; + uint16_t udi_releaseNo; + uint8_t udi_class; + uint8_t udi_subclass; + uint8_t udi_protocol; + uint8_t udi_config; + uint8_t udi_speed; #define USB_SPEED_LOW 1 #define USB_SPEED_FULL 2 #define USB_SPEED_HIGH 3 int udi_power; int udi_nports; char udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN]; - u_int8_t udi_ports[16]; + uint8_t udi_ports[16]; #define USB_PORT_ENABLED 0xff #define USB_PORT_SUSPENDED 0xfe #define USB_PORT_POWERED 0xfd diff --git a/share/man/man5/core.5 b/share/man/man5/core.5 index 52a0086b94f5..6f9bb1824d40 100644 --- a/share/man/man5/core.5 +++ b/share/man/man5/core.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: core.5,v 1.22 2005/05/24 21:29:16 nathanw Exp $ +.\" $NetBSD: core.5,v 1.23 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -267,12 +267,12 @@ each of the following core segment headers to allow for any machine dependent alignment requirements. .Bd -literal struct core { - u_int32_t c_midmag; /* magic, id, flags */ - u_int16_t c_hdrsize; /* Size of this header (machdep algn) */ - u_int16_t c_seghdrsize; /* Size of a segment header */ - u_int32_t c_nseg; /* # of core segments */ + uint32_t c_midmag; /* magic, id, flags */ + uint16_t c_hdrsize; /* Size of this header (machdep algn) */ + uint16_t c_seghdrsize; /* Size of a segment header */ + uint32_t c_nseg; /* # of core segments */ char c_name[MAXCOMLEN+1]; /* Copy of p-\*[Gt]p_comm */ - u_int32_t c_signo; /* Killing signal */ + uint32_t c_signo; /* Killing signal */ u_long c_ucode; /* Signal code */ u_long c_cpusize; /* Size of machine dependent segment */ u_long c_tsize; /* Size of traditional text segment */ @@ -331,7 +331,7 @@ segments, each of which is preceded with a segment header, .Fa struct coreseg : .Bd -literal struct coreseg { - u_int32_t c_midmag; /* magic, id, flags */ + uint32_t c_midmag; /* magic, id, flags */ u_long c_addr; /* Virtual address of segment */ u_long c_size; /* Size of this segment */ }; diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5 index 656a75799f97..2653bdb6da42 100644 --- a/share/man/man5/dir.5 +++ b/share/man/man5/dir.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: dir.5,v 1.18 2005/08/19 02:07:49 christos Exp $ +.\" $NetBSD: dir.5,v 1.19 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -87,9 +87,9 @@ The directory entry format is defined in the file struct dirent { ino_t d_fileno; /* file number of entry */ - u_int16_t d_reclen; /* length of this record */ - u_int8_t d_type; /* file type, see below */ - u_int8_t d_namlen; /* length of string in d_name */ + uint16_t d_reclen; /* length of this record */ + uint8_t d_type; /* file type, see below */ + uint8_t d_namlen; /* length of string in d_name */ #define MAXNAMLEN 511 char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ }; diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5 index 79d0a5962e80..e8e668e2705c 100644 --- a/share/man/man5/fs.5 +++ b/share/man/man5/fs.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: fs.5,v 1.16 2005/08/05 13:20:05 jmmv Exp $ +.\" $NetBSD: fs.5,v 1.17 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -141,7 +141,7 @@ struct fs { /* these fields retain the current block allocation info */ int32_t fs_cgrotor; /* last cg searched (UNUSED) */ void *fs_ocsp[NOCSPTRS];/* padding; was list of fs_cs buffers */ - u_int8_t *fs_contigdirs; /* # of contiguously allocated dirs */ + uint8_t *fs_contigdirs; /* # of contiguously allocated dirs */ struct csum *fs_csp; /* cg summary info buffer for fs_cs */ int32_t *fs_maxcluster; /* max cluster in each cyl group */ u_char *fs_active; /* used by snapshots to track fs */ @@ -168,7 +168,7 @@ struct fs { int32_t fs_contigsumsize; /* size of cluster summary array */ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ - u_int64_t fs_maxfilesize; /* maximum representable file size */ + uint64_t fs_maxfilesize; /* maximum representable file size */ int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ int32_t fs_state; /* validate fs_clean field (UNUSED) */ diff --git a/share/man/man5/types.5 b/share/man/man5/types.5 index cc6a14eee2c1..2159d54471ee 100644 --- a/share/man/man5/types.5 +++ b/share/man/man5/types.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: types.5,v 1.9 2003/08/07 10:31:17 agc Exp $ +.\" $NetBSD: types.5,v 1.10 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -64,29 +64,29 @@ typedef unsigned int uint; /* Sys V compatibility */ typedef unsigned long ulong; /* Sys V compatibility */ #endif -typedef u_int64_t u_quad_t; /* quads */ +typedef uint64_t u_quad_t; /* quads */ typedef int64_t quad_t; typedef quad_t * qaddr_t; typedef char * caddr_t; /* core address */ typedef int32_t daddr_t; /* disk address */ typedef int32_t dev_t; /* device number */ -typedef u_int32_t fixpt_t; /* fixed point number */ -typedef u_int32_t gid_t; /* group id */ -typedef u_int32_t ino_t; /* inode number */ +typedef uint32_t fixpt_t; /* fixed point number */ +typedef uint32_t gid_t; /* group id */ +typedef uint32_t ino_t; /* inode number */ typedef long key_t; /* IPC key (for Sys V IPC) */ -typedef u_int16_t mode_t; /* permissions */ -typedef u_int16_t nlink_t; /* link count */ +typedef uint16_t mode_t; /* permissions */ +typedef uint16_t nlink_t; /* link count */ typedef quad_t off_t; /* file offset */ typedef int32_t pid_t; /* process id */ typedef quad_t rlim_t; /* resource limit */ typedef int32_t segsz_t; /* segment size */ typedef int32_t swblk_t; /* swap offset */ -typedef u_int32_t uid_t; /* user id */ +typedef uint32_t uid_t; /* user id */ #if !defined(_POSIX_SOURCE) \*[Am]\*[Am] !defined(_XOPEN_SOURCE) /* Major, minor numbers, dev_t's. */ -#define major(x) ((int32_t)(((u_int32_t)(x) \*[Gt]\*[Gt] 8) \*[Am] 0xff)) +#define major(x) ((int32_t)(((uint32_t)(x) \*[Gt]\*[Gt] 8) \*[Am] 0xff)) #define minor(x) ((int32_t)((x) \*[Am] 0xff)) #define makedev(x,y) ((dev_t)(((x) \*[Lt]\*[Lt] 8) | (y))) #endif diff --git a/share/man/man9/arc4random.9 b/share/man/man9/arc4random.9 index ed8791ef8d99..453826fb6031 100644 --- a/share/man/man9/arc4random.9 +++ b/share/man/man9/arc4random.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: arc4random.9,v 1.2 2003/04/16 13:35:24 wiz Exp $ +.\" $NetBSD: arc4random.9,v 1.3 2005/12/26 19:48:12 perry Exp $ .\" $OpenBSD: arc4random.3,v 1.17 2000/12/21 14:07:41 aaron Exp $ .\" .\" Copyright 1997 Niels Provos @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In sys/types.h .In sys/systm.h -.Ft u_int32_t +.Ft uint32_t .Fn arc4random "void" .Sh DESCRIPTION The diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9 index 48e41f89b272..50818fb4edc0 100644 --- a/share/man/man9/bus_space.9 +++ b/share/man/man9/bus_space.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: bus_space.9,v 1.31 2003/06/30 12:10:40 wiz Exp $ +.\" $NetBSD: bus_space.9,v 1.32 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -138,118 +138,118 @@ "int prot" "int flags" .Ft int .Fn bus_space_peek_1 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int8_t *datap" +"bus_size_t offset" "uint8_t *datap" .Ft int .Fn bus_space_peek_2 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int16_t *datap" +"bus_size_t offset" "uint16_t *datap" .Ft int .Fn bus_space_peek_4 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int32_t *datap" +"bus_size_t offset" "uint32_t *datap" .Ft int .Fn bus_space_peek_8 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int64_t *datap" +"bus_size_t offset" "uint64_t *datap" .Ft int .Fn bus_space_poke_1 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int8_t data" +"bus_size_t offset" "uint8_t data" .Ft int .Fn bus_space_poke_2 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int16_t data" +"bus_size_t offset" "uint16_t data" .Ft int .Fn bus_space_poke_4 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int32_t data" +"bus_size_t offset" "uint32_t data" .Ft int .Fn bus_space_poke_8 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int64_t data" -.Ft u_int8_t +"bus_size_t offset" "uint64_t data" +.Ft uint8_t .Fn bus_space_read_1 "bus_space_tag_t space" "bus_space_handle_t handle" \ "bus_size_t offset" -.Ft u_int16_t +.Ft uint16_t .Fn bus_space_read_2 "bus_space_tag_t space" "bus_space_handle_t handle" \ "bus_size_t offset" -.Ft u_int32_t +.Ft uint32_t .Fn bus_space_read_4 "bus_space_tag_t space" "bus_space_handle_t handle" \ "bus_size_t offset" -.Ft u_int64_t +.Ft uint64_t .Fn bus_space_read_8 "bus_space_tag_t space" "bus_space_handle_t handle" \ "bus_size_t offset" .Ft void .Fn bus_space_write_1 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int8_t value" +"bus_size_t offset" "uint8_t value" .Ft void .Fn bus_space_write_2 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int16_t value" +"bus_size_t offset" "uint16_t value" .Ft void .Fn bus_space_write_4 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int32_t value" +"bus_size_t offset" "uint32_t value" .Ft void .Fn bus_space_write_8 "bus_space_tag_t space" "bus_space_handle_t handle" \ -"bus_size_t offset" "u_int64_t value" +"bus_size_t offset" "uint64_t value" .Ft void .Fn bus_space_barrier "bus_space_tag_t space" "bus_space_handle_t handle" \ "bus_size_t offset" "bus_size_t length" "int flags" .Ft void .Fn bus_space_read_region_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_stream_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_stream_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_stream_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_region_stream_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_stream_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_stream_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_stream_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_region_stream_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_copy_region_1 "bus_space_tag_t space" \ @@ -269,83 +269,83 @@ "bus_space_handle_t dsthandle" "bus_size_t dstoffset" "bus_size_t count" .Ft void .Fn bus_space_set_region_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint8_t value" \ "bus_size_t count" .Ft void .Fn bus_space_set_region_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint16_t value" \ "bus_size_t count" .Ft void .Fn bus_space_set_region_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint32_t value" \ "bus_size_t count" .Ft void .Fn bus_space_set_region_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint64_t value" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_stream_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_stream_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_stream_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_read_multi_stream_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint64_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_stream_1 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int8_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint8_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_stream_2 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int16_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint16_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_stream_4 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int32_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint32_t *datap" \ "bus_size_t count" .Ft void .Fn bus_space_write_multi_stream_8 "bus_space_tag_t space" \ -"bus_space_handle_t handle" "bus_size_t offset" "const u_int64_t *datap" \ +"bus_space_handle_t handle" "bus_size_t offset" "const uint64_t *datap" \ "bus_size_t count" .Sh DESCRIPTION The diff --git a/share/man/man9/cred.9 b/share/man/man9/cred.9 index 6d75baa7329b..7686068324fd 100644 --- a/share/man/man9/cred.9 +++ b/share/man/man9/cred.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: cred.9,v 1.5 2003/04/16 13:35:27 wiz Exp $ +.\" $NetBSD: cred.9,v 1.6 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -69,10 +69,10 @@ structure: .Pp .Bd -literal struct ucred { - u_int32_t cr_ref; /* reference count */ + uint32_t cr_ref; /* reference count */ uid_t cr_uid; /* effective user id */ gid_t cr_gid; /* effective group id */ - u_int32_t cr_ngroups; /* number of groups */ + uint32_t cr_ngroups; /* number of groups */ gid_t cr_groups[NGROUPS]; /* groups */ }; .Ed diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9 index b45d1866c0ed..3a5d2a2bfd61 100644 --- a/share/man/man9/disk.9 +++ b/share/man/man9/disk.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: disk.9,v 1.23 2005/08/14 12:01:26 yamt Exp $ +.\" $NetBSD: disk.9,v 1.24 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1995, 1996 Jason R. Thorpe. .\" All rights reserved. @@ -82,11 +82,11 @@ struct disk { * on certain types of disks. */ int dk_busy; /* busy counter */ - u_int64_t dk_rxfer; /* total number of read transfers */ - u_int64_t dk_wxfer; /* total number of write transfers */ - u_int64_t dk_seek; /* total independent seek operations */ - u_int64_t dk_rbytes; /* total bytes read */ - u_int64_t dk_wbytes; /* total bytes written */ + uint64_t dk_rxfer; /* total number of read transfers */ + uint64_t dk_wxfer; /* total number of write transfers */ + uint64_t dk_seek; /* total independent seek operations */ + uint64_t dk_rbytes; /* total bytes read */ + uint64_t dk_wbytes; /* total bytes written */ struct timeval dk_attachtime; /* time disk was attached */ struct timeval dk_timestamp; /* timestamp of last unbusy */ struct timeval dk_time; /* total time spent busy */ diff --git a/share/man/man9/ethersubr.9 b/share/man/man9/ethersubr.9 index 2c9485c20192..9f4a122635a2 100644 --- a/share/man/man9/ethersubr.9 +++ b/share/man/man9/ethersubr.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: ethersubr.9,v 1.15 2003/04/16 13:35:28 wiz Exp $ +.\" $NetBSD: ethersubr.9,v 1.16 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -52,7 +52,7 @@ .Sh SYNOPSIS .In net/if_ether.h .Ft void -.Fn ether_ifattach "struct ifnet *ifp" "u_int8_t *lla" +.Fn ether_ifattach "struct ifnet *ifp" "uint8_t *lla" .Ft int .Fn ether_addmulti "struct ifrequest *ifr" "struct ethercom *ec" .Ft int @@ -62,10 +62,10 @@ .Ft void .Fn ETHER_NEXT_MULTI "struct ether_multistep step" "struct ether_multi *enm" .Ft int -.Fn ETHER_IS_MULTICAST "u_int8_t *addr" +.Fn ETHER_IS_MULTICAST "uint8_t *addr" .In net/if_fddi.h .Ft void -.Fn fddi_ifattach "struct ifnet *ifp" "u_int8_t *lla" +.Fn fddi_ifattach "struct ifnet *ifp" "uint8_t *lla" .Ft int .Fn fddi_addmulti "struct ifrequest *ifr" "struct ethercom *ec" .Ft int diff --git a/share/man/man9/evcnt.9 b/share/man/man9/evcnt.9 index 52dba4dad4da..2f4789fbaf61 100644 --- a/share/man/man9/evcnt.9 +++ b/share/man/man9/evcnt.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: evcnt.9,v 1.13 2005/01/11 07:23:49 simonb Exp $ +.\" $NetBSD: evcnt.9,v 1.14 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2000 Christopher G. Demetriou .\" All rights reserved. @@ -62,7 +62,7 @@ structure. Its user-accessible fields are: .Bd -literal struct evcnt { - u_int64_t ev_count; /* how many have occurred */ + uint64_t ev_count; /* how many have occurred */ TAILQ_ENTRY(evcnt) ev_list; /* entry on list of all counters */ unsigned char ev_type; /* counter type; see below */ unsigned char ev_grouplen; /* 'group' len, excluding NUL */ diff --git a/share/man/man9/humanize_number.9 b/share/man/man9/humanize_number.9 index d3704d4f0965..450d74565623 100644 --- a/share/man/man9/humanize_number.9 +++ b/share/man/man9/humanize_number.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: humanize_number.9,v 1.6 2004/10/04 19:12:52 rumble Exp $ +.\" $NetBSD: humanize_number.9,v 1.7 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,11 +44,11 @@ .Sh SYNOPSIS .Ft int .Fo humanize_number -.Fa "char *buf" "size_t len" "u_int64_t number" "const char *suffix" +.Fa "char *buf" "size_t len" "uint64_t number" "const char *suffix" .Fa "int divisor" .Fc .Ft int -.Fn format_bytes "char *buf" "size_t len" "u_int64_t number" +.Fn format_bytes "char *buf" "size_t len" "uint64_t number" .Sh DESCRIPTION .Ss humanize_number The diff --git a/share/man/man9/ioasic.9 b/share/man/man9/ioasic.9 index 08fd0242cbd9..ec4d262b27c5 100644 --- a/share/man/man9/ioasic.9 +++ b/share/man/man9/ioasic.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: ioasic.9,v 1.8 2003/04/16 13:35:29 wiz Exp $ +.\" $NetBSD: ioasic.9,v 1.9 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -118,7 +118,7 @@ containing the following members: char *iad_modname; tc_offset_t iad_offset; void *iad_cookie; - u_int32_t iad_intrbits; + uint32_t iad_intrbits; .Ed .El .Sh FUNCTIONS diff --git a/share/man/man9/isapnp.9 b/share/man/man9/isapnp.9 index 1a720ec530eb..46431879b7a8 100644 --- a/share/man/man9/isapnp.9 +++ b/share/man/man9/isapnp.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: isapnp.9,v 1.8 2003/04/16 13:35:29 wiz Exp $ +.\" $NetBSD: isapnp.9,v 1.9 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -106,18 +106,18 @@ Describes ISAPNP bus-space regions. It contains the following members: .Bd -literal bus_space_handle_t h; - u_int32_t base; - u_int32_t length; + uint32_t base; + uint32_t length; .Ed .It Fa struct isapnp_pin Describes the wiring of interrupts and DMA pins from the ISAPNP bus onto the host processor. It contains the following members: .Bd -literal - u_int8_t num; - u_int8_t flags:4; - u_int8_t type:4; - u_int16_t bits; + uint8_t num; + uint8_t flags:4; + uint8_t type:4; + uint16_t bits; .Ed .It Fa struct isapnp_attach_args A structure used to inform the driver of the device properties. diff --git a/share/man/man9/man9.i386/bios32_service.9 b/share/man/man9/man9.i386/bios32_service.9 index 3e7fcaeeea35..9f22b604b24d 100644 --- a/share/man/man9/man9.i386/bios32_service.9 +++ b/share/man/man9/man9.i386/bios32_service.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: bios32_service.9,v 1.4 2003/04/16 13:35:36 wiz Exp $ +.\" $NetBSD: bios32_service.9,v 1.5 2005/12/26 19:48:13 perry Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In i386/bios32.h .Ft int -.Fn bios32_service "u_int32_t service " "bios32_entry_t e" \ +.Fn bios32_service "uint32_t service " "bios32_entry_t e" \ "bios32_entry_info_t ei" .Sh DESCRIPTION The diff --git a/share/man/man9/pcmcia.9 b/share/man/man9/pcmcia.9 index b4f1957ffc84..5df1571953cf 100644 --- a/share/man/man9/pcmcia.9 +++ b/share/man/man9/pcmcia.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: pcmcia.9,v 1.14 2005/11/02 06:42:36 wiz Exp $ +.\" $NetBSD: pcmcia.9,v 1.15 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -99,15 +99,15 @@ "int (*handler)(void *)" "void *arg" .Ft void .Fn pcmcia_intr_disestablish "struct pcmcia_function *pf" "void *ih" -.Ft u_int8_t +.Ft uint8_t .Fn pcmcia_cis_read_1 "struct pcmcia_tuple *tuple" "int index" -.Ft u_int16_t +.Ft uint16_t .Fn pcmcia_cis_read_2 "struct pcmcia_tuple *tuple" "int index" -.Ft u_int32_t +.Ft uint32_t .Fn pcmcia_cis_read_3 "struct pcmcia_tuple *tuple" "int index" -.Ft u_int32_t +.Ft uint32_t .Fn pcmcia_cis_read_4 "struct pcmcia_tuple *tuple" "int index" -.Ft u_int32_t +.Ft uint32_t .Fn pcmcia_cis_read_n "struct pcmcia_tuple *tuple" "int number" "int index" .Ft int .Fn pcmcia_scan_cis "struct device *dev" \ @@ -157,7 +157,7 @@ It contains the following members: char *cis1_info[4]; int32_t manufacturer; int32_t product; - u_int16_t error; + uint16_t error; SIMPLEQ_HEAD(, pcmcia_function) pf_head; .Ed .It Fa struct pcmcia_function @@ -170,7 +170,7 @@ Contains information about the resources requested by the device. It contains the following members: .Bd -literal int number; - u_int32_t flags; + uint32_t flags; int iftype; int num_iospace; u_long iomask; @@ -178,7 +178,7 @@ It contains the following members: u_long length; u_long start; } iospace[4]; - u_int16_t irqmask; + uint16_t irqmask; int num_memspace; struct { u_long length; diff --git a/share/man/man9/ppi.9 b/share/man/man9/ppi.9 index 5c0826d10bc7..a3bed380141a 100644 --- a/share/man/man9/ppi.9 +++ b/share/man/man9/ppi.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: ppi.9,v 1.3 2004/01/23 19:50:43 wiz Exp $ +.\" $NetBSD: ppi.9,v 1.4 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1997 .\" Michael Smith @@ -44,7 +44,7 @@ interface is performed using .Fn ioctl calls. Each command takes a single -.Ft u_int8_t +.Ft uint8_t argument, transferring one byte of data. The following commands are available: .Bl -tag -width indent @@ -76,7 +76,7 @@ To present the value 0x5a to the data port, drive STROBE low and then high again, the following code fragment can be used: .Bd -literal -compact int fd; - u_int8_t val; + uint8_t val; val = 0x5a; ioctl(fd, PPISDATA, \*[Am]val); diff --git a/share/man/man9/rnd.9 b/share/man/man9/rnd.9 index df5c6a48e17c..159f580bebdd 100644 --- a/share/man/man9/rnd.9 +++ b/share/man/man9/rnd.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: rnd.9,v 1.14 2003/04/16 13:35:33 wiz Exp $ +.\" $NetBSD: rnd.9,v 1.15 2005/12/26 19:48:12 perry Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -47,13 +47,13 @@ .Sh SYNOPSIS .In sys/rnd.h .Ft void -.Fn rnd_attach_source "rndsource_element_t *rnd_source" "char *devname" "u_int32_t source_type" "u_int32_t flags" +.Fn rnd_attach_source "rndsource_element_t *rnd_source" "char *devname" "uint32_t source_type" "uint32_t flags" .Ft void .Fn rnd_detach_source "rndsource_element_t *rnd_source" .Ft void -.Fn rnd_add_data "rndsource_element_t *rnd_source" "void *data" "u_int32_t len" "u_int32_t entropy" +.Fn rnd_add_data "rndsource_element_t *rnd_source" "void *data" "uint32_t len" "uint32_t entropy" .Ft void -.Fn rnd_add_uint32 "rndsource_element_t *rnd_source" "u_int32_t datum" +.Fn rnd_add_uint32 "rndsource_element_t *rnd_source" "uint32_t datum" .Sh DESCRIPTION These .Nm @@ -70,7 +70,7 @@ Do not share structures between two devices. .Pp .Bl -tag -width 8n -.It Fn rnd_attach_source "rndsource_element_t *rnd_source" "char *devname" "u_int32_t source_type" "u_int32_t flags" +.It Fn rnd_attach_source "rndsource_element_t *rnd_source" "char *devname" "uint32_t source_type" "uint32_t flags" This function announces the availability of a device for entropy collection. It must be called before the source struct pointed to by .Fa rnd_source @@ -110,7 +110,7 @@ default to .Pp .It Fn rnd_detach_source "rndsource_element_t *rnd_source" This function disconnects the device from entropy collection. -.It Fn rnd_add_uint32 "rndsource_element_t *rnd_source" "u_int32_t datum" +.It Fn rnd_add_uint32 "rndsource_element_t *rnd_source" "uint32_t datum" This function adds the value of .Va datum to the entropy pool. @@ -143,7 +143,7 @@ of randomness, passing for .Va rnd_source is permitted, and the device does not need to be attached. -.It Fn rnd_add_data "rndsource_element_t *rnd_source" "void *data" "u_int32_t len" "u_int32_t entropy" +.It Fn rnd_add_data "rndsource_element_t *rnd_source" "void *data" "uint32_t len" "uint32_t entropy" adds (hopefully) random .Fa data to the entropy pool. diff --git a/share/man/man9/scsipi.9 b/share/man/man9/scsipi.9 index 61839718f34b..10e20ec9e5ad 100644 --- a/share/man/man9/scsipi.9 +++ b/share/man/man9/scsipi.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: scsipi.9,v 1.17 2005/12/20 19:53:15 rpaulo Exp $ +.\" $NetBSD: scsipi.9,v 1.18 2005/12/26 19:48:13 perry Exp $ .\" .\" .\" Copyright (c) 2001 Manuel Bouyer. @@ -298,14 +298,14 @@ error value returned by the HBA driver to mid-layer. See description of .Fn scsipi_done for valid values -.It Va union {struct scsipi_sense_data scsi_sense; u_int32_t atapi_sense;} sense +.It Va union {struct scsipi_sense_data scsi_sense; uint32_t atapi_sense;} sense where to store sense info if .Fa error is .Dv XS_SENSE or .Dv XS_SHORTSENSE -.It Va u_int8_t status +.It Va uint8_t status SCSI status; checked by middle layer when .Fa error is .Dv XS_BUSY @@ -313,9 +313,9 @@ SCSI status; checked by middle layer when .Dv SCSI_CHECK and .Dv SCSI_QUEUE_FULL ) -.It Va u_int8_t xs_tag_type +.It Va uint8_t xs_tag_type SCSI tag type, set to 0 if untagged command -.It Va u_int8_t xs_tag_id +.It Va uint8_t xs_tag_id tag ID, used for tagged commands .El .Ss FUNCTIONS AND CALLBACKS diff --git a/share/man/man9/ucom.9 b/share/man/man9/ucom.9 index a26331d75f46..3dbe16f32aed 100644 --- a/share/man/man9/ucom.9 +++ b/share/man/man9/ucom.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: ucom.9,v 1.12 2005/12/20 19:53:15 rpaulo Exp $ +.\" $NetBSD: ucom.9,v 1.13 2005/12/26 19:48:13 perry Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -140,9 +140,9 @@ struct ucom_methods { int (*ucom_open)(void *sc, int portno); void (*ucom_close)(void *sc, int portno); void (*ucom_read)(void *sc, int portno, u_char **ptr, - u_int32_t *count); + uint32_t *count); void (*ucom_write)(void *sc, int portno, u_char *to, - u_char *from, u_int32_t *count); + u_char *from, uint32_t *count); }; .Ed .Pp @@ -174,14 +174,14 @@ driver opens the bulk pipes for the port. called just after the .Nm driver closes the bulk pipes for the port. -.It Fn "void (*ucom_read)" "void *sc, int portno, u_char **ptr, u_int32_t *count" +.It Fn "void (*ucom_read)" "void *sc, int portno, u_char **ptr, uint32_t *count" if the data delivered on the bulk pipe is not just the raw input characters this routine needs to adjust .Fa ptr and .Fa count so that they tell where to find the given number of raw characters. -.It Fn "void (*ucom_write)" "void *sc, int portno, u_char *dst, u_char *src, u_int32_t *count" +.It Fn "void (*ucom_write)" "void *sc, int portno, u_char *dst, u_char *src, uint32_t *count" if the data written to the bulk pipe is not just the raw characters then this routine needs to copy .Fa count diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9 index 9f564a02d6c8..d15eec3d11fb 100644 --- a/share/man/man9/usbdi.9 +++ b/share/man/man9/usbdi.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: usbdi.9,v 1.5 2002/10/14 13:43:35 wiz Exp $ +.\" $NetBSD: usbdi.9,v 1.6 2005/12/26 19:48:13 perry Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -69,8 +69,8 @@ describe usbd_status .Ss Functions offered by usbdi .Bl -tag -width indent -.It Dv usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address, - u_int8_t flags, +.It Dv usbd_status usbd_open_pipe(usbd_interface_handle iface, uint8_t address, + uint8_t flags, usbd_pipe_handle *pipe) .It Dv usbd_status usbd_close_pipe(usbd_pipe_handle pipe) .It Dv usbd_status usbd_transfer(usbd_xfer_handle req) @@ -78,46 +78,46 @@ usbd_status .It Dv usbd_status usbd_free_xfer(usbd_xfer_handle xfer) .It Dv void usbd_setup_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe, usbd_private_handle priv, void *buffer, - u_int32_t length, u_int16_t flags, u_int32_t timeout, + uint32_t length, uint16_t flags, uint32_t timeout, usbd_callback) .It Dv void usbd_setup_default_xfer(usbd_xfer_handle xfer, usbd_device_handle dev, - usbd_private_handle priv, u_int32_t timeout, + usbd_private_handle priv, uint32_t timeout, usb_device_request_t *req, void *buffer, - u_int32_t length, u_int16_t flags, usbd_callback) + uint32_t length, uint16_t flags, usbd_callback) .It Dv void usbd_setup_isoc_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe, - usbd_private_handle priv, u_int16_t *frlengths, - u_int32_t nframes, u_int16_t flags, usbd_callback) + usbd_private_handle priv, uint16_t *frlengths, + uint32_t nframes, uint16_t flags, usbd_callback) .It Dv void usbd_get_xfer_status(usbd_xfer_handle xfer, usbd_private_handle *priv, - void **buffer, u_int32_t *count, usbd_status *status) -.It Dv usb_endpoint_descriptor_t *usbd_interface2endpoint_descriptor(usbd_interface_handle iface, u_int8_t address) + void **buffer, uint32_t *count, usbd_status *status) +.It Dv usb_endpoint_descriptor_t *usbd_interface2endpoint_descriptor(usbd_interface_handle iface, uint8_t address) .It Dv usbd_status usbd_abort_pipe(usbd_pipe_handle pipe) .It Dv usbd_status usbd_clear_endpoint_stall(usbd_pipe_handle pipe) .It Dv usbd_status usbd_clear_endpoint_stall_async(usbd_pipe_handle pipe) -.It Dv usbd_status usbd_endpoint_count(usbd_interface_handle dev, u_int8_t *count) -.It Dv usbd_status usbd_interface_count(usbd_device_handle dev, u_int8_t *count) +.It Dv usbd_status usbd_endpoint_count(usbd_interface_handle dev, uint8_t *count) +.It Dv usbd_status usbd_interface_count(usbd_device_handle dev, uint8_t *count) .It Dv usbd_status usbd_interface2device_handle(usbd_interface_handle iface, usbd_device_handle *dev) -.It Dv usbd_status usbd_device2interface_handle(usbd_device_handle dev, u_int8_t ifaceno, usbd_interface_handle *iface) +.It Dv usbd_status usbd_device2interface_handle(usbd_device_handle dev, uint8_t ifaceno, usbd_interface_handle *iface) .Pp .It Dv usbd_device_handle usbd_pipe2device_handle(usbd_pipe_handle) -.It Dv void *usbd_alloc_buffer(usbd_xfer_handle req, u_int32_t size) +.It Dv void *usbd_alloc_buffer(usbd_xfer_handle req, uint32_t size) .It Dv void usbd_free_buffer(usbd_xfer_handle req) .It Dv void *usbd_get_buffer(usbd_xfer_handle xfer) .It Dv usbd_status usbd_sync_transfer(usbd_xfer_handle req) -.It Dv usbd_status usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address, - u_int8_t flags, usbd_pipe_handle *pipe, +.It Dv usbd_status usbd_open_pipe_intr(usbd_interface_handle iface, uint8_t address, + uint8_t flags, usbd_pipe_handle *pipe, usbd_private_handle priv, void *buffer, - u_int32_t length, usbd_callback) + uint32_t length, usbd_callback) .It Dv usbd_status usbd_do_request(usbd_device_handle pipe, usb_device_request_t *req, void *data) .It Dv usbd_status usbd_do_request_async(usbd_device_handle pipe, usb_device_request_t *req, void *data) .It Dv usbd_status usbd_do_request_flags(usbd_device_handle pipe, usb_device_request_t *req, - void *data, u_int16_t flags, int *) + void *data, uint16_t flags, int *) .It Dv usb_interface_descriptor_t *usbd_get_interface_descriptor(usbd_interface_handle iface) .It Dv usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle dev) .It Dv usb_device_descriptor_t *usbd_get_device_descriptor(usbd_device_handle dev) .It Dv usbd_status usbd_set_interface(usbd_interface_handle, int) .It Dv int usbd_get_no_alts(usb_config_descriptor_t *, int) -.It Dv usbd_status usbd_get_interface(usbd_interface_handle iface, u_int8_t *aiface) +.It Dv usbd_status usbd_get_interface(usbd_interface_handle iface, uint8_t *aiface) .It Dv void usbd_fill_deviceinfo (usbd_device_handle dev, struct usb_device_info *di) .It Dv int usbd_get_interface_altindex(usbd_interface_handle iface) .It Dv usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *cd, int iindex, int ano) @@ -166,7 +166,7 @@ through .It Dv usbd_status usbd_alloc_report_desc (usbd_interface_handle ifc, void **descp, int *sizep, int mem) .It Dv usbd_status usbd_get_config -(usbd_device_handle dev, u_int8_t *conf) +(usbd_device_handle dev, uint8_t *conf) .It Dv usbd_status usbd_get_string_desc (usbd_device_handle dev, int sindex, int langid, usb_string_descriptor_t *sdesc) @@ -176,8 +176,8 @@ through .It Dv usbd_status usbd_set_config_index (usbd_device_handle dev, int index, int msg) .It Dv usbd_status usbd_bulk_transfer -(usbd_xfer_handle xfer, usbd_pipe_handle pipe, u_int16_t flags, - u_int32_t timeout, void *buf, u_int32_t *size, char *lbl) +(usbd_xfer_handle xfer, usbd_pipe_handle pipe, uint16_t flags, + uint32_t timeout, void *buf, uint32_t *size, char *lbl) .It Dv void usb_detach_wait(device_ptr_t) .It Dv void usb_detach_wakeup(device_ptr_t) .El diff --git a/share/man/man9/wdc.9 b/share/man/man9/wdc.9 index 579c5ae5db61..fbb677df5950 100644 --- a/share/man/man9/wdc.9 +++ b/share/man/man9/wdc.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: wdc.9,v 1.14 2005/09/10 22:30:33 wiz Exp $ +.\" $NetBSD: wdc.9,v 1.15 2005/12/26 19:48:13 perry Exp $ .\" .\" Copyright (c) 1998 Manuel Bouyer. .\" @@ -86,8 +86,8 @@ struct wdc_softc { /* Per controller state */ #define WDC_CAPABILITY_SINGLE_DRIVE 0x0800 #define WDC_CAPABILITY_NOIRQ 0x1000 #define WDC_CAPABILITY_SELECT 0x2000 - u_int8_t pio_mode; - u_int8_t dma_mode; + uint8_t pio_mode; + uint8_t dma_mode; int nchannels; struct channel_softc *channels; @@ -114,15 +114,15 @@ struct channel_softc { /* Per channel data */ int ch_flags; #define WDCF_ACTIVE 0x01 #define WDCF_IRQ_WAIT 0x10 - u_int8_t ch_status; - u_int8_t ch_error; + uint8_t ch_status; + uint8_t ch_error; struct ata_drive_datas ch_drive[2]; struct channel_queue *ch_queue; }; struct ata_drive_datas { - u_int8_t drive; - u_int8_t drive_flags; + uint8_t drive; + uint8_t drive_flags; #define DRIVE_ATA 0x01 #define DRIVE_ATAPI 0x02 #define DRIVE (DRIVE_ATA|DRIVE_ATAPI) @@ -130,10 +130,10 @@ struct ata_drive_datas { #define DRIVE_DMA 0x08 #define DRIVE_UDMA 0x10 #define DRIVE_MODE 0x20 - u_int8_t PIO_mode; - u_int8_t DMA_mode; - u_int8_t UDMA_mode; - u_int8_t state; + uint8_t PIO_mode; + uint8_t DMA_mode; + uint8_t UDMA_mode; + uint8_t state; struct device *drv_softc; void* chnl_softc;