From c07a612e259542a0bfbeb9f703b513a60575b402 Mon Sep 17 00:00:00 2001 From: Jason Montleon Date: Wed, 27 Nov 2024 03:40:23 -0500 Subject: [PATCH 218/219] header workarounds --- include/uapi/linux/es_vb_user.h | 4 +++ include/uapi/linux/eswin-ipc-scpu.h | 5 +++- include/uapi/linux/mmz_vb.h | 45 +++++++++++++++-------------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/include/uapi/linux/es_vb_user.h b/include/uapi/linux/es_vb_user.h index db3bda6d0d69..984bc837946f 100644 --- a/include/uapi/linux/es_vb_user.h +++ b/include/uapi/linux/es_vb_user.h @@ -12,6 +12,10 @@ #define ES_MAX_MMZ_NAME_LEN 64 +typedef char ES_CHAR; +typedef unsigned int ES_U32; +typedef unsigned long long ES_U64; + /** * mmz vb pool or block struct definition */ diff --git a/include/uapi/linux/eswin-ipc-scpu.h b/include/uapi/linux/eswin-ipc-scpu.h index e8fa083a2c7f..a0164b374b13 100644 --- a/include/uapi/linux/eswin-ipc-scpu.h +++ b/include/uapi/linux/eswin-ipc-scpu.h @@ -47,6 +47,9 @@ IPC_RES_STATUS_SIZE + IPC_RES_SERVICE_STATUS_SIZE+IPC_RES_LEN_SIZE+ \ IPC_RES_XOR_SIZE) +typedef unsigned char u_int8_t; +typedef unsigned int u_int32_t; + typedef enum { OTP_KEY = 0, @@ -684,7 +687,7 @@ typedef struct { }cipher_get_nid_req_t; typedef struct { - __u32 id; // globally unique id for this mem info in kernel, ipc driver use it to find this mem info + __u32 id; /* globally unique id for this mem info in kernel, ipc driver use it to find this mem info */ struct dma_allocation_data dma_alloc_info; }khandle_dma_allocation_data_t; diff --git a/include/uapi/linux/mmz_vb.h b/include/uapi/linux/mmz_vb.h index 49ebac96f6e1..80d599a61c43 100644 --- a/include/uapi/linux/mmz_vb.h +++ b/include/uapi/linux/mmz_vb.h @@ -2,6 +2,9 @@ #define _MMZ_VB_UAPI_H_ #include +#include + +typedef ES_U32 VB_POOL; /*vb cfg flag*/ #define MMZ_VB_CFG_FLAG_INIT (1 << 0) @@ -96,36 +99,36 @@ typedef struct esVB_GET_BLOCK_CMD_S struct esVB_GET_BLOCK_RESP_S getBlkResp; }VB_GET_BLOCK_CMD_S; -//corresponding to MMZ_VB_IOCTL_POOL_SIZE +/* corresponding to MMZ_VB_IOCTL_POOL_SIZE */ typedef struct esVB_GET_POOLSIZE_CMD_S { VB_POOL poolId; __u64 poolSize; }VB_GET_POOLSIZE_CMD_S; -//corresponding to MMZ_VB_IOCTL_FLUSH_POOL +/* corresponding to MMZ_VB_IOCTL_FLUSH_POOL */ typedef struct esVB_FLUSH_POOL_CMD_S { VB_POOL poolId; - __u64 offset; // offset addr in the pool - __u64 size; // size to be flushed + __u64 offset; /* offset addr in the pool */ + __u64 size; /* size to be flushed */ }VB_FLUSH_POOL_CMD_S; -//corresponding to MMZ_VB_IOCTL_BLOCK_TO_POOL +/* corresponding to MMZ_VB_IOCTL_BLOCK_TO_POOL */ typedef struct esVB_BLOCK_TO_POOL_CMD_S { - int fd; // Input: The dmabuf_fd of the block - VB_POOL poolId; //Output: The pool which the block belongs to; + int fd; /* Input: The dmabuf_fd of the block */ + VB_POOL poolId; /* Output: The pool which the block belongs to; */ }VB_BLOCK_TO_POOL_CMD_S; -//corresponding to MMZ_VB_IOCTL_GET_BLOCK_OFFSET +/* corresponding to MMZ_VB_IOCTL_GET_BLOCK_OFFSET */ typedef struct esVB_GET_BLOCKOFFSET_CMD_S { - int fd; // Input: The dmabuf_fd, it might be the real block or the splittedBlock - __u64 offset; // Output: The offset in pool + int fd; /* Input: The dmabuf_fd, it might be the real block or the splittedBlock */ + __u64 offset; /* Output: The offset in pool */ }VB_GET_BLOCKOFFSET_CMD_S; -//corresponding to MMZ_VB_IOCTL_SPLIT_DMABUF +/* corresponding to MMZ_VB_IOCTL_SPLIT_DMABUF */ typedef struct esVB_SPLIT_DMABUF_CMD_S { int fd; /* Input: The original dmabuf fd to be splitted */ int slice_fd; /* Outpu: splitted dmabuf fd */ @@ -133,26 +136,26 @@ typedef struct esVB_SPLIT_DMABUF_CMD_S { __u64 len; /* size of the buffer to be splitted */ }VB_BLOCK_SPLIT_CMD_S; -//corresponding to MMZ_VB_IOCTL_DMABUF_REFCOUNT +/* corresponding to MMZ_VB_IOCTL_DMABUF_REFCOUNT */ typedef struct esVB_DMABUF_REFCOUNT_CMD_S { - int fd; // Input: The dmabuf_fd - __u64 refCnt; // Output: The file_count of the dmabuf + int fd; /* Input: The dmabuf_fd */ + __u64 refCnt; /* Output: The file_count of the dmabuf */ }VB_DMABUF_REFCOUNT_CMD_S; -//corresponding to MMZ_VB_IOCTL_RETRIEVE_MEM_NODE +/* corresponding to MMZ_VB_IOCTL_RETRIEVE_MEM_NODE */ typedef struct esVB_RETRIEVE_MEM_NODE_CMD_S { - int fd; // Input: The dmabuf_fd - void *cpu_vaddr; // Input: The virtual addr of cpu in user space - int numa_node; // Ouput: return the NUMA node id of the memory + int fd; /* Input: The dmabuf_fd */ + void *cpu_vaddr; /* Input: The virtual addr of cpu in user space */ + int numa_node; /* Ouput: return the NUMA node id of the memory */ }VB_RETRIEVE_MEM_NODE_CMD_S; -//corresponding to MMZ_VB_IOCTL_DMABUF_SIZE +/* corresponding to MMZ_VB_IOCTL_DMABUF_SIZE */ typedef struct esVB_DMABUF_SIZE_CMD_S { - int fd; // Input: The dmabuf_fd - __u64 size; // Output: The size of the dmabuf + int fd; /* Input: The dmabuf_fd */ + __u64 size; /* Output: The size of the dmabuf */ }VB_DMABUF_SIZE_CMD_S; #define MMZ_VB_IOC_MAGIC 'M' -- 2.47.0