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

Commit 80520a44 authored by Serban Constantinescu's avatar Serban Constantinescu Committed by David Ng
Browse files

staging: android: binder: replace types with portable ones 



Since this driver is meant to be used on different types of processors
and a portable driver should specify the size a variable expects to be
this patch changes the types used throughout the binder interface.

We use "userspace" types since this header will be exported and used by
the Android filesystem.

The patch does not change in any way the functionality of the binder driver.

Change-Id: Iede6575f6f9d76bec0bbed11948abe3ff081d0ee
Signed-off-by: default avatarSerban Constantinescu <serban.constantinescu@arm.com>
Acked-by: default avatarArve Hjønnevåg <arve@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: eecddef594f9eb159040160b929642f16a07387f
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarNeeti Desai <neetid@codeaurora.org>
Signed-off-by: default avatarAjay Dudani <adudani@codeaurora.org>
parent f22d69f8

drivers/staging/android/binder.h

+13 −13
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ struct binder_transaction_data { 
		void	*ptr;	/* target descriptor of return transaction */

	} target;

	void		*cookie;	/* target object cookie */

	unsigned int	code;		/* transaction command */

	__u32		code;		/* transaction command */



	/* General information about the transaction. */

	unsigned int	flags;

	__u32	        flags;

	pid_t		sender_pid;

	uid_t		sender_euid;

	size_t		data_size;	/* number of bytes of data */
@@ -143,7 +143,7 @@ struct binder_transaction_data { 
			/* offsets from buffer to flat_binder_object structs */

			const void __user	*offsets;

		} ptr;

		uint8_t	buf[8];

		__u8	buf[8];

	} data;

};
@@ -153,18 +153,18 @@ struct binder_ptr_cookie { 
};



struct binder_pri_desc {

	int priority;

	int desc;

	__s32 priority;

	__s32 desc;

};



struct binder_pri_ptr_cookie {

	int priority;

	__s32 priority;

	void *ptr;

	void *cookie;

};



enum binder_driver_return_protocol {

	BR_ERROR = _IOR('r', 0, int),

	BR_ERROR = _IOR('r', 0, __s32),

	/*

	 * int: error code

	 */
@@ -178,7 +178,7 @@ enum binder_driver_return_protocol { 
	 * binder_transaction_data: the received command.

	 */



	BR_ACQUIRE_RESULT = _IOR('r', 4, int),

	BR_ACQUIRE_RESULT = _IOR('r', 4, __s32),

	/*

	 * not currently supported

	 * int: 0 if the last bcATTEMPT_ACQUIRE was not successful.
@@ -258,7 +258,7 @@ enum binder_driver_command_protocol { 
	 * binder_transaction_data: the sent command.

	 */



	BC_ACQUIRE_RESULT = _IOW('c', 2, int),

	BC_ACQUIRE_RESULT = _IOW('c', 2, __s32),

	/*

	 * not currently supported

	 * int:  0 if the last BR_ATTEMPT_ACQUIRE was not successful.
@@ -270,10 +270,10 @@ enum binder_driver_command_protocol { 
	 * void *: ptr to transaction data received on a read

	 */



	BC_INCREFS = _IOW('c', 4, int),

	BC_ACQUIRE = _IOW('c', 5, int),

	BC_RELEASE = _IOW('c', 6, int),

	BC_DECREFS = _IOW('c', 7, int),

	BC_INCREFS = _IOW('c', 4, __u32),

	BC_ACQUIRE = _IOW('c', 5, __u32),

	BC_RELEASE = _IOW('c', 6, __u32),

	BC_DECREFS = _IOW('c', 7, __u32),

	/*

	 * int:	descriptor

	 */