Merge "drivers: soc: qti: Fix data type for uapi header" (6c32e173) · Commits · e / devices / android_kernel_fairphone_FP5

include/uapi/linux/qbt_handler.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ enum qbt_fw_event {
		* @is_wuhb_connected - if non-zero, WUHB INT line is connected
		*/
		struct qbt_wuhb_connected_status {
		bool is_wuhb_connected;
		_Bool is_wuhb_connected;
		};

		/*
		@@ -72,7 +72,7 @@ struct qbt_key_event {
		* @rad_y: movement radius in y direction
		*/
		struct qbt_touch_config {
		bool rad_filter_enable;
		_Bool rad_filter_enable;
		int rad_x;
		int rad_y;
		};

+16 −16

Original line number	Diff line number	Diff line
		@@ -47,12 +47,12 @@ enum qce_ota_algo_enum {
		* generate the final cipher data stream.
		*/
		struct qce_f8_req {
		uint8_t *data_in;
		uint8_t *data_out;
		uint16_t data_len;
		uint32_t count_c;
		uint8_t bearer;
		uint8_t ckey[OTA_KEY_SIZE];
		__u8 *data_in;
		__u8 *data_out;
		__u16 data_len;
		__u32 count_c;
		__u8 bearer;
		__u8 ckey[OTA_KEY_SIZE];
		enum qce_ota_dir_enum direction;
		enum qce_ota_algo_enum algorithm;
		};
		@@ -117,9 +117,9 @@ struct qce_f8_req {
		*
		*/
		struct qce_f8_multi_pkt_req {
		uint16_t num_pkt;
		uint16_t cipher_start;
		uint16_t cipher_size;
		__u16 num_pkt;
		__u16 cipher_start;
		__u16 cipher_size;
		struct qce_f8_req qce_f8_req;
		};

		@@ -193,14 +193,14 @@ struct qce_f8_variable_multi_pkt_req {
		* @algorithm: Kasumi, or Snow3G.
		*/
		struct qce_f9_req {
		uint8_t *message;
		uint16_t msize;
		uint8_t last_bits;
		uint32_t mac_i;
		uint32_t fresh;
		uint32_t count_i;
		__u8 *message;
		__u16 msize;
		__u8 last_bits;
		__u32 mac_i;
		__u32 fresh;
		__u32 count_i;
		enum qce_ota_dir_enum direction;
		uint8_t ikey[OTA_KEY_SIZE];
		__u8 ikey[OTA_KEY_SIZE];
		enum qce_ota_algo_enum algorithm;
		};

+22 −22

Original line number	Diff line number	Diff line
		@@ -11,14 +11,14 @@
		#define SMCINVOKE_USERSPACE_OBJ_NULL -1

		struct smcinvoke_buf {
		uint64_t addr;
		uint64_t size;
		__u64 addr;
		__u64 size;
		};

		struct smcinvoke_obj {
		int64_t fd;
		int32_t cb_server_fd;
		int32_t reserved;
		__s64 fd;
		__s32 cb_server_fd;
		__s32 reserved;
		};

		union smcinvoke_arg {
		@@ -35,11 +35,11 @@ union smcinvoke_arg {
		* @args - args is pointer to buffer having all arguments
		*/
		struct smcinvoke_cmd_req {
		uint32_t op;
		uint32_t counts;
		int32_t result;
		uint32_t argsize;
		uint64_t args;
		__u32 op;
		__u32 counts;
		__s32 result;
		__u32 argsize;
		__u64 args;
		};

		/*
		@@ -59,23 +59,23 @@ struct smcinvoke_cmd_req {
		* to complete operation op
		*/
		struct smcinvoke_accept {
		uint32_t has_resp;
		uint32_t txn_id;
		int32_t result;
		int32_t cbobj_id;
		uint32_t op;
		uint32_t counts;
		int32_t reserved;
		uint32_t argsize;
		uint64_t buf_len;
		uint64_t buf_addr;
		__u32 has_resp;
		__u32 txn_id;
		__s32 result;
		__s32 cbobj_id;
		__u32 op;
		__u32 counts;
		__s32 reserved;
		__u32 argsize;
		__u64 buf_len;
		__u64 buf_addr;
		};

		/*
		* @cb_buf_size: IN: Max buffer size for any callback obj implemented by client
		*/
		struct smcinvoke_server {
		uint32_t cb_buf_size;
		__u32 cb_buf_size;
		};

		#define SMCINVOKE_IOC_MAGIC 0x98
		@@ -90,6 +90,6 @@ struct smcinvoke_server {
		_IOWR(SMCINVOKE_IOC_MAGIC, 3, struct smcinvoke_server)

		#define SMCINVOKE_IOCTL_ACK_LOCAL_OBJ \
		_IOWR(SMCINVOKE_IOC_MAGIC, 4, int32_t)
		_IOWR(SMCINVOKE_IOC_MAGIC, 4, __s32)

		#endif /* _UAPI_SMCINVOKE_H_ */

+8 −7

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		#define __user
		#endif

		#include <linux/types.h>
		#include <linux/sockios.h>

		/* Numbers SIOCDEVPRIVATE and SIOCDEVPRIVATE + 1
		@@ -57,16 +58,16 @@
		#define WIL_MMIO_ADDR_MASK 0xff00

		struct wil_memio {
		uint32_t op; /* enum wil_memio_op */
		uint32_t addr; /* should be 32-bit aligned */
		uint32_t val;
		__u32 op; /* enum wil_memio_op */
		__u32 addr; /* should be 32-bit aligned */
		__u32 val;
		};

		struct wil_memio_block {
		uint32_t op; /* enum wil_memio_op */
		uint32_t addr; /* should be 32-bit aligned */
		uint32_t size; /* should be multiple of 4 */
		uint64_t __user block; /* block address */
		__u32 op; /* enum wil_memio_op */
		__u32 addr; /* should be 32-bit aligned */
		__u32 size; /* should be multiple of 4 */
		__u64 __user block; /* block address */
		};

		#endif /* __WIL6210_UAPI_H__ */