Module Name: src
Committed By: dholland
Date: Mon Sep 7 03:49:46 UTC 2015
Modified Files:
src/sys/arch/acorn32/include: scrio.h
src/sys/arch/alpha/include: kbio.h
src/sys/arch/amiga/dev: clockioctl.h grfioctl.h iteioctl.h kbdreg.h
viewioctl.h
src/sys/arch/atari/dev: clockioctl.h grfioctl.h iteioctl.h kbdreg.h
viewioctl.h
src/sys/arch/atari/include: msioctl.h
src/sys/arch/atari/vme: leoioctl.h
src/sys/arch/hp300/stand/common: scsireg.h
src/sys/arch/mac68k/include: grfioctl.h
src/sys/arch/macppc/include: grfioctl.h
src/sys/arch/newsmips/include: wsconsio.h
src/sys/arch/ofppc/include: grfioctl.h
src/sys/arch/prep/include: nvram.h
src/sys/arch/sh3/include: wdogvar.h
src/sys/arch/shark/include: beep.h kbd.h mouse.h profileio.h scrio.h
src/sys/arch/sparc/dev: cgfourteenvar.h
src/sys/arch/sparc/include: openpromio.h tctrl.h
src/sys/arch/sun3/dev: xio.h
src/sys/arch/x68k/include: grfioctl.h iteioctl.h kbio.h sram.h
src/sys/arch/x68k/x68k: clockioctl.h
src/sys/arch/xen/include: xenio.h xenio3.h xenio_gntdev.h
Log Message:
Final bit of PR 41200: headers that declare ioctls should include sys/ioccom.h.
This covers most if not all of the MD headers.
XXX: a lot of the ioctl definitions in some of these files are cutpasted.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/acorn32/include/scrio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/include/kbio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/clockioctl.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amiga/dev/grfioctl.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/dev/iteioctl.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/dev/kbdreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/viewioctl.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/atari/dev/clockioctl.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/dev/grfioctl.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/dev/iteioctl.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/dev/kbdreg.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/arch/atari/dev/viewioctl.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/atari/include/msioctl.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/vme/leoioctl.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp300/stand/common/scsireg.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mac68k/include/grfioctl.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/include/grfioctl.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/newsmips/include/wsconsio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ofppc/include/grfioctl.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/prep/include/nvram.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sh3/include/wdogvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/shark/include/beep.h \
src/sys/arch/shark/include/kbd.h src/sys/arch/shark/include/mouse.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/shark/include/profileio.h \
src/sys/arch/shark/include/scrio.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/dev/cgfourteenvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/include/openpromio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/include/tctrl.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sun3/dev/xio.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/include/grfioctl.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/include/iteioctl.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/include/kbio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/include/sram.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/x68k/clockioctl.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/xen/include/xenio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/xen/include/xenio3.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/xen/include/xenio_gntdev.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/arch/acorn32/include/scrio.h
diff -u src/sys/arch/acorn32/include/scrio.h:1.1 src/sys/arch/acorn32/include/scrio.h:1.2
--- src/sys/arch/acorn32/include/scrio.h:1.1 Fri Oct 5 22:27:52 2001
+++ src/sys/arch/acorn32/include/scrio.h Mon Sep 7 03:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scrio.h,v 1.1 2001/10/05 22:27:52 reinoud Exp $ */
+/* $NetBSD: scrio.h,v 1.2 2015/09/07 03:49:44 dholland Exp $ */
/*
* Copyright 1997
@@ -40,6 +40,8 @@
#ifndef _ARM32_SCRIO_H_
#define _ARM32_SCRIO_H_
+#include <sys/ioccom.h>
+
#define ATR_BUF_MAX 1 + 1 + 4 * 10 + 15 + 1 /* TS + T0 + 4 * TABCD + 15 * TK + TCK */
#define CMD_BUF_LEN 5
#define DATA_BUF_MAX 256
Index: src/sys/arch/alpha/include/kbio.h
diff -u src/sys/arch/alpha/include/kbio.h:1.4 src/sys/arch/alpha/include/kbio.h:1.5
--- src/sys/arch/alpha/include/kbio.h:1.4 Sun Dec 11 12:16:16 2005
+++ src/sys/arch/alpha/include/kbio.h Mon Sep 7 03:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.4 2005/12/11 12:16:16 christos Exp $ */
+/* $NetBSD: kbio.h,v 1.5 2015/09/07 03:49:44 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -40,6 +40,8 @@
* @(#)kbio.h 8.1 (Berkeley) 6/11/93
*/
+#include <sys/ioccom.h>
+
#if 0 /* XXX */
/*
* The following is a minimal emulation of Sun's `kio' structures
Index: src/sys/arch/amiga/dev/clockioctl.h
diff -u src/sys/arch/amiga/dev/clockioctl.h:1.5 src/sys/arch/amiga/dev/clockioctl.h:1.6
--- src/sys/arch/amiga/dev/clockioctl.h:1.5 Tue Feb 8 20:20:08 2011
+++ src/sys/arch/amiga/dev/clockioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: clockioctl.h,v 1.5 2011/02/08 20:20:08 rmind Exp $ */
+/* $NetBSD: clockioctl.h,v 1.6 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1989 University of Utah.
@@ -38,6 +38,8 @@
* @(#)clockioctl.h 7.2 (Berkeley) 11/2/90
*/
+#include <sys/ioccom.h>
+
#define CLOCKMAP _IOWR('C', 1, int)
#define CLOCKUNMAP _IOW('C', 2, int)
#define CLOCKGETRES _IOR('C', 3, int)
Index: src/sys/arch/amiga/dev/grfioctl.h
diff -u src/sys/arch/amiga/dev/grfioctl.h:1.20 src/sys/arch/amiga/dev/grfioctl.h:1.21
--- src/sys/arch/amiga/dev/grfioctl.h:1.20 Tue Feb 8 20:20:08 2011
+++ src/sys/arch/amiga/dev/grfioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.20 2011/02/08 20:20:08 rmind Exp $ */
+/* $NetBSD: grfioctl.h,v 1.21 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,6 +38,8 @@
* @(#)grfioctl.h 7.2 (Berkeley) 11/4/90
*/
+#include <sys/ioccom.h>
+
/* these are changeable values, encapsulated in their own structure, so
no the whole thing has to be copied when setting parameters. */
struct grfdyninfo {
Index: src/sys/arch/amiga/dev/iteioctl.h
diff -u src/sys/arch/amiga/dev/iteioctl.h:1.12 src/sys/arch/amiga/dev/iteioctl.h:1.13
--- src/sys/arch/amiga/dev/iteioctl.h:1.12 Tue Feb 8 20:20:08 2011
+++ src/sys/arch/amiga/dev/iteioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iteioctl.h,v 1.12 2011/02/08 20:20:08 rmind Exp $ */
+/* $NetBSD: iteioctl.h,v 1.13 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,6 +38,8 @@
* @(#)iteioctl.h 7.2 (Berkeley) 11/4/90
*/
+#include <sys/ioccom.h>
+
struct itewinsize {
int x; /* leftedge offset to the right */
int y; /* topedge offset down */
Index: src/sys/arch/amiga/dev/kbdreg.h
diff -u src/sys/arch/amiga/dev/kbdreg.h:1.7 src/sys/arch/amiga/dev/kbdreg.h:1.8
--- src/sys/arch/amiga/dev/kbdreg.h:1.7 Sun Dec 11 12:16:28 2005
+++ src/sys/arch/amiga/dev/kbdreg.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdreg.h,v 1.7 2005/12/11 12:16:28 christos Exp $ */
+/* $NetBSD: kbdreg.h,v 1.8 2015/09/07 03:49:45 dholland Exp $ */
/*
* losely based on:
@@ -44,6 +44,8 @@
* Header: kbio.h,v 1.4 92/11/26 01:16:32 torek Exp (LBL)
*/
+#include <sys/ioccom.h>
+
#define KIOCTRANS _IOW('k', 0, int) /* set translation mode */
/* (we only accept TR_UNTRANS_EVENT) */
#define KIOCGTRANS _IOR('k', 5, int) /* get translation mode */
Index: src/sys/arch/amiga/dev/viewioctl.h
diff -u src/sys/arch/amiga/dev/viewioctl.h:1.9 src/sys/arch/amiga/dev/viewioctl.h:1.10
--- src/sys/arch/amiga/dev/viewioctl.h:1.9 Fri Sep 6 13:19:18 2002
+++ src/sys/arch/amiga/dev/viewioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: viewioctl.h,v 1.9 2002/09/06 13:19:18 gehenna Exp $ */
+/* $NetBSD: viewioctl.h,v 1.10 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -39,6 +39,8 @@
* a interface to graphics.
*/
+#include <sys/ioccom.h>
+
struct view_size {
int x;
int y;
Index: src/sys/arch/atari/dev/clockioctl.h
diff -u src/sys/arch/atari/dev/clockioctl.h:1.4 src/sys/arch/atari/dev/clockioctl.h:1.5
--- src/sys/arch/atari/dev/clockioctl.h:1.4 Tue Feb 8 20:20:10 2011
+++ src/sys/arch/atari/dev/clockioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: clockioctl.h,v 1.4 2011/02/08 20:20:10 rmind Exp $ */
+/* $NetBSD: clockioctl.h,v 1.5 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1989 University of Utah.
@@ -38,6 +38,8 @@
* @(#)clockioctl.h 7.2 (Berkeley) 11/2/90
*/
+#include <sys/ioccom.h>
+
#define CLOCKMAP _IOWR('C', 1, int)
#define CLOCKUNMAP _IOW('C', 2, int)
#define CLOCKGETRES _IOR('C', 3, int)
Index: src/sys/arch/atari/dev/grfioctl.h
diff -u src/sys/arch/atari/dev/grfioctl.h:1.9 src/sys/arch/atari/dev/grfioctl.h:1.10
--- src/sys/arch/atari/dev/grfioctl.h:1.9 Tue Feb 8 20:20:10 2011
+++ src/sys/arch/atari/dev/grfioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.9 2011/02/08 20:20:10 rmind Exp $ */
+/* $NetBSD: grfioctl.h,v 1.10 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _MACHINE_GRFIOCTL_H_
#define _MACHINE_GRFIOCTL_H_
+#include <sys/ioccom.h>
+
/* these are changeable values, encapsulated in their own structure, so
no the whole thing has to be copied when setting parameters. */
struct grfdyninfo {
Index: src/sys/arch/atari/dev/iteioctl.h
diff -u src/sys/arch/atari/dev/iteioctl.h:1.7 src/sys/arch/atari/dev/iteioctl.h:1.8
--- src/sys/arch/atari/dev/iteioctl.h:1.7 Tue Feb 8 20:20:10 2011
+++ src/sys/arch/atari/dev/iteioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iteioctl.h,v 1.7 2011/02/08 20:20:10 rmind Exp $ */
+/* $NetBSD: iteioctl.h,v 1.8 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _MACHINE_ITEIOCTL_H_
#define _MACHINE_ITEIOCTL_H_
+#include <sys/ioccom.h>
+
#ifndef _KERNEL
#include <machine/kbdmap.h>
#endif
Index: src/sys/arch/atari/dev/kbdreg.h
diff -u src/sys/arch/atari/dev/kbdreg.h:1.5 src/sys/arch/atari/dev/kbdreg.h:1.6
--- src/sys/arch/atari/dev/kbdreg.h:1.5 Sun Dec 11 12:16:54 2005
+++ src/sys/arch/atari/dev/kbdreg.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdreg.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: kbdreg.h,v 1.6 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,6 +45,8 @@
#ifndef _MACHINE_KBDREG_H_
#define _MACHINE_KBDREG_H_
+#include <sys/ioccom.h>
+
struct kbdbell {
u_int volume; /* volume of bell (0-64) */
u_int pitch; /* pitch of bell (10-20000) */
Index: src/sys/arch/atari/dev/viewioctl.h
diff -u src/sys/arch/atari/dev/viewioctl.h:1.1.1.1 src/sys/arch/atari/dev/viewioctl.h:1.2
--- src/sys/arch/atari/dev/viewioctl.h:1.1.1.1 Sun Mar 26 07:12:14 1995
+++ src/sys/arch/atari/dev/viewioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: viewioctl.h,v 1.1.1.1 1995/03/26 07:12:14 leo Exp $ */
+/* $NetBSD: viewioctl.h,v 1.2 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -39,6 +39,8 @@
* a interface to graphics.
*/
+#include <sys/ioccom.h>
+
struct view_size {
int x;
int y;
Index: src/sys/arch/atari/include/msioctl.h
diff -u src/sys/arch/atari/include/msioctl.h:1.4 src/sys/arch/atari/include/msioctl.h:1.5
--- src/sys/arch/atari/include/msioctl.h:1.4 Tue Oct 20 19:10:11 2009
+++ src/sys/arch/atari/include/msioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msioctl.h,v 1.4 2009/10/20 19:10:11 snj Exp $ */
+/* $NetBSD: msioctl.h,v 1.5 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -25,6 +25,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
#define MIOCS3B_EMUL _IOW('M', 0x0, int) /* Set/clear 3But emulation */
#define MIOCG3B_EMUL _IOR('M', 0x1, int) /* Get 3But emulation state */
Index: src/sys/arch/atari/vme/leoioctl.h
diff -u src/sys/arch/atari/vme/leoioctl.h:1.2 src/sys/arch/atari/vme/leoioctl.h:1.3
--- src/sys/arch/atari/vme/leoioctl.h:1.2 Mon Apr 28 20:23:15 2008
+++ src/sys/arch/atari/vme/leoioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: leoioctl.h,v 1.2 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: leoioctl.h,v 1.3 2015/09/07 03:49:45 dholland Exp $ */
/*-
* Copyright (c) 1997 maximum entropy <entr...@zippy.bernstein.com>
@@ -27,5 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
#define LIOCYRES _IOW('l', 0, int)
#define LIOCSCRL _IOW('l', 1, int)
Index: src/sys/arch/hp300/stand/common/scsireg.h
diff -u src/sys/arch/hp300/stand/common/scsireg.h:1.3 src/sys/arch/hp300/stand/common/scsireg.h:1.4
--- src/sys/arch/hp300/stand/common/scsireg.h:1.3 Tue Feb 8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/scsireg.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scsireg.h,v 1.3 2011/02/08 20:20:14 rmind Exp $ */
+/* $NetBSD: scsireg.h,v 1.4 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -38,6 +38,8 @@
* HP 98265A SCSI Interface Hardware Description.
*/
+#include <sys/ioccom.h>
+
struct scsidevice {
u_char p0, scsi_id;
#define ID_MASK 0x1f
Index: src/sys/arch/mac68k/include/grfioctl.h
diff -u src/sys/arch/mac68k/include/grfioctl.h:1.14 src/sys/arch/mac68k/include/grfioctl.h:1.15
--- src/sys/arch/mac68k/include/grfioctl.h:1.14 Tue Feb 8 20:20:17 2011
+++ src/sys/arch/mac68k/include/grfioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.14 2011/02/08 20:20:17 rmind Exp $ */
+/* $NetBSD: grfioctl.h,v 1.15 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _MAC68K_GRFIOCTL_H_
#define _MAC68K_GRFIOCTL_H_
+#include <sys/ioccom.h>
+
struct grfmode {
u_int8_t mode_id; /* Identifier for mode */
u_int8_t pad0;
Index: src/sys/arch/macppc/include/grfioctl.h
diff -u src/sys/arch/macppc/include/grfioctl.h:1.6 src/sys/arch/macppc/include/grfioctl.h:1.7
--- src/sys/arch/macppc/include/grfioctl.h:1.6 Tue Feb 8 20:20:18 2011
+++ src/sys/arch/macppc/include/grfioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.6 2011/02/08 20:20:18 rmind Exp $ */
+/* $NetBSD: grfioctl.h,v 1.7 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _MACPPC_GRFIOCTL_H_
#define _MACPPC_GRFIOCTL_H_
+#include <sys/ioccom.h>
+
struct grfinfo {
void * gd_regaddr; /* control registers physaddr */
int gd_regsize; /* control registers size */
Index: src/sys/arch/newsmips/include/wsconsio.h
diff -u src/sys/arch/newsmips/include/wsconsio.h:1.2 src/sys/arch/newsmips/include/wsconsio.h:1.3
--- src/sys/arch/newsmips/include/wsconsio.h:1.2 Sun Dec 11 12:18:24 2005
+++ src/sys/arch/newsmips/include/wsconsio.h Mon Sep 7 03:49:45 2015
@@ -1,8 +1,9 @@
-/* $NetBSD: wsconsio.h,v 1.2 2005/12/11 12:18:24 christos Exp $ */
+/* $NetBSD: wsconsio.h,v 1.3 2015/09/07 03:49:45 dholland Exp $ */
#ifndef _NEWSMIPS_WSCONSIO_H_
#define _NEWSMIPS_WSCONSIO_H_
+#include <sys/ioccom.h>
#include <dev/wscons/wsconsio.h>
struct newsmips_wsdisplay_fbinfo {
Index: src/sys/arch/ofppc/include/grfioctl.h
diff -u src/sys/arch/ofppc/include/grfioctl.h:1.3 src/sys/arch/ofppc/include/grfioctl.h:1.4
--- src/sys/arch/ofppc/include/grfioctl.h:1.3 Tue Feb 8 20:20:22 2011
+++ src/sys/arch/ofppc/include/grfioctl.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.3 2011/02/08 20:20:22 rmind Exp $ */
+/* $NetBSD: grfioctl.h,v 1.4 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _MACPPC_GRFIOCTL_H_
#define _MACPPC_GRFIOCTL_H_
+#include <sys/ioccom.h>
+
struct grfinfo {
void * gd_regaddr; /* control registers physaddr */
int gd_regsize; /* control registers size */
Index: src/sys/arch/prep/include/nvram.h
diff -u src/sys/arch/prep/include/nvram.h:1.8 src/sys/arch/prep/include/nvram.h:1.9
--- src/sys/arch/prep/include/nvram.h:1.8 Sat Oct 27 17:18:08 2012
+++ src/sys/arch/prep/include/nvram.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.h,v 1.8 2012/10/27 17:18:08 chs Exp $ */
+/* $NetBSD: nvram.h,v 1.9 2015/09/07 03:49:45 dholland Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -39,6 +39,8 @@
#ifndef _MACHINE_NVRAM_H
#define _MACHINE_NVRAM_H
+#include <sys/ioccom.h>
+
#if defined(_KERNEL)
/* for the motorola machines */
#include <dev/ic/mk48txxvar.h>
Index: src/sys/arch/sh3/include/wdogvar.h
diff -u src/sys/arch/sh3/include/wdogvar.h:1.6 src/sys/arch/sh3/include/wdogvar.h:1.7
--- src/sys/arch/sh3/include/wdogvar.h:1.6 Sun Apr 28 17:10:37 2002
+++ src/sys/arch/sh3/include/wdogvar.h Mon Sep 7 03:49:45 2015
@@ -1,8 +1,10 @@
-/* $NetBSD: wdogvar.h,v 1.6 2002/04/28 17:10:37 uch Exp $ */
+/* $NetBSD: wdogvar.h,v 1.7 2015/09/07 03:49:45 dholland Exp $ */
#ifndef _SH3_WDOGVAR_H_
#define _SH3_WDOGVAR_H_
+#include <sys/ioccom.h>
+
#define WDOGF_OPEN 1
#define SIORESETWDOG _IO('S', 0x0)
Index: src/sys/arch/shark/include/beep.h
diff -u src/sys/arch/shark/include/beep.h:1.2 src/sys/arch/shark/include/beep.h:1.3
--- src/sys/arch/shark/include/beep.h:1.2 Sun Mar 4 06:00:42 2007
+++ src/sys/arch/shark/include/beep.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: beep.h,v 1.2 2007/03/04 06:00:42 christos Exp $ */
+/* $NetBSD: beep.h,v 1.3 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) Mark Brinicombe 1995 All rights reserved
@@ -30,6 +30,7 @@
*/
#include <sys/types.h>
+#include <sys/ioccom.h>
struct wavebuffer {
void *addr;
Index: src/sys/arch/shark/include/kbd.h
diff -u src/sys/arch/shark/include/kbd.h:1.2 src/sys/arch/shark/include/kbd.h:1.3
--- src/sys/arch/shark/include/kbd.h:1.2 Sat Mar 14 14:46:06 2009
+++ src/sys/arch/shark/include/kbd.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.h,v 1.2 2009/03/14 14:46:06 dsl Exp $ */
+/* $NetBSD: kbd.h,v 1.3 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -39,6 +39,8 @@
* Created : 21/07/95
*/
+#include <sys/ioccom.h>
+
struct kbd_data {
int keycode;
struct timeval event_time;
Index: src/sys/arch/shark/include/mouse.h
diff -u src/sys/arch/shark/include/mouse.h:1.2 src/sys/arch/shark/include/mouse.h:1.3
--- src/sys/arch/shark/include/mouse.h:1.2 Fri Apr 19 01:43:49 2002
+++ src/sys/arch/shark/include/mouse.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mouse.h,v 1.2 2002/04/19 01:43:49 wiz Exp $ */
+/* $NetBSD: mouse.h,v 1.3 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) Mark Brinicombe 1996 All rights reserved
@@ -31,6 +31,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/ioccom.h>
+
/*
#define MOUSE_BUTTON_RIGHT 0x10
#define MOUSE_BUTTON_MIDDLE 0x20
Index: src/sys/arch/shark/include/profileio.h
diff -u src/sys/arch/shark/include/profileio.h:1.1 src/sys/arch/shark/include/profileio.h:1.2
--- src/sys/arch/shark/include/profileio.h:1.1 Sun Feb 10 01:57:37 2002
+++ src/sys/arch/shark/include/profileio.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: profileio.h,v 1.1 2002/02/10 01:57:37 thorpej Exp $ */
+/* $NetBSD: profileio.h,v 1.2 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright 1997
@@ -45,6 +45,7 @@
#define __PROFILE_IO_H__
#include <sys/types.h>
+#include <sys/ioccom.h>
/* I have no idea what the 'P' group id means,
* I presume it isn't used for much.??
Index: src/sys/arch/shark/include/scrio.h
diff -u src/sys/arch/shark/include/scrio.h:1.1 src/sys/arch/shark/include/scrio.h:1.2
--- src/sys/arch/shark/include/scrio.h:1.1 Sun Feb 10 01:57:40 2002
+++ src/sys/arch/shark/include/scrio.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scrio.h,v 1.1 2002/02/10 01:57:40 thorpej Exp $ */
+/* $NetBSD: scrio.h,v 1.2 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright 1997
@@ -40,6 +40,8 @@
#ifndef _ARM32_SCRIO_H_
#define _ARM32_SCRIO_H_
+#include <sys/ioccom.h>
+
#define ATR_BUF_MAX 1 + 1 + 4 * 10 + 15 + 1 /* TS + T0 + 4 * TABCD + 15 * TK + TCK */
#define CMD_BUF_LEN 5
#define DATA_BUF_MAX 256
Index: src/sys/arch/sparc/dev/cgfourteenvar.h
diff -u src/sys/arch/sparc/dev/cgfourteenvar.h:1.16 src/sys/arch/sparc/dev/cgfourteenvar.h:1.17
--- src/sys/arch/sparc/dev/cgfourteenvar.h:1.16 Wed May 29 22:26:39 2013
+++ src/sys/arch/sparc/dev/cgfourteenvar.h Mon Sep 7 03:49:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteenvar.h,v 1.16 2013/05/29 22:26:39 macallan Exp $ */
+/* $NetBSD: cgfourteenvar.h,v 1.17 2015/09/07 03:49:45 dholland Exp $ */
/*
* Copyright (c) 1996
@@ -32,6 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+
+#include <sys/ioccom.h>
+
struct sbus_reg {
uint32_t sbr_slot;
uint32_t sbr_offset;
Index: src/sys/arch/sparc/include/openpromio.h
diff -u src/sys/arch/sparc/include/openpromio.h:1.6 src/sys/arch/sparc/include/openpromio.h:1.7
--- src/sys/arch/sparc/include/openpromio.h:1.6 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/include/openpromio.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: openpromio.h,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: openpromio.h,v 1.7 2015/09/07 03:49:46 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,6 +43,8 @@
#ifndef _SPARC_OPENPROMIO_H_
#define _SPARC_OPENPROMIO_H_
+#include <sys/ioccom.h>
+
struct opiocdesc {
int op_nodeid; /* passed or returned node id */
int op_namelen; /* length of op_name */
Index: src/sys/arch/sparc/include/tctrl.h
diff -u src/sys/arch/sparc/include/tctrl.h:1.4 src/sys/arch/sparc/include/tctrl.h:1.5
--- src/sys/arch/sparc/include/tctrl.h:1.4 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/tctrl.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.h,v 1.4 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: tctrl.h,v 1.5 2015/09/07 03:49:46 dholland Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,6 +31,8 @@
#ifndef _MACHINE_TCTRL_H
#define _MACHINE_TCTRL_H
+#include <sys/ioccom.h>
+
struct tctrl_req {
uint8_t cmdbuf[16];
uint8_t cmdlen;
Index: src/sys/arch/sun3/dev/xio.h
diff -u src/sys/arch/sun3/dev/xio.h:1.3 src/sys/arch/sun3/dev/xio.h:1.4
--- src/sys/arch/sun3/dev/xio.h:1.3 Tue Feb 1 20:19:32 2011
+++ src/sys/arch/sun3/dev/xio.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xio.h,v 1.3 2011/02/01 20:19:32 chuck Exp $ */
+/* $NetBSD: xio.h,v 1.4 2015/09/07 03:49:46 dholland Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -39,6 +39,8 @@
* 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/arch/x68k/include/grfioctl.h
diff -u src/sys/arch/x68k/include/grfioctl.h:1.6 src/sys/arch/x68k/include/grfioctl.h:1.7
--- src/sys/arch/x68k/include/grfioctl.h:1.6 Tue Feb 8 20:20:26 2011
+++ src/sys/arch/x68k/include/grfioctl.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.6 2011/02/08 20:20:26 rmind Exp $ */
+/* $NetBSD: grfioctl.h,v 1.7 2015/09/07 03:49:46 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _X68K_GRFIOCTL_H_
#define _X68K_GRFIOCTL_H_
+#include <sys/ioccom.h>
+
struct grfinfo {
int gd_id; /* HPUX identifier */
void * gd_regaddr; /* control registers physaddr */
Index: src/sys/arch/x68k/include/iteioctl.h
diff -u src/sys/arch/x68k/include/iteioctl.h:1.8 src/sys/arch/x68k/include/iteioctl.h:1.9
--- src/sys/arch/x68k/include/iteioctl.h:1.8 Tue Feb 8 20:20:26 2011
+++ src/sys/arch/x68k/include/iteioctl.h Mon Sep 7 03:49:46 2015
@@ -34,12 +34,13 @@
* from: Utah $Hdr: iteioctl.h 1.1 90/07/09$
*
* @(#)iteioctl.h 7.2 (Berkeley) 11/4/90
- * $NetBSD: iteioctl.h,v 1.8 2011/02/08 20:20:26 rmind Exp $
+ * $NetBSD: iteioctl.h,v 1.9 2015/09/07 03:49:46 dholland Exp $
*/
#ifndef _X68K_ITEIOCTL_H_
#define _X68K_ITEIOCTL_H_
+#include <sys/ioccom.h>
#include <machine/kbdmap.h>
struct itewinsize {
Index: src/sys/arch/x68k/include/kbio.h
diff -u src/sys/arch/x68k/include/kbio.h:1.5 src/sys/arch/x68k/include/kbio.h:1.6
--- src/sys/arch/x68k/include/kbio.h:1.5 Mon Aug 28 17:15:24 2006
+++ src/sys/arch/x68k/include/kbio.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.5 2006/08/28 17:15:24 he Exp $ */
+/* $NetBSD: kbio.h,v 1.6 2015/09/07 03:49:46 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,6 +43,7 @@
#ifndef _X68K_KBIO_H_
#define _X68K_KBIO_H_
+#include <sys/ioccom.h>
#include <dev/sun/kbio.h>
struct kiockey {
Index: src/sys/arch/x68k/include/sram.h
diff -u src/sys/arch/x68k/include/sram.h:1.3 src/sys/arch/x68k/include/sram.h:1.4
--- src/sys/arch/x68k/include/sram.h:1.3 Sun Dec 11 12:19:44 2005
+++ src/sys/arch/x68k/include/sram.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sram.h,v 1.3 2005/12/11 12:19:44 christos Exp $ */
+/* $NetBSD: sram.h,v 1.4 2015/09/07 03:49:46 dholland Exp $ */
/*
* Copyright (c) 1994 Kazuhisa Shimizu.
@@ -35,6 +35,8 @@
/* This is sram device driver. */
+#include <sys/ioccom.h>
+
#define SRAM_SIZE 16*1024 /* Sram size is 16K bytes. */
#define SRAM_IO_SIZE 16 /* IO size */
Index: src/sys/arch/x68k/x68k/clockioctl.h
diff -u src/sys/arch/x68k/x68k/clockioctl.h:1.4 src/sys/arch/x68k/x68k/clockioctl.h:1.5
--- src/sys/arch/x68k/x68k/clockioctl.h:1.4 Tue Feb 8 20:20:26 2011
+++ src/sys/arch/x68k/x68k/clockioctl.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: clockioctl.h,v 1.4 2011/02/08 20:20:26 rmind Exp $ */
+/* $NetBSD: clockioctl.h,v 1.5 2015/09/07 03:49:46 dholland Exp $ */
/*
* Copyright (c) 1989 University of Utah.
@@ -38,6 +38,8 @@
* @(#)clockioctl.h 8.1 (Berkeley) 6/10/93
*/
+#include <sys/ioccom.h>
+
#define CLOCKMAP _IOWR('C', 1, int)
#define CLOCKUNMAP _IOW('C', 2, int)
#define CLOCKGETRES _IOR('C', 3, int)
Index: src/sys/arch/xen/include/xenio.h
diff -u src/sys/arch/xen/include/xenio.h:1.9 src/sys/arch/xen/include/xenio.h:1.10
--- src/sys/arch/xen/include/xenio.h:1.9 Mon Jan 10 11:13:03 2011
+++ src/sys/arch/xen/include/xenio.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenio.h,v 1.9 2011/01/10 11:13:03 cegger Exp $ */
+/* $NetBSD: xenio.h,v 1.10 2015/09/07 03:49:46 dholland Exp $ */
/******************************************************************************
* privcmd.h
@@ -32,6 +32,9 @@
/* Interface to /proc/xen/privcmd */
+#include <sys/ioccom.h>
+
+
typedef struct privcmd_hypercall
{
unsigned long op;
Index: src/sys/arch/xen/include/xenio3.h
diff -u src/sys/arch/xen/include/xenio3.h:1.3 src/sys/arch/xen/include/xenio3.h:1.4
--- src/sys/arch/xen/include/xenio3.h:1.3 Fri Sep 3 06:07:24 2010
+++ src/sys/arch/xen/include/xenio3.h Mon Sep 7 03:49:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenio3.h,v 1.3 2010/09/03 06:07:24 cegger Exp $ */
+/* $NetBSD: xenio3.h,v 1.4 2015/09/07 03:49:46 dholland Exp $ */
/******************************************************************************
* evtchn.h
*
@@ -31,6 +31,8 @@
#ifndef __XEN_XENIO3_H__
#define __XEN_XENIO3_H__
+#include <sys/ioccom.h>
+
/*
* Bind a fresh port to VIRQ @virq.
* Return allocated port.
Index: src/sys/arch/xen/include/xenio_gntdev.h
diff -u src/sys/arch/xen/include/xenio_gntdev.h:1.1 src/sys/arch/xen/include/xenio_gntdev.h:1.2
--- src/sys/arch/xen/include/xenio_gntdev.h:1.1 Wed Dec 15 14:28:22 2010
+++ src/sys/arch/xen/include/xenio_gntdev.h Mon Sep 7 03:49:46 2015
@@ -33,6 +33,8 @@
#ifndef __XEN_GNTDEV_H__
#define __XEN_GNTDEV_H__
+#include <sys/ioccom.h>
+
struct ioctl_gntdev_grant_ref {
/* The domain ID of the grant to be mapped. */
uint32_t domid;
