svn commit: r290887 - in stable/9: lib/libc/db/man lib/libc/gen lib/libc/net lib/libc/rpc lib/libc/sys lib/libcam lib/libdevstat lib/libradius sbin/bsdlabel sbin/newfs_msdos share/man/man4 share/ma...

Garrett Cooper ngie at FreeBSD.org
Sun Nov 15 21:27:55 UTC 2015 

Author: ngie
Date: Sun Nov 15 21:27:50 2015
New Revision: 290887
URL: https://svnweb.freebsd.org/changeset/base/290887

Log:
  MFstable/10 r231564:
  r231564 (by ed):
  
  Globally replace u_int*_t from (non-contributed) man pages.
  
  The reasoning behind this, is that if we are consistent in our
  documentation about the uint*_t stuff, people will be less tempted to
  write new code that uses the non-standard types.
  
  I am not going to bump the man page dates, as these changes can be
  considered style nits. The meaning of the man pages is unaffected.

Modified:
  stable/9/lib/libc/db/man/hash.3
  stable/9/lib/libc/gen/arc4random.3
  stable/9/lib/libc/net/nsdispatch.3
  stable/9/lib/libc/rpc/rpc.3
  stable/9/lib/libc/rpc/rpc_clnt_create.3
  stable/9/lib/libc/sys/getdirentries.2
  stable/9/lib/libc/sys/nfssvc.2
  stable/9/lib/libcam/cam.3
  stable/9/lib/libcam/cam_cdbparse.3
  stable/9/lib/libdevstat/devstat.3
  stable/9/lib/libradius/libradius.3
  stable/9/sbin/bsdlabel/bsdlabel.8
  stable/9/sbin/newfs_msdos/newfs_msdos.8
  stable/9/share/man/man4/agp.4
  stable/9/share/man/man4/icmp6.4
  stable/9/share/man/man4/ip6.4
  stable/9/share/man/man4/mem.4
  stable/9/share/man/man4/mtio.4
  stable/9/share/man/man4/natm.4
  stable/9/share/man/man4/net80211.4
  stable/9/share/man/man4/ng_async.4
  stable/9/share/man/man4/ng_bridge.4
  stable/9/share/man/man4/ng_btsocket.4
  stable/9/share/man/man4/ng_car.4
  stable/9/share/man/man4/ng_ccatm.4
  stable/9/share/man/man4/ng_cisco.4
  stable/9/share/man/man4/ng_etf.4
  stable/9/share/man/man4/ng_hci.4
  stable/9/share/man/man4/ng_l2cap.4
  stable/9/share/man/man4/ng_l2tp.4
  stable/9/share/man/man4/ng_mppc.4
  stable/9/share/man/man4/ng_one2many.4
  stable/9/share/man/man4/ng_ppp.4
  stable/9/share/man/man4/ng_pppoe.4
  stable/9/share/man/man4/ng_pptpgre.4
  stable/9/share/man/man4/ppi.4
  stable/9/share/man/man5/fs.5
  stable/9/share/man/man9/MD5.9
  stable/9/share/man/man9/bios.9
  stable/9/share/man/man9/bus_space.9
  stable/9/share/man/man9/crypto.9
  stable/9/share/man/man9/device_set_flags.9
  stable/9/share/man/man9/devstat.9
  stable/9/share/man/man9/eventtimers.9
  stable/9/share/man/man9/get_cyclecount.9
  stable/9/share/man/man9/mbchain.9
  stable/9/share/man/man9/mbuf_tags.9
  stable/9/share/man/man9/mdchain.9
  stable/9/share/man/man9/netisr.9
  stable/9/share/man/man9/random.9
  stable/9/share/man/man9/rijndael.9
  stable/9/share/man/man9/zone.9
  stable/9/usr.bin/m4/lib/ohash_interval.3
  stable/9/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/sys/   (props changed)
  stable/9/lib/libcam/   (props changed)
  stable/9/lib/libradius/   (props changed)
  stable/9/sbin/   (props changed)
  stable/9/sbin/bsdlabel/   (props changed)
  stable/9/sbin/newfs_msdos/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/share/man/man5/   (props changed)
  stable/9/share/man/man9/   (props changed)
  stable/9/usr.bin/   (props changed)
  stable/9/usr.bin/m4/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/bsnmpd/   (props changed)

Modified: stable/9/lib/libc/db/man/hash.3
==============================================================================
--- stable/9/lib/libc/db/man/hash.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/db/man/hash.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -65,7 +65,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

Modified: stable/9/lib/libc/gen/arc4random.3
==============================================================================
--- stable/9/lib/libc/gen/arc4random.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/gen/arc4random.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -44,12 +44,12 @@
 .Lb libc
 .Sh SYNOPSIS
 .In stdlib.h
-.Ft u_int32_t
+.Ft uint32_t
 .Fn arc4random "void"
 .Ft void
 .Fn arc4random_buf "void *buf" "size_t nbytes"
-.Ft u_int32_t
-.Fn arc4random_uniform "u_int32_t upper_bound"
+.Ft uint32_t
+.Fn arc4random_uniform "uint32_t upper_bound"
 .Ft void
 .Fn arc4random_stir "void"
 .Ft void

Modified: stable/9/lib/libc/net/nsdispatch.3
==============================================================================
--- stable/9/lib/libc/net/nsdispatch.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/net/nsdispatch.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -129,7 +129,7 @@ structures, which have the following for
 .Bd -literal -offset indent
 typedef struct _ns_src {
 	const char	*src;
-	u_int32_t	 flags;
+	uint32_t	 flags;
 } ns_src;
 .Ed
 .Bd -ragged -offset indent

Modified: stable/9/lib/libc/rpc/rpc.3
==============================================================================
--- stable/9/lib/libc/rpc/rpc.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/rpc/rpc.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -119,12 +119,12 @@ file.
 .Sh 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   int32_t rpc_inline_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
 .Sh "Data Structures"
 Some of the data structures used by the

Modified: stable/9/lib/libc/rpc/rpc_clnt_create.3
==============================================================================
--- stable/9/lib/libc/rpc/rpc_clnt_create.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/rpc/rpc_clnt_create.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -106,10 +106,10 @@ Set the timeout argument to 0 for batchi
 .It Dv CLGET_FD Ta "int *" Ta "get fd from handle"
 .It Dv CLSET_FD_CLOSE Ta "void" Ta "close fd on destroy"
 .It Dv CLSET_FD_NCLOSE Ta void Ta "do not close fd on destroy"
-.It Dv CLGET_VERS Ta "u_int32_t *" Ta "get RPC program version"
-.It Dv CLSET_VERS Ta "u_int32_t *" Ta "set RPC program version"
-.It Dv CLGET_XID Ta "u_int32_t *" Ta "get XID of previous call"
-.It Dv CLSET_XID Ta "u_int32_t *" Ta "set XID of next call"
+.It Dv CLGET_VERS Ta "uint32_t *" Ta "get RPC program version"
+.It Dv CLSET_VERS Ta "uint32_t *" Ta "set RPC program version"
+.It Dv CLGET_XID Ta "uint32_t *" Ta "get XID of previous call"
+.It Dv CLSET_XID Ta "uint32_t *" Ta "set XID of next call"
 .El
 .Pp
 The following operations are valid for connectionless transports only:

Modified: stable/9/lib/libc/sys/getdirentries.2
==============================================================================
--- stable/9/lib/libc/sys/getdirentries.2	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/sys/getdirentries.2	Sun Nov 15 21:27:50 2015	(r290887)
@@ -71,10 +71,10 @@ The data in the buffer is a series of
 .Vt dirent
 structures each containing the following entries:
 .Bd -literal -offset indent
-u_int32_t d_fileno;
-u_int16_t d_reclen;
-u_int8_t  d_type;
-u_int8_t  d_namlen;
+uint32_t d_fileno;
+uint16_t d_reclen;
+uint8_t  d_type;
+uint8_t  d_namlen;
 char	d_name[MAXNAMELEN + 1];	/* see below */
 .Ed
 .Pp

Modified: stable/9/lib/libc/sys/nfssvc.2
==============================================================================
--- stable/9/lib/libc/sys/nfssvc.2	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libc/sys/nfssvc.2	Sun Nov 15 21:27:50 2015	(r290887)
@@ -143,14 +143,14 @@ and a pointer to a
 struct nfsd_srvargs {
 	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
 	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_int32_t	nsd_haddr;	/* Ip address of client */
+	uint32_t	nsd_haddr;	/* Ip address of client */
 	struct ucred	nsd_cr;		/* Cred. uid maps to */
 	int		nsd_authlen;	/* Length of auth string (ret) */
 	u_char		*nsd_authstr;	/* Auth string (ret) */
 	int		nsd_verflen;	/* and the verifier */
 	u_char		*nsd_verfstr;
 	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	u_int32_t	nsd_ttl;	/* credential ttl (sec) */
+	uint32_t	nsd_ttl;	/* credential ttl (sec) */
 	NFSKERBKEY_T	nsd_key;	/* Session key */
 };
 .Ed

Modified: stable/9/lib/libcam/cam.3
==============================================================================
--- stable/9/lib/libcam/cam.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libcam/cam.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -145,7 +145,7 @@ struct cam_device {
 						     * Device name given by
 						     * the user.
 						     */
-	u_int32_t	given_unit_number;	    /*
+	uint32_t	given_unit_number;	    /*
 						     * Unit number given by
 						     * the user.
 						     */
@@ -153,7 +153,7 @@ struct cam_device {
 						  * Name of the device,
 						  * e.g. 'pass'
 						  */
-	u_int32_t	dev_unit_num;	/* Unit number of the passthrough
+	uint32_t	dev_unit_num;	/* Unit number of the passthrough
 					 * device associated with this
 					 * particular device.
 					 */
@@ -161,18 +161,18 @@ struct cam_device {
 	char		sim_name[SIM_IDLEN+1];/*
 					       * Controller name, e.g.'ahc'
 					       */
-	u_int32_t	sim_unit_number; /* Controller unit number */
-	u_int32_t	bus_id;		 /* Controller bus number */
+	uint32_t	sim_unit_number; /* Controller unit number */
+	uint32_t	bus_id;		 /* Controller bus number */
 	lun_id_t	target_lun;	 /* Logical Unit Number */
 	target_id_t	target_id;	 /* Target ID */
 	path_id_t	path_id;	 /* System SCSI bus number */
-	u_int16_t	pd_type;	 /* type of peripheral device */
+	uint16_t	pd_type;	 /* type of peripheral device */
 	struct scsi_inquiry_data inq_data;  /* SCSI Inquiry data */
-	u_int8_t	serial_num[252]; /* device serial number */
-	u_int8_t	serial_num_len;  /* length of the serial number */
-	u_int8_t	sync_period;	 /* Negotiated sync period */
-	u_int8_t	sync_offset;	 /* Negotiated sync offset */
-	u_int8_t	bus_width;	 /* Negotiated bus width */
+	uint8_t		serial_num[252]; /* device serial number */
+	uint8_t		serial_num_len;  /* length of the serial number */
+	uint8_t		sync_period;	 /* Negotiated sync period */
+	uint8_t		sync_offset;	 /* Negotiated sync offset */
+	uint8_t		bus_width;	 /* Negotiated bus width */
 	int		fd;		 /* file descriptor for device */
 };
 .Ed

Modified: stable/9/lib/libcam/cam_cdbparse.3
==============================================================================
--- stable/9/lib/libcam/cam_cdbparse.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libcam/cam_cdbparse.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -83,9 +83,9 @@
 .Ft int
 .Fo csio_build
 .Fa "struct ccb_scsiio *csio"
-.Fa "u_int8_t *data_ptr"
-.Fa "u_int32_t dxfer_len"
-.Fa "u_int32_t flags"
+.Fa "uint8_t *data_ptr"
+.Fa "uint32_t dxfer_len"
+.Fa "uint32_t flags"
 .Fa "int retry_count"
 .Fa "int timeout"
 .Fa "const char *cmd_spec"
@@ -94,9 +94,9 @@
 .Ft int
 .Fo csio_build_visit
 .Fa "struct ccb_scsiio *csio"
-.Fa "u_int8_t *data_ptr"
-.Fa "u_int32_t dxfer_len"
-.Fa "u_int32_t flags"
+.Fa "uint8_t *data_ptr"
+.Fa "uint32_t dxfer_len"
+.Fa "uint32_t flags"
 .Fa "int retry_count"
 .Fa "int timeout"
 .Fa "const char *cmd_spec"
@@ -122,14 +122,14 @@
 .Fc
 .Ft int
 .Fo buff_decode
-.Fa "u_int8_t *buff"
+.Fa "uint8_t *buff"
 .Fa "size_t len"
 .Fa "const char *fmt"
 .Fa "..."
 .Fc
 .Ft int
 .Fo buff_decode_visit
-.Fa "u_int8_t *buff"
+.Fa "uint8_t *buff"
 .Fa "size_t len"
 .Fa "const char *fmt"
 .Fa "void (*arg_put)(void *, int, void *, int, char *)"
@@ -150,7 +150,7 @@
 .Fc
 .Ft int
 .Fo buff_encode_visit
-.Fa "u_int8_t *buff"
+.Fa "uint8_t *buff"
 .Fa "size_t len"
 .Fa "const char *fmt"
 .Fa "int (*arg_get)(void *hook, char *field_name)"

Modified: stable/9/lib/libdevstat/devstat.3
==============================================================================
--- stable/9/lib/libdevstat/devstat.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libdevstat/devstat.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -193,7 +193,7 @@ subelement contains the following elemen
 .Bd -literal -offset indent
 struct devinfo {
 	struct devstat	*devices;
-	u_int8_t	*mem_ptr;
+	uint8_t		*mem_ptr;
 	long		generation;
 	int		numdevs;
 };
@@ -472,7 +472,7 @@ structure to calculate statistics over
 For each statistics to be calculated, the user should supply the proper
 enumerated type (listed below), and a variable of the indicated type.
 All statistics are either integer values, for which a
-.Vt u_int64_t
+.Vt uint64_t
 is used,
 or floating point, for which a
 .Vt "long double"
@@ -489,7 +489,7 @@ be the last argument passed to
 It is an argument list terminator.
 .It Dv DSM_TOTAL_BYTES
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The total number of bytes transferred between the acquisition of
 .Fa previous
@@ -499,7 +499,7 @@ and
 .It Dv DSM_TOTAL_BYTES_WRITE
 .It Dv DSM_TOTAL_BYTES_FREE
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The total number of bytes in transactions of the specified type
 between the acquisition of
@@ -508,7 +508,7 @@ and
 .Fa current .
 .It Dv DSM_TOTAL_TRANSFERS
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The total number of transfers between the acquisition of
 .Fa previous
@@ -519,7 +519,7 @@ and
 .It Dv DSM_TOTAL_TRANSFERS_WRITE
 .It Dv DSM_TOTAL_TRANSFERS_FREE
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The total number of transactions of the specified type between
 the acquisition of
@@ -528,7 +528,7 @@ and
 .Fa current .
 .It Dv DSM_TOTAL_BLOCKS
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The total number of blocks transferred between the acquisition of
 .Fa previous
@@ -541,7 +541,7 @@ blocksize of 512 bytes will be used in t
 .It Dv DSM_TOTAL_BLOCKS_WRITE
 .It Dv DSM_TOTAL_BLOCKS_FREE
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The total number of blocks of the specified type between the acquisition of
 .Fa previous
@@ -665,7 +665,7 @@ and
 .Fa current .
 .It Dv DSM_QUEUE_LENGTH
 type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
 .Pp
 The number of not yet completed transactions at the time when
 .Fa current

Modified: stable/9/lib/libradius/libradius.3
==============================================================================
--- stable/9/lib/libradius/libradius.3	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/lib/libradius/libradius.3	Sun Nov 15 21:27:50 2015	(r290887)
@@ -51,14 +51,14 @@
 .Fn rad_create_response "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
@@ -66,7 +66,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
@@ -76,7 +76,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

Modified: stable/9/sbin/bsdlabel/bsdlabel.8
==============================================================================
--- stable/9/sbin/bsdlabel/bsdlabel.8	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/sbin/bsdlabel/bsdlabel.8	Sun Nov 15 21:27:50 2015	(r290887)
@@ -475,7 +475,7 @@ The kernel device drivers will not allow
 to be decreased or the offset of a partition to be changed while it is open.
 .Sh COMPATIBILITY
 Due to the use of an
-.Vt u_int32_t
+.Vt uint32_t
 to store the number of sectors,
 .Bx
 labels are restricted to a maximum of 2^32-1 sectors.

Modified: stable/9/sbin/newfs_msdos/newfs_msdos.8
==============================================================================
--- stable/9/sbin/newfs_msdos/newfs_msdos.8	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/sbin/newfs_msdos/newfs_msdos.8	Sun Nov 15 21:27:50 2015	(r290887)
@@ -180,27 +180,27 @@ For reference purposes, this structure i
 below.
 .Bd -literal
 struct bsbpb {
-    u_int16_t	bpbBytesPerSec;		/* [-S] bytes per sector */
-    u_int8_t	bpbSecPerClust;		/* [-c] sectors per cluster */
-    u_int16_t	bpbResSectors;		/* [-r] reserved sectors */
-    u_int8_t	bpbFATs;		/* [-n] number of FATs */
-    u_int16_t	bpbRootDirEnts;		/* [-e] root directory entries */
-    u_int16_t	bpbSectors;		/* [-s] total sectors */
-    u_int8_t	bpbMedia;		/* [-m] media descriptor */
-    u_int16_t	bpbFATsecs;		/* [-a] sectors per FAT */
-    u_int16_t	bpbSecPerTrack;		/* [-u] sectors per track */
-    u_int16_t	bpbHeads;		/* [-h] drive heads */
-    u_int32_t	bpbHiddenSecs;		/* [-o] hidden sectors */
-    u_int32_t	bpbHugeSectors;		/* [-s] big total sectors */
+    uint16_t	bpbBytesPerSec;		/* [-S] bytes per sector */
+    uint8_t	bpbSecPerClust;		/* [-c] sectors per cluster */
+    uint16_t	bpbResSectors;		/* [-r] reserved sectors */
+    uint8_t	bpbFATs;		/* [-n] number of FATs */
+    uint16_t	bpbRootDirEnts;		/* [-e] root directory entries */
+    uint16_t	bpbSectors;		/* [-s] total sectors */
+    uint8_t	bpbMedia;		/* [-m] media descriptor */
+    uint16_t	bpbFATsecs;		/* [-a] sectors per FAT */
+    uint16_t	bpbSecPerTrack;		/* [-u] sectors per track */
+    uint16_t	bpbHeads;		/* [-h] drive heads */
+    uint32_t	bpbHiddenSecs;		/* [-o] hidden sectors */
+    uint32_t	bpbHugeSectors;		/* [-s] big total sectors */
 };
 /* FAT32 extensions */
 struct bsxbpb {
-    u_int32_t	bpbBigFATsecs;		/* [-a] big sectors per FAT */
-    u_int16_t	bpbExtFlags;		/* control flags */
-    u_int16_t	bpbFSVers;		/* file system version */
-    u_int32_t	bpbRootClust;		/* root directory start cluster */
-    u_int16_t	bpbFSInfo;		/* [-i] file system info sector */
-    u_int16_t	bpbBackup;		/* [-k] backup boot sector */
+    uint32_t	bpbBigFATsecs;		/* [-a] big sectors per FAT */
+    uint16_t	bpbExtFlags;		/* control flags */
+    uint16_t	bpbFSVers;		/* file system version */
+    uint32_t	bpbRootClust;		/* root directory start cluster */
+    uint16_t	bpbFSInfo;		/* [-i] file system info sector */
+    uint16_t	bpbBackup;		/* [-k] backup boot sector */
 };
 .Ed
 .Sh LIMITATION

Modified: stable/9/share/man/man4/agp.4
==============================================================================
--- stable/9/share/man/man4/agp.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/agp.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -80,8 +80,8 @@ The result is a pointer to the following
 .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)    */
@@ -105,7 +105,7 @@ This
 takes the following structure:
 .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
 .Pp
@@ -120,8 +120,8 @@ takes the following structure:
 typedef struct _agp_allocate {
 	int key;              /* tag of allocation            */
 	size_t pg_count;      /* number of pages              */
-	u_int32_t type;       /* 0 == normal, other devspec   */
-	u_int32_t physical;   /* device specific (some devices
+	uint32_t type;        /* 0 == normal, other devspec   */
+	uint32_t physical;    /* device specific (some devices
 			       * need a phys address of the
 			       * actual page behind the gatt
 			       * table)                       */
@@ -159,7 +159,7 @@ takes the following structure:
 .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

Modified: stable/9/share/man/man4/icmp6.4
==============================================================================
--- stable/9/share/man/man4/icmp6.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/icmp6.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -140,13 +140,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;
 

Modified: stable/9/share/man/man4/ip6.4
==============================================================================
--- stable/9/share/man/man4/ip6.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ip6.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -75,12 +75,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 */
@@ -121,8 +121,8 @@ The IPv6 header may be followed by any n
 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
@@ -281,8 +281,8 @@ The option is stored in the following st
 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
@@ -301,8 +301,8 @@ The option is stored in the following st
 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
@@ -333,10 +333,10 @@ The header is stored in the following st
 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

Modified: stable/9/share/man/man4/mem.4
==============================================================================
--- stable/9/share/man/man4/mem.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/mem.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -101,8 +101,8 @@ The region cannot be written to.
 Memory ranges are described by
 .Vt struct mem_range_desc :
 .Bd -literal -offset indent
-u_int64_t	mr_base;	/\(** physical base address \(**/
-u_int64_t	mr_len;		/\(** physical length of region \(**/
+uint64_t	mr_base;	/\(** physical base address \(**/
+uint64_t	mr_len;		/\(** physical length of region \(**/
 int		mr_flags;	/\(** attributes of region \(**/
 char		mr_owner[8];
 .Ed

Modified: stable/9/share/man/man4/mtio.4
==============================================================================
--- stable/9/share/man/man4/mtio.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/mtio.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -169,7 +169,7 @@ struct mtget {
 #if defined (__FreeBSD__)
 	daddr_t mt_blksiz;	/* presently operating blocksize */
 	daddr_t mt_density;	/* presently operating density */
-	u_int32_t mt_comp;	/* presently operating compression */
+	uint32_t mt_comp;	/* presently operating compression */
 	daddr_t mt_blksiz0;	/* blocksize for mode 0 */
 	daddr_t mt_blksiz1;	/* blocksize for mode 1 */
 	daddr_t mt_blksiz2;	/* blocksize for mode 2 */
@@ -179,10 +179,10 @@ struct mtget {
 	daddr_t mt_density2;	/* density for mode 2 */
 	daddr_t mt_density3;	/* density for mode 3 */
 /* the following are not yet implemented */
-	u_int32_t mt_comp0;	/* compression type for mode 0 */
-	u_int32_t mt_comp1;	/* compression type for mode 1 */
-	u_int32_t mt_comp2;	/* compression type for mode 2 */
-	u_int32_t mt_comp3;	/* compression type for mode 3 */
+	uint32_t mt_comp0;	/* compression type for mode 0 */
+	uint32_t mt_comp1;	/* compression type for mode 1 */
+	uint32_t mt_comp2;	/* compression type for mode 2 */
+	uint32_t mt_comp3;	/* compression type for mode 3 */
 /* end not yet implemented */
 #endif
 	daddr_t	mt_fileno;	/* relative file number of current position */
@@ -197,23 +197,23 @@ struct scsi_tape_errors {
 	 * Check Condition noted for these operations. The act
 	 * of issuing an MTIOCERRSTAT unlatches and clears them.
 	 */
-	u_int8_t io_sense[32];	/* Last Sense Data For Data I/O */
+	uint8_t io_sense[32];	/* Last Sense Data For Data I/O */
 	u_int32_t io_resid;	/* residual count from last Data I/O */
-	u_int8_t io_cdb[16];	/* Command that Caused the Last Data Sense */
-	u_int8_t ctl_sense[32];	/* Last Sense Data For Control I/O */
+	uint8_t io_cdb[16];	/* Command that Caused the Last Data Sense */
+	uint8_t ctl_sense[32];	/* Last Sense Data For Control I/O */
 	u_int32_t ctl_resid;	/* residual count from last Control I/O */
-	u_int8_t ctl_cdb[16];	/* Command that Caused the Last Control Sense */
+	uint8_t ctl_cdb[16];	/* Command that Caused the Last Control Sense */
 	/*
 	 * These are the read and write cumulative error counters.
 	 * (how to reset cumulative error counters is not yet defined).
 	 * (not implemented as yet but space is being reserved for them)
 	 */
 	struct {
-		u_int32_t retries;	/* total # retries performed */
-		u_int32_t corrected;	/* total # corrections performed */
-		u_int32_t processed;	/* total # corrections successful */
-		u_int32_t failures;	/* total # corrections/retries failed */
-		u_int64_t nbytes;	/* total # bytes processed */
+		uint32_t retries;	/* total # retries performed */
+		uint32_t corrected;	/* total # corrections performed */
+		uint32_t processed;	/* total # corrections successful */
+		uint32_t failures;	/* total # corrections/retries failed */
+		uint64_t nbytes;	/* total # bytes processed */
 	} wterr, rderr;
 };
 
@@ -259,18 +259,18 @@ union mterrstat {
  * rethink these ioctls to support all the entities they haul into
  * the picture (64 bit blocks, logical file record numbers, etc..).
  */
-#define	MTIOCRDSPOS	_IOR('m', 5, u_int32_t)	/* get logical blk addr */
-#define	MTIOCRDHPOS	_IOR('m', 6, u_int32_t)	/* get hardware blk addr */
-#define	MTIOCSLOCATE	_IOW('m', 5, u_int32_t)	/* seek to logical blk addr */
-#define	MTIOCHLOCATE	_IOW('m', 6, u_int32_t)	/* seek to hardware blk addr */
+#define	MTIOCRDSPOS	_IOR('m', 5, uint32_t)	/* get logical blk addr */
+#define	MTIOCRDHPOS	_IOR('m', 6, uint32_t)	/* get hardware blk addr */
+#define	MTIOCSLOCATE	_IOW('m', 5, uint32_t)	/* seek to logical blk addr */
+#define	MTIOCHLOCATE	_IOW('m', 6, uint32_t)	/* seek to hardware blk addr */
 #define	MTIOCERRSTAT	_IOR('m', 7, union mterrstat)	/* get tape errors */
 /*
  * Set EOT model- argument is number of filemarks to end a tape with.
  * Note that not all possible values will be accepted.
  */
-#define	MTIOCSETEOTMODEL	_IOW('m', 8, u_int32_t)
+#define	MTIOCSETEOTMODEL	_IOW('m', 8, uint32_t)
 /* Get current EOT model */
-#define	MTIOCGETEOTMODEL	_IOR('m', 8, u_int32_t)
+#define	MTIOCGETEOTMODEL	_IOR('m', 8, uint32_t)
 
 #ifndef _KERNEL
 #define	DEFTAPE	"/dev/nsa0"

Modified: stable/9/share/man/man4/natm.4
==============================================================================
--- stable/9/share/man/man4/natm.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/natm.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -23,11 +23,11 @@ The NATM layer uses a
 to specify a virtual circuit:
 .Bd -literal -offset indent
 struct sockaddr_natm {
-  u_int8_t      snatm_len;              /* length */
-  u_int8_t      snatm_family;           /* AF_NATM */
+  uint8_t       snatm_len;              /* length */
+  uint8_t       snatm_family;           /* AF_NATM */
   char          snatm_if[IFNAMSIZ];     /* interface name */
-  u_int16_t     snatm_vci;              /* vci */
-  u_int8_t      snatm_vpi;              /* vpi */
+  uint16_t      snatm_vci;              /* vci */
+  uint8_t       snatm_vpi;              /* vpi */
 };
 .Ed
 .Pp

Modified: stable/9/share/man/man4/net80211.4
==============================================================================
--- stable/9/share/man/man4/net80211.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/net80211.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -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 */

Modified: stable/9/share/man/man4/ng_async.4
==============================================================================
--- stable/9/share/man/man4/ng_async.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_async.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -118,9 +118,9 @@ Sets the node configuration, which is de
 .Bd -literal -offset 4n
 struct ng_async_cfg {
   u_char    enabled;  /* Turn encoding on/off */
-  u_int16_t amru;     /* Max receive async frame len */
-  u_int16_t smru;     /* Max receive sync frame len */
-  u_int32_t accm;     /* ACCM encoding */
+  uint16_t  amru;     /* Max receive async frame len */
+  uint16_t  smru;     /* Max receive sync frame len */
+  uint32_t  accm;     /* ACCM encoding */
 };
 .Ed
 .Pp

Modified: stable/9/share/man/man4/ng_bridge.4
==============================================================================
--- stable/9/share/man/man4/ng_bridge.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_bridge.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -108,9 +108,9 @@ as an argument:
 struct ng_bridge_config {
   u_char      ipfw[NG_BRIDGE_MAX_LINKS]; /* enable ipfw */
   u_char      debugLevel;           /* debug level */
-  u_int32_t   loopTimeout;          /* link loopback mute time */
-  u_int32_t   maxStaleness;         /* max host age before nuking */
-  u_int32_t   minStableAge;         /* min time for a stable host */
+  uint32_t    loopTimeout;          /* link loopback mute time */
+  uint32_t    maxStaleness;         /* max host age before nuking */
+  uint32_t    minStableAge;         /* min time for a stable host */
 };
 .Ed
 .Pp
@@ -155,20 +155,20 @@ currently connected:
 .Bd -literal -offset 0n
 /* Statistics structure (one for each link) */
 struct ng_bridge_link_stats {
-  u_int64_t   recvOctets;     /* total octets rec'd on link */
-  u_int64_t   recvPackets;    /* total pkts rec'd on link */
-  u_int64_t   recvMulticasts; /* multicast pkts rec'd on link */
-  u_int64_t   recvBroadcasts; /* broadcast pkts rec'd on link */
-  u_int64_t   recvUnknown;    /* pkts rec'd with unknown dest addr */
-  u_int64_t   recvRunts;      /* pkts rec'd less than 14 bytes */
-  u_int64_t   recvInvalid;    /* pkts rec'd with bogus source addr */
-  u_int64_t   xmitOctets;     /* total octets xmit'd on link */
-  u_int64_t   xmitPackets;    /* total pkts xmit'd on link */
-  u_int64_t   xmitMulticasts; /* multicast pkts xmit'd on link */
-  u_int64_t   xmitBroadcasts; /* broadcast pkts xmit'd on link */
-  u_int64_t   loopDrops;      /* pkts dropped due to loopback */
-  u_int64_t   loopDetects;    /* number of loop detections */
-  u_int64_t   memoryFailures; /* times couldn't get mem or mbuf */
+  uint64_t   recvOctets;     /* total octets rec'd on link */
+  uint64_t   recvPackets;    /* total pkts rec'd on link */
+  uint64_t   recvMulticasts; /* multicast pkts rec'd on link */
+  uint64_t   recvBroadcasts; /* broadcast pkts rec'd on link */
+  uint64_t   recvUnknown;    /* pkts rec'd with unknown dest addr */
+  uint64_t   recvRunts;      /* pkts rec'd less than 14 bytes */
+  uint64_t   recvInvalid;    /* pkts rec'd with bogus source addr */
+  uint64_t   xmitOctets;     /* total octets xmit'd on link */
+  uint64_t   xmitPackets;    /* total pkts xmit'd on link */
+  uint64_t   xmitMulticasts; /* multicast pkts xmit'd on link */
+  uint64_t   xmitBroadcasts; /* broadcast pkts xmit'd on link */
+  uint64_t   loopDrops;      /* pkts dropped due to loopback */
+  uint64_t   loopDetects;    /* number of loop detections */
+  uint64_t   memoryFailures; /* times couldn't get mem or mbuf */
 };
 .Ed
 .It Dv NGM_BRIDGE_CLR_STATS

Modified: stable/9/share/man/man4/ng_btsocket.4
==============================================================================
--- stable/9/share/man/man4/ng_btsocket.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_btsocket.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -154,7 +154,7 @@ The Bluetooth L2CAP socket address is de
 struct sockaddr_l2cap {
         u_char    l2cap_len;    /* total length */
         u_char    l2cap_family; /* address family */
-        u_int16_t l2cap_psm;    /* Protocol/Service Multiplexor */
+        uint16_t  l2cap_psm;    /* Protocol/Service Multiplexor */
         bdaddr_t  l2cap_bdaddr; /* address */
 };
 .Ed
@@ -272,7 +272,7 @@ struct sockaddr_rfcomm {
         u_char   rfcomm_len;     /* total length */
         u_char   rfcomm_family;  /* address family */
         bdaddr_t rfcomm_bdaddr;  /* address */
-        u_int8_t rfcomm_channel; /* channel */
+        uint8_t  rfcomm_channel; /* channel */
 };
 .Ed
 .Ss Dv SOCK_STREAM Ss RFCOMM sockets

Modified: stable/9/share/man/man4/ng_car.4
==============================================================================
--- stable/9/share/man/man4/ng_car.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_car.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -123,15 +123,15 @@ Return current node configuration as
 .Vt "struct ng_car_bulkconf"
 .Bd -literal
 struct ng_car_hookconf {
-	u_int64_t cbs;		/* Committed burst size */
-	u_int64_t ebs;		/* Exceeded/Peak burst size */
-	u_int64_t cir;		/* Committed information rate */
-	u_int64_t pir;		/* Peak information rate */
-	u_int8_t green_action;	/* Action for green packets */
-	u_int8_t yellow_action;	/* Action for yellow packets */
-	u_int8_t red_action;	/* Action for red packets */
-	u_int8_t mode;		/* operation mode */
-	u_int8_t opt;		/* mode options */
+	uint64_t cbs;		/* Committed burst size */
+	uint64_t ebs;		/* Exceeded/Peak burst size */
+	uint64_t cir;		/* Committed information rate */
+	uint64_t pir;		/* Peak information rate */
+	uint8_t  green_action;	/* Action for green packets */
+	uint8_t  yellow_action;	/* Action for yellow packets */
+	uint8_t  red_action;	/* Action for red packets */
+	uint8_t  mode;		/* operation mode */
+	uint8_t  opt;		/* mode options */
 };
 
 /* possible actions (..._action) */
@@ -161,12 +161,12 @@ Return node statistics as
 .Vt "struct ng_car_bulkstats"
 .Bd -literal
 struct ng_car_hookstats {
-	u_int64_t passed_pkts;
-	u_int64_t droped_pkts;
-	u_int64_t green_pkts;
-	u_int64_t yellow_pkts;
-	u_int64_t red_pkts;
-	u_int64_t errors;
+	uint64_t passed_pkts;
+	uint64_t droped_pkts;
+	uint64_t green_pkts;
+	uint64_t yellow_pkts;
+	uint64_t red_pkts;
+	uint64_t errors;
 };
 
 struct ng_car_bulkstats {

Modified: stable/9/share/man/man4/ng_ccatm.4
==============================================================================
--- stable/9/share/man/man4/ng_ccatm.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_ccatm.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -110,7 +110,7 @@ The interface on these hooks is defined 
 and uses a structure
 .Bd -literal
 struct ccatm_op {
-	u_int32_t	op;	/* request code */
+	uint32_t	op;	/* request code */
 	u_char		data[];	/* optional data */
 };
 .Ed
@@ -230,7 +230,7 @@ struct ngm_ccatm_get_addresses {
 	struct ngm_ccatm_address_req addr[0];
 };
 struct ngm_ccatm_address_req {
-	u_int32_t	port;
+	uint32_t	port;
 	struct uni_addr	addr;
 };
 .Ed

Modified: stable/9/share/man/man4/ng_cisco.4
==============================================================================
--- stable/9/share/man/man4/ng_cisco.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_cisco.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -148,8 +148,8 @@ Returns a
 .Dv "struct ngciscostat" :
 .Bd -literal -offset 4n
 struct ngciscostat {
-  u_int32_t   seq_retries;       /* # unack'd retries */
-  u_int32_t   keepalive_period;  /* in seconds */
+  uint32_t   seq_retries;       /* # unack'd retries */
+  uint32_t   keepalive_period;  /* in seconds */
 };
 .Ed
 .El

Modified: stable/9/share/man/man4/ng_etf.4
==============================================================================
--- stable/9/share/man/man4/ng_etf.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_etf.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -102,7 +102,7 @@ are specified in a structure of type
 .Bd -literal -offset 4n
 struct ng_etffilter {
         char       matchhook[NG_HOOKSIZ];     /* hook name */
-        u_int16_t  ethertype;	              /* catch these */
+        uint16_t   ethertype;	              /* catch these */
 };
 .Ed
 .El

Modified: stable/9/share/man/man4/ng_hci.4
==============================================================================
--- stable/9/share/man/man4/ng_hci.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_hci.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -133,9 +133,9 @@ The next sections specify the HCI packet
 .Bd -literal -offset indent
 #define NG_HCI_CMD_PKT 0x01
 typedef struct {
-        u_int8_t  type;   /* MUST be 0x1 */
-        u_int16_t opcode; /* OpCode */
-        u_int8_t  length; /* parameter(s) length in bytes */
+        uint8_t  type;   /* MUST be 0x1 */
+        uint16_t opcode; /* OpCode */
+        uint8_t  length; /* parameter(s) length in bytes */
 } __attribute__ ((packed)) ng_hci_cmd_pkt_t;
 .Ed
 .Pp
@@ -156,9 +156,9 @@ Controller to the Host.
 .Bd -literal -offset indent
 #define NG_HCI_EVENT_PKT 0x04
 typedef struct {
-        u_int8_t type;   /* MUST be 0x4 */
-        u_int8_t event;  /* event */
-        u_int8_t length; /* parameter(s) length in bytes */
+        uint8_t type;   /* MUST be 0x4 */
+        uint8_t event;  /* event */
+        uint8_t length; /* parameter(s) length in bytes */
 } __attribute__ ((packed)) ng_hci_event_pkt_t;
 .Ed
 .Pp
@@ -168,9 +168,9 @@ when events occur.
 .Bd -literal -offset indent
 #define NG_HCI_ACL_DATA_PKT 0x02
 typedef struct {
-        u_int8_t  type;       /* MUST be 0x2 */
-        u_int16_t con_handle; /* connection handle + PB + BC flags */
-        u_int16_t length;     /* payload length in bytes */
+        uint8_t  type;       /* MUST be 0x2 */
+        uint16_t con_handle; /* connection handle + PB + BC flags */
+        uint16_t length;     /* payload length in bytes */
 } __attribute__ ((packed)) ng_hci_acldata_pkt_t;
 .Ed
 .Pp
@@ -180,9 +180,9 @@ Host Controller.
 .Bd -literal -offset indent
 #define NG_HCI_SCO_DATA_PKT 0x03
 typedef struct {
-        u_int8_t  type;       /* MUST be 0x3 */
-        u_int16_t con_handle; /* connection handle + reserved bits */
-        u_int8_t  length;     /* payload length in bytes */
+        uint8_t  type;       /* MUST be 0x3 */
+        uint16_t con_handle; /* connection handle + reserved bits */
+        uint8_t  length;     /* payload length in bytes */
 } __attribute__ ((packed)) ng_hci_scodata_pkt_t;
 .Ed
 .Pp
@@ -216,9 +216,9 @@ Netgraph message defined as follows.
 .Bd -literal -offset indent
 #define NGM_HCI_NODE_UP 112 /* HCI -> Upper */
 typedef struct {
-        u_int16_t pkt_size; /* max. ACL/SCO packet size (w/o hdr) */
-        u_int16_t num_pkts; /* ACL/SCO packet queue size */
-        u_int16_t reserved; /* place holder */
+        uint16_t  pkt_size; /* max. ACL/SCO packet size (w/o hdr) */
+        uint16_t  num_pkts; /* ACL/SCO packet queue size */
+        uint16_t  reserved; /* place holder */
         bdaddr_t  bdaddr;   /* bdaddr */
 } ng_hci_node_up_ep;
 .Ed
@@ -244,8 +244,8 @@ Netgraph message is defined as follows.
 .Bd -literal -offset indent
 #define NGM_HCI_SYNC_CON_QUEUE 113 /* HCI -> Upper */
 typedef struct {
-        u_int16_t con_handle; /* connection handle */
-        u_int16_t completed;  /* number of completed packets */
+        uint16_t con_handle; /* connection handle */
+        uint16_t completed;  /* number of completed packets */
 } ng_hci_sync_con_queue_ep;
 .Ed
 .Sh HOOKS

Modified: stable/9/share/man/man4/ng_l2cap.4
==============================================================================
--- stable/9/share/man/man4/ng_l2cap.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_l2cap.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -310,9 +310,9 @@ appropriate upstream hook and must be pr
 .Bd -literal -offset indent
 /* L2CA data packet header */
 typedef struct {
-        u_int32_t token;  /* token to use in L2CAP_L2CA_WRITE */
-        u_int16_t length; /* length of the data */
-        u_int16_t lcid;   /* local channel ID */
+        uint32_t token;  /* token to use in L2CAP_L2CA_WRITE */
+        uint16_t length; /* length of the data */
+        uint16_t lcid;   /* local channel ID */
 } __attribute__ ((packed)) ng_l2cap_l2ca_hdr_t;
 .Ed
 .Pp

Modified: stable/9/share/man/man4/ng_l2tp.4
==============================================================================
--- stable/9/share/man/man4/ng_l2tp.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_l2tp.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -115,11 +115,11 @@ as an argument:
 struct ng_l2tp_config {
     u_char      enabled;        /* enables traffic flow */
     u_char      match_id;       /* tunnel id must match 'tunnel_id' */
-    u_int16_t   tunnel_id;      /* local tunnel id */
-    u_int16_t   peer_id;        /* peer's tunnel id */
-    u_int16_t   peer_win;       /* peer's max recv window size */
-    u_int16_t   rexmit_max;     /* max retransmits before failure */
-    u_int16_t   rexmit_max_to;  /* max delay between retransmits */
+    uint16_t    tunnel_id;      /* local tunnel id */
+    uint16_t    peer_id;        /* peer's tunnel id */
+    uint16_t    peer_win;       /* peer's max recv window size */
+    uint16_t    rexmit_max;     /* max retransmits before failure */
+    uint16_t    rexmit_max_to;  /* max delay between retransmits */
 };
 .Ed
 .Pp
@@ -197,8 +197,8 @@ The argument is a
 .Bd -literal
 /* Configuration for a session hook */
 struct ng_l2tp_sess_config {
-    u_int16_t   session_id;     /* local session id */
-    u_int16_t   peer_id;        /* peer's session id */
+    uint16_t    session_id;     /* local session id */
+    uint16_t    peer_id;        /* peer's session id */
     u_char      control_dseq;   /* we control data sequencing? */
     u_char      enable_dseq;    /* enable data sequencing? */
     u_char      include_length; /* include length field? */

Modified: stable/9/share/man/man4/ng_mppc.4
==============================================================================
--- stable/9/share/man/man4/ng_mppc.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_mppc.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -106,7 +106,7 @@ as an argument:
 /* Configuration for a session */
 struct ng_mppc_config {
     u_char    enable;                 /* enable */
-    u_int32_t bits;                   /* config bits */
+    uint32_t  bits;                   /* config bits */
     u_char    startkey[MPPE_KEY_LEN]; /* start key */
 };
 

Modified: stable/9/share/man/man4/ng_one2many.4
==============================================================================
--- stable/9/share/man/man4/ng_one2many.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_one2many.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -156,8 +156,8 @@ as the control message argument:
 .Bd -literal
 /* Node configuration structure */
 struct ng_one2many_config {
-  u_int32_t   xmitAlg;        /* how to distribute packets */
-  u_int32_t   failAlg;        /* how to detect link failure */
+  uint32_t    xmitAlg;        /* how to distribute packets */
+  uint32_t    failAlg;        /* how to detect link failure */
   u_char      enabledLinks[NG_ONE2MANY_MAX_LINKS];
 };
 .Ed
@@ -187,10 +187,10 @@ link, which may or may not be currently 
 .Bd -literal
 /* Statistics structure (one for each link) */
 struct ng_one2many_link_stats {
-  u_int64_t   recvOctets;     /* total octets rec'd on link */
-  u_int64_t   recvPackets;    /* total pkts rec'd on link */
-  u_int64_t   xmitOctets;     /* total octets xmit'd on link */
-  u_int64_t   xmitPackets;    /* total pkts xmit'd on link */
+  uint64_t   recvOctets;     /* total octets rec'd on link */
+  uint64_t   recvPackets;    /* total pkts rec'd on link */
+  uint64_t   xmitOctets;     /* total octets xmit'd on link */
+  uint64_t   xmitPackets;    /* total pkts xmit'd on link */
 };
 .Ed
 .Pp

Modified: stable/9/share/man/man4/ng_ppp.4
==============================================================================
--- stable/9/share/man/man4/ng_ppp.4	Sun Nov 15 21:16:13 2015	(r290886)
+++ stable/9/share/man/man4/ng_ppp.4	Sun Nov 15 21:27:50 2015	(r290887)
@@ -357,14 +357,14 @@ struct ng_ppp_link_conf {
   u_char    enableLink;     /* enable this link */
   u_char    enableProtoComp;/* enable protocol field compression */
   u_char    enableACFComp;  /* enable addr/ctrl field compression */
-  u_int16_t mru;            /* peer MRU */
-  u_int32_t latency;        /* link latency (in milliseconds) */
-  u_int32_t bandwidth;      /* link bandwidth (in bytes/second) */
+  uint16_t  mru;            /* peer MRU */
+  uint32_t  latency;        /* link latency (in milliseconds) */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-stable-9 mailing list