Tue May 19 21:59:10 2009 UTC ()
use symbolic constants and parenthesize the macro args everywhere.


(christos)
diff -r1.9 -r1.10 src/sys/sys/ioccom.h
cvs diff -r1.9 -r1.10 src/sys/sys/ioccom.h (expand / switch to unified diff)

--- src/sys/sys/ioccom.h 2007/05/29 21:32:30 1.9
+++ src/sys/sys/ioccom.h 2009/05/19 21:59:10 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ioccom.h,v 1.9 2007/05/29 21:32:30 christos Exp $ */ 1/* $NetBSD: ioccom.h,v 1.10 2009/05/19 21:59:10 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1982, 1986, 1990, 1993, 1994 4 * Copyright (c) 1982, 1986, 1990, 1993, 1994
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -48,22 +48,23 @@ @@ -48,22 +48,23 @@
48 48
49#define IOCPARM_MAX NBPG /* max size of ioctl args, mult. of NBPG */ 49#define IOCPARM_MAX NBPG /* max size of ioctl args, mult. of NBPG */
50 /* no parameters */ 50 /* no parameters */
51#define IOC_VOID (unsigned long)0x20000000 51#define IOC_VOID (unsigned long)0x20000000
52 /* copy parameters out */ 52 /* copy parameters out */
53#define IOC_OUT (unsigned long)0x40000000 53#define IOC_OUT (unsigned long)0x40000000
54 /* copy parameters in */ 54 /* copy parameters in */
55#define IOC_IN (unsigned long)0x80000000 55#define IOC_IN (unsigned long)0x80000000
56 /* copy parameters in and out */ 56 /* copy parameters in and out */
57#define IOC_INOUT (IOC_IN|IOC_OUT) 57#define IOC_INOUT (IOC_IN|IOC_OUT)
58 /* mask for IN/OUT/VOID */ 58 /* mask for IN/OUT/VOID */
59#define IOC_DIRMASK (unsigned long)0xe0000000 59#define IOC_DIRMASK (unsigned long)0xe0000000
60 60
61#define _IOC(inout,group,num,len) \ 61#define _IOC(inout, group, num, len) \
62 (inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num)) 62 ((inout) | (((len) & IOCPARM_MASK) << IOCPARM_SHIFT) | \
 63 ((group) << IOCGROUP_SHIFT) | (num))
63#define _IO(g,n) _IOC(IOC_VOID, (g), (n), 0) 64#define _IO(g,n) _IOC(IOC_VOID, (g), (n), 0)
64#define _IOR(g,n,t) _IOC(IOC_OUT, (g), (n), sizeof(t)) 65#define _IOR(g,n,t) _IOC(IOC_OUT, (g), (n), sizeof(t))
65#define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t)) 66#define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t))
66/* this should be _IORW, but stdio got there first */ 67/* this should be _IORW, but stdio got there first */
67#define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) 68#define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t))
68 69
69#endif /* !_SYS_IOCCOM_H_ */ 70#endif /* !_SYS_IOCCOM_H_ */