Module Name: src
Committed By: dholland
Date: Sun Sep 6 06:01:02 UTC 2015
Modified Files:
src/sys/coda: coda.h coda_io.h coda_pioctl.h
src/sys/compat/freebsd: freebsd_ioctl.h
src/sys/compat/netinet6: in6_var.h
src/sys/compat/sunos: sunos.h
src/sys/compat/sys: clockctl.h cpuio.h
src/sys/compat/ultrix: ultrix_tty.h
src/sys/dev: biovar.h ccdvar.h cgdvar.h fssvar.h vndvar.h
src/sys/dev/apm: apmio.h
src/sys/dev/bluetooth: btdev.h btsco.h
src/sys/dev/dm: netbsd-dm.h
src/sys/dev/filemon: filemon.h
src/sys/dev/gpib: gpibio.h
src/sys/dev/i2o: iopio.h
src/sys/dev/ic: athioctl.h hd44780var.h isp_ioctl.h
src/sys/dev/ir: cirio.h irdaio.h
src/sys/dev/isa: satlinkio.h spkrio.h wtreg.h
src/sys/dev/ofw: openfirmio.h
src/sys/dev/pci: if_devar.h if_ipwvar.h if_iwivar.h if_lmc.h mlyio.h
twaio.h
src/sys/dev/pci/cxgb: cxgb_ioctl.h
src/sys/dev/pcmcia: if_cnwioctl.h if_rayreg.h
src/sys/dev/ppbus: lptio.h
src/sys/dev/raidframe: rf_compat50.h
src/sys/dev/scsipi: ses.h
src/sys/dev/sun: disklabel.h fbio.h kbio.h vuid_event.h
src/sys/dev/tc: sticio.h
src/sys/dev/usb: ukyopon.h urio.h
src/sys/dev/vme: xio.h
src/sys/dev/wscons: wsdisplay_usl_io.h wseventvar.h
src/sys/net: if_atm.h if_gre.h if_ppp.h if_pppoe.h if_sppp.h if_srt.h
if_tap.h if_tun.h slip.h
src/sys/net80211: ieee80211_ioctl.h
src/sys/netatalk: phase2.h
src/sys/netbt: hci.h
src/sys/netinet6: in6_var.h
src/sys/netisdn: i4b_debug.h i4b_ioctl.h i4b_isppp.h i4b_rbch_ioctl.h
i4b_tel_ioctl.h i4b_trace.h
src/sys/netnatm: natm.h
src/sys/opencrypto: ocryptodev.h
src/sys/sys: agpio.h cdio.h chio.h clockctl.h gpio.h ioctl_compat.h
ksyms.h lua.h midiio.h mtio.h radioio.h rndio.h scanio.h videoio.h
Log Message:
More on PR 41200: headers that declare ioctls should include sys/ioccom.h.
This covers (I think) all the MI headers outside of external/ (and dist/).
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/coda/coda.h
cvs rdiff -u -r1.7 -r1.8 src/sys/coda/coda_io.h
cvs rdiff -u -r1.8 -r1.9 src/sys/coda/coda_pioctl.h
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/freebsd/freebsd_ioctl.h
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netinet6/in6_var.h
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/sunos/sunos.h
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/clockctl.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/cpuio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/ultrix/ultrix_tty.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/biovar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ccdvar.h src/sys/dev/vndvar.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/cgdvar.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/fssvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/apm/apmio.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/bluetooth/btdev.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/bluetooth/btsco.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/dm/netbsd-dm.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/filemon/filemon.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/gpib/gpibio.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2o/iopio.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/athioctl.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/hd44780var.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/isp_ioctl.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ir/cirio.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ir/irdaio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/isa/satlinkio.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/spkrio.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/wtreg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ofw/openfirmio.h
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_devar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_ipwvar.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_iwivar.h
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/mlyio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/twaio.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxgb/cxgb_ioctl.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pcmcia/if_cnwioctl.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/if_rayreg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ppbus/lptio.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/raidframe/rf_compat50.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/scsipi/ses.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sun/disklabel.h src/sys/dev/sun/kbio.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/sun/fbio.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/sun/vuid_event.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/tc/sticio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/ukyopon.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/urio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/vme/xio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wscons/wsdisplay_usl_io.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/wscons/wseventvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_atm.h
cvs rdiff -u -r1.42 -r1.43 src/sys/net/if_gre.h
cvs rdiff -u -r1.26 -r1.27 src/sys/net/if_ppp.h
cvs rdiff -u -r1.11 -r1.12 src/sys/net/if_pppoe.h
cvs rdiff -u -r1.27 -r1.28 src/sys/net/if_sppp.h
cvs rdiff -u -r1.3 -r1.4 src/sys/net/if_srt.h
cvs rdiff -u -r1.5 -r1.6 src/sys/net/if_tap.h
cvs rdiff -u -r1.18 -r1.19 src/sys/net/if_tun.h
cvs rdiff -u -r1.9 -r1.10 src/sys/net/slip.h
cvs rdiff -u -r1.20 -r1.21 src/sys/net80211/ieee80211_ioctl.h
cvs rdiff -u -r1.2 -r1.3 src/sys/netatalk/phase2.h
cvs rdiff -u -r1.39 -r1.40 src/sys/netbt/hci.h
cvs rdiff -u -r1.73 -r1.74 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.9 -r1.10 src/sys/netisdn/i4b_debug.h
cvs rdiff -u -r1.12 -r1.13 src/sys/netisdn/i4b_ioctl.h
cvs rdiff -u -r1.3 -r1.4 src/sys/netisdn/i4b_isppp.h
cvs rdiff -u -r1.2 -r1.3 src/sys/netisdn/i4b_rbch_ioctl.h
cvs rdiff -u -r1.4 -r1.5 src/sys/netisdn/i4b_tel_ioctl.h
cvs rdiff -u -r1.5 -r1.6 src/sys/netisdn/i4b_trace.h
cvs rdiff -u -r1.14 -r1.15 src/sys/netnatm/natm.h
cvs rdiff -u -r1.2 -r1.3 src/sys/opencrypto/ocryptodev.h
cvs rdiff -u -r1.10 -r1.11 src/sys/sys/agpio.h
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/cdio.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/chio.h
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/clockctl.h src/sys/sys/midiio.h
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/gpio.h
cvs rdiff -u -r1.16 -r1.17 src/sys/sys/ioctl_compat.h
cvs rdiff -u -r1.32 -r1.33 src/sys/sys/ksyms.h
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/lua.h
cvs rdiff -u -r1.23 -r1.24 src/sys/sys/mtio.h
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/radioio.h src/sys/sys/scanio.h
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/rndio.h
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/videoio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/coda/coda.h
diff -u src/sys/coda/coda.h:1.18 src/sys/coda/coda.h:1.19
--- src/sys/coda/coda.h:1.18 Sat Dec 13 15:58:39 2014
+++ src/sys/coda/coda.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.18 2014/12/13 15:58:39 hannken Exp $ */
+/* $NetBSD: coda.h,v 1.19 2015/09/06 06:00:59 dholland Exp $ */
/*
@@ -40,6 +40,7 @@ Mellon the rights to redistribute these
#define _CODA_HEADER_
#if defined(__NetBSD__)
+#include <sys/ioccom.h>
#if defined(_KERNEL_OPT)
/* pull in optional CODA_COMPAT_5 flag and NVCODA. */
#include "opt_coda_compat.h"
Index: src/sys/coda/coda_io.h
diff -u src/sys/coda/coda_io.h:1.7 src/sys/coda/coda_io.h:1.8
--- src/sys/coda/coda_io.h:1.7 Sun Dec 11 12:19:50 2005
+++ src/sys/coda/coda_io.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_io.h,v 1.7 2005/12/11 12:19:50 christos Exp $ */
+/* $NetBSD: coda_io.h,v 1.8 2015/09/06 06:00:59 dholland Exp $ */
/*
*
@@ -49,6 +49,8 @@
/* Define ioctl commands for vcioctl, /dev/cfs */
+#include <sys/ioccom.h>
+
#define CODARESIZE _IOW('c', 1, struct coda_resize ) /* Resize CODA NameCache */
#define CODASTATS _IO('c', 2) /* Collect stats */
#define CODAPRINT _IO('c', 3) /* Print Cache */
Index: src/sys/coda/coda_pioctl.h
diff -u src/sys/coda/coda_pioctl.h:1.8 src/sys/coda/coda_pioctl.h:1.9
--- src/sys/coda/coda_pioctl.h:1.8 Sat Aug 7 20:39:33 2010
+++ src/sys/coda/coda_pioctl.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_pioctl.h,v 1.8 2010/08/07 20:39:33 christos Exp $ */
+/* $NetBSD: coda_pioctl.h,v 1.9 2015/09/06 06:00:59 dholland Exp $ */
/*
*
@@ -51,6 +51,8 @@
#ifndef _SYS_PIOCTL_H_
#define _SYS_PIOCTL_H_
+#include <sys/ioccom.h>
+
/* The 8K limits above are a consequence of the size of the kernel buffer
used to buffer requests from the user to venus--2*MAXPATHLEN.
The buffer pointers may be null, or the counts may be 0 if there
Index: src/sys/compat/freebsd/freebsd_ioctl.h
diff -u src/sys/compat/freebsd/freebsd_ioctl.h:1.6 src/sys/compat/freebsd/freebsd_ioctl.h:1.7
--- src/sys/compat/freebsd/freebsd_ioctl.h:1.6 Tue May 29 21:32:27 2007
+++ src/sys/compat/freebsd/freebsd_ioctl.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_ioctl.h,v 1.6 2007/05/29 21:32:27 christos Exp $ */
+/* $NetBSD: freebsd_ioctl.h,v 1.7 2015/09/06 06:00:59 dholland Exp $ */
/*
* Copyright (c) 1995 Frank van der Linden
@@ -34,6 +34,8 @@
#ifndef _FREEBSD_IOCTL_H
#define _FREEBSD_IOCTL_H
+#include <sys/ioccom.h>
+
#define FREEBSD_IOCGROUP(x) (((x) >> 8) & 0xff)
#define FREEBSD_IOC_DIRMASK 0xe0000000
Index: src/sys/compat/netinet6/in6_var.h
diff -u src/sys/compat/netinet6/in6_var.h:1.2 src/sys/compat/netinet6/in6_var.h:1.3
--- src/sys/compat/netinet6/in6_var.h:1.2 Thu Jan 15 20:32:59 2009
+++ src/sys/compat/netinet6/in6_var.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.2 2009/01/15 20:32:59 christos Exp $ */
+/* $NetBSD: in6_var.h,v 1.3 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -38,6 +38,8 @@
#ifndef _COMPAT_NETINET6_IN6_VAR_H_
#define _COMPAT_NETINET6_IN6_VAR_H_
+#include <sys/ioccom.h>
+
struct in6_addrlifetime50 {
int32_t ia6t_expire;
int32_t ia6t_preferred;
Index: src/sys/compat/sunos/sunos.h
diff -u src/sys/compat/sunos/sunos.h:1.23 src/sys/compat/sunos/sunos.h:1.24
--- src/sys/compat/sunos/sunos.h:1.23 Sun Jan 11 02:45:49 2009
+++ src/sys/compat/sunos/sunos.h Sun Sep 6 06:00:59 2015
@@ -1,8 +1,10 @@
-/* $NetBSD: sunos.h,v 1.23 2009/01/11 02:45:49 christos Exp $ */
+/* $NetBSD: sunos.h,v 1.24 2015/09/06 06:00:59 dholland Exp $ */
#ifndef _COMPAT_SUNOS_SUNOS_H_
#define _COMPAT_SUNOS_SUNOS_H_
+#include <sys/ioccom.h>
+
/* used to ensure `struct sunos' types rename constantly sized. */
#ifdef __arch64__
typedef u_int32_t sunos_charp;
Index: src/sys/compat/sys/clockctl.h
diff -u src/sys/compat/sys/clockctl.h:1.3 src/sys/compat/sys/clockctl.h:1.4
--- src/sys/compat/sys/clockctl.h:1.3 Wed Jan 4 13:45:55 2012
+++ src/sys/compat/sys/clockctl.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.h,v 1.3 2012/01/04 13:45:55 apb Exp $ */
+/* $NetBSD: clockctl.h,v 1.4 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
#ifndef _COMPAT_SYS_CLOCKCTL_H_
#define _COMPAT_SYS_CLOCKCTL_H_
+#include <sys/ioccom.h>
#include <sys/time.h>
#include <sys/timex.h>
Index: src/sys/compat/sys/cpuio.h
diff -u src/sys/compat/sys/cpuio.h:1.4 src/sys/compat/sys/cpuio.h:1.5
--- src/sys/compat/sys/cpuio.h:1.4 Wed Aug 29 17:13:22 2012
+++ src/sys/compat/sys/cpuio.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: cpuio.h,v 1.4 2012/08/29 17:13:22 drochner Exp $ */
+/* $NetBSD: cpuio.h,v 1.5 2015/09/06 06:00:59 dholland Exp $ */
+
+#include <sys/ioccom.h>
struct compat6_cpu_ucode {
uint64_t version;
Index: src/sys/compat/ultrix/ultrix_tty.h
diff -u src/sys/compat/ultrix/ultrix_tty.h:1.3 src/sys/compat/ultrix/ultrix_tty.h:1.4
--- src/sys/compat/ultrix/ultrix_tty.h:1.3 Mon Dec 14 00:47:12 2009
+++ src/sys/compat/ultrix/ultrix_tty.h Sun Sep 6 06:00:59 2015
@@ -1,7 +1,9 @@
-/* $NetBSD: ultrix_tty.h,v 1.3 2009/12/14 00:47:12 matt Exp $ */
+/* $NetBSD: ultrix_tty.h,v 1.4 2015/09/06 06:00:59 dholland Exp $ */
/* From: NetBSD sunos.h,v 1.4 1995/03/04 09:50:00 pk Exp */
+#include <sys/ioccom.h>
+
struct ultrix_ttysize {
int ts_row;
Index: src/sys/dev/biovar.h
diff -u src/sys/dev/biovar.h:1.9 src/sys/dev/biovar.h:1.10
--- src/sys/dev/biovar.h:1.9 Thu Mar 12 15:33:10 2015
+++ src/sys/dev/biovar.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: biovar.h,v 1.9 2015/03/12 15:33:10 christos Exp $ */
+/* $NetBSD: biovar.h,v 1.10 2015/09/06 06:00:59 dholland Exp $ */
/* $OpenBSD: biovar.h,v 1.26 2007/03/19 03:02:08 marco Exp $ */
/*
@@ -38,6 +38,7 @@
#include <sys/types.h>
#include <sys/device.h>
+#include <sys/ioccom.h>
#ifndef _KERNEL
#include <stdbool.h>
Index: src/sys/dev/ccdvar.h
diff -u src/sys/dev/ccdvar.h:1.34 src/sys/dev/ccdvar.h:1.35
--- src/sys/dev/ccdvar.h:1.34 Sat Aug 16 19:27:27 2014
+++ src/sys/dev/ccdvar.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdvar.h,v 1.34 2014/08/16 19:27:27 sborrill Exp $ */
+/* $NetBSD: ccdvar.h,v 1.35 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -71,6 +71,7 @@
#define _DEV_CCDVAR_H_
#include <sys/buf.h>
+#include <sys/ioccom.h>
#include <sys/mutex.h>
#include <sys/queue.h>
#include <sys/condvar.h>
Index: src/sys/dev/vndvar.h
diff -u src/sys/dev/vndvar.h:1.34 src/sys/dev/vndvar.h:1.35
--- src/sys/dev/vndvar.h:1.34 Mon May 25 20:57:18 2015
+++ src/sys/dev/vndvar.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vndvar.h,v 1.34 2015/05/25 20:57:18 prlw1 Exp $ */
+/* $NetBSD: vndvar.h,v 1.35 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -70,6 +70,7 @@
#ifndef _SYS_DEV_VNDVAR_H_
#define _SYS_DEV_VNDVAR_H_
+#include <sys/ioccom.h>
#include <sys/pool.h>
/*
Index: src/sys/dev/cgdvar.h
diff -u src/sys/dev/cgdvar.h:1.17 src/sys/dev/cgdvar.h:1.18
--- src/sys/dev/cgdvar.h:1.17 Tue Mar 18 15:44:37 2014
+++ src/sys/dev/cgdvar.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.17 2014/03/18 15:44:37 skrll Exp $ */
+/* $NetBSD: cgdvar.h,v 1.18 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _DEV_CGDVAR_H_
#define _DEV_CGDVAR_H_
+#include <sys/ioccom.h>
+
/* ioctl(2) code: used by CGDIOCSET and CGDIOCCLR */
struct cgd_ioctl {
const char *ci_disk;
Index: src/sys/dev/fssvar.h
diff -u src/sys/dev/fssvar.h:1.28 src/sys/dev/fssvar.h:1.29
--- src/sys/dev/fssvar.h:1.28 Fri Feb 28 10:16:51 2014
+++ src/sys/dev/fssvar.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fssvar.h,v 1.28 2014/02/28 10:16:51 skrll Exp $ */
+/* $NetBSD: fssvar.h,v 1.29 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _SYS_DEV_FSSVAR_H
#define _SYS_DEV_FSSVAR_H
+#include <sys/ioccom.h>
+
#define FSS_UNCONFIG_ON_CLOSE 0x01 /* Unconfigure on last close */
#define FSS_UNLINK_ON_CREATE 0x02 /* Unlink backing store on create */
Index: src/sys/dev/apm/apmio.h
diff -u src/sys/dev/apm/apmio.h:1.5 src/sys/dev/apm/apmio.h:1.6
--- src/sys/dev/apm/apmio.h:1.5 Mon Apr 28 20:23:47 2008
+++ src/sys/dev/apm/apmio.h Sun Sep 6 06:00:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: apmio.h,v 1.5 2008/04/28 20:23:47 martin Exp $ */
+/* $NetBSD: apmio.h,v 1.6 2015/09/06 06:00:59 dholland Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,6 +30,8 @@
#ifndef _DEV_APM_APMIO_H_
#define _DEV_APM_APMIO_H_
+#include <sys/ioccom.h>
+
struct apm_event_info {
u_int type;
u_int index;
Index: src/sys/dev/bluetooth/btdev.h
diff -u src/sys/dev/bluetooth/btdev.h:1.9 src/sys/dev/bluetooth/btdev.h:1.10
--- src/sys/dev/bluetooth/btdev.h:1.9 Wed Apr 28 06:13:51 2010
+++ src/sys/dev/bluetooth/btdev.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: btdev.h,v 1.9 2010/04/28 06:13:51 plunky Exp $ */
+/* $NetBSD: btdev.h,v 1.10 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -34,6 +34,8 @@
#ifndef _DEV_BLUETOOTH_BTDEV_H_
#define _DEV_BLUETOOTH_BTDEV_H_
+#include <sys/ioccom.h>
+
/* btdev attach/detach ioctl's */
#define BTDEV_ATTACH _IOW('b', 14, struct plistref)
#define BTDEV_DETACH _IOW('b', 15, struct plistref)
Index: src/sys/dev/bluetooth/btsco.h
diff -u src/sys/dev/bluetooth/btsco.h:1.2 src/sys/dev/bluetooth/btsco.h:1.3
--- src/sys/dev/bluetooth/btsco.h:1.2 Sun Sep 10 15:45:56 2006
+++ src/sys/dev/bluetooth/btsco.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.h,v 1.2 2006/09/10 15:45:56 plunky Exp $ */
+/* $NetBSD: btsco.h,v 1.3 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -34,6 +34,7 @@
#ifndef _DEV_BLUETOOTH_BTSCO_H_
#define _DEV_BLUETOOTH_BTSCO_H_
+#include <sys/ioccom.h>
#include <netbt/bluetooth.h>
/* btsco(4) properties */
Index: src/sys/dev/dm/netbsd-dm.h
diff -u src/sys/dev/dm/netbsd-dm.h:1.6 src/sys/dev/dm/netbsd-dm.h:1.7
--- src/sys/dev/dm/netbsd-dm.h:1.6 Sat Dec 5 11:30:26 2009
+++ src/sys/dev/dm/netbsd-dm.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd-dm.h,v 1.6 2009/12/05 11:30:26 haad Exp $ */
+/* $NetBSD: netbsd-dm.h,v 1.7 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
#ifndef __NETBSD_DM_H__
#define __NETBSD_DM_H__
+#include <sys/ioccom.h>
#include <prop/proplib.h>
#define DM_CMD_LEN 16
Index: src/sys/dev/filemon/filemon.h
diff -u src/sys/dev/filemon/filemon.h:1.6 src/sys/dev/filemon/filemon.h:1.7
--- src/sys/dev/filemon/filemon.h:1.6 Wed Jun 17 02:17:00 2015
+++ src/sys/dev/filemon/filemon.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.h,v 1.6 2015/06/17 02:17:00 sjg Exp $ */
+/* $NetBSD: filemon.h,v 1.7 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -25,6 +25,8 @@
*/
#ifndef FILEMON_SET_FD
+#include <sys/ioccom.h>
+
#ifndef _PATH_FILEMON
#define _PATH_FILEMON "/dev/filemon"
#endif
Index: src/sys/dev/gpib/gpibio.h
diff -u src/sys/dev/gpib/gpibio.h:1.3 src/sys/dev/gpib/gpibio.h:1.4
--- src/sys/dev/gpib/gpibio.h:1.3 Sun Dec 11 12:21:21 2005
+++ src/sys/dev/gpib/gpibio.h Sun Sep 6 06:01:00 2015
@@ -1,8 +1,10 @@
-/* $NetBSD: gpibio.h,v 1.3 2005/12/11 12:21:21 christos Exp $ */
+/* $NetBSD: gpibio.h,v 1.4 2015/09/06 06:01:00 dholland Exp $ */
#ifndef _SYS_GPIBIO_H_
#define _SYS_GPIBIO_H_
+#include <sys/ioccom.h>
+
/* XXX */
#define GPIB_INFO _IOR('G', 0, int)
Index: src/sys/dev/i2o/iopio.h
diff -u src/sys/dev/i2o/iopio.h:1.6 src/sys/dev/i2o/iopio.h:1.7
--- src/sys/dev/i2o/iopio.h:1.6 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/i2o/iopio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iopio.h,v 1.6 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: iopio.h,v 1.7 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _I2O_IOPIO_H_
#define _I2O_IOPIO_H_
+#include <sys/ioccom.h>
+
#define IOP_MAX_MSG_XFERS 3 /* Maximum transfer count per msg */
#define IOP_MAX_OUTBOUND 256 /* Maximum outbound queue depth */
#define IOP_MAX_INBOUND 256 /* Maximum inbound queue depth */
Index: src/sys/dev/ic/athioctl.h
diff -u src/sys/dev/ic/athioctl.h:1.15 src/sys/dev/ic/athioctl.h:1.16
--- src/sys/dev/ic/athioctl.h:1.15 Sun Aug 3 19:14:24 2014
+++ src/sys/dev/ic/athioctl.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: athioctl.h,v 1.15 2014/08/03 19:14:24 wiz Exp $ */
+/* $NetBSD: athioctl.h,v 1.16 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -44,6 +44,8 @@
#ifndef _DEV_ATH_ATHIOCTL_H
#define _DEV_ATH_ATHIOCTL_H
+#include <sys/ioccom.h>
+
struct ath_stats {
u_int32_t ast_watchdog; /* device reset by watchdog */
u_int32_t ast_hardware; /* fatal hardware error interrupts */
Index: src/sys/dev/ic/hd44780var.h
diff -u src/sys/dev/ic/hd44780var.h:1.7 src/sys/dev/ic/hd44780var.h:1.8
--- src/sys/dev/ic/hd44780var.h:1.7 Sun Aug 30 02:07:05 2009
+++ src/sys/dev/ic/hd44780var.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780var.h,v 1.7 2009/08/30 02:07:05 tsutsui Exp $ */
+/* $NetBSD: hd44780var.h,v 1.8 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -30,6 +30,8 @@
#ifndef _DEV_IC_HD44780VAR_H_
#define _DEV_IC_HD44780VAR_H_
+#include <sys/ioccom.h>
+
/* IOCTL definitions */
#define HLCD_DISPCTL _IOW('h', 1, struct hd44780_dispctl)
#define HLCD_RESET _IO('h', 2)
Index: src/sys/dev/ic/isp_ioctl.h
diff -u src/sys/dev/ic/isp_ioctl.h:1.11 src/sys/dev/ic/isp_ioctl.h:1.12
--- src/sys/dev/ic/isp_ioctl.h:1.11 Tue Mar 11 05:33:30 2008
+++ src/sys/dev/ic/isp_ioctl.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_ioctl.h,v 1.11 2008/03/11 05:33:30 mjacob Exp $ */
+/* $NetBSD: isp_ioctl.h,v 1.12 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2001-2007 by Matthew Jacob
* All rights reserved.
@@ -25,9 +25,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+
/*
* ioctl definitions for Qlogic FC/SCSI HBA driver
*/
+
+#include <sys/ioccom.h>
+
#define ISP_IOC (021) /* 'Ctrl-Q' */
/*
Index: src/sys/dev/ir/cirio.h
diff -u src/sys/dev/ir/cirio.h:1.3 src/sys/dev/ir/cirio.h:1.4
--- src/sys/dev/ir/cirio.h:1.3 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ir/cirio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cirio.h,v 1.3 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: cirio.h,v 1.4 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _SYS_DEV_CIRIO_H_
#define _SYS_DEV_CIRIO_H_
+#include <sys/ioccom.h>
+
struct cir_params {
unsigned int raw;
};
Index: src/sys/dev/ir/irdaio.h
diff -u src/sys/dev/ir/irdaio.h:1.7 src/sys/dev/ir/irdaio.h:1.8
--- src/sys/dev/ir/irdaio.h:1.7 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ir/irdaio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: irdaio.h,v 1.7 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: irdaio.h,v 1.8 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _SYS_DEV_IRDAIO_H_
#define _SYS_DEV_IRDAIO_H_
+#include <sys/ioccom.h>
+
struct irda_params {
unsigned int speed;
unsigned int ebofs;
Index: src/sys/dev/isa/satlinkio.h
diff -u src/sys/dev/isa/satlinkio.h:1.3 src/sys/dev/isa/satlinkio.h:1.4
--- src/sys/dev/isa/satlinkio.h:1.3 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isa/satlinkio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: satlinkio.h,v 1.3 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: satlinkio.h,v 1.4 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,6 +35,8 @@
* ioctl definitions for SatLink interface.
*/
+#include <sys/ioccom.h>
+
struct satlink_id {
u_int16_t sid_mfrid; /* manufacturer ID */
u_int8_t sid_grpid; /* group ID */
Index: src/sys/dev/isa/spkrio.h
diff -u src/sys/dev/isa/spkrio.h:1.1 src/sys/dev/isa/spkrio.h:1.2
--- src/sys/dev/isa/spkrio.h:1.1 Wed Apr 15 20:26:19 1998
+++ src/sys/dev/isa/spkrio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spkrio.h,v 1.1 1998/04/15 20:26:19 drochner Exp $ */
+/* $NetBSD: spkrio.h,v 1.2 2015/09/06 06:01:00 dholland Exp $ */
/*
* spkr.h -- interface definitions for speaker ioctl()
@@ -7,6 +7,8 @@
#ifndef _DEV_ISA_SPKR_H_
#define _DEV_ISA_SPKR_H_
+#include <sys/ioccom.h>
+
#define SPKRTONE _IOW('S', 1, tone_t) /* emit tone */
#define SPKRTUNE _IO('S', 2) /* emit tone sequence */
Index: src/sys/dev/isa/wtreg.h
diff -u src/sys/dev/isa/wtreg.h:1.8 src/sys/dev/isa/wtreg.h:1.9
--- src/sys/dev/isa/wtreg.h:1.8 Sun Dec 11 12:22:03 2005
+++ src/sys/dev/isa/wtreg.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wtreg.h,v 1.8 2005/12/11 12:22:03 christos Exp $ */
+/* $NetBSD: wtreg.h,v 1.9 2015/09/06 06:01:00 dholland Exp $ */
/*
* Streamer tape driver.
@@ -50,6 +50,8 @@
* Copyright 1988, 1989 by Intel Corporation
*/
+#include <sys/ioccom.h>
+
/* ioctl for direct QIC commands */
#define WTQICMD _IO('W', 0)
Index: src/sys/dev/ofw/openfirmio.h
diff -u src/sys/dev/ofw/openfirmio.h:1.6 src/sys/dev/ofw/openfirmio.h:1.7
--- src/sys/dev/ofw/openfirmio.h:1.6 Sun Dec 11 12:22:48 2005
+++ src/sys/dev/ofw/openfirmio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirmio.h,v 1.6 2005/12/11 12:22:48 christos Exp $ */
+/* $NetBSD: openfirmio.h,v 1.7 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,6 +42,8 @@
#ifndef _DEV_OFW_OPENFIRMIO_H_
#define _DEV_OFW_OPENFIRMIO_H_
+#include <sys/ioccom.h>
+
struct ofiocdesc {
int of_nodeid; /* passed or returned node id */
int of_namelen; /* length of op_name */
Index: src/sys/dev/pci/if_devar.h
diff -u src/sys/dev/pci/if_devar.h:1.59 src/sys/dev/pci/if_devar.h:1.60
--- src/sys/dev/pci/if_devar.h:1.59 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/pci/if_devar.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_devar.h,v 1.59 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: if_devar.h,v 1.60 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -927,6 +927,7 @@ static void tulip_softintr(void);
#endif
#ifdef notyet
+#include <sys/ioccom.h>
#define SIOCGADDRROM _IOW('i', 240, struct ifreq) /* get 128 bytes of ROM */
#define SIOCGCHIPID _IOWR('i', 241, struct ifreq) /* get chipid */
#endif
Index: src/sys/dev/pci/if_ipwvar.h
diff -u src/sys/dev/pci/if_ipwvar.h:1.16 src/sys/dev/pci/if_ipwvar.h:1.17
--- src/sys/dev/pci/if_ipwvar.h:1.16 Sat Oct 27 17:18:33 2012
+++ src/sys/dev/pci/if_ipwvar.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipwvar.h,v 1.16 2012/10/27 17:18:33 chs Exp $ */
+/* $NetBSD: if_ipwvar.h,v 1.17 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2004
@@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
struct ipw_firmware {
void *main;
int main_size;
Index: src/sys/dev/pci/if_iwivar.h
diff -u src/sys/dev/pci/if_iwivar.h:1.17 src/sys/dev/pci/if_iwivar.h:1.18
--- src/sys/dev/pci/if_iwivar.h:1.17 Wed Jan 7 07:05:48 2015
+++ src/sys/dev/pci/if_iwivar.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwivar.h,v 1.17 2015/01/07 07:05:48 ozaki-r Exp $ */
+/* $NetBSD: if_iwivar.h,v 1.18 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2004, 2005
@@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
struct iwi_firmware {
void *boot;
int boot_size;
Index: src/sys/dev/pci/if_lmc.h
diff -u src/sys/dev/pci/if_lmc.h:1.21 src/sys/dev/pci/if_lmc.h:1.22
--- src/sys/dev/pci/if_lmc.h:1.21 Sat Oct 27 17:18:33 2012
+++ src/sys/dev/pci/if_lmc.h Sun Sep 6 06:01:00 2015
@@ -1,5 +1,5 @@
/*-
- * $NetBSD: if_lmc.h,v 1.21 2012/10/27 17:18:33 chs Exp $
+ * $NetBSD: if_lmc.h,v 1.22 2015/09/06 06:01:00 dholland Exp $
*
* Copyright (c) 2002-2006 David Boggs. (bo...@boggs.palo-alto.ca.us)
* All rights reserved.
@@ -47,6 +47,9 @@
#ifndef IF_LMC_H
#define IF_LMC_H
+#include <sys/ioccom.h>
+
+
#define DEVICE_NAME "lmc"
#define VER_YEAR 2006
Index: src/sys/dev/pci/mlyio.h
diff -u src/sys/dev/pci/mlyio.h:1.4 src/sys/dev/pci/mlyio.h:1.5
--- src/sys/dev/pci/mlyio.h:1.4 Mon Apr 28 20:23:55 2008
+++ src/sys/dev/pci/mlyio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mlyio.h,v 1.4 2008/04/28 20:23:55 martin Exp $ */
+/* $NetBSD: mlyio.h,v 1.5 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,6 +68,9 @@
#ifndef _PCI_MLYIO_H_
#define _PCI_MLYIO_H_
+#include <sys/ioccom.h>
+
+
struct mly_user_command {
unsigned char ControllerNumber;
union mly_cmd_packet CommandMailbox;
Index: src/sys/dev/pci/twaio.h
diff -u src/sys/dev/pci/twaio.h:1.5 src/sys/dev/pci/twaio.h:1.6
--- src/sys/dev/pci/twaio.h:1.5 Mon Sep 8 23:36:54 2008
+++ src/sys/dev/pci/twaio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: twaio.h,v 1.5 2008/09/08 23:36:54 gmcgarry Exp $ */
+/* $NetBSD: twaio.h,v 1.6 2015/09/06 06:01:00 dholland Exp $ */
/* $wasabi: twaio.h,v 1.8 2006/04/27 17:12:39 wrstuden Exp $ */
/*-
@@ -39,6 +39,9 @@
#ifndef _DEV_PCI_TWAIO_H_
#define _DEV_PCI_TWAIO_H_
+#include <sys/ioccom.h>
+
+
#define TWA_AEN_NOT_RETRIEVED 0x1
#define TWA_AEN_RETRIEVED 0x2
Index: src/sys/dev/pci/cxgb/cxgb_ioctl.h
diff -u src/sys/dev/pci/cxgb/cxgb_ioctl.h:1.1 src/sys/dev/pci/cxgb/cxgb_ioctl.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_ioctl.h:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_ioctl.h Sun Sep 6 06:01:00 2015
@@ -29,6 +29,9 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef __CHIOCTL_H__
#define __CHIOCTL_H__
+#include <sys/ioccom.h>
+
+
/*
* Ioctl commands specific to this driver.
*/
Index: src/sys/dev/pcmcia/if_cnwioctl.h
diff -u src/sys/dev/pcmcia/if_cnwioctl.h:1.4 src/sys/dev/pcmcia/if_cnwioctl.h:1.5
--- src/sys/dev/pcmcia/if_cnwioctl.h:1.4 Sun Dec 11 12:23:23 2005
+++ src/sys/dev/pcmcia/if_cnwioctl.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnwioctl.h,v 1.4 2005/12/11 12:23:23 christos Exp $ */
+/* $NetBSD: if_cnwioctl.h,v 1.5 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 1996, 1997 Berkeley Software Design, Inc.
@@ -55,6 +55,8 @@
* jo...@staff.cs.uit.no, http://www.cs.uit.no/~johnm/
*/
+#include <sys/ioccom.h>
+
struct cnwstatus {
struct ifreq ifr;
u_char data[0x100];
Index: src/sys/dev/pcmcia/if_rayreg.h
diff -u src/sys/dev/pcmcia/if_rayreg.h:1.10 src/sys/dev/pcmcia/if_rayreg.h:1.11
--- src/sys/dev/pcmcia/if_rayreg.h:1.10 Tue Dec 25 18:33:42 2007
+++ src/sys/dev/pcmcia/if_rayreg.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rayreg.h,v 1.10 2007/12/25 18:33:42 perry Exp $ */
+/* $NetBSD: if_rayreg.h,v 1.11 2015/09/06 06:01:00 dholland Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
* All rights reserved.
@@ -28,6 +28,8 @@
* SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
#define RAY_MAXSSIDLEN 32
/*
Index: src/sys/dev/ppbus/lptio.h
diff -u src/sys/dev/ppbus/lptio.h:1.8 src/sys/dev/ppbus/lptio.h:1.9
--- src/sys/dev/ppbus/lptio.h:1.8 Mon Apr 28 20:23:56 2008
+++ src/sys/dev/ppbus/lptio.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lptio.h,v 1.8 2008/04/28 20:23:56 martin Exp $ */
+/* $NetBSD: lptio.h,v 1.9 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef __DEV_PPBUS_LPTIO_H_
#define __DEV_PPBUS_LPTIO_H_
+#include <sys/ioccom.h>
+
/* Definitions for get status command */
enum lpt_mode_t {
mode_unknown = -1,
Index: src/sys/dev/raidframe/rf_compat50.h
diff -u src/sys/dev/raidframe/rf_compat50.h:1.1 src/sys/dev/raidframe/rf_compat50.h:1.2
--- src/sys/dev/raidframe/rf_compat50.h:1.1 Sun Jan 18 16:37:19 2009
+++ src/sys/dev/raidframe/rf_compat50.h Sun Sep 6 06:01:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.h,v 1.1 2009/01/18 16:37:19 christos Exp $ */
+/* $NetBSD: rf_compat50.h,v 1.2 2015/09/06 06:01:00 dholland Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -39,6 +39,8 @@
#ifndef _RF_COMPAT50_H_
#define _RF_COMPAT50_H_
+#include <sys/ioccom.h>
+
#define RAIDFRAME_CONFIGURE50 _IOW ('r', 1, void *)
#define RAIDFRAME_GET_INFO50 _IOWR('r', 15, void *)
Index: src/sys/dev/scsipi/ses.h
diff -u src/sys/dev/scsipi/ses.h:1.3 src/sys/dev/scsipi/ses.h:1.4
--- src/sys/dev/scsipi/ses.h:1.3 Sun Dec 11 12:23:51 2005
+++ src/sys/dev/scsipi/ses.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.h,v 1.3 2005/12/11 12:23:51 christos Exp $ */
+/* $NetBSD: ses.h,v 1.4 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
@@ -23,6 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
#define SESIOC (('s' - 040) << 8)
#define SESIOC_GETNOBJ _IO(SESIOC, 1)
Index: src/sys/dev/sun/disklabel.h
diff -u src/sys/dev/sun/disklabel.h:1.4 src/sys/dev/sun/disklabel.h:1.5
--- src/sys/dev/sun/disklabel.h:1.4 Sun Dec 11 12:23:56 2005
+++ src/sys/dev/sun/disklabel.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.5 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -44,6 +44,8 @@
* SunOS disk label layout (only relevant portions discovered here).
*/
+#include <sys/ioccom.h>
+
#define SUN_DKMAGIC 55998
/* These are the guys that Sun's dkinfo needs... */
Index: src/sys/dev/sun/kbio.h
diff -u src/sys/dev/sun/kbio.h:1.4 src/sys/dev/sun/kbio.h:1.5
--- src/sys/dev/sun/kbio.h:1.4 Mon Aug 28 17:15:24 2006
+++ src/sys/dev/sun/kbio.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.4 2006/08/28 17:15:24 he Exp $ */
+/* $NetBSD: kbio.h,v 1.5 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,6 +43,8 @@
#ifndef _DEV_SUN_KBIO_H_
#define _DEV_SUN_KBIO_H_
+#include <sys/ioccom.h>
+
/*
* The following is a minimal emulation of Sun's `kio' structures
* and related operations necessary to make X11 happy (i.e., make it
Index: src/sys/dev/sun/fbio.h
diff -u src/sys/dev/sun/fbio.h:1.11 src/sys/dev/sun/fbio.h:1.12
--- src/sys/dev/sun/fbio.h:1.11 Wed Aug 26 22:34:50 2009
+++ src/sys/dev/sun/fbio.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fbio.h,v 1.11 2009/08/26 22:34:50 macallan Exp $ */
+/* $NetBSD: fbio.h,v 1.12 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -38,6 +38,8 @@
#ifndef FBIO_H
#define FBIO_H
+#include <sys/ioccom.h>
+
/*
* Frame buffer ioctls (from Sprite, trimmed to essentials for X11).
*/
Index: src/sys/dev/sun/vuid_event.h
diff -u src/sys/dev/sun/vuid_event.h:1.7 src/sys/dev/sun/vuid_event.h:1.8
--- src/sys/dev/sun/vuid_event.h:1.7 Mon Jan 12 02:26:16 2009
+++ src/sys/dev/sun/vuid_event.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vuid_event.h,v 1.7 2009/01/12 02:26:16 christos Exp $ */
+/* $NetBSD: vuid_event.h,v 1.8 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,6 +43,8 @@
#ifndef _SUN_VUID_EVENT_H_
#define _SUN_VUID_EVENT_H_
+#include <sys/ioccom.h>
+
struct firm_timeval {
long tv_sec;
long tv_usec;
Index: src/sys/dev/tc/sticio.h
diff -u src/sys/dev/tc/sticio.h:1.4 src/sys/dev/tc/sticio.h:1.5
--- src/sys/dev/tc/sticio.h:1.4 Mon Apr 28 20:23:58 2008
+++ src/sys/dev/tc/sticio.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sticio.h,v 1.4 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: sticio.h,v 1.5 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _TC_STICIO_H_
#define _TC_STICIO_H_
+#include <sys/ioccom.h>
+
/*
* Buffer sizes. Image buffers (span buffers, really) must be able to hold
* 1280 32-bit pixels, even for the 8-bit boards.
Index: src/sys/dev/usb/ukyopon.h
diff -u src/sys/dev/usb/ukyopon.h:1.4 src/sys/dev/usb/ukyopon.h:1.5
--- src/sys/dev/usb/ukyopon.h:1.4 Mon Apr 28 20:24:00 2008
+++ src/sys/dev/usb/ukyopon.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.h,v 1.4 2008/04/28 20:24:00 martin Exp $ */
+/* $NetBSD: ukyopon.h,v 1.5 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
#ifdef _KERNEL
#include <machine/limits.h>
#else
Index: src/sys/dev/usb/urio.h
diff -u src/sys/dev/usb/urio.h:1.3 src/sys/dev/usb/urio.h:1.4
--- src/sys/dev/usb/urio.h:1.3 Mon Apr 28 20:24:00 2008
+++ src/sys/dev/usb/urio.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.h,v 1.3 2008/04/28 20:24:00 martin Exp $ */
+/* $NetBSD: urio.h,v 1.4 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,6 +30,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
struct urio_command
{
unsigned short length;
Index: src/sys/dev/vme/xio.h
diff -u src/sys/dev/vme/xio.h:1.5 src/sys/dev/vme/xio.h:1.6
--- src/sys/dev/vme/xio.h:1.5 Tue Feb 1 19:36:24 2011
+++ src/sys/dev/vme/xio.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xio.h,v 1.5 2011/02/01 19:36:24 chuck Exp $ */
+/* $NetBSD: xio.h,v 1.6 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -39,6 +39,9 @@
* xylogic ioctl interface
*/
+#include <sys/ioccom.h>
+
+
struct xd_iocmd {
u_char cmd; /* in: command number */
u_char subfn; /* in: subfunction number */
Index: src/sys/dev/wscons/wsdisplay_usl_io.h
diff -u src/sys/dev/wscons/wsdisplay_usl_io.h:1.3 src/sys/dev/wscons/wsdisplay_usl_io.h:1.4
--- src/sys/dev/wscons/wsdisplay_usl_io.h:1.3 Tue May 15 15:06:23 2001
+++ src/sys/dev/wscons/wsdisplay_usl_io.h Sun Sep 6 06:01:01 2015
@@ -1,8 +1,10 @@
-/* $NetBSD: wsdisplay_usl_io.h,v 1.3 2001/05/15 15:06:23 lukem Exp $ */
+/* $NetBSD: wsdisplay_usl_io.h,v 1.4 2015/09/06 06:01:01 dholland Exp $ */
#ifndef _DEV_WSCONS_WSDISPLAY_USL_IO_H_
#define _DEV_WSCONS_WSDISPLAY_USL_IO_H_
+#include <sys/ioccom.h>
+
#define VT_OPENQRY _IOR('v', 1, int)
#define VT_SETMODE _IOW('v', 2, vtmode_t)
#define VT_GETMODE _IOR('v', 3, vtmode_t)
Index: src/sys/dev/wscons/wseventvar.h
diff -u src/sys/dev/wscons/wseventvar.h:1.15 src/sys/dev/wscons/wseventvar.h:1.16
--- src/sys/dev/wscons/wseventvar.h:1.15 Fri Jan 16 15:14:11 2009
+++ src/sys/dev/wscons/wseventvar.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wseventvar.h,v 1.15 2009/01/16 15:14:11 yamt Exp $ */
+/* $NetBSD: wseventvar.h,v 1.16 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -70,6 +70,8 @@
* @(#)event_var.h 8.1 (Berkeley) 6/11/93
*/
+#include <sys/ioccom.h>
+
/*
* Internal "wscons_event" queue interface for the keyboard and mouse drivers.
* The drivers are expected not to place events in the queue above spltty(),
Index: src/sys/net/if_atm.h
diff -u src/sys/net/if_atm.h:1.19 src/sys/net/if_atm.h:1.20
--- src/sys/net/if_atm.h:1.19 Tue Feb 1 19:46:28 2011
+++ src/sys/net/if_atm.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.h,v 1.19 2011/02/01 19:46:28 chuck Exp $ */
+/* $NetBSD: if_atm.h,v 1.20 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -32,6 +32,8 @@
#ifndef _NET_IF_ATM_H_
#define _NET_IF_ATM_H_
+#include <sys/ioccom.h>
+
#if (defined(__FreeBSD__) || defined(__bsdi__)) && defined(KERNEL)
#ifndef _KERNEL
#define _KERNEL
Index: src/sys/net/if_gre.h
diff -u src/sys/net/if_gre.h:1.42 src/sys/net/if_gre.h:1.43
--- src/sys/net/if_gre.h:1.42 Tue Nov 29 17:28:45 2011
+++ src/sys/net/if_gre.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.h,v 1.42 2011/11/29 17:28:45 drochner Exp $ */
+/* $NetBSD: if_gre.h,v 1.43 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#ifndef _NET_IF_GRE_H_
#define _NET_IF_GRE_H_
+#include <sys/ioccom.h>
#include <sys/evcnt.h>
#include <sys/queue.h>
#include <sys/mutex.h>
Index: src/sys/net/if_ppp.h
diff -u src/sys/net/if_ppp.h:1.26 src/sys/net/if_ppp.h:1.27
--- src/sys/net/if_ppp.h:1.26 Thu Aug 20 11:18:53 2015
+++ src/sys/net/if_ppp.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.h,v 1.26 2015/08/20 11:18:53 uebayasi Exp $ */
+/* $NetBSD: if_ppp.h,v 1.27 2015/09/06 06:01:01 dholland Exp $ */
/* Id: if_ppp.h,v 1.16 1997/04/30 05:46:04 paulus Exp */
/*
@@ -46,6 +46,8 @@
#ifndef _NET_IF_PPP_H_
#define _NET_IF_PPP_H_
+#include <sys/ioccom.h>
+
/*
* Bit definitions for flags.
*/
Index: src/sys/net/if_pppoe.h
diff -u src/sys/net/if_pppoe.h:1.11 src/sys/net/if_pppoe.h:1.12
--- src/sys/net/if_pppoe.h:1.11 Mon Apr 28 20:24:09 2008
+++ src/sys/net/if_pppoe.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.h,v 1.11 2008/04/28 20:24:09 martin Exp $ */
+/* $NetBSD: if_pppoe.h,v 1.12 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _NET_IF_PPPOE_H_
#define _NET_IF_PPPOE_H_
+#include <sys/ioccom.h>
+
struct pppoediscparms {
char ifname[IFNAMSIZ]; /* pppoe interface name */
char eth_ifname[IFNAMSIZ]; /* external ethernet interface name */
Index: src/sys/net/if_sppp.h
diff -u src/sys/net/if_sppp.h:1.27 src/sys/net/if_sppp.h:1.28
--- src/sys/net/if_sppp.h:1.27 Tue Apr 20 14:32:03 2010
+++ src/sys/net/if_sppp.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sppp.h,v 1.27 2010/04/20 14:32:03 jmcneill Exp $ */
+/* $NetBSD: if_sppp.h,v 1.28 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,6 +34,9 @@
/* ioctls used by the if_spppsubr.c driver */
+#include <sys/ioccom.h>
+
+
#define SPPP_AUTHPROTO_NONE 0
#define SPPP_AUTHPROTO_PAP 1
#define SPPP_AUTHPROTO_CHAP 2
Index: src/sys/net/if_srt.h
diff -u src/sys/net/if_srt.h:1.3 src/sys/net/if_srt.h:1.4
--- src/sys/net/if_srt.h:1.3 Wed Dec 9 00:44:26 2009
+++ src/sys/net/if_srt.h Sun Sep 6 06:01:01 2015
@@ -1,10 +1,11 @@
#ifndef _IF_SRT_H_1b91f8f1_
#define _IF_SRT_H_1b91f8f1_
-/* $NetBSD: if_srt.h,v 1.3 2009/12/09 00:44:26 dyoung Exp $ */
+/* $NetBSD: if_srt.h,v 1.4 2015/09/06 06:01:01 dholland Exp $ */
/* This file is in the public domain. */
+#include <sys/ioccom.h> /* for _IOR etc */
#include <net/if.h> /* XXX for IFNAMSIZ */
#include <netinet/in.h> /* for in_addr/in6_addr */
Index: src/sys/net/if_tap.h
diff -u src/sys/net/if_tap.h:1.5 src/sys/net/if_tap.h:1.6
--- src/sys/net/if_tap.h:1.5 Tue Apr 29 06:53:03 2008
+++ src/sys/net/if_tap.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.h,v 1.5 2008/04/29 06:53:03 martin Exp $ */
+/* $NetBSD: if_tap.h,v 1.6 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation.
@@ -29,6 +29,8 @@
#ifndef _NET_IF_TAP_H_
#define _NET_IF_TAP_H_
+#include <sys/ioccom.h>
+
/* 'e' comes from former name 'ethfoo' */
#define TAPGIFNAME _IOR('e', 0, struct ifreq)
Index: src/sys/net/if_tun.h
diff -u src/sys/net/if_tun.h:1.18 src/sys/net/if_tun.h:1.19
--- src/sys/net/if_tun.h:1.18 Sat Oct 18 08:33:29 2014
+++ src/sys/net/if_tun.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.h,v 1.18 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: if_tun.h,v 1.19 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1988, Julian Onions <j...@cs.nott.ac.uk>
@@ -19,6 +19,8 @@
#ifndef _NET_IF_TUN_H_
#define _NET_IF_TUN_H_
+#include <sys/ioccom.h>
+
#ifdef _KERNEL
struct tun_softc {
struct ifnet tun_if; /* the interface */
Index: src/sys/net/slip.h
diff -u src/sys/net/slip.h:1.9 src/sys/net/slip.h:1.10
--- src/sys/net/slip.h:1.9 Sat Dec 10 23:21:39 2005
+++ src/sys/net/slip.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: slip.h,v 1.9 2005/12/10 23:21:39 elad Exp $ */
+/* $NetBSD: slip.h,v 1.10 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 1994
@@ -34,6 +34,8 @@
#ifndef _NET_SLIP_H_
#define _NET_SLIP_H_
+#include <sys/ioccom.h>
+
/* Ioctls operating on SLIP ttys. */
#define SLIOCGUNIT _IOR('t', 88, int) /* get slip unit number */
Index: src/sys/net80211/ieee80211_ioctl.h
diff -u src/sys/net80211/ieee80211_ioctl.h:1.20 src/sys/net80211/ieee80211_ioctl.h:1.21
--- src/sys/net80211/ieee80211_ioctl.h:1.20 Sun Jun 12 00:07:19 2011
+++ src/sys/net80211/ieee80211_ioctl.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_ioctl.h,v 1.20 2011/06/12 00:07:19 christos Exp $ */
+/* $NetBSD: ieee80211_ioctl.h,v 1.21 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -38,6 +38,7 @@
/*
* IEEE 802.11 ioctls.
*/
+#include <sys/ioccom.h>
#include <net80211/_ieee80211.h>
#include <net80211/ieee80211.h>
#include <net80211/ieee80211_crypto.h>
Index: src/sys/netatalk/phase2.h
diff -u src/sys/netatalk/phase2.h:1.2 src/sys/netatalk/phase2.h:1.3
--- src/sys/netatalk/phase2.h:1.2 Sat Dec 10 23:29:05 2005
+++ src/sys/netatalk/phase2.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: phase2.h,v 1.2 2005/12/10 23:29:05 elad Exp $ */
+/* $NetBSD: phase2.h,v 1.3 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -29,6 +29,7 @@
#ifndef _NETATALK_PHASE2_H_
#define _NETATALK_PHASE2_H_
+#include <sys/ioccom.h>
#include <net/if_llc.h>
#define llc_org_code llc_un.type_snap.org_code
Index: src/sys/netbt/hci.h
diff -u src/sys/netbt/hci.h:1.39 src/sys/netbt/hci.h:1.40
--- src/sys/netbt/hci.h:1.39 Tue Jul 1 05:49:18 2014
+++ src/sys/netbt/hci.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hci.h,v 1.39 2014/07/01 05:49:18 rtr Exp $ */
+/* $NetBSD: hci.h,v 1.40 2015/09/06 06:01:01 dholland Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -54,7 +54,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: hci.h,v 1.39 2014/07/01 05:49:18 rtr Exp $
+ * $Id: hci.h,v 1.40 2015/09/06 06:01:01 dholland Exp $
* $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
*/
@@ -76,6 +76,8 @@
#include <netbt/bluetooth.h>
+#include <sys/ioccom.h>
+
/**************************************************************************
**************************************************************************
** Common defines and types (HCI)
Index: src/sys/netinet6/in6_var.h
diff -u src/sys/netinet6/in6_var.h:1.73 src/sys/netinet6/in6_var.h:1.74
--- src/sys/netinet6/in6_var.h:1.73 Tue Apr 7 23:30:36 2015
+++ src/sys/netinet6/in6_var.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.73 2015/04/07 23:30:36 roy Exp $ */
+/* $NetBSD: in6_var.h,v 1.74 2015/09/06 06:01:01 dholland Exp $ */
/* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -65,6 +65,7 @@
#define _NETINET6_IN6_VAR_H_
#include <sys/callout.h>
+#include <sys/ioccom.h>
/*
* Interface address, Internet version. One of these structures
Index: src/sys/netisdn/i4b_debug.h
diff -u src/sys/netisdn/i4b_debug.h:1.9 src/sys/netisdn/i4b_debug.h:1.10
--- src/sys/netisdn/i4b_debug.h:1.9 Sat Oct 27 17:18:40 2012
+++ src/sys/netisdn/i4b_debug.h Sun Sep 6 06:01:01 2015
@@ -27,7 +27,7 @@
* i4b_debug.h - i4b debug header file
* -----------------------------------
*
- * $Id: i4b_debug.h,v 1.9 2012/10/27 17:18:40 chs Exp $
+ * $Id: i4b_debug.h,v 1.10 2015/09/06 06:01:01 dholland Exp $
*
* $FreeBSD$
*
@@ -38,6 +38,8 @@
#ifndef _NETISDN_I4B_DEBUG_H_
#define _NETISDN_I4B_DEBUG_H_
+#include <sys/ioccom.h>
+
#if !defined DO_I4B_DEBUG
# define DO_I4B_DEBUG 1 /* default = include debugging code */
#elif DO_I4B_DEBUG != 0
Index: src/sys/netisdn/i4b_ioctl.h
diff -u src/sys/netisdn/i4b_ioctl.h:1.12 src/sys/netisdn/i4b_ioctl.h:1.13
--- src/sys/netisdn/i4b_ioctl.h:1.12 Sat Oct 18 08:33:29 2014
+++ src/sys/netisdn/i4b_ioctl.h Sun Sep 6 06:01:01 2015
@@ -27,7 +27,7 @@
* i4b_ioctl.h - messages kernel <--> userland
* -------------------------------------------
*
- * $Id: i4b_ioctl.h,v 1.12 2014/10/18 08:33:29 snj Exp $
+ * $Id: i4b_ioctl.h,v 1.13 2015/09/06 06:01:01 dholland Exp $
*
* $FreeBSD$
*
@@ -44,6 +44,8 @@
#endif /* _MACHINE_TYPES_H_ */
#endif /* __FreeBSD__ */
+#include <sys/ioccom.h>
+
/*---------------------------------------------------------------------------*
* version and release number for isdn4bsd package
*---------------------------------------------------------------------------*/
Index: src/sys/netisdn/i4b_isppp.h
diff -u src/sys/netisdn/i4b_isppp.h:1.3 src/sys/netisdn/i4b_isppp.h:1.4
--- src/sys/netisdn/i4b_isppp.h:1.3 Sun Mar 4 06:03:30 2007
+++ src/sys/netisdn/i4b_isppp.h Sun Sep 6 06:01:01 2015
@@ -18,7 +18,7 @@
*
* From: if_sppp.h,v 1.14 1999/03/30 13:28:26 phk Exp
*
- * $Id: i4b_isppp.h,v 1.3 2007/03/04 06:03:30 christos Exp $
+ * $Id: i4b_isppp.h,v 1.4 2015/09/06 06:01:01 dholland Exp $
*/
#ifndef _NETISDN_I4B_ISPPP_H_
@@ -26,6 +26,8 @@
#define SPPP_VJ /* use VJ compression */
+#include <sys/ioccom.h>
+
#ifdef SPPP_VJ
#if !(defined (KERNEL) || defined (_KERNEL))
Index: src/sys/netisdn/i4b_rbch_ioctl.h
diff -u src/sys/netisdn/i4b_rbch_ioctl.h:1.2 src/sys/netisdn/i4b_rbch_ioctl.h:1.3
--- src/sys/netisdn/i4b_rbch_ioctl.h:1.2 Sat Dec 10 23:51:50 2005
+++ src/sys/netisdn/i4b_rbch_ioctl.h Sun Sep 6 06:01:01 2015
@@ -27,7 +27,7 @@
* i4b_rbch_ioctl.h raw B-channel driver interface ioctls
* ------------------------------------------------------
*
- * $Id: i4b_rbch_ioctl.h,v 1.2 2005/12/10 23:51:50 elad Exp $
+ * $Id: i4b_rbch_ioctl.h,v 1.3 2015/09/06 06:01:01 dholland Exp $
*
* $FreeBSD$
*
@@ -38,6 +38,8 @@
#ifndef _NETISDN_I4B_RBCH_IOCTL_H_
#define _NETISDN_I4B_RBCH_IOCTL_H_
+#include <sys/ioccom.h>
+
/*---------------------------------------------------------------------------*
* instruct the rbch device to dial the given number
*---------------------------------------------------------------------------*/
Index: src/sys/netisdn/i4b_tel_ioctl.h
diff -u src/sys/netisdn/i4b_tel_ioctl.h:1.4 src/sys/netisdn/i4b_tel_ioctl.h:1.5
--- src/sys/netisdn/i4b_tel_ioctl.h:1.4 Sat Dec 10 23:51:50 2005
+++ src/sys/netisdn/i4b_tel_ioctl.h Sun Sep 6 06:01:01 2015
@@ -27,7 +27,7 @@
* i4b_tel_ioctl.h telephony interface ioctls
* ------------------------------------------
*
- * $Id: i4b_tel_ioctl.h,v 1.4 2005/12/10 23:51:50 elad Exp $
+ * $Id: i4b_tel_ioctl.h,v 1.5 2015/09/06 06:01:01 dholland Exp $
*
* $FreeBSD$
*
@@ -38,6 +38,8 @@
#ifndef _NETISDN_I4B_TEL_IOCTL_H_
#define _NETISDN_I4B_TEL_IOCTL_H_
+#include <sys/ioccom.h>
+
/*===========================================================================*
* /dev/i4btel<n> devices (audio data)
*===========================================================================*/
Index: src/sys/netisdn/i4b_trace.h
diff -u src/sys/netisdn/i4b_trace.h:1.5 src/sys/netisdn/i4b_trace.h:1.6
--- src/sys/netisdn/i4b_trace.h:1.5 Sat Dec 10 23:51:50 2005
+++ src/sys/netisdn/i4b_trace.h Sun Sep 6 06:01:01 2015
@@ -27,7 +27,7 @@
* i4b_trace.h - header file for trace data read device
* ----------------------------------------------------
*
- * $Id: i4b_trace.h,v 1.5 2005/12/10 23:51:50 elad Exp $
+ * $Id: i4b_trace.h,v 1.6 2015/09/06 06:01:01 dholland Exp $
*
* $FreeBSD$
*
@@ -38,6 +38,8 @@
#ifndef _NETISDN_I4B_TRACE_H_
#define _NETISDN_I4B_TRACE_H_
+#include <sys/ioccom.h>
+
/*---------------------------------------------------------------------------*
* structure of the header at the beginning of every trace mbuf
*---------------------------------------------------------------------------*/
Index: src/sys/netnatm/natm.h
diff -u src/sys/netnatm/natm.h:1.14 src/sys/netnatm/natm.h:1.15
--- src/sys/netnatm/natm.h:1.14 Sun Jul 6 15:44:25 2014
+++ src/sys/netnatm/natm.h Sun Sep 6 06:01:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.h,v 1.14 2014/07/06 15:44:25 rtr Exp $ */
+/* $NetBSD: natm.h,v 1.15 2015/09/06 06:01:01 dholland Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -32,6 +32,8 @@
* natm.h: native mode atm
*/
+#include <sys/ioccom.h>
+
/*
* supported protocols
Index: src/sys/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.2 src/sys/opencrypto/ocryptodev.h:1.3
--- src/sys/opencrypto/ocryptodev.h:1.2 Sat Feb 19 16:26:34 2011
+++ src/sys/opencrypto/ocryptodev.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.2 2011/02/19 16:26:34 drochner Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.3 2015/09/06 06:01:02 dholland Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -85,6 +85,8 @@
#ifndef _CRYPTO_OCRYPTODEV_H_
#define _CRYPTO_OCRYPTODEV_H_
+#include <sys/ioccom.h>
+
struct osession_op { /* backwards compatible */
u_int32_t cipher; /* ie. CRYPTO_DES_CBC */
u_int32_t mac; /* ie. CRYPTO_MD5_HMAC */
Index: src/sys/sys/agpio.h
diff -u src/sys/sys/agpio.h:1.10 src/sys/sys/agpio.h:1.11
--- src/sys/sys/agpio.h:1.10 Tue Feb 15 08:57:01 2011
+++ src/sys/sys/agpio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: agpio.h,v 1.10 2011/02/15 08:57:01 jmcneill Exp $ */
+/* $NetBSD: agpio.h,v 1.11 2015/09/06 06:01:02 dholland Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -31,6 +31,8 @@
#ifndef _SYS_AGPIO_H_
#define _SYS_AGPIO_H_
+#include <sys/ioccom.h>
+
/*
* The AGP gatt uses 4k pages irrespective of the host page size.
*/
Index: src/sys/sys/cdio.h
diff -u src/sys/sys/cdio.h:1.33 src/sys/sys/cdio.h:1.34
--- src/sys/sys/cdio.h:1.33 Thu Jan 29 19:36:28 2009
+++ src/sys/sys/cdio.h Sun Sep 6 06:01:02 2015
@@ -1,8 +1,10 @@
-/* $NetBSD: cdio.h,v 1.33 2009/01/29 19:36:28 reinoud Exp $ */
+/* $NetBSD: cdio.h,v 1.34 2015/09/06 06:01:02 dholland Exp $ */
#ifndef _SYS_CDIO_H_
#define _SYS_CDIO_H_
+#include <sys/ioccom.h>
+
/* Shared between kernel & process */
union msf_lba {
Index: src/sys/sys/chio.h
diff -u src/sys/sys/chio.h:1.12 src/sys/sys/chio.h:1.13
--- src/sys/sys/chio.h:1.12 Mon Apr 28 20:24:10 2008
+++ src/sys/sys/chio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: chio.h,v 1.12 2008/04/28 20:24:10 martin Exp $ */
+/* $NetBSD: chio.h,v 1.13 2015/09/06 06:01:02 dholland Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@@ -33,6 +33,8 @@
#ifndef _SYS_CHIO_H_
#define _SYS_CHIO_H_
+#include <sys/ioccom.h>
+
/*
* Element types. Used as "to" and "from" type indicators in move
* and exchange operations.
Index: src/sys/sys/clockctl.h
diff -u src/sys/sys/clockctl.h:1.15 src/sys/sys/clockctl.h:1.16
--- src/sys/sys/clockctl.h:1.15 Sun Jan 11 02:45:55 2009
+++ src/sys/sys/clockctl.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.h,v 1.15 2009/01/11 02:45:55 christos Exp $ */
+/* $NetBSD: clockctl.h,v 1.16 2015/09/06 06:01:02 dholland Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
#ifndef _SYS_CLOCKCTL_H_
#define _SYS_CLOCKCTL_H_
+#include <sys/ioccom.h>
#include <sys/time.h>
#include <sys/timex.h>
Index: src/sys/sys/midiio.h
diff -u src/sys/sys/midiio.h:1.15 src/sys/sys/midiio.h:1.16
--- src/sys/sys/midiio.h:1.15 Mon Apr 28 20:24:11 2008
+++ src/sys/sys/midiio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: midiio.h,v 1.15 2008/04/28 20:24:11 martin Exp $ */
+/* $NetBSD: midiio.h,v 1.16 2015/09/06 06:01:02 dholland Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
*/
#include <machine/endian_machdep.h>
+#include <sys/ioccom.h>
/*
* ioctl() commands for /dev/midi##
Index: src/sys/sys/gpio.h
diff -u src/sys/sys/gpio.h:1.13 src/sys/sys/gpio.h:1.14
--- src/sys/sys/gpio.h:1.13 Sun Nov 13 16:56:15 2011
+++ src/sys/sys/gpio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.h,v 1.13 2011/11/13 16:56:15 mbalmer Exp $ */
+/* $NetBSD: gpio.h,v 1.14 2015/09/06 06:01:02 dholland Exp $ */
/* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */
/*
* Copyright (c) 2009, 2011 Marc Balmer <m...@msys.ch>
@@ -20,6 +20,7 @@
#ifndef _SYS_GPIO_H_
#define _SYS_GPIO_H_
+#include <sys/ioccom.h>
#include <sys/time.h>
/* GPIO pin states */
Index: src/sys/sys/ioctl_compat.h
diff -u src/sys/sys/ioctl_compat.h:1.16 src/sys/sys/ioctl_compat.h:1.17
--- src/sys/sys/ioctl_compat.h:1.16 Thu Jul 11 19:17:57 2013
+++ src/sys/sys/ioctl_compat.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ioctl_compat.h,v 1.16 2013/07/11 19:17:57 christos Exp $ */
+/* $NetBSD: ioctl_compat.h,v 1.17 2015/09/06 06:01:02 dholland Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -39,6 +39,7 @@
#ifndef _SYS_IOCTL_COMPAT_H_
#define _SYS_IOCTL_COMPAT_H_
+#include <sys/ioccom.h>
#include <sys/ttychars.h>
#include <sys/ttydev.h>
Index: src/sys/sys/ksyms.h
diff -u src/sys/sys/ksyms.h:1.32 src/sys/sys/ksyms.h:1.33
--- src/sys/sys/ksyms.h:1.32 Wed May 20 04:37:45 2015
+++ src/sys/sys/ksyms.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ksyms.h,v 1.32 2015/05/20 04:37:45 matt Exp $ */
+/* $NetBSD: ksyms.h,v 1.33 2015/09/06 06:01:02 dholland Exp $ */
/*
* Copyright (c) 2001, 2003 Anders Magnusson (ra...@ludd.luth.se).
@@ -32,6 +32,7 @@
#ifdef _KSYMS_PRIVATE
#include <sys/exec_elf.h>
+#include <sys/ioccom.h>
#include <sys/queue.h>
struct ksyms_symtab {
Index: src/sys/sys/lua.h
diff -u src/sys/sys/lua.h:1.7 src/sys/sys/lua.h:1.8
--- src/sys/sys/lua.h:1.7 Sun Nov 30 19:12:59 2014
+++ src/sys/sys/lua.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.h,v 1.7 2014/11/30 19:12:59 lneto Exp $ */
+/* $NetBSD: lua.h,v 1.8 2015/09/06 06:01:02 dholland Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto <ln...@netbsd.org>.
@@ -33,6 +33,7 @@
#define _SYS_LUA_H_
#include <sys/param.h>
+#include <sys/ioccom.h>
#include <lua.h> /* for lua_State */
Index: src/sys/sys/mtio.h
diff -u src/sys/sys/mtio.h:1.23 src/sys/sys/mtio.h:1.24
--- src/sys/sys/mtio.h:1.23 Mon Dec 26 18:41:36 2005
+++ src/sys/sys/mtio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mtio.h,v 1.23 2005/12/26 18:41:36 perry Exp $ */
+/* $NetBSD: mtio.h,v 1.24 2015/09/06 06:01:02 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -34,6 +34,8 @@
#ifndef _SYS_MTIO_H_
#define _SYS_MTIO_H_
+#include <sys/ioccom.h>
+
/*
* Structures and definitions for mag tape io control commands
*/
Index: src/sys/sys/radioio.h
diff -u src/sys/sys/radioio.h:1.2 src/sys/sys/radioio.h:1.3
--- src/sys/sys/radioio.h:1.2 Mon Dec 26 18:41:36 2005
+++ src/sys/sys/radioio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: radioio.h,v 1.2 2005/12/26 18:41:36 perry Exp $ */
+/* $NetBSD: radioio.h,v 1.3 2015/09/06 06:01:02 dholland Exp $ */
/* $OpenBSD: radioio.h,v 1.2 2001/12/05 10:27:05 mickey Exp $ */
/* $RuOBSD: radioio.h,v 1.4 2001/10/18 16:51:36 pva Exp $ */
@@ -32,6 +32,7 @@
#define _SYS_RADIOIO_H_
#include <sys/param.h>
+#include <sys/ioccom.h>
#define MIN_FM_FREQ 87500
#define MAX_FM_FREQ 108000
Index: src/sys/sys/scanio.h
diff -u src/sys/sys/scanio.h:1.2 src/sys/sys/scanio.h:1.3
--- src/sys/sys/scanio.h:1.2 Tue Feb 10 00:25:44 1998
+++ src/sys/sys/scanio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scanio.h,v 1.2 1998/02/10 00:25:44 perry Exp $ */
+/* $NetBSD: scanio.h,v 1.3 2015/09/06 06:01:02 dholland Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -36,6 +36,8 @@
#ifndef _SYS_SCANIO_H_
#define _SYS_SCANIO_H_
+#include <sys/ioccom.h>
+
/*
* XXX scancap make this sort of obsolete:
*
Index: src/sys/sys/rndio.h
diff -u src/sys/sys/rndio.h:1.1 src/sys/sys/rndio.h:1.2
--- src/sys/sys/rndio.h:1.1 Mon Apr 13 15:39:19 2015
+++ src/sys/sys/rndio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rndio.h,v 1.1 2015/04/13 15:39:19 riastradh Exp $ */
+/* $NetBSD: rndio.h,v 1.2 2015/09/06 06:01:02 dholland Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <sys/sha1.h>
+#include <sys/ioccom.h>
/*
* Exposed "size" of entropy pool, for convenience in load/save
Index: src/sys/sys/videoio.h
diff -u src/sys/sys/videoio.h:1.8 src/sys/sys/videoio.h:1.9
--- src/sys/sys/videoio.h:1.8 Sat Aug 13 02:49:06 2011
+++ src/sys/sys/videoio.h Sun Sep 6 06:01:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: videoio.h,v 1.8 2011/08/13 02:49:06 jakllsch Exp $ */
+/* $NetBSD: videoio.h,v 1.9 2015/09/06 06:01:02 dholland Exp $ */
/*-
* Copyright (c) 2005, 2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,6 +31,7 @@
#define _HAVE_SYS_VIDEOIO_H
#include <sys/types.h>
+#include <sys/ioccom.h>
#include <sys/time.h>
#ifdef _KERNEL
#include <compat/sys/time.h>
