about summary refs log tree commit diff
path: root/arch/powerpc/bits/ioctl.h
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-05-26 18:22:12 -0400
committerRich Felker <dalias@aerifal.cx>2013-05-26 18:22:12 -0400
commitd9265653552a2b667bf3e84407a06edaa7e9f74f (patch)
tree2781a8b5385ee8224b4cda826ac159c3b769b995 /arch/powerpc/bits/ioctl.h
parent5e642b5a2395893873affa2a121a694943b3f4e0 (diff)
parent31ff797787d89bc01a69ca672fb2340ff21a827e (diff)
downloadmusl-d9265653552a2b667bf3e84407a06edaa7e9f74f.tar.gz
musl-d9265653552a2b667bf3e84407a06edaa7e9f74f.tar.xz
musl-d9265653552a2b667bf3e84407a06edaa7e9f74f.zip
Merge remote-tracking branch 'nsz/review'
Diffstat (limited to 'arch/powerpc/bits/ioctl.h')
-rw-r--r--arch/powerpc/bits/ioctl.h25
1 files changed, 3 insertions, 22 deletions
diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h
index 15cd6c72..0c903dcb 100644
--- a/arch/powerpc/bits/ioctl.h
+++ b/arch/powerpc/bits/ioctl.h
@@ -1,31 +1,12 @@
-//#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
-//
-#define _IOC_SIZEBITS   13
-#define _IOC_DIRBITS    3
-
-#define _IOC_NRBITS     8
-#define _IOC_TYPEBITS   8
-
-#define _IOC_NRSHIFT    0
-#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-#define _IOC(dir,type,nr,size) \
-        (((dir)  << _IOC_DIRSHIFT) | \
-          ((type) << _IOC_TYPESHIFT) | \
-          ((nr)   << _IOC_NRSHIFT) | \
-          ((size) << _IOC_SIZESHIFT))
-
-
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
 #define _IOC_NONE  1U
 #define _IOC_WRITE 4U
 #define _IOC_READ  2U
 
 #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
 #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ | _IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
 
 #define FIONCLEX	_IO('f', 2)
 #define FIOCLEX		_IO('f', 1)