 @@ -1,14 +1,14 @@
-/*      $NetBSD: at91dbguvar.h,v 1.5 2012/02/02 19:42:57 tls Exp $	*/
+/*      $NetBSD: at91dbguvar.h,v 1.6 2015/04/14 20:32:35 riastradh Exp $	*/
 /*-
  * Copyright (c) 2007 Embedtronics Oy
+ *
  * 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.
+ *
 @@ -21,26 +21,30 @@
  * 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 _AT91DBGUVAR_H_
 #define _AT91DBGUVAR_H_
 #include <sys/tty.h>
 #ifdef RND_COM
 #include <sys/rndsource.h>
 #endif
 /* Hardware flag masks */
 #define COM_HW_NOIEN		0x01
 #define COM_HW_DEV_OK		0x20
 #define COM_HW_CONSOLE		0x40
 #define COM_HW_KGDB		0x80
 #define RX_TTY_BLOCKED		0x01
 #define RX_TTY_OVERFLOWED	0x02
 #define RX_IBUF_BLOCKED		0x04
 #define RX_IBUF_OVERFLOWED	0x08
 #define RX_ANY_BLOCK		0x0f
 #define AT91DBGU_RING_SIZE	2048

 @@ -1,14 +1,14 @@
-/*      $NetBSD: at91usartvar.h,v 1.6 2012/11/12 18:00:36 skrll Exp $	*/
+/*      $NetBSD: at91usartvar.h,v 1.7 2015/04/14 20:32:35 riastradh Exp $	*/
 /*-
  * Copyright (c) 2007 Embedtronics Oy. 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.
+ *
 @@ -21,26 +21,29 @@
  * 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 _AT91USARTVAR_H_
 #define _AT91USARTVAR_H_
 #include <sys/tty.h>
 #include <arm/at91/at91pdcvar.h>
 #ifdef RND_COM
 #include <sys/rndsource.h>
 #endif
 /* Hardware flag masks */
 #define COM_HW_NOIEN		0x01
 #define COM_HW_DEV_OK		0x20
 #define COM_HW_CONSOLE		0x40
 #define COM_HW_KGDB		0x80
 #define RX_TTY_BLOCKED		0x01
 #define RX_TTY_OVERFLOWED	0x02
 #define RX_IBUF_BLOCKED		0x04
 #define RX_IBUF_OVERFLOWED	0x08
 #define RX_ANY_BLOCK		0x0f

 @@ -1,14 +1,14 @@
-/*      $NetBSD: epcomvar.h,v 1.7 2012/10/27 17:17:37 chs Exp $        */
+/*      $NetBSD: epcomvar.h,v 1.8 2015/04/14 20:32:35 riastradh Exp $        */
 /*-
  * Copyright (c) 2004 Jesse Off
+ *
  * 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
 @@ -18,26 +18,30 @@
  * 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 _EPCOMVAR_H_
 #define _EPCOMVAR_H_
 #ifdef RND_COM
 #include <sys/rndsource.h>
 #endif
 /* Hardware flag masks */
 #define COM_HW_NOIEN		0x01
 #define COM_HW_DEV_OK		0x20
 #define COM_HW_CONSOLE		0x40
 #define COM_HW_KGDB		0x80
 #define RX_TTY_BLOCKED		0x01
 #define RX_TTY_OVERFLOWED	0x02
 #define RX_IBUF_BLOCKED		0x04
 #define RX_IBUF_OVERFLOWED	0x08
 #define RX_ANY_BLOCK		0x0f
 #define EPCOM_RING_SIZE	2048

 @@ -1,14 +1,14 @@
-/* $NetBSD: sscom_var.h,v 1.13 2014/03/14 21:40:48 matt Exp $ */
+/* $NetBSD: sscom_var.h,v 1.14 2015/04/14 20:32:35 riastradh Exp $ */
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003 Genetec Corporation
  * 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
 @@ -66,26 +66,29 @@
 #ifndef _ARM_S3C2XX0_SSCOM_VAR_H
 #define _ARM_S3C2XX0_SSCOM_VAR_H
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_sscom.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/callout.h>
 #include <sys/bus.h>
 #ifdef RND_COM
 #include <sys/rndsource.h>
 #endif
 #ifdef	SSCOM_S3C2410
 #include <arm/s3c2xx0/s3c2410reg.h>
 #include <arm/s3c2xx0/s3c2410var.h>
 #elif defined(SSCOM_S3C2440)
 #include <arm/s3c2xx0/s3c2440reg.h>
 #include <arm/s3c2xx0/s3c2440var.h>
 #endif
 /* Hardware flag masks */
 #define	SSCOM_HW_FLOW		0x02
 #define	SSCOM_HW_DEV_OK		0x04
 #define	SSCOM_HW_CONSOLE	0x08

 @@ -1,14 +1,14 @@
-/* $NetBSD: sscom_var.h,v 1.3 2014/04/16 21:28:51 reinoud Exp $ */
+/* $NetBSD: sscom_var.h,v 1.4 2015/04/14 20:32:35 riastradh Exp $ */
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003 Genetec Corporation
  * 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
 @@ -66,26 +66,29 @@
 #ifndef _ARM_SAMSUNG_SSCOM_VAR_H
 #define _ARM_SAMSUNG_SSCOM_VAR_H
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_sscom.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/callout.h>
 #include <sys/bus.h>
 #ifdef RND_COM
 #include <sys/rndsource.h>
 #endif
 #include <arm/samsung/sscom_reg.h>
 /* Hardware flag masks */
 #define	SSCOM_HW_FLOW		0x02
 #define	SSCOM_HW_DEV_OK		0x04
 #define	SSCOM_HW_CONSOLE	0x08
 #define	SSCOM_HW_KGDB		0x10
 #define SSCOM_HW_TXINT		0x20
 #define SSCOM_HW_RXINT		0x40
 /* Buffer size for character buffer */
 #define	SSCOM_RING_SIZE	2048

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rdvar.h,v 1.22 2012/02/02 19:42:59 tls Exp $	*/
+/*	$NetBSD: rdvar.h,v 1.23 2015/04/14 20:32:35 riastradh Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,26 +29,27 @@
  * 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.
+ *
  * from: Utah $Hdr: rdvar.h 1.1 92/12/21$
+ *
  *	@(#)rdvar.h	8.1 (Berkeley) 6/10/93
  */
 #include <sys/callout.h>
 #include <sys/rndsource.h>
 struct	rdidentinfo {
 	short	ri_hwid;		/* 2 byte HW id */
 	short	ri_maxunum;		/* maximum allowed unit number */
 	const char *ri_desc;		/* drive type description */
 	int	ri_nbpt;		/* DEV_BSIZE blocks per track */
 	int	ri_ntpc;		/* tracks per cylinder */
 	int	ri_ncyl;		/* cylinders per unit */
 	int	ri_nblocks;		/* DEV_BSIZE blocks on disk */
 };
 struct rdstats {
 	long	rdretries;

 @@ -1,14 +1,14 @@
-/* $NetBSD: xbdvar.h,v 1.15 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: xbdvar.h,v 1.16 2015/04/14 20:32:35 riastradh Exp $ */
 /*
+ *
  * Copyright (c) 2004 Christian Limpach.
  * 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
 @@ -20,26 +20,28 @@
  * IN NO EVENT SHALL THE AUTHOR 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 _XEN_XBDVAR_H_
 #define _XEN_XBDVAR_H_
 #include <sys/rndsource.h>
 struct xbd_softc {
 	device_t		sc_dev;		/* base device glue */
 	struct dk_softc		sc_dksc;	/* generic disk interface */
 	unsigned long		sc_xd_device;	/* cookie identifying device */
 	struct dk_intf		*sc_di;		/* pseudo-disk interface */
 	int			sc_shutdown;	/* about to be removed */
 	krndsource_t	sc_rnd_source;
 };
 struct xbd_attach_args {
 	const char 		*xa_device;
 	vdisk_t			*xa_xd;
 	struct dk_intf		*xa_dkintf;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mb86950var.h,v 1.8 2012/10/27 17:18:21 chs Exp $	*/
+/*	$NetBSD: mb86950var.h,v 1.9 2015/04/14 20:32:35 riastradh Exp $	*/
 /*
  * Copyright (c) 1995 Mika Kortelainen
  * 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.
 @@ -20,26 +20,28 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
  */
 #include <sys/rndsource.h>
 /*
  * Adapted from if_qnreg.h for the amiga port of NetBSD by Dave J. Barnes, 2004.
  */
 /*
  * EStar_softc: per line info and status
  */
 struct mb86950_softc {
 	device_t sc_dev;
 	struct ethercom sc_ec;		/* ethernet common */
 	struct ifmedia sc_media;	/* supported media information */
 	bus_space_tag_t sc_bst;		/* bus space */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gfevar.h,v 1.12 2012/02/02 19:43:04 tls Exp $	*/
+/*	$NetBSD: if_gfevar.h,v 1.13 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, 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.
 @@ -29,26 +29,28 @@
  * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL EITHER ALLEGRO NETWORKS, INC. OR 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 _IF_GFEVAR_H_
 #define _IF_GFEVAR_H_
 #include <sys/rndsource.h>
 #define	GE_RXDESC_MEMSIZE		(1 * PAGE_SIZE)
 #define	GE_RXDESC_MAX			64
 #define	GE_RXBUF_SIZE			2048
 #define	GE_RXBUF_MEMSIZE		(GE_RXDESC_MAX*GE_RXBUF_SIZE)
 #define	GE_RXBUF_NSEGS			((GE_RXBUF_MEMSIZE/PAGE_SIZE)+1)
 #define	GE_DMSEG_MAX			(GE_RXBUF_NSEGS)
 struct gfe_dmamem {
 	bus_dmamap_t gdm_map;		/* dmamem'ed memory */
 	void *gdm_kva;		/* kva of tx memory */
 	int gdm_nsegs;			/* # of segment in gdm_segs */
 	int gdm_maxsegs;		/* maximum # of segments allowed */
 	size_t gdm_size;		/* size of memory region */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: edvar.h,v 1.17 2014/03/20 06:48:54 skrll Exp $	*/
+/*	$NetBSD: edvar.h,v 1.18 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * 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.
 @@ -20,26 +20,27 @@
  * ``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.
  */
 #include <sys/mutex.h>
 #include <sys/rndsource.h>
 struct edc_mca_softc;
 struct ed_softc {
 	device_t sc_dev;
 	/* General disk infos */
 	struct disk sc_dk;
 	struct bufq_state *sc_q;
 	kmutex_t sc_q_lock;
 	struct edc_mca_softc *edc_softc;   /* pointer to our controller */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hifn7751var.h,v 1.11 2014/01/03 16:09:22 pgoyette Exp $	*/
+/*	$NetBSD: hifn7751var.h,v 1.12 2015/04/14 20:32:36 riastradh Exp $	*/
 /*	$OpenBSD: hifn7751var.h,v 1.18 2000/06/02 22:36:45 deraadt Exp $	*/
 /*
  * Invertex AEON / Hifn 7751 driver
  * Copyright (c) 1999 Invertex Inc. All rights reserved.
  * Copyright (c) 1999 Theo de Raadt
  * Copyright (c) 2000-2001 Network Security Technologies, Inc.
  *			http://www.netsec.net
+ *
  * Please send any comments, feedback, bug-fixes, or feature requests to
  * software@invertex.com.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -35,26 +35,28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  */
 #ifndef __DEV_PCI_HIFN7751VAR_H__
 #define __DEV_PCI_HIFN7751VAR_H__
 #ifdef _KERNEL
 #include <sys/rndsource.h>
 /*
  *  Some configurable values for the driver
  */
 #define	HIFN_D_CMD_RSIZE	24	/* command descriptors */
 #define	HIFN_D_SRC_RSIZE	80	/* source descriptors */
 #define	HIFN_D_DST_RSIZE	80	/* destination descriptors */
 #define	HIFN_D_RES_RSIZE	24	/* result descriptors */
 /*
  *  Length values for cryptography
  */
 #define HIFN_DES_KEY_LENGTH		8
 #define HIFN_3DES_KEY_LENGTH		24

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bgevar.h,v 1.17 2013/10/31 04:26:40 msaitoh Exp $	*/
+/*	$NetBSD: if_bgevar.h,v 1.18 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -57,26 +57,27 @@
+ *
  * 3) Flat mode. If the 'flat mode' bit in the PCI state register is
  *    set, the device I/O mapping consumes 32MB of host address space,
  *    allowing all of the registers and internal NIC memory to be
  *    accessed directly. NIC memory addresses are offset by 0x01000000.
  *    Flat mode consumes so much host address space that it is not
  *    recommended.
  */
 #ifndef _DEV_PCI_IF_BGEVAR_H_
 #define _DEV_PCI_IF_BGEVAR_H_
 #include <sys/bus.h>
 #include <sys/rndsource.h>
 #include <net/if_ether.h>
 #include <dev/pci/pcivar.h>
 #define BGE_HOSTADDR(x, y)						\
 	do {								\
 		(x).bge_addr_lo = ((uint64_t) (y) & 0xffffffff);	\
 		if (sizeof (bus_addr_t) == 8)				\
 			(x).bge_addr_hi = ((uint64_t) (y) >> 32);	\
 		else							\
 			(x).bge_addr_hi = 0;				\
 	} while(0)
 #define RCB_WRITE_4(sc, rcb, offset, val) \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_casvar.h,v 1.4 2012/02/02 19:43:05 tls Exp $ */
+/*	$NetBSD: if_casvar.h,v 1.5 2015/04/14 20:32:36 riastradh Exp $ */
 /*	$OpenBSD: if_casvar.h,v 1.6 2009/06/13 12:18:58 kettenis Exp $	*/
 /*
+ *
  * Copyright (C) 2007 Mark Kettenis.
  * Copyright (C) 2001 Eduardo Horvath.
  * 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
 @@ -26,26 +26,27 @@
  * 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	_IF_CASVAR_H
 #define	_IF_CASVAR_H
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/rndsource.h>
 /*
  * Misc. definitions for Sun Cassini ethernet controllers.
  */
 /*
  * Preferred page size.  Cassini has a configurable page size, but
  * needs at least 8k to handle jumbo frames.  This happens to be the
  * default anyway.
  */
 #define	CAS_PAGE_SIZE		8192
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vtevar.h,v 1.3 2012/02/02 19:43:05 tls Exp $	*/
+/*	$NetBSD: if_vtevar.h,v 1.4 2015/04/14 20:32:36 riastradh Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * 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 unmodified, 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
 @@ -22,26 +22,28 @@
  * 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.
+ *
  * FreeBSD: src/sys/dev/vte/if_vtevar.h,v 1.1 2010/12/31 00:21:41 yongari Exp
  */
 #ifndef	_IF_VTEVAR_H
 #define	_IF_VTEVAR_H
 #include <sys/rndsource.h>
 #define	VTE_TX_RING_CNT		64
 #define	VTE_TX_RING_ALIGN	16
 /*
  * The TX/RX descriptor format has no limitation for number of
  * descriptors in TX/RX ring.  However, the maximum number of
  * descriptors that could be set as RX descriptor ring residue
  * counter is 255.  This effectively limits number of RX
  * descriptors available to be less than or equal to 255.
  */
 #define	VTE_RX_RING_CNT		128
 #define	VTE_RX_RING_ALIGN	16
 #define	VTE_RX_BUF_ALIGN	4

 @@ -1,39 +1,41 @@
-/*	$NetBSD: cdvar.h,v 1.31 2012/02/02 19:43:06 tls Exp $	*/
+/*	$NetBSD: cdvar.h,v 1.32 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 1997 Manuel Bouyer.  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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
  */
 #include <sys/rndsource.h>
 #define	CDRETRIES	4
 struct cd_softc {
 	device_t sc_dev;
 	struct disk sc_dk;
 	kmutex_t sc_lock;
 	int flags;
 #define	CDF_WLABEL	0x04		/* label is writable */
 #define	CDF_LABELLING	0x08		/* writing label */
 #define	CDF_ANCIENT	0x10		/* disk is ancient; for minphys */
 	struct scsipi_periph *sc_periph;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_auereg.h,v 1.25 2012/02/02 19:43:07 tls Exp $	*/
+/*	$NetBSD: if_auereg.h,v 1.26 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ee.columbia.edu>.  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
 @@ -37,26 +37,28 @@
  * Register definitions for ADMtek Pegasus AN986 USB to Ethernet
  * chip. The Pegasus uses a total of four USB endpoints: the control
  * endpoint (0), a bulk read endpoint for receiving packets (1),
  * a bulk write endpoint for sending packets (2) and an interrupt
  * endpoint for passing RX and TX status (3). Endpoint 0 is used
  * to read and write the ethernet module's registers. All registers
  * are 8 bits wide.
+ *
  * Packet transfer is done in 64 byte chunks. The last chunk in a
  * transfer is denoted by having a length less that 64 bytes. For
  * the RX case, the data includes an optional RX status word.
  */
 #include <sys/rndsource.h>
 #define AUE_UR_READREG		0xF0
 #define AUE_UR_WRITEREG		0xF1
 #define AUE_CONFIG_NO		1
 #define AUE_IFACE_IDX		0
 /*
  * Note that while the ADMtek technically has four
  * endpoints, the control endpoint (endpoint 0) is
  * regarded as special by the USB code and drivers
  * don't have direct access to it. (We access it
  * using usbd_do_request() when reading/writing
  * registers.) Consequently, our endpoint indexes

 @@ -1,21 +1,23 @@
-/*	$NetBSD: if_axenreg.h,v 1.1 2013/10/26 09:16:20 nonaka Exp $	*/
+/*	$NetBSD: if_axenreg.h,v 1.2 2015/04/14 20:32:36 riastradh Exp $	*/
 /*	$OpenBSD: if_axenreg.h,v 1.1 2013/10/07 05:37:41 yuo Exp $	*/
 /*
  * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>. All right reserved.
+ *
  */
 #include <sys/rndsource.h>
 /*
  * Definitions for the ASIX Electronics AX88179 to ethernet controller.
  */
 #define AXEN_PHY_ID		0x0003
 #define AXEN_MCAST_FILTER_SIZE	8
 /* unit: KB */
 #define AXEN_BUFSZ_LS		8
 #define AXEN_BUFSZ_HS		16
 #define AXEN_BUFSZ_SS		24
 #define AXEN_REV_UA1		0
 #define AXEN_REV_UA2		1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_axereg.h,v 1.16 2013/11/08 17:46:35 roy Exp $	*/
+/*	$NetBSD: if_axereg.h,v 1.17 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -28,26 +28,27 @@
  * 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.
+ *
  * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.2 2003/06/15 21:45:43 wpaul Exp $
  */
 /*
  * Definitions for the ASIX Electronics AX88172 to ethernet controller.
  */
 #include <sys/rndsource.h>
 /*
  * Vendor specific commands
  * ASIX conveniently doesn't document the 'set NODEID' command in their
  * datasheet (thanks a lot guys).
  * To make handling these commands easier, I added some extra data
  * which is decided by the axe_cmd() routine. Commands are encoded
  * in 16 bites, with the format: LDCC. L and D are both nibbles in
  * the high byte. L represents the data length (0 to 15) and D
  * represents the direction (0 for vendor read, 1 for vendor write).
  * CC is the command byte, as specified in the manual.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_kuereg.h,v 1.18 2012/02/02 19:43:07 tls Exp $	*/
+/*	$NetBSD: if_kuereg.h,v 1.19 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wpaul@ee.columbia.edu>.  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
 @@ -31,26 +31,28 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.2 2000/01/06 07:39:07 wpaul Exp $
  */
 /*
  * Definitions for the KLSI KL5KUSB101B USB to ethernet controller.
  * The KLSI part is controlled via vendor control requests, the structure
  * of which depend a bit on the firmware running on the internal
  * microcontroller. The one exception is the 'send scan data' command,
  * which is used to load the firmware.
  */
 #include <sys/rndsource.h>
 #define KUE_CONFIG_NO		1
 #define KUE_IFACE_IDX		0
 #define KUE_CMD_GET_ETHER_DESCRIPTOR		0x00
 #define KUE_CMD_SET_MCAST_FILTERS		0x01
 #define KUE_CMD_SET_PKT_FILTER			0x02
 #define KUE_CMD_GET_ETHERSTATS			0x03
 #define KUE_CMD_GET_GPIO			0x04
 #define KUE_CMD_SET_GPIO			0x05
 #define KUE_CMD_SET_MAC				0x06
 #define KUE_CMD_GET_MAC				0x07
 #define KUE_CMD_SET_URB_SIZE			0x08
 #define KUE_CMD_SET_SOFS			0x09

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_smscvar.h,v 1.3 2014/06/09 14:18:28 mlelstv Exp $	*/
+/*	$NetBSD: if_smscvar.h,v 1.4 2015/04/14 20:32:36 riastradh Exp $	*/
 /*	$OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $	*/
 /*-
  * Copyright (c) 2012
  *	Ben Gray <bgray@freebsd.org>.
  * 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
 @@ -22,26 +22,28 @@
  * 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.
+ *
  * $FreeBSD: src/sys/dev/usb/net/if_smscreg.h,v 1.1 2012/08/15 04:03:55 gonzo Exp $
  */
 #ifndef _IF_SMSCVAR_H_
 #define _IF_SMSCVAR_H_
 #include <sys/rndsource.h>
 struct smsc_chain {
 	struct smsc_softc	*sc_sc;
 	usbd_xfer_handle	 sc_xfer;
 	char			*sc_buf;
 	struct mbuf		*sc_mbuf;
 	int			 sc_accum;
 	int			 sc_idx;
 };
 struct smsc_cdata {
 	struct smsc_chain	 tx_chain[SMSC_TX_LIST_CNT];
 	struct smsc_chain	 rx_chain[SMSC_RX_LIST_CNT];
 	int			 tx_prod;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_udavreg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $	*/
+/*	$NetBSD: if_udavreg.h,v 1.10 2015/04/14 20:32:36 riastradh Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
 /*
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  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.
 @@ -20,26 +20,28 @@
  * 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 AUTHOR 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.
+ *
  */
 #include <sys/rndsource.h>
 #define	UDAV_IFACE_INDEX	0
 #define	UDAV_CONFIG_NO		1
 #define	UDAV_TX_LIST_CNT	1
 #define	UDAV_RX_LIST_CNT	1
 #define	UDAV_TX_TIMEOUT		1000
 #define	UDAV_TIMEOUT		10000
 #define	ETHER_ALIGN		2
 /* Packet length */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_urlreg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $	*/
+/*	$NetBSD: if_urlreg.h,v 1.10 2015/04/14 20:32:36 riastradh Exp $	*/
 /*
  * Copyright (c) 2001, 2002
  *     Shingo WATANABE <nabe@nabechan.org>.  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. Neither the name of the author nor the names of any co-contributors
 @@ -19,26 +19,28 @@
  * 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 AUTHOR 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.
+ *
  */
 #include <sys/rndsource.h>
 #define	URL_IFACE_INDEX		0
 #define	URL_CONFIG_NO		1
 #define	URL_TX_LIST_CNT		1
 #define	URL_RX_LIST_CNT		1
 #define	URL_TX_TIMEOUT		1000
 #define	URL_TIMEOUT		10000
 #define	ETHER_ALIGN		2
 /* Packet length */