Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys More on PR 41200: headers that declare ioctls should inc...
details: https://anonhg.NetBSD.org/src/rev/3925e7f9c64a
branches: trunk
changeset: 340454:3925e7f9c64a
user: dholland <dholland%NetBSD.org@localhost>
date: Sun Sep 06 06:00:59 2015 +0000
description:
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/).
diffstat:
sys/coda/coda.h | 3 ++-
sys/coda/coda_io.h | 4 +++-
sys/coda/coda_pioctl.h | 4 +++-
sys/compat/freebsd/freebsd_ioctl.h | 4 +++-
sys/compat/netinet6/in6_var.h | 4 +++-
sys/compat/sunos/sunos.h | 4 +++-
sys/compat/sys/clockctl.h | 3 ++-
sys/compat/sys/cpuio.h | 4 +++-
sys/compat/ultrix/ultrix_tty.h | 4 +++-
sys/dev/apm/apmio.h | 4 +++-
sys/dev/biovar.h | 3 ++-
sys/dev/bluetooth/btdev.h | 4 +++-
sys/dev/bluetooth/btsco.h | 3 ++-
sys/dev/ccdvar.h | 3 ++-
sys/dev/cgdvar.h | 4 +++-
sys/dev/dm/netbsd-dm.h | 3 ++-
sys/dev/filemon/filemon.h | 4 +++-
sys/dev/fssvar.h | 4 +++-
sys/dev/gpib/gpibio.h | 4 +++-
sys/dev/i2o/iopio.h | 4 +++-
sys/dev/ic/athioctl.h | 4 +++-
sys/dev/ic/hd44780var.h | 4 +++-
sys/dev/ic/isp_ioctl.h | 6 +++++-
sys/dev/ir/cirio.h | 4 +++-
sys/dev/ir/irdaio.h | 4 +++-
sys/dev/isa/satlinkio.h | 4 +++-
sys/dev/isa/spkrio.h | 4 +++-
sys/dev/isa/wtreg.h | 4 +++-
sys/dev/ofw/openfirmio.h | 4 +++-
sys/dev/pci/cxgb/cxgb_ioctl.h | 3 +++
sys/dev/pci/if_devar.h | 3 ++-
sys/dev/pci/if_ipwvar.h | 4 +++-
sys/dev/pci/if_iwivar.h | 4 +++-
sys/dev/pci/if_lmc.h | 5 ++++-
sys/dev/pci/mlyio.h | 5 ++++-
sys/dev/pci/twaio.h | 5 ++++-
sys/dev/pcmcia/if_cnwioctl.h | 4 +++-
sys/dev/pcmcia/if_rayreg.h | 4 +++-
sys/dev/ppbus/lptio.h | 4 +++-
sys/dev/raidframe/rf_compat50.h | 4 +++-
sys/dev/scsipi/ses.h | 3 ++-
sys/dev/sun/disklabel.h | 4 +++-
sys/dev/sun/fbio.h | 4 +++-
sys/dev/sun/kbio.h | 4 +++-
sys/dev/sun/vuid_event.h | 4 +++-
sys/dev/tc/sticio.h | 4 +++-
sys/dev/usb/ukyopon.h | 4 +++-
sys/dev/usb/urio.h | 4 +++-
sys/dev/vme/xio.h | 5 ++++-
sys/dev/vndvar.h | 3 ++-
sys/dev/wscons/wsdisplay_usl_io.h | 4 +++-
sys/dev/wscons/wseventvar.h | 4 +++-
sys/net/if_atm.h | 4 +++-
sys/net/if_gre.h | 3 ++-
sys/net/if_ppp.h | 4 +++-
sys/net/if_pppoe.h | 4 +++-
sys/net/if_sppp.h | 5 ++++-
sys/net/if_srt.h | 3 ++-
sys/net/if_tap.h | 4 +++-
sys/net/if_tun.h | 4 +++-
sys/net/slip.h | 4 +++-
sys/net80211/ieee80211_ioctl.h | 3 ++-
sys/netatalk/phase2.h | 3 ++-
sys/netbt/hci.h | 6 ++++--
sys/netinet6/in6_var.h | 3 ++-
sys/netisdn/i4b_debug.h | 4 +++-
sys/netisdn/i4b_ioctl.h | 4 +++-
sys/netisdn/i4b_isppp.h | 4 +++-
sys/netisdn/i4b_rbch_ioctl.h | 4 +++-
sys/netisdn/i4b_tel_ioctl.h | 4 +++-
sys/netisdn/i4b_trace.h | 4 +++-
sys/netnatm/natm.h | 4 +++-
sys/opencrypto/ocryptodev.h | 4 +++-
sys/sys/agpio.h | 4 +++-
sys/sys/cdio.h | 4 +++-
sys/sys/chio.h | 4 +++-
sys/sys/clockctl.h | 3 ++-
sys/sys/gpio.h | 3 ++-
sys/sys/ioctl_compat.h | 3 ++-
sys/sys/ksyms.h | 3 ++-
sys/sys/lua.h | 3 ++-
sys/sys/midiio.h | 3 ++-
sys/sys/mtio.h | 4 +++-
sys/sys/radioio.h | 3 ++-
sys/sys/rndio.h | 3 ++-
sys/sys/scanio.h | 4 +++-
sys/sys/videoio.h | 3 ++-
87 files changed, 246 insertions(+), 87 deletions(-)
diffs (truncated from 1552 to 300 lines):
diff -r 172c270d4792 -r 3925e7f9c64a sys/coda/coda.h
--- a/sys/coda/coda.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/coda/coda.h Sun Sep 06 06:00:59 2015 +0000
@@ -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 @@
#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"
diff -r 172c270d4792 -r 3925e7f9c64a sys/coda/coda_io.h
--- a/sys/coda/coda_io.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/coda/coda_io.h Sun Sep 06 06:00:59 2015 +0000
@@ -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 */
diff -r 172c270d4792 -r 3925e7f9c64a sys/coda/coda_pioctl.h
--- a/sys/coda/coda_pioctl.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/coda/coda_pioctl.h Sun Sep 06 06:00:59 2015 +0000
@@ -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
diff -r 172c270d4792 -r 3925e7f9c64a sys/compat/freebsd/freebsd_ioctl.h
--- a/sys/compat/freebsd/freebsd_ioctl.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/compat/freebsd/freebsd_ioctl.h Sun Sep 06 06:00:59 2015 +0000
@@ -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
diff -r 172c270d4792 -r 3925e7f9c64a sys/compat/netinet6/in6_var.h
--- a/sys/compat/netinet6/in6_var.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/compat/netinet6/in6_var.h Sun Sep 06 06:00:59 2015 +0000
@@ -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;
diff -r 172c270d4792 -r 3925e7f9c64a sys/compat/sunos/sunos.h
--- a/sys/compat/sunos/sunos.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/compat/sunos/sunos.h Sun Sep 06 06:00:59 2015 +0000
@@ -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;
diff -r 172c270d4792 -r 3925e7f9c64a sys/compat/sys/clockctl.h
--- a/sys/compat/sys/clockctl.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/compat/sys/clockctl.h Sun Sep 06 06:00:59 2015 +0000
@@ -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>
diff -r 172c270d4792 -r 3925e7f9c64a sys/compat/sys/cpuio.h
--- a/sys/compat/sys/cpuio.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/compat/sys/cpuio.h Sun Sep 06 06:00:59 2015 +0000
@@ -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;
diff -r 172c270d4792 -r 3925e7f9c64a sys/compat/ultrix/ultrix_tty.h
--- a/sys/compat/ultrix/ultrix_tty.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/compat/ultrix/ultrix_tty.h Sun Sep 06 06:00:59 2015 +0000
@@ -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;
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/apm/apmio.h
--- a/sys/dev/apm/apmio.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/apm/apmio.h Sun Sep 06 06:00:59 2015 +0000
@@ -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;
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/biovar.h
--- a/sys/dev/biovar.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/biovar.h Sun Sep 06 06:00:59 2015 +0000
@@ -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>
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/bluetooth/btdev.h
--- a/sys/dev/bluetooth/btdev.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/bluetooth/btdev.h Sun Sep 06 06:00:59 2015 +0000
@@ -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)
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/bluetooth/btsco.h
--- a/sys/dev/bluetooth/btsco.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/bluetooth/btsco.h Sun Sep 06 06:00:59 2015 +0000
@@ -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 */
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/ccdvar.h
--- a/sys/dev/ccdvar.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/ccdvar.h Sun Sep 06 06:00:59 2015 +0000
@@ -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>
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/cgdvar.h
--- a/sys/dev/cgdvar.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/cgdvar.h Sun Sep 06 06:00:59 2015 +0000
@@ -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;
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/dm/netbsd-dm.h
--- a/sys/dev/dm/netbsd-dm.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/dm/netbsd-dm.h Sun Sep 06 06:00:59 2015 +0000
@@ -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
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/filemon/filemon.h
--- a/sys/dev/filemon/filemon.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/filemon/filemon.h Sun Sep 06 06:00:59 2015 +0000
@@ -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
diff -r 172c270d4792 -r 3925e7f9c64a sys/dev/fssvar.h
--- a/sys/dev/fssvar.h Sun Sep 06 04:42:06 2015 +0000
+++ b/sys/dev/fssvar.h Sun Sep 06 06:00:59 2015 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index