Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f54d8a1b authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Kyle McMartin
Browse files

parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>. 



Now that <asm-generic/ioctl.h> allows overriding of the most commonly
changed macro values, take advantage of that.

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent e557d277

include/asm-parisc/ioctl.h

+1 −50
Original line number Diff line number Diff line
@@ -32,21 +32,6 @@ 
 * NOTE: This limits the max parameter size to 16kB -1 !

 */



#define _IOC_NRBITS	8

#define _IOC_TYPEBITS	8

#define _IOC_SIZEBITS	14

#define _IOC_DIRBITS	2



#define _IOC_NRMASK	((1 << _IOC_NRBITS)-1)

#define _IOC_TYPEMASK	((1 << _IOC_TYPEBITS)-1)

#define _IOC_SIZEMASK	((1 << _IOC_SIZEBITS)-1)

#define _IOC_DIRMASK	((1 << _IOC_DIRBITS)-1)



#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)



/*

 * Direction bits.

 */
@@ -54,40 +39,6 @@ 
#define _IOC_WRITE	2U

#define _IOC_READ	1U



#define _IOC(dir,type,nr,size) \

	(((dir)  << _IOC_DIRSHIFT) | \

	 ((type) << _IOC_TYPESHIFT) | \

	 ((nr)   << _IOC_NRSHIFT) | \

	 ((size) << _IOC_SIZESHIFT))



/* provoke compile error for invalid uses of size argument */

extern unsigned int __invalid_size_argument_for_IOC;

#define _IOC_TYPECHECK(t) \

	((sizeof(t) == sizeof(t[1]) && \

	  sizeof(t) < (1 << _IOC_SIZEBITS)) ? \

	  sizeof(t) : __invalid_size_argument_for_IOC)



/* used to create numbers */

#define _IO(type,nr)		_IOC(_IOC_NONE,(type),(nr),0)

#define _IOR(type,nr,size)	_IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))

#define _IOW(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))

#define _IOWR(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))

#define _IOR_BAD(type,nr,size)	_IOC(_IOC_READ,(type),(nr),sizeof(size))

#define _IOW_BAD(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),sizeof(size))

#define _IOWR_BAD(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))



/* used to decode ioctl numbers.. */

#define _IOC_DIR(nr)		(((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)

#define _IOC_TYPE(nr)		(((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)

#define _IOC_NR(nr)		(((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)

#define _IOC_SIZE(nr)		(((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)



/* ...and for the drivers/sound files... */



#define IOC_IN		(_IOC_WRITE << _IOC_DIRSHIFT)

#define IOC_OUT		(_IOC_READ << _IOC_DIRSHIFT)

#define IOC_INOUT	((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)

#define IOCSIZE_MASK	(_IOC_SIZEMASK << _IOC_SIZESHIFT)

#define IOCSIZE_SHIFT	(_IOC_SIZESHIFT)

#include <asm-generic/ioctl.h>



#endif /* _ASM_PARISC_IOCTL_H */