[src/trunk]: src/sys/arch Final bit of PR 41200: headers that declare ioctls ...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b27b85ebb7dd
branches:  trunk
changeset: 340470:b27b85ebb7dd
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Sep 07 03:49:44 2015 +0000

description:
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.

diffstat:

 sys/arch/acorn32/include/scrio.h      |  4 +++-
 sys/arch/alpha/include/kbio.h         |  4 +++-
 sys/arch/amiga/dev/clockioctl.h       |  4 +++-
 sys/arch/amiga/dev/grfioctl.h         |  4 +++-
 sys/arch/amiga/dev/iteioctl.h         |  4 +++-
 sys/arch/amiga/dev/kbdreg.h           |  4 +++-
 sys/arch/amiga/dev/viewioctl.h        |  4 +++-
 sys/arch/atari/dev/clockioctl.h       |  4 +++-
 sys/arch/atari/dev/grfioctl.h         |  4 +++-
 sys/arch/atari/dev/iteioctl.h         |  4 +++-
 sys/arch/atari/dev/kbdreg.h           |  4 +++-
 sys/arch/atari/dev/viewioctl.h        |  4 +++-
 sys/arch/atari/include/msioctl.h      |  4 +++-
 sys/arch/atari/vme/leoioctl.h         |  4 +++-
 sys/arch/hp300/stand/common/scsireg.h |  4 +++-
 sys/arch/mac68k/include/grfioctl.h    |  4 +++-
 sys/arch/macppc/include/grfioctl.h    |  4 +++-
 sys/arch/newsmips/include/wsconsio.h  |  3 ++-
 sys/arch/ofppc/include/grfioctl.h     |  4 +++-
 sys/arch/prep/include/nvram.h         |  4 +++-
 sys/arch/sh3/include/wdogvar.h        |  4 +++-
 sys/arch/shark/include/beep.h         |  3 ++-
 sys/arch/shark/include/kbd.h          |  4 +++-
 sys/arch/shark/include/mouse.h        |  4 +++-
 sys/arch/shark/include/profileio.h    |  3 ++-
 sys/arch/shark/include/scrio.h        |  4 +++-
 sys/arch/sparc/dev/cgfourteenvar.h    |  5 ++++-
 sys/arch/sparc/include/openpromio.h   |  4 +++-
 sys/arch/sparc/include/tctrl.h        |  4 +++-
 sys/arch/sun3/dev/xio.h               |  4 +++-
 sys/arch/x68k/include/grfioctl.h      |  4 +++-
 sys/arch/x68k/include/iteioctl.h      |  3 ++-
 sys/arch/x68k/include/kbio.h          |  3 ++-
 sys/arch/x68k/include/sram.h          |  4 +++-
 sys/arch/x68k/x68k/clockioctl.h       |  4 +++-
 sys/arch/xen/include/xenio.h          |  5 ++++-
 sys/arch/xen/include/xenio3.h         |  4 +++-
 sys/arch/xen/include/xenio_gntdev.h   |  2 ++
 38 files changed, 110 insertions(+), 37 deletions(-)

diffs (truncated from 669 to 300 lines):

diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/acorn32/include/scrio.h
--- a/sys/arch/acorn32/include/scrio.h  Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/acorn32/include/scrio.h  Mon Sep 07 03:49:44 2015 +0000
@@ -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
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/alpha/include/kbio.h
--- a/sys/arch/alpha/include/kbio.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/alpha/include/kbio.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/amiga/dev/clockioctl.h
--- a/sys/arch/amiga/dev/clockioctl.h   Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/amiga/dev/clockioctl.h   Mon Sep 07 03:49:44 2015 +0000
@@ -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)
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/amiga/dev/grfioctl.h
--- a/sys/arch/amiga/dev/grfioctl.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/amiga/dev/grfioctl.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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 {
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/amiga/dev/iteioctl.h
--- a/sys/arch/amiga/dev/iteioctl.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/amiga/dev/iteioctl.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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 */
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/amiga/dev/kbdreg.h
--- a/sys/arch/amiga/dev/kbdreg.h       Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/amiga/dev/kbdreg.h       Mon Sep 07 03:49:44 2015 +0000
@@ -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 */
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/amiga/dev/viewioctl.h
--- a/sys/arch/amiga/dev/viewioctl.h    Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/amiga/dev/viewioctl.h    Mon Sep 07 03:49:44 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: viewioctl.h,v 1.9 2002/09/06 13:18:43 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;
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/dev/clockioctl.h
--- a/sys/arch/atari/dev/clockioctl.h   Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/dev/clockioctl.h   Mon Sep 07 03:49:44 2015 +0000
@@ -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)
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/dev/grfioctl.h
--- a/sys/arch/atari/dev/grfioctl.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/dev/grfioctl.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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 {
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/dev/iteioctl.h
--- a/sys/arch/atari/dev/iteioctl.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/dev/iteioctl.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/dev/kbdreg.h
--- a/sys/arch/atari/dev/kbdreg.h       Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/dev/kbdreg.h       Mon Sep 07 03:49:44 2015 +0000
@@ -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) */
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/dev/viewioctl.h
--- a/sys/arch/atari/dev/viewioctl.h    Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/dev/viewioctl.h    Mon Sep 07 03:49:44 2015 +0000
@@ -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;
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/include/msioctl.h
--- a/sys/arch/atari/include/msioctl.h  Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/include/msioctl.h  Mon Sep 07 03:49:44 2015 +0000
@@ -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 */
 
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/atari/vme/leoioctl.h
--- a/sys/arch/atari/vme/leoioctl.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/atari/vme/leoioctl.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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 <entropy%zippy.bernstein.com@localhost>
@@ -27,5 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/ioccom.h>
+
 #define LIOCYRES _IOW('l', 0, int)
 #define LIOCSCRL _IOW('l', 1, int)
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/hp300/stand/common/scsireg.h
--- a/sys/arch/hp300/stand/common/scsireg.h     Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/hp300/stand/common/scsireg.h     Mon Sep 07 03:49:44 2015 +0000
@@ -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
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/mac68k/include/grfioctl.h
--- a/sys/arch/mac68k/include/grfioctl.h        Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/mac68k/include/grfioctl.h        Mon Sep 07 03:49:44 2015 +0000
@@ -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;
diff -r 6012a84d661c -r b27b85ebb7dd sys/arch/macppc/include/grfioctl.h
--- a/sys/arch/macppc/include/grfioctl.h        Mon Sep 07 03:44:19 2015 +0000
+++ b/sys/arch/macppc/include/grfioctl.h        Mon Sep 07 03:49:44 2015 +0000
@@ -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_