 @@ -1,288 +1,288 @@
-/*	$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.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT 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.
  */
 /*
  * RRS section definitions.
+ *
  * The layout of some data structures defined in this header file is
  * such that we can provide compatibility with the SunOS 4.x shared
  * library scheme.
  */
 #ifndef _LINK_AOUT_H_
 #define _LINK_AOUT_H_
 #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;
 	unsigned long	nz_size;
 #define nz_un		nlist.n_un
 #define nz_strx		nlist.n_un.n_strx
 #define nz_name		nlist.n_un.n_name
 #define nz_type		nlist.n_type
 #define nz_value	nlist.n_value
 #define nz_desc		nlist.n_desc
 #define nz_other	nlist.n_other
 };
 #define N_AUX(p)	((p)->n_other & 0xf)
 #define N_BIND(p)	(((unsigned int)(p)->n_other >> 4) & 0xf)
 #define N_OTHER(r, v)	(((unsigned int)(r) << 4) | ((v) & 0xf))
 #define AUX_OBJECT	1
 #define AUX_FUNC	2
 #define AUX_LABEL	3
 /*#define BIND_LOCAL	0	not used */
 /*#define BIND_GLOBAL	1	not used */
 #define BIND_WEAK	2
 /*
  * The `section_dispatch_table' structure contains offsets to various data
  * structures needed to do run-time relocation.
  */
 struct section_dispatch_table {
 	struct so_map *sdt_loaded;	/* List of loaded objects */
 	long	sdt_sods;		/* List of shared objects descriptors */
 	long	sdt_paths;		/* Library search paths */
 	long	sdt_got;		/* Global offset table */
 	long	sdt_plt;		/* Procedure linkage table */
 	long	sdt_rel;		/* Relocation table */
 	long	sdt_hash;		/* Symbol hash table */
 	long	sdt_nzlist;		/* Symbol table itself */
 	long	sdt_filler2;		/* Unused (was: stab_hash) */
 	long	sdt_buckets;		/* Number of hash buckets */
 	long	sdt_strings;		/* Symbol strings */
 	long	sdt_str_sz;		/* Size of symbol strings */
 	long	sdt_text_sz;		/* Size of text area */
 	long	sdt_plt_sz;		/* Size of procedure linkage table */
 };
 /*
  * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table.
  * Used to quickly lookup symbols of the shared object by hashing
  * on the symbol's name. `rh_symbolnum' is the index of the symbol
  * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is
  * the next symbol in the hash bucket (in case of collisions).
  */
 struct rrs_hash {
 	int	rh_symbolnum;		/* Symbol number */
 	int	rh_next;		/* Next hash entry */
 };
 /*
  * `rt_symbols' is used to keep track of run-time allocated commons
  * and data items copied from shared objects.
  */
 struct rt_symbol {
 	struct nzlist		*rt_sp;		/* The symbol */
 	struct rt_symbol	*rt_next;	/* Next in linear list */
 	struct rt_symbol	*rt_link;	/* Next in bucket */
 	caddr_t			rt_srcaddr;	/* Address of "master" copy */
 	struct so_map		*rt_smp;	/* Originating map */
 };
 /*
  * Debugger interface structure.
  */
 struct so_debug {
 	int	dd_version;		/* Version # of interface */
 	int	dd_in_debugger;		/* Set when run by debugger */
 	int	dd_sym_loaded;		/* Run-time linking brought more
 					   symbols into scope */
 	char   	 *dd_bpt_addr;		/* Address of rtld-generated bpt */
 	int	dd_bpt_shadow;		/* Original contents of bpt */
 	struct rt_symbol *dd_cc;	/* Allocated commons/copied data */
 };
 /*
  * Entry points into ld.so - user interface to the run-time linker.
  */
 struct ld_entry {
 	void	*(*dlopen)(const char *, int);
 	int	(*dlclose)(void *);
 	void	*(*dlsym)(void *, const char *);
 	int	(*dlctl)(void *, int, void *);
 	void	(*dlexit)(void);
 	int	(*dladdr)(const void *, Dl_info *);
 	void	(*dlrsrvd[2])(void);
 };
 /*
  * This is the structure pointed at by the __DYNAMIC symbol if an
  * executable requires the attention of the run-time link editor.
  * __DYNAMIC is given the value zero if no run-time linking needs to
  * be done (it is always present in shared objects).
  * The union `d_un' provides for different versions of the dynamic
  * linking mechanism (switched on by `d_version'). The last version
  * used by Sun is 3. We leave some room here and go to version number
  * 8 for NetBSD, the main difference lying in the support for the
  * `nz_list' type of symbols.
  */
 struct	_dynamic {
 	int		d_version;	/* version # of this interface */
 	struct so_debug	*d_debug;
 	union {
 		struct section_dispatch_table *d_sdt;
 	} d_un;
 	struct ld_entry *d_entry;	/* compat - now in crt_ldso */
 };
 #define LD_VERSION_SUN		(3)
 #define LD_VERSION_BSD		(8)
 #define LD_VERSION_NZLIST_P(v)	((v) >= 8)
 #define LD_GOT(x)	((x)->d_un.d_sdt->sdt_got)
 #define LD_PLT(x)	((x)->d_un.d_sdt->sdt_plt)
 #define LD_REL(x)	((x)->d_un.d_sdt->sdt_rel)
 #define LD_SYMBOL(x)	((x)->d_un.d_sdt->sdt_nzlist)
 #define LD_HASH(x)	((x)->d_un.d_sdt->sdt_hash)
 #define LD_STRINGS(x)	((x)->d_un.d_sdt->sdt_strings)
 #define LD_NEED(x)	((x)->d_un.d_sdt->sdt_sods)
 #define LD_BUCKETS(x)	((x)->d_un.d_sdt->sdt_buckets)
 #define LD_PATHS(x)	((x)->d_un.d_sdt->sdt_paths)
 #define LD_GOTSZ(x)	((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got)
 #define LD_RELSZ(x)	((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel)
 #define LD_HASHSZ(x)	((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash)
 #define LD_STABSZ(x)	((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist)
 #define LD_PLTSZ(x)	((x)->d_un.d_sdt->sdt_plt_sz)
 #define LD_STRSZ(x)	((x)->d_un.d_sdt->sdt_str_sz)
 #define LD_TEXTSZ(x)	((x)->d_un.d_sdt->sdt_text_sz)
 /*
  * Interface to ld.so
  */
 struct crt_ldso {
 	int		crt_ba;		/* Base address of ld.so */
 	int		crt_dzfd;	/* "/dev/zero" file descriptor (SunOS) */
 	int		crt_ldfd;	/* ld.so file descriptor */
 	struct _dynamic	*crt_dp;	/* Main's __DYNAMIC */
 	char		**crt_ep;	/* environment strings */
 	caddr_t		crt_bp;		/* Breakpoint if run from debugger */
 	char		*crt_prog;	/* Program name (v3) */
 	char		*crt_ldso;	/* Link editor name (v4) */
 	struct ld_entry	*crt_ldentry;	/* dl*() access (v4) */
 };
 /*
  * Version passed from crt0 to ld.so (1st argument to _rtld()).
  */
 #define CRT_VERSION_SUN		1
 #define CRT_VERSION_BSD_2	2
 #define CRT_VERSION_BSD_3	3
 #define CRT_VERSION_BSD_4	4
 /*
  * Maximum number of recognized shared object version numbers.
  */
 #define MAXDEWEY	8
 /*
  * Header of the hints file.
  */
 struct hints_header {
 	long		hh_magic;
 #define HH_MAGIC	011421044151
 	long		hh_version;	/* Interface version number */
 #define LD_HINTS_VERSION_1	1
 #define LD_HINTS_VERSION_2	2
 	long		hh_hashtab;	/* Location of hash table */
 	long		hh_nbucket;	/* Number of buckets in hashtab */
 	long		hh_strtab;	/* Location of strings */
 	long		hh_strtab_sz;	/* Size of strings */
 	long		hh_ehints;	/* End of hints (max offset in file) */
 	long		hh_dirlist;	/* Colon-separated list of srch dirs */
 };
 #define HH_BADMAG(hdr)	((hdr).hh_magic != HH_MAGIC)
 /*
  * Hash table element in hints file.
  */
 struct hints_bucket {
 	/* namex and pathx are indices into the string table */
 	int		hi_namex;		/* Library name */
 	int		hi_pathx;		/* Full path */
 	int		hi_dewey[MAXDEWEY];	/* The versions */
 	int		hi_ndewey;		/* Number of version numbers */
 #define hi_major hi_dewey[0]
 #define hi_minor hi_dewey[1]
 	int		hi_next;		/* Next in this bucket */
 };
 #define _PATH_LD_HINTS		"/var/run/ld.so.hints"
 #endif /* _LINK_AOUT_H_ */

 @@ -1,230 +1,230 @@
-/*	$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.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT 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.
  */
 #ifndef _NSSWITCH_H
 #define _NSSWITCH_H	1
 #include <sys/types.h>
 #include <stdarg.h>
 #define	NSS_MODULE_INTERFACE_VERSION	0
 #ifndef _PATH_NS_CONF
 #define _PATH_NS_CONF	"/etc/nsswitch.conf"
 #endif
 #define	NS_CONTINUE	0
 #define	NS_RETURN	1
 /*
  * Layout of:
  *	uint32_t ns_src.flags
  */
 	/* nsswitch.conf status codes and nsdispatch(3) return values */
 #define	NS_SUCCESS	(1<<0)		/* entry was found */
 #define	NS_UNAVAIL	(1<<1)		/* source not responding, or corrupt */
 #define	NS_NOTFOUND	(1<<2)		/* source responded 'no such entry' */
 #define	NS_TRYAGAIN	(1<<3)		/* source busy, may respond to retrys */
 #define	NS_STATUSMASK	0x000000ff	/* bitmask to get the status flags */
 	/* internal nsdispatch(3) flags; not settable in nsswitch.conf(5)  */
 #define	NS_FORCEALL	(1<<8)		/* force all methods to be invoked; */
 /*
  * Currently implemented sources.
  */
 #define NSSRC_FILES	"files"		/* local files */
 #define	NSSRC_DNS	"dns"		/* DNS; IN for hosts, HS for others */
 #define	NSSRC_NIS	"nis"		/* YP/NIS */
 #define	NSSRC_COMPAT	"compat"	/* passwd,group in YP compat mode */
 /*
  * Currently implemented databases.
  */
 #define NSDB_HOSTS		"hosts"
 #define NSDB_GROUP		"group"
 #define NSDB_GROUP_COMPAT	"group_compat"
 #define NSDB_NETGROUP		"netgroup"
 #define NSDB_NETWORKS		"networks"
 #define NSDB_PASSWD		"passwd"
 #define NSDB_PASSWD_COMPAT	"passwd_compat"
 #define NSDB_SHELLS		"shells"
 /*
  * Suggested databases to implement.
  */
 #define NSDB_ALIASES		"aliases"
 #define NSDB_AUTH		"auth"
 #define NSDB_AUTOMOUNT		"automount"
 #define NSDB_BOOTPARAMS		"bootparams"
 #define NSDB_ETHERS		"ethers"
 #define NSDB_EXPORTS		"exports"
 #define NSDB_NETMASKS		"netmasks"
 #define NSDB_PHONES		"phones"
 #define NSDB_PRINTCAP		"printcap"
 #define NSDB_PROTOCOLS		"protocols"
 #define NSDB_REMOTE		"remote"
 #define NSDB_RPC		"rpc"
 #define NSDB_SENDMAILVARS	"sendmailvars"
 #define NSDB_SERVICES		"services"
 #define NSDB_TERMCAP		"termcap"
 #define NSDB_TTYS		"ttys"
 /*
  * ns_dtab `callback' function signature.
  */
 typedef	int (*nss_method)(void *, void *, va_list);
 /*
  * ns_dtab - `nsswitch dispatch table'
  * Contains an entry for each source and the appropriate function to call.
  */
 typedef struct {
 	const char	 *src;
 	nss_method	 callback;
 	void		 *cb_data;
 } ns_dtab;
 /*
  * Macros to help build an ns_dtab[]
  */
 #define NS_FILES_CB(F,C)	{ NSSRC_FILES,	F,	__UNCONST(C) },
 #define NS_COMPAT_CB(F,C)	{ NSSRC_COMPAT,	F,	__UNCONST(C) },
 #ifdef HESIOD
 #   define NS_DNS_CB(F,C)	{ NSSRC_DNS,	F,	__UNCONST(C) },
 #else
 #   define NS_DNS_CB(F,C)
 #endif
 #ifdef YP
 #   define NS_NIS_CB(F,C)	{ NSSRC_NIS,	F,	__UNCONST(C) },
 #else
 #   define NS_NIS_CB(F,C)
 #endif
 #define	NS_NULL_CB		{ .src = NULL },
 /*
  * ns_src - `nsswitch source'
  * Used by the nsparser routines to store a mapping between a source
  * and its dispatch control flags for a given database.
  */
 typedef struct {
 	const char	*name;
 	uint32_t	 flags;
 } ns_src;
 /*
  * Default sourcelists (if nsswitch.conf is missing, corrupt,
  * or the requested database doesn't have an entry)
  */
 extern const ns_src __nsdefaultsrc[];
 extern const ns_src __nsdefaultcompat[];
 extern const ns_src __nsdefaultcompat_forceall[];
 extern const ns_src __nsdefaultfiles[];
 extern const ns_src __nsdefaultfiles_forceall[];
 extern const ns_src __nsdefaultnis[];
 extern const ns_src __nsdefaultnis_forceall[];
 /*
  * ns_mtab - `nsswitch method table'
  * An nsswitch module provides a mapping from (database name, method name)
  * tuples to the nss_method and associated callback data.  Effectively,
  * ns_dtab, but used for dynamically loaded modules.
  */
 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 [], ...);
 #ifdef _NS_PRIVATE
 int		 _nsdbtaddsrc(ns_dbt *, const ns_src *);
 void		 _nsdbtdump(const ns_dbt *);
 int		 _nsdbtput(const ns_dbt *);
 void		 _nsyyerror(const char *);
 int		 _nsyylex(void);
 #endif /* _NS_PRIVATE */
 __END_DECLS
 #endif /* !_NSSWITCH_H */

 @@ -1,92 +1,92 @@
-/*	$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
  *    must display the following acknowledgement:
  *	This product includes software developed by Berkeley Software Design,
  *	Inc.
  * 4. The name of Berkeley Software Design, Inc.  may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN, INC. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN, INC. BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * 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 login_cap.h,v 2.10 1997/08/07 21:35:19 prb Exp
  */
 #ifndef _LOGIN_CAP_H_
 #define _LOGIN_CAP_H_
 #define	LOGIN_DEFCLASS		"default"
 #define	LOGIN_DEFSERVICE	"login"
 #define	LOGIN_DEFUMASK		022
 #define	_PATH_LOGIN_CONF	"/etc/login.conf"
 #define	LOGIN_OSETGROUP		0x0001	/* Obsolete setgroup */
 #define	LOGIN_SETLOGIN		0x0002	/* Set login */
 #define	LOGIN_SETPATH		0x0004	/* Set path */
 #define	LOGIN_SETPRIORITY	0x0008	/* Set priority */
 #define	LOGIN_SETRESOURCES	0x0010	/* Set resource limits */
 #define	LOGIN_SETUMASK		0x0020	/* Set umask */
 #define	LOGIN_SETUSER		0x0040	/* Set user */
 #define	LOGIN_SETENV		0x0080	/* Set user environment */
 #define	LOGIN_SETGID		0x0100	/* Set group id */
 #define	LOGIN_SETGROUPS		0x0200	/* Set group membership (initgroups) */
 #define	LOGIN_SETALL		0x03fe	/* Set all. 0x0001 is obsolete! */
 #define	LOGIN_SETGROUP		(LOGIN_SETGID|LOGIN_SETGROUPS) /* Set group */
 typedef struct {
 	char	*lc_class;
 	char	*lc_cap;
 	char	*lc_style;
 } login_cap_t;
 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,65 +1,67 @@
-/*	$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
  *    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
  *    must display the following acknowledgement:
  *	This product includes software developed for the NetBSD Project by
  *	Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT 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.
  */
 #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,146 +1,146 @@
-/*	$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
  *    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
  *    must display the following acknowledgement:
  *	This product includes software developed by TooLs GmbH.
  * 4. The name of TooLs GmbH may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT 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.
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
+ *
  * This software is provided "as is".
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #ifndef _MSDOSFS_DIRENTRY_H_
 #define _MSDOSFS_DIRENTRY_H_
 /*
  * Structure of a dos directory entry.
  */
 struct direntry {
 	uint8_t		deName[8];	/* filename, blank filled */
 #define	SLOT_EMPTY	0x00		/* slot has never been used */
 #define	SLOT_E5		0x05		/* the real value is 0xe5 */
 #define	SLOT_DELETED	0xe5		/* file in this slot deleted */
 	uint8_t		deExtension[3];	/* extension, blank filled */
 	uint8_t		deAttributes;	/* file attributes */
 #define	ATTR_NORMAL	0x00		/* normal file */
 #define	ATTR_READONLY	0x01		/* file is readonly */
 #define	ATTR_HIDDEN	0x02		/* file is hidden */
 #define	ATTR_SYSTEM	0x04		/* file is a system file */
 #define	ATTR_VOLUME	0x08		/* entry is a volume label */
 #define	ATTR_DIRECTORY	0x10		/* entry is a directory name */
 #define	ATTR_ARCHIVE	0x20		/* file is new or modified */
 	uint8_t		deReserved;	/* reserved */
 	uint8_t		deCHundredth;	/* hundredth of seconds in CTime */
 	uint8_t		deCTime[2];	/* create time */
 	uint8_t		deCDate[2];	/* create date */
 	uint8_t		deADate[2];	/* access date */
 	uint8_t		deHighClust[2];	/* high bytes of cluster number */
 	uint8_t		deMTime[2];	/* last update time */
 	uint8_t		deMDate[2];	/* last update date */
 	uint8_t		deStartCluster[2]; /* starting cluster of file */
 	uint8_t		deFileSize[4];	/* size of file in bytes */
 };
 static __inline uint8_t
 msdos_dirchar(const struct direntry *de, size_t i) {
 	return i < sizeof(de->deName) ? de->deName[i] :
 	    de->deExtension[i - sizeof(de->deName)];
+}
 /*
  * Structure of a Win95 long name directory entry
  */
 struct winentry {
 	uint8_t		weCnt;
 #define	WIN_LAST	0x40
 #define	WIN_CNT		0x3f
 	uint8_t		wePart1[10];
 	uint8_t		weAttributes;
 #define	ATTR_WIN95	0x0f
 	uint8_t		weReserved1;
 	uint8_t		weChksum;
 	uint8_t		wePart2[12];
 	uint16_t	weReserved2;
 	uint8_t		wePart3[4];
 };
 #define	WIN_CHARS	13	/* Number of chars per winentry */
 /*
  * This is the format of the contents of the deTime field in the direntry
  * structure.
  * We don't use bitfields because we don't know how compilers for
  * arbitrary machines will lay them out.
  */
 #define DT_2SECONDS_MASK	0x1F	/* seconds divided by 2 */
 #define DT_2SECONDS_SHIFT	0
 #define DT_MINUTES_MASK		0x7E0	/* minutes */
 #define DT_MINUTES_SHIFT	5
 #define DT_HOURS_MASK		0xF800	/* hours */
 #define DT_HOURS_SHIFT		11
 /*
  * This is the format of the contents of the deDate field in the direntry
  * 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,198 +1,198 @@
-/* $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.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT 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.
  */
 #ifndef _SYS_ENVSYS_H_
 #define _SYS_ENVSYS_H_
 #ifndef _KERNEL
 #include <stdbool.h>
 #endif
 #include <sys/ioccom.h>
 #include <sys/power.h>
 #include <sys/queue.h>
 /*
  * ENVironmental SYStem version 2 (aka ENVSYS 2)
  */
 #define ENVSYS_MAXSENSORS	512
 #define ENVSYS_DESCLEN		32
 /* sensor units */
 enum envsys_units {
 	ENVSYS_STEMP		= 0,	/* Temperature (microkelvins) */
 	ENVSYS_SFANRPM,			/* Fan RPM */
 	ENVSYS_SVOLTS_AC,		/* AC Volts */
 	ENVSYS_SVOLTS_DC,		/* DC Volts */
 	ENVSYS_SOHMS,			/* Ohms */
 	ENVSYS_SWATTS,			/* Watts */
 	ENVSYS_SAMPS,			/* Ampere */
 	ENVSYS_SWATTHOUR,		/* Watt hour */
 	ENVSYS_SAMPHOUR,		/* Ampere hour */
 	ENVSYS_INDICATOR,		/* Indicator */
 	ENVSYS_INTEGER,			/* Integer */
 	ENVSYS_DRIVE,			/* Drive */
 	ENVSYS_BATTERY_CAPACITY,	/* Battery capacity */
 	ENVSYS_BATTERY_CHARGE,		/* Battery charging/discharging */
 	ENVSYS_SRELHUMIDITY,		/* relative humidity */
 	ENVSYS_NSENSORS
 };
 /* sensor states */
 enum envsys_states {
 	ENVSYS_SVALID		= 10,	/* sensor state is valid */
 	ENVSYS_SINVALID,		/* sensor state is invalid */
 	ENVSYS_SCRITICAL,		/* sensor state is critical */
 	ENVSYS_SCRITUNDER,		/* sensor state is critical under */
 	ENVSYS_SCRITOVER,		/* sensor state is critical over */
 	ENVSYS_SWARNUNDER,		/* sensor state is warn under */
 	ENVSYS_SWARNOVER		/* sensor state is warn over */
 };
 /* sensor drive states */
 enum envsys_drive_states {
 	ENVSYS_DRIVE_EMPTY	= 1,	/* drive is empty */
 	ENVSYS_DRIVE_READY,		/* drive is ready */
 	ENVSYS_DRIVE_POWERUP,		/* drive is powered up */
 	ENVSYS_DRIVE_ONLINE,		/* drive is online */
 	ENVSYS_DRIVE_IDLE,		/* drive is idle */
 	ENVSYS_DRIVE_ACTIVE,		/* drive is active */
 	ENVSYS_DRIVE_REBUILD,		/* drive is rebuilding */
 	ENVSYS_DRIVE_POWERDOWN,		/* drive is powered down */
 	ENVSYS_DRIVE_FAIL,		/* drive failed */
 	ENVSYS_DRIVE_PFAIL,		/* drive is degraded */
 	ENVSYS_DRIVE_MIGRATING,		/* drive is migrating */
 	ENVSYS_DRIVE_OFFLINE,		/* drive is offline */
 	ENVSYS_DRIVE_BUILD,		/* drive is building */
 	ENVSYS_DRIVE_CHECK		/* drive is checking its state */
 };
 /* sensor battery capacity states */
 enum envsys_battery_capacity_states {
 	ENVSYS_BATTERY_CAPACITY_NORMAL	= 1,	/* normal cap in battery */
 	ENVSYS_BATTERY_CAPACITY_WARNING,	/* warning cap in battery */
 	ENVSYS_BATTERY_CAPACITY_CRITICAL,	/* critical cap in battery */
 	ENVSYS_BATTERY_CAPACITY_HIGH,		/* high cap in battery */
 	ENVSYS_BATTERY_CAPACITY_MAX,		/* maximum cap in battery */
 	ENVSYS_BATTERY_CAPACITY_LOW		/* low cap in battery */
 };
 /* sensor indicator states */
 enum envsys_indicator_states {
 	ENVSYS_INDICATOR_FALSE		= 0,
 	ENVSYS_INDICATOR_TRUE		= 1
 };
 /*
  * IOCTLs
  */
 #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
 #define ENVSYS_DRIVE_POWERUP    3
 #define ENVSYS_DRIVE_ONLINE     4
 #define ENVSYS_DRIVE_IDLE       5
 #define ENVSYS_DRIVE_ACTIVE     6
 #define ENVSYS_DRIVE_REBUILD    7
 #define ENVSYS_DRIVE_POWERDOWN  8
 #define ENVSYS_DRIVE_FAIL       9
 #define ENVSYS_DRIVE_PFAIL      10
 #ifdef ENVSYSUNITNAMES
 static const char * const envsysunitnames[] = {
     "degC", "RPM", "VAC", "V", "Ohms", "W",
     "A", "Wh", "Ah", "bool", "integer", "drive", "%rH", "Unk"
 };
 static const char * const envsysdrivestatus[] = {
     "unknown", "empty", "ready", "powering up", "online", "idle", "active",
     "rebuilding", "powering down", "failed", "degraded"
 };
 #endif
 /* 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,84 +1,84 @@
-/*	$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.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT 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.
  */
 #ifndef _SYS_FDIO_H_
 #define _SYS_FDIO_H_
 #include <sys/ioccom.h>
 /* 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 */
 #endif /* _SYS_FDIO_H_ */

 @@ -1,109 +1,109 @@
-/*	$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
  *    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
  *    must display the following acknowledgement:
  *	This product includes software developed by Zembu Labs, Inc.
  * 4. Neither the name of Zembu Labs nor the names of its employees may
  *    be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY ZEMBU LABS, INC. ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WAR-
  * RANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS-
  * CLAIMED.  IN NO EVENT SHALL ZEMBU LABS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
  */
 #ifndef _SYS_WDOG_H_
 #define	_SYS_WDOG_H_
 #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)
 /*
  * WHICH -- returns the mode information of the currently armed
  *          watchdog timer.
  */
 #define	WDOGIOC_WHICH		 _IOR('w', 2, struct wdog_mode)
 /*
  * TICKLE -- tickle the currently armed watchdog timer if the
  *           mode of that timer is UTICKLE.
  */
 #define	WDOGIOC_TICKLE		  _IO('w', 3)
 /*
  * GTICKLER -- get the PID of the last process to tickle the timer.
  */
 #define	WDOGIOC_GTICKLER	 _IOR('w', 4, pid_t)
 /*
  * GWDOGS -- fill in the character array with the names of all of
  *           the watchdog timers present on the system.  The names
  *           will be padded out to WDOG_NAMESIZE.  Thus, the argument
  *           should be (count * WDOG_NAMESIZE) bytes long.
  */
 struct wdog_conf {
 	char *wc_names;
 	int wc_count;
 };
 #define	WDOGIOC_GWDOGS		_IOWR('w', 5, struct wdog_conf)
 #define	WDOG_MODE_DISARMED	0	/* watchdog is disarmed */
 #define	WDOG_MODE_KTICKLE	1	/* kernel tickles watchdog */
 #define	WDOG_MODE_UTICKLE	2	/* user tickles watchdog */
 #define	WDOG_MODE_ETICKLE	3	/* external program tickles watchdog */
 #define	WDOG_MODE_MASK		0x03
 #define	WDOG_FEATURE_ALARM	0x10	/* enable audible alarm on expire */
 #define	WDOG_FEATURE_MASK	0x10
 #define	WDOG_PERIOD_DEFAULT	((u_int)-1)
 /* Period is expressed in seconds. */
 #define	WDOG_PERIOD_TO_TICKS(period)	((period) * hz)
 #endif /* _SYS_WDOG_H_ */

 @@ -1,56 +1,56 @@
-/*	$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
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * 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
 #include <sys/cdefs.h>
 __BEGIN_DECLS
 int getifaddrs(struct ifaddrs **);
 void freeifaddrs(struct ifaddrs *);
 __END_DECLS
 #endif /* !_IFADDRS_H_ */