This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.1'.

[unix-history] / sys / sys / ioctl.h

diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index eb49978..c38c68a 100644 (file)
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) UNIX System Laboratories, Inc.  All or some portions
+ * of this file are derived from material licensed to the
+ * University of California by American Telephone and Telegraph Co.
+ * or UNIX System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ */

 /*-
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
 /*-
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.


@@ -31,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)ioctl.h       7.19 (Berkeley) 6/26/91
  * SUCH DAMAGE.
  *
  *     from: @(#)ioctl.h       7.19 (Berkeley) 6/26/91

- *     $Id: ioctl.h,v 1.4 1993/10/12 04:57:33 rgrimes Exp $
+ *     $Id: ioctl.h,v 1.6 1993/12/19 00:55:15 wollman Exp $

  */
 
 #ifndef        _IOCTL_H_
  */
 
 #ifndef        _IOCTL_H_


@@ -71,11 +78,11 @@ struct ttysize {
 #define        IOCGROUP(x)     (((x) >> 8) & 0xff)
 
 #define        IOCPARM_MAX     NBPG            /* max size of ioctl, mult. of NBPG */
 #define        IOCGROUP(x)     (((x) >> 8) & 0xff)
 
 #define        IOCPARM_MAX     NBPG            /* max size of ioctl, mult. of NBPG */

-#define        IOC_VOID        0x20000000      /* no parameters */
-#define        IOC_OUT         0x40000000      /* copy out parameters */
-#define        IOC_IN          0x80000000      /* copy in parameters */
+#define        IOC_VOID        0x20000000UL    /* no parameters */
+#define        IOC_OUT         0x40000000UL    /* copy out parameters */
+#define        IOC_IN          0x80000000UL    /* copy in parameters */

 #define        IOC_INOUT       (IOC_IN|IOC_OUT)
 #define        IOC_INOUT       (IOC_IN|IOC_OUT)

-#define        IOC_DIRMASK     0xe0000000      /* mask for IN/OUT/VOID */
+#define        IOC_DIRMASK     0xe0000000UL    /* mask for IN/OUT/VOID */

 
 #define        _IOC(inout,group,num,len) \
        (inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num))
 
 #define        _IOC(inout,group,num,len) \
        (inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num))