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

Commit 685fe000 authored by Neeti Desai's avatar Neeti Desai Committed by David Ng
Browse files

Revert "staging: android: binder: replace types with portable ones" 



This reverts commit f7a23df5.

Change-Id: I33bae22160c60dd135c3146e9522a08cb7481f4a
Signed-off-by: default avatarNeeti Desai <neetid@codeaurora.org>
Signed-off-by: default avatarAjay Dudani <adudani@codeaurora.org>
parent bdfbfd84

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 */

	__u32		code;		/* transaction command */

	unsigned int	code;		/* transaction command */



	/* General information about the transaction. */

	__u32	        flags;

	unsigned int	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;

		__u8	buf[8];

		uint8_t	buf[8];

	} data;

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



struct binder_pri_desc {

	__s32 priority;

	__s32 desc;

	int priority;

	int desc;

};



struct binder_pri_ptr_cookie {

	__s32 priority;

	int priority;

	void *ptr;

	void *cookie;

};



enum binder_driver_return_protocol {

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

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

	/*

	 * int: error code

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

	 */



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

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

	/*

	 * 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, __s32),

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

	/*

	 * 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, __u32),

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

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

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

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

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

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

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

	/*

	 * int:	descriptor

	 */