 @@ -1,14 +1,14 @@
-/*	$NetBSD: ifaddrs.h,v 1.6 2016/01/22 21:55:57 dholland Exp $	*/
+/*	$NetBSD: ifaddrs.h,v 1.7 2016/01/23 01:26:14 dholland Exp $	*/
 /*
  * Copyright (c) 1995, 1999
  *	Berkeley Software Design, Inc.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 @@ -21,27 +21,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	BSDI ifaddrs.h,v 2.5 2000/02/23 14:51:59 dab Exp
  */
 #ifndef	_IFADDRS_H_
 #define	_IFADDRS_H_
 struct ifaddrs {
 	struct ifaddrs  *ifa_next;
 	char		*ifa_name;
-	unsigned	 ifa_flags;
+	unsigned int	 ifa_flags;
 	struct sockaddr	*ifa_addr;
 	struct sockaddr	*ifa_netmask;
 	struct sockaddr	*ifa_dstaddr;
 	void		*ifa_data;
 };
 /*
  * This may have been defined in <net/if.h>.  Note that if <net/if.h> is
  * to be included it must be included before this header file.
  */
 #ifndef	ifa_broadaddr
 #define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: link_aout.h,v 1.22 2016/01/22 21:55:57 dholland Exp $	*/
+/*	$NetBSD: link_aout.h,v 1.23 2016/01/23 01:26:14 dholland Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -42,46 +42,46 @@
 #include <dlfcn.h>			/* for Dl_info */
 #include <a.out.h>			/* for struct nlist */
 /*
  * A `Shared Object Descriptor' describes a shared object that is needed
  * to complete the link edit process of the object containing it.
  * A list of such objects (chained through `sod_next') is pointed at
  * by `sdt_sods' in the section_dispatch_table structure.
  */
 struct sod {	/* Shared Object Descriptor */
 	long	sod_name;		/* name (relative to load address) */
-	unsigned sod_library  : 1,	/* Searched for by library rules */
+	unsigned int sod_library  : 1,	/* Searched for by library rules */
 		sod_reserved : 31;
 	short	sod_major;		/* major version number */
 	short	sod_minor;		/* minor version number */
 	long	sod_next;		/* next sod */
 };
 /*
  * `Shared Object Map's are used by the run-time link editor (ld.so) to
  * keep track of all shared objects loaded into a process' address space.
  * These structures are only used at run-time and do not occur within
  * the text or data segment of an executable or shared library.
  */
 struct so_map {		/* Shared Object Map */
 	caddr_t		som_addr;	/* Address at which object mapped */
 	char 		*som_path;	/* Path to mmap'ed file */
 	struct so_map	*som_next;	/* Next map in chain */
 	struct sod	*som_sod;	/* Sod responsible for this map */
 	caddr_t		som_sodbase;	/* Base address of this sod */
-	unsigned	som_write : 1;	/* Text is currently writable */
+	unsigned int	som_write : 1;	/* Text is currently writable */
 	struct _dynamic	*som_dynamic;	/* _dynamic structure */
 	caddr_t		som_spd;	/* Private data */
 };
 /*
  * Symbol description with size. This is simply an `nlist' with
  * one field (nz_size) added.
  * Used to convey size information on items in the data segment
  * of shared objects. An array of these live in the shared object's
  * text segment and is addressed by the `sdt_nzlist' field.
  */
 struct nzlist {
 	struct nlist	nlist;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nsswitch.h,v 1.22 2016/01/22 21:55:57 dholland Exp $	*/
+/*	$NetBSD: nsswitch.h,v 1.23 2016/01/23 01:26:14 dholland Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -165,55 +165,55 @@ extern const ns_src __nsdefaultnis_force
 typedef struct {
 	const char	*database;
 	const char	*name;
 	nss_method	 method;
 	void		*mdata;
 } ns_mtab;
 /*
  * nss_module_register_fn - module registration function
  *	called at module load
  * nss_module_unregister_fn - module un-registration function
  *	called at module unload
  */
-typedef	void (*nss_module_unregister_fn)(ns_mtab *, unsigned);
+typedef	void (*nss_module_unregister_fn)(ns_mtab *, unsigned int);
-typedef	ns_mtab *(*nss_module_register_fn)(const char *, unsigned *,
+typedef	ns_mtab *(*nss_module_register_fn)(const char *, unsigned int *,
 					   nss_module_unregister_fn *);
 #ifdef _NS_PRIVATE
 /*
  * Private data structures for back-end nsswitch implementation.
  */
 /*
  * ns_dbt - `nsswitch database thang'
  * For each database in /etc/nsswitch.conf there is a ns_dbt, with its
  * name and a list of ns_src's containing the source information.
  */
 typedef struct {
 	const char	*name;		/* name of database */
 	ns_src		*srclist;	/* list of sources */
-	unsigned	 srclistsize;	/* size of srclist */
+	unsigned int	 srclistsize;	/* size of srclist */
 } ns_dbt;
 /*
  * ns_mod - `nsswitch module'
  */
 typedef struct {
 	const char	*name;		/* module name */
 	void		*handle;	/* handle from dlopen() */
 	ns_mtab		*mtab;		/* method table */
-	unsigned	 mtabsize;	/* size of mtab */
+	unsigned int	 mtabsize;	/* size of mtab */
 					/* called to unload module */
 	nss_module_unregister_fn unregister;
 } ns_mod;
 #endif /* _NS_PRIVATE */
 #include <sys/cdefs.h>
 __BEGIN_DECLS
 int	nsdispatch(void *, const ns_dtab [], const char *,
 			const char *, const ns_src [], ...);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: login_cap.h,v 1.12 2016/01/22 21:55:57 dholland Exp $	*/
+/*	$NetBSD: login_cap.h,v 1.13 2016/01/23 01:26:14 dholland Exp $	*/
 /*-
  * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -63,30 +63,30 @@ typedef struct {
 typedef int (*envfunc_t)(void *, const char *, const char *, int);
 #include <sys/cdefs.h>
 __BEGIN_DECLS
 struct passwd;
 login_cap_t *login_getclass(const char *);
 #ifndef __LIBC12_SOURCE__
 login_cap_t *login_getpwclass(const struct passwd *)
     __RENAME(__login_getpwclass50);
 #endif
 void	 login_close(login_cap_t *);
-int	 login_getcapbool(login_cap_t *, const char *, unsigned);
+int	 login_getcapbool(login_cap_t *, const char *, unsigned int);
 quad_t	 login_getcapnum(login_cap_t *, const char *, quad_t, quad_t);
 quad_t	 login_getcapsize(login_cap_t *, const char *, quad_t, quad_t);
 char	*login_getcapstr(login_cap_t *, const char *, char *, char *);
 quad_t	 login_getcaptime(login_cap_t *, const char *, quad_t, quad_t);
-int	setclasscontext(const char *, unsigned);
+int	setclasscontext(const char *, unsigned int);
 #ifndef __LIBC12_SOURCE__
-int	setusercontext(login_cap_t *, struct passwd *, uid_t, unsigned)
+int	setusercontext(login_cap_t *, struct passwd *, uid_t, unsigned int)
     __RENAME(__setusercontext50);
 #endif
 void	setuserpath(login_cap_t *, const char *, envfunc_t, void *);
 int	setuserenv(login_cap_t *, envfunc_t, void *);
 __END_DECLS
 #endif	/* !_LOGIN_CAP_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci.h,v 1.7 2016/01/22 22:22:48 dholland Exp $	*/
+/*	$NetBSD: pci.h,v 1.8 2016/01/23 01:26:14 dholland Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -38,28 +38,30 @@
 #ifndef _PCI_H_
 #define	_PCI_H_
 #include <stddef.h>
 #include <stdint.h> /* XXX */
 /*
  * Interface to the PCI bus for user programs.
  */
 typedef uint32_t pcireg_t;	/* XXX */
 /* pci_bus.c */
-int	pcibus_conf_read(int, unsigned, unsigned, unsigned, unsigned, pcireg_t *);
+int	pcibus_conf_read(int, unsigned int, unsigned int, unsigned int,
-int	pcibus_conf_write(int, unsigned, unsigned, unsigned, unsigned, pcireg_t);
+		unsigned int, pcireg_t *);
 int	pcibus_conf_write(int, unsigned int, unsigned int, unsigned int,
 		unsigned int, pcireg_t);
 /* pci_device.c */
-int	pcidev_conf_read(int, unsigned, pcireg_t *);
+int	pcidev_conf_read(int, unsigned int, pcireg_t *);
-int	pcidev_conf_write(int, unsigned, pcireg_t);
+int	pcidev_conf_write(int, unsigned int, pcireg_t);
 /* pci_drvname.c */
-int	pci_drvname(int, unsigned, unsigned, char *, size_t);
+int	pci_drvname(int, unsigned int, unsigned int, char *, size_t);
 /* pci_subr.c */
 void	pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t);
-void	pci_conf_print(int, unsigned, unsigned, unsigned);
+void	pci_conf_print(int, unsigned int, unsigned int, unsigned int);
 #endif /* _PCI_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: direntry.h,v 1.8 2016/01/22 22:53:36 dholland Exp $	*/
+/*	$NetBSD: direntry.h,v 1.9 2016/01/23 01:26:14 dholland Exp $	*/
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -120,27 +120,27 @@ struct winentry {
  * structure.
  */
 #define DD_DAY_MASK		0x1F	/* day of month */
 #define DD_DAY_SHIFT		0
 #define DD_MONTH_MASK		0x1E0	/* month */
 #define DD_MONTH_SHIFT		5
 #define DD_YEAR_MASK		0xFE00	/* year - 1980 */
 #define DD_YEAR_SHIFT		9
 #if defined(_KERNEL) || defined(MAKEFS)
 struct dirent;
 void	unix2dostime(const struct timespec *tsp, int gmtoff, uint16_t *ddp,
 	    uint16_t *dtp, uint8_t *dhp);
-void	dos2unixtime(unsigned dd, unsigned dt, unsigned dh, int gmtoff,
+void	dos2unixtime(unsigned int dd, unsigned int dt, unsigned int dh,
-	    struct timespec *tsp);
+	    int gmtoff, struct timespec *tsp);
 int	dos2unixfn(unsigned char dn[11], unsigned char *un, int lower);
 int	unix2dosfn(const unsigned char *un, unsigned char dn[12], int unlen,
-	    unsigned gen);
+	    unsigned int gen);
 int	unix2winfn(const unsigned char *un, int unlen, struct winentry *wep,
 	    int cnt, int chksum);
 int	winChkName(const unsigned char *un, int unlen, struct winentry *wep,
 	    int chksum);
 int	win2unixfn(struct winentry *wep, struct dirent *dp, int chksum);
 uint8_t winChksum(uint8_t *name);
 int	winSlotCnt(const unsigned char *un, int unlen);
 #endif /* _KERNEL || MAKEFS */
 #endif /* _MSDOSFS_DIRENTRY_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: envsys.h,v 1.35 2016/01/22 23:33:42 dholland Exp $ */
+/* $NetBSD: envsys.h,v 1.36 2016/01/23 01:26:14 dholland Exp $ */
 /*-
  * Copyright (c) 1999, 2007, 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour, Juan Romero Pardines and Bill Squier.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -117,36 +117,36 @@ enum envsys_indicator_states {
  */
 #define ENVSYS_GETDICTIONARY	_IOWR('E', 0, struct plistref)
 #define ENVSYS_SETDICTIONARY	_IOWR('E', 1, struct plistref)
 #define ENVSYS_REMOVEPROPS	_IOWR('E', 2, struct plistref)
 /*
  * Compatibility with old interface. Only ENVSYS_GTREDATA
  * and ENVSYS_GTREINFO ioctls are supported.
  */
 /* get sensor data */
 struct envsys_tre_data {
-	unsigned sensor;
+	unsigned int sensor;
 	union {				/* all data is given */
 		uint32_t data_us;	/* in microKelvins, */
 		int32_t data_s;		/* rpms, volts, amps, */
 	} cur, min, max, avg;		/* ohms, watts, etc */
 					/* see units below */
 	uint32_t	warnflags;	/* warning flags */
 	uint32_t	validflags;	/* sensor valid flags */
-	unsigned	units;		/* type of sensor */
+	unsigned int	units;		/* type of sensor */
 };
 typedef struct envsys_tre_data envsys_tre_data_t;
 /* flags for warnflags */
 #define ENVSYS_WARN_OK		0x00000000  /* All is well */
 #define ENVSYS_WARN_UNDER	0x00000001  /* an under condition */
 #define ENVSYS_WARN_CRITUNDER	0x00000002  /* a critical under condition */
 #define ENVSYS_WARN_OVER	0x00000004  /* an over condition */
 #define ENVSYS_WARN_CRITOVER	0x00000008  /* a critical over condition */
 /* drive status */
 #define ENVSYS_DRIVE_EMPTY      1
 #define ENVSYS_DRIVE_READY      2
 @@ -174,25 +174,25 @@ static const char * const envsysdrivesta
 /* flags for validflags */
 #define ENVSYS_FVALID		0x00000001  /* sensor is valid */
 #define ENVSYS_FCURVALID	0x00000002  /* cur for this sens is valid */
 #define ENVSYS_FMINVALID	0x00000004  /* min for this sens is valid */
 #define ENVSYS_FMAXVALID	0x00000008  /* max for this sens is valid */
 #define ENVSYS_FAVGVALID	0x00000010  /* avg for this sens is valid */
 #define ENVSYS_FFRACVALID	0x00000020  /* display fraction of max */
 #define ENVSYS_GTREDATA 	_IOWR('E', 2, envsys_tre_data_t)
 /* set and check sensor info */
 struct envsys_basic_info {
-	unsigned sensor;	/* sensor number */
+	unsigned int sensor;	/* sensor number */
-	unsigned units;		/* type of sensor */
+	unsigned int units;	/* type of sensor */
 	char	desc[33];	/* sensor description */
-	unsigned rfact;		/* for volts, (int)(factor x 10^4) */
+	unsigned int rfact;	/* for volts, (int)(factor x 10^4) */
-	unsigned rpms;		/* for fans, set nominal RPMs */
+	unsigned int rpms;	/* for fans, set nominal RPMs */
 	uint32_t validflags;	/* sensor valid flags */
 };
 typedef struct envsys_basic_info envsys_basic_info_t;
 #define ENVSYS_GTREINFO 	_IOWR('E', 4, envsys_basic_info_t)
 #endif /* _SYS_ENVSYS_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fdio.h,v 1.5 2016/01/22 23:35:18 dholland Exp $	*/
+/*	$NetBSD: fdio.h,v 1.6 2016/01/23 01:26:14 dholland Exp $	*/
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by John Kohl.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -36,48 +36,48 @@
 /* Floppy diskette definitions */
 enum fdformat_result {
 	FDFORMAT_SUCCESS,
 	FDFORMAT_MEDIA_ERROR,		/* hardware reported a formatting
 					   error */
 	FDFORMAT_CONFIG_ERROR		/* something bogus in parameters */
 };
 #define FDFORMAT_VERSION 19961120
 struct fdformat_cmd {
-	unsigned formatcmd_version;	/* FDFORMAT_VERSION */
+	unsigned int formatcmd_version;	/* FDFORMAT_VERSION */
 	int head;		/* IN */
 	int cylinder;		/* IN */
 };
 struct fdformat_parms {
 /* list of items taken from i386 formatting glop (NEC 765);
    should be made the union of support needed for other devices. */
-    unsigned fdformat_version;	/* rev this when needed; write drivers to
+    unsigned int fdformat_version;/* rev this when needed; write drivers to
 				   allow forward compatibility, please,
 				   and add elements to the end of the
 				   structure */
-    unsigned nbps;			/* number of bytes per sector */
+    unsigned int nbps;			/* number of bytes per sector */
-    unsigned ncyl;			/* number of cylinders */
+    unsigned int ncyl;			/* number of cylinders */
-    unsigned nspt;			/* sectors per track */
+    unsigned int nspt;			/* sectors per track */
-    unsigned ntrk;			/* number of heads/tracks per cyl */
+    unsigned int ntrk;			/* number of heads/tracks per cyl */
-    unsigned stepspercyl;		/* steps per cylinder */
+    unsigned int stepspercyl;		/* steps per cylinder */
-    unsigned gaplen;			/* formatting gap length */
+    unsigned int gaplen;		/* formatting gap length */
-    unsigned fillbyte;			/* formatting fill byte */
+    unsigned int fillbyte;		/* formatting fill byte */
-    unsigned xfer_rate;			/* in bits per second; driver
+    unsigned int xfer_rate;		/* in bits per second; driver
 					   must convert */
-    unsigned interleave;		/* interleave factor */
+    unsigned int interleave;		/* interleave factor */
 };
 #define FDOPT_NORETRY 0x0001	/* no retries on failure (cleared on close) */
 #define FDOPT_SILENT  0x0002	/* no error messages (cleared on close) */
 #define FDIOCGETOPTS  _IOR('d', 114, int) /* drive options, see previous */
 #define FDIOCSETOPTS  _IOW('d', 115, int)
 #define FDIOCSETFORMAT _IOW('d', 116, struct fdformat_parms) /* set format parms */
 #define FDIOCGETFORMAT _IOR('d', 117, struct fdformat_parms) /* get format parms */
 #define FDIOCFORMAT_TRACK _IOW('d', 118, struct fdformat_cmd) /* do it */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wdog.h,v 1.4 2016/01/22 23:47:04 dholland Exp $	*/
+/*	$NetBSD: wdog.h,v 1.5 2016/01/23 01:26:14 dholland Exp $	*/
 /*-
  * Copyright (c) 2000 Zembu Labs, Inc.
  * All rights reserved.
+ *
  * Author: Jason R. Thorpe <thorpej@zembu.com>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -38,27 +38,27 @@
 #include <sys/ioccom.h>
 /*
  * Definitions for manipulating watchdog timers.
  */
 /* This must match struct device's "dv_xname" size. */
 #define	WDOG_NAMESIZE	16
 struct wdog_mode {
 	char wm_name[WDOG_NAMESIZE];
 	int wm_mode;		/* timer mode */
-	unsigned wm_period;	/* timer period (seconds) */
+	unsigned int wm_period;	/* timer period (seconds) */
 };
 /*
  * GMODE -- get mode of watchdog specified by wm_name.
+ *
  * SMODE -- set mode of watchdog specified by wm_mame.  If
  *          wm_mode is not DISARMED, the watchdog is armed,
  *          if another watchdog is not already running.
  */
 #define	WDOGIOC_GMODE		_IOWR('w', 0, struct wdog_mode)
 #define	WDOGIOC_SMODE		 _IOW('w', 1, struct wdog_mode)
 /*