uapi: Fix QCOM headers to work with UAPI_HEADER_TEST

UAPI_HEADER_TEST ensures that all the uapi headers can be built as
standalone files which facilitates their use in the wider world. Fix
headers to use common kernel definitions.

Change-Id: Id20599d5cf1c20150ad90752bccdcf2c218b35da
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
This commit is contained in:
Siddharth Gupta 2020-05-14 16:36:32 -07:00
parent 17439c2c67
commit 45c1f3c5da
2 changed files with 13 additions and 13 deletions

View File

@ -6,7 +6,7 @@
#ifndef _UAPI_SPSS_UTILS_H_
#define _UAPI_SPSS_UTILS_H_
#include <linux/types.h> /* uint32_t, bool */
#include <linux/types.h> /* __u32, _Bool */
#include <linux/ioctl.h> /* ioctl() */
/**
@ -23,8 +23,8 @@
#define CMAC_SIZE_IN_WORDS 4
struct spss_ioc_set_fw_cmac {
uint32_t cmac[CMAC_SIZE_IN_WORDS];
uint32_t app_cmacs[NUM_SPU_UEFI_APPS][CMAC_SIZE_IN_WORDS];
__u32 cmac[CMAC_SIZE_IN_WORDS];
__u32 app_cmacs[NUM_SPU_UEFI_APPS][CMAC_SIZE_IN_WORDS];
} __packed;
#define SPSS_IOC_SET_FW_CMAC \
@ -52,9 +52,9 @@ enum spss_event_status {
};
struct spss_ioc_wait_for_event {
uint32_t event_id; /* input */
uint32_t timeout_sec; /* input */
uint32_t status; /* output */
__u32 event_id; /* input */
__u32 timeout_sec; /* input */
__u32 status; /* output */
} __packed;
#define SPSS_IOC_WAIT_FOR_EVENT \
@ -62,8 +62,8 @@ struct spss_ioc_wait_for_event {
/* ---------- signal event ------------------------------ */
struct spss_ioc_signal_event {
uint32_t event_id; /* input */
uint32_t status; /* output */
__u32 event_id; /* input */
__u32 status; /* output */
} __packed;
#define SPSS_IOC_SIGNAL_EVENT \
@ -71,8 +71,8 @@ struct spss_ioc_signal_event {
/* ---------- is event isgnaled ------------------------------ */
struct spss_ioc_is_signaled {
uint32_t event_id; /* input */
uint32_t status; /* output */
__u32 event_id; /* input */
__u32 status; /* output */
} __attribute__((packed));
#define SPSS_IOC_IS_EVENT_SIGNALED \

View File

@ -22,9 +22,9 @@ enum wigig_sensing_mode {
struct wigig_sensing_change_mode {
enum wigig_sensing_mode mode;
bool has_channel;
uint32_t channel;
uint32_t burst_size;
_Bool has_channel;
__u32 channel;
__u32 burst_size;
};
enum wigig_sensing_event {