From 667343a606f70368a1b207846cf600e01570ba3a Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Wed, 22 Apr 2020 17:10:18 -0700 Subject: [PATCH] include: uapi: update headers for upstream compliance Fix uapi headers to work with KERNEL_HEADER_TEST and UAPI_HEADER_TEST. Use __uX instead of uintX_t. Use __sX instead of intX_t. Use _Bool instead of bool. Change-Id: I8c12efb728081716e49aea294f65ddfbae437267 Signed-off-by: Vignesh Kulothungan --- include/uapi/audio/linux/avtimer.h | 3 +- include/uapi/audio/linux/msm_audio.h | 150 +++++------ include/uapi/audio/linux/msm_audio_aac.h | 11 +- include/uapi/audio/linux/msm_audio_alac.h | 26 +- include/uapi/audio/linux/msm_audio_amrnb.h | 7 +- include/uapi/audio/linux/msm_audio_amrwb.h | 7 +- include/uapi/audio/linux/msm_audio_ape.h | 22 +- .../uapi/audio/linux/msm_audio_calibration.h | 220 ++++++++-------- include/uapi/audio/linux/msm_audio_g711.h | 3 +- include/uapi/audio/linux/msm_audio_g711_dec.h | 3 +- include/uapi/audio/linux/msm_audio_mvs.h | 39 +-- include/uapi/audio/linux/msm_audio_qcp.h | 13 +- include/uapi/audio/linux/msm_audio_sbc.h | 15 +- .../uapi/audio/linux/msm_audio_voicememo.h | 19 +- include/uapi/audio/linux/msm_audio_wma.h | 8 +- include/uapi/audio/linux/msm_audio_wmapro.h | 14 +- include/uapi/audio/sound/audio_effects.h | 240 +++++++++--------- include/uapi/audio/sound/devdep_params.h | 40 +-- include/uapi/audio/sound/lsm_params.h | 18 +- 19 files changed, 440 insertions(+), 418 deletions(-) diff --git a/include/uapi/audio/linux/avtimer.h b/include/uapi/audio/linux/avtimer.h index 96b5483fbf..ed3f8d2999 100644 --- a/include/uapi/audio/linux/avtimer.h +++ b/include/uapi/audio/linux/avtimer.h @@ -2,9 +2,10 @@ #define _UAPI_AVTIMER_H #include +#include #define MAJOR_NUM 100 -#define IOCTL_GET_AVTIMER_TICK _IOR(MAJOR_NUM, 0, uint64_t) +#define IOCTL_GET_AVTIMER_TICK _IOR(MAJOR_NUM, 0, __u64) #endif diff --git a/include/uapi/audio/linux/msm_audio.h b/include/uapi/audio/linux/msm_audio.h index a306571ace..c072b1363b 100644 --- a/include/uapi/audio/linux/msm_audio.h +++ b/include/uapi/audio/linux/msm_audio.h @@ -2,7 +2,7 @@ /* * * Copyright (C) 2008 Google, Inc. - * Copyright (c) 2012, 2014, 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014, 2017, 2020 The Linux Foundation. All rights reserved. */ #ifndef _UAPI_LINUX_MSM_AUDIO_H @@ -160,30 +160,30 @@ #define VOC_REC_BOTH 0x02 struct msm_audio_config { - uint32_t buffer_size; - uint32_t buffer_count; - uint32_t channel_count; - uint32_t sample_rate; - uint32_t type; - uint32_t meta_field; - uint32_t bits; - uint32_t unused[3]; + __u32 buffer_size; + __u32 buffer_count; + __u32 channel_count; + __u32 sample_rate; + __u32 type; + __u32 meta_field; + __u32 bits; + __u32 unused[3]; }; struct msm_audio_stream_config { - uint32_t buffer_size; - uint32_t buffer_count; + __u32 buffer_size; + __u32 buffer_count; }; struct msm_audio_buf_cfg { - uint32_t meta_info_enable; - uint32_t frames_per_buf; + __u32 meta_info_enable; + __u32 frames_per_buf; }; struct msm_audio_stats { - uint32_t byte_count; - uint32_t sample_count; - uint32_t unused[2]; + __u32 byte_count; + __u32 sample_count; + __u32 unused[2]; }; struct msm_audio_ion_info { @@ -198,8 +198,8 @@ struct msm_audio_pmem_info { struct msm_audio_aio_buf { void *buf_addr; - uint32_t buf_len; - uint32_t data_len; + __u32 buf_len; + __u32 data_len; void *private_data; unsigned short mfield_sz; /*only useful for data has meta field */ }; @@ -212,23 +212,23 @@ struct msm_audio_aio_buf { #define SND_MUTE_MUTED 1 struct msm_mute_info { - uint32_t mute; - uint32_t path; + __u32 mute; + __u32 path; }; struct msm_vol_info { - uint32_t vol; - uint32_t path; + __u32 vol; + __u32 path; }; struct msm_voicerec_mode { - uint32_t rec_mode; + __u32 rec_mode; }; struct msm_snd_device_config { - uint32_t device; - uint32_t ear_mute; - uint32_t mic_mute; + __u32 device; + __u32 ear_mute; + __u32 mic_mute; }; #define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct msm_device_config *) @@ -242,15 +242,15 @@ enum cad_device_path_type { }; struct cad_devices_type { - uint32_t rx_device; - uint32_t tx_device; + __u32 rx_device; + __u32 tx_device; enum cad_device_path_type pathtype; }; struct msm_cad_device_config { struct cad_devices_type device; - uint32_t ear_mute; - uint32_t mic_mute; + __u32 ear_mute; + __u32 mic_mute; }; #define CAD_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct msm_cad_device_config *) @@ -259,17 +259,17 @@ struct msm_cad_device_config { #define SND_METHOD_MIDI 4 struct msm_snd_volume_config { - uint32_t device; - uint32_t method; - uint32_t volume; + __u32 device; + __u32 method; + __u32 volume; }; #define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct msm_snd_volume_config *) struct msm_cad_volume_config { struct cad_devices_type device; - uint32_t method; - uint32_t volume; + __u32 method; + __u32 volume; }; #define CAD_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct msm_cad_volume_config *) @@ -315,9 +315,9 @@ struct msm_cad_endpoint { #define CAD_GET_ENDPOINT _IOWR(SND_IOCTL_MAGIC, 5, struct msm_cad_endpoint *) struct msm_audio_pcm_config { - uint32_t pcm_feedback; /* 0 - disable > 0 - enable */ - uint32_t buffer_count; /* Number of buffers to allocate */ - uint32_t buffer_size; /* Size of buffer for capturing of + __u32 pcm_feedback; /* 0 - disable > 0 - enable */ + __u32 buffer_count; /* Number of buffers to allocate */ + __u32 buffer_size; /* Size of buffer for capturing of * PCM samples */ }; @@ -333,18 +333,18 @@ struct msm_audio_pcm_config { #define AUDIO_CODEC_TYPE_AAC 1 struct msm_audio_bitstream_info { - uint32_t codec_type; - uint32_t chan_info; - uint32_t sample_rate; - uint32_t bit_stream_info; - uint32_t bit_rate; - uint32_t unused[3]; + __u32 codec_type; + __u32 chan_info; + __u32 sample_rate; + __u32 bit_stream_info; + __u32 bit_rate; + __u32 unused[3]; }; struct msm_audio_bitstream_error_info { - uint32_t dec_id; - uint32_t err_msg_indicator; - uint32_t err_type; + __u32 dec_id; + __u32 err_msg_indicator; + __u32 err_type; }; union msm_audio_event_payload { @@ -365,24 +365,24 @@ struct msm_audio_event { #define MSM_SNDDEV_CAP_VOICE 0x4 struct msm_snd_device_info { - uint32_t dev_id; - uint32_t dev_cap; /* bitmask describe capability of device */ + __u32 dev_id; + __u32 dev_cap; /* bitmask describe capability of device */ char dev_name[64]; }; struct msm_snd_device_list { - uint32_t num_dev; /* Indicate number of device info to be retrieved */ + __u32 num_dev; /* Indicate number of device info to be retrieved */ struct msm_snd_device_info *list; }; struct msm_dtmf_config { - uint16_t path; - uint16_t dtmf_hi; - uint16_t dtmf_low; - uint16_t duration; - uint16_t tx_gain; - uint16_t rx_gain; - uint16_t mixing; + __u16 path; + __u16 dtmf_hi; + __u16 dtmf_low; + __u16 duration; + __u16 tx_gain; + __u16 rx_gain; + __u16 mixing; }; #define AUDIO_ROUTE_STREAM_VOICE_RX 0 @@ -391,37 +391,37 @@ struct msm_dtmf_config { #define AUDIO_ROUTE_STREAM_REC 3 struct msm_audio_route_config { - uint32_t stream_type; - uint32_t stream_id; - uint32_t dev_id; + __u32 stream_type; + __u32 stream_id; + __u32 dev_id; }; #define AUDIO_MAX_EQ_BANDS 12 struct msm_audio_eq_band { - uint16_t band_idx; /* The band index, 0 .. 11 */ - uint32_t filter_type; /* Filter band type */ - uint32_t center_freq_hz; /* Filter band center frequency */ - uint32_t filter_gain; /* Filter band initial gain (dB) */ + __u16 band_idx; /* The band index, 0 .. 11 */ + __u32 filter_type; /* Filter band type */ + __u32 center_freq_hz; /* Filter band center frequency */ + __u32 filter_gain; /* Filter band initial gain (dB) */ /* Range is +12 dB to -12 dB with 1dB increments. */ - uint32_t q_factor; + __u32 q_factor; } __attribute__ ((packed)); struct msm_audio_eq_stream_config { - uint32_t enable; /* Number of consequtive bands specified */ - uint32_t num_bands; + __u32 enable; /* Number of consequtive bands specified */ + __u32 num_bands; struct msm_audio_eq_band eq_bands[AUDIO_MAX_EQ_BANDS]; } __attribute__ ((packed)); struct msm_acdb_cmd_device { - uint32_t command_id; - uint32_t device_id; - uint32_t network_id; - uint32_t sample_rate_id; /* Actual sample rate value */ - uint32_t interface_id; /* See interface id's above */ - uint32_t algorithm_block_id; /* See enumerations above */ - uint32_t total_bytes; /* Length in bytes used by buffer */ - uint32_t *phys_buf; /* Physical Address of data */ + __u32 command_id; + __u32 device_id; + __u32 network_id; + __u32 sample_rate_id; /* Actual sample rate value */ + __u32 interface_id; /* See interface id's above */ + __u32 algorithm_block_id; /* See enumerations above */ + __u32 total_bytes; /* Length in bytes used by buffer */ + __u32 *phys_buf; /* Physical Address of data */ }; struct msm_hwacc_data_config { diff --git a/include/uapi/audio/linux/msm_audio_aac.h b/include/uapi/audio/linux/msm_audio_aac.h index 7e1e1b7242..d1eb84bf3f 100644 --- a/include/uapi/audio/linux/msm_audio_aac.h +++ b/include/uapi/audio/linux/msm_audio_aac.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_AAC_H #include +#include #define AUDIO_SET_AAC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), struct msm_audio_aac_config) @@ -15,7 +16,7 @@ (AUDIO_MAX_COMMON_IOCTL_NUM+4), struct msm_audio_aac_enc_config) #define AUDIO_SET_AAC_MIX_CONFIG _IOR(AUDIO_IOCTL_MAGIC, \ - (AUDIO_MAX_COMMON_IOCTL_NUM+5), uint32_t) + (AUDIO_MAX_COMMON_IOCTL_NUM+5), __u32) #define AUDIO_AAC_FORMAT_ADTS -1 #define AUDIO_AAC_FORMAT_RAW 0x0000 @@ -67,10 +68,10 @@ struct msm_audio_aac_config { }; struct msm_audio_aac_enc_config { - uint32_t channels; - uint32_t sample_rate; - uint32_t bit_rate; - uint32_t stream_format; + __u32 channels; + __u32 sample_rate; + __u32 bit_rate; + __u32 stream_format; }; #endif /* _UAPI_MSM_AUDIO_AAC_H */ diff --git a/include/uapi/audio/linux/msm_audio_alac.h b/include/uapi/audio/linux/msm_audio_alac.h index 5476e96d06..a3165451b4 100644 --- a/include/uapi/audio/linux/msm_audio_alac.h +++ b/include/uapi/audio/linux/msm_audio_alac.h @@ -1,24 +1,26 @@ #ifndef _UAPI_MSM_AUDIO_ALAC_H #define _UAPI_MSM_AUDIO_ALAC_H +#include + #define AUDIO_GET_ALAC_CONFIG _IOR(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), struct msm_audio_alac_config) #define AUDIO_SET_ALAC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+1), struct msm_audio_alac_config) struct msm_audio_alac_config { - uint32_t frameLength; - uint8_t compatVersion; - uint8_t bitDepth; - uint8_t pb; /* currently unused */ - uint8_t mb; /* currently unused */ - uint8_t kb; /* currently unused */ - uint8_t channelCount; - uint16_t maxRun; /* currently unused */ - uint32_t maxSize; - uint32_t averageBitRate; - uint32_t sampleRate; - uint32_t channelLayout; + __u32 frameLength; + __u8 compatVersion; + __u8 bitDepth; + __u8 pb; /* currently unused */ + __u8 mb; /* currently unused */ + __u8 kb; /* currently unused */ + __u8 channelCount; + __u16 maxRun; /* currently unused */ + __u32 maxSize; + __u32 averageBitRate; + __u32 sampleRate; + __u32 channelLayout; }; #endif /* _UAPI_MSM_AUDIO_ALAC_H */ diff --git a/include/uapi/audio/linux/msm_audio_amrnb.h b/include/uapi/audio/linux/msm_audio_amrnb.h index 619f928f71..c903983ab9 100644 --- a/include/uapi/audio/linux/msm_audio_amrnb.h +++ b/include/uapi/audio/linux/msm_audio_amrnb.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_AMRNB_H #include +#include #define AUDIO_GET_AMRNB_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), unsigned int) @@ -27,8 +28,8 @@ struct msm_audio_amrnb_enc_config { }; struct msm_audio_amrnb_enc_config_v2 { - uint32_t band_mode; - uint32_t dtx_enable; - uint32_t frame_format; + __u32 band_mode; + __u32 dtx_enable; + __u32 frame_format; }; #endif /* _UAPI_MSM_AUDIO_AMRNB_H */ diff --git a/include/uapi/audio/linux/msm_audio_amrwb.h b/include/uapi/audio/linux/msm_audio_amrwb.h index 5124038998..416760ee50 100644 --- a/include/uapi/audio/linux/msm_audio_amrwb.h +++ b/include/uapi/audio/linux/msm_audio_amrwb.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_AMRWB_H #include +#include #define AUDIO_GET_AMRWB_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), \ @@ -11,8 +12,8 @@ struct msm_audio_amrwb_enc_config) struct msm_audio_amrwb_enc_config { - uint32_t band_mode; - uint32_t dtx_enable; - uint32_t frame_format; + __u32 band_mode; + __u32 dtx_enable; + __u32 frame_format; }; #endif /* _UAPI_MSM_AUDIO_AMRWB_H */ diff --git a/include/uapi/audio/linux/msm_audio_ape.h b/include/uapi/audio/linux/msm_audio_ape.h index 587d3bc183..bc14c58aa6 100644 --- a/include/uapi/audio/linux/msm_audio_ape.h +++ b/include/uapi/audio/linux/msm_audio_ape.h @@ -5,22 +5,24 @@ #ifndef _UAPI_MSM_AUDIO_APE_H #define _UAPI_MSM_AUDIO_APE_H +#include + #define AUDIO_GET_APE_CONFIG _IOR(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), struct msm_audio_ape_config) #define AUDIO_SET_APE_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+1), struct msm_audio_ape_config) struct msm_audio_ape_config { - uint16_t compatibleVersion; - uint16_t compressionLevel; - uint32_t formatFlags; - uint32_t blocksPerFrame; - uint32_t finalFrameBlocks; - uint32_t totalFrames; - uint16_t bitsPerSample; - uint16_t numChannels; - uint32_t sampleRate; - uint32_t seekTablePresent; + __u16 compatibleVersion; + __u16 compressionLevel; + __u32 formatFlags; + __u32 blocksPerFrame; + __u32 finalFrameBlocks; + __u32 totalFrames; + __u16 bitsPerSample; + __u16 numChannels; + __u32 sampleRate; + __u32 seekTablePresent; }; #endif /* _UAPI_MSM_AUDIO_APE_H */ diff --git a/include/uapi/audio/linux/msm_audio_calibration.h b/include/uapi/audio/linux/msm_audio_calibration.h index e8ba1b3c20..0a293bff6f 100644 --- a/include/uapi/audio/linux/msm_audio_calibration.h +++ b/include/uapi/audio/linux/msm_audio_calibration.h @@ -137,22 +137,22 @@ enum { /* common structures */ struct audio_cal_header { - int32_t data_size; - int32_t version; - int32_t cal_type; - int32_t cal_type_size; + __s32 data_size; + __s32 version; + __s32 cal_type; + __s32 cal_type_size; }; struct audio_cal_type_header { - int32_t version; - int32_t buffer_number; + __s32 version; + __s32 buffer_number; }; struct audio_cal_data { /* Size of cal data at mem_handle allocation or at vaddr */ - int32_t cal_size; + __s32 cal_size; /* If mem_handle if shared memory is used*/ - int32_t mem_handle; + __s32 mem_handle; /* size of virtual memory if shared memory not used */ }; @@ -207,7 +207,7 @@ struct audio_cal_post { /*AUDIO_CORE_META_INFO */ struct audio_cal_info_metainfo { - uint32_t nKey; + __u32 nKey; }; /* Cal info types */ @@ -218,75 +218,75 @@ enum { }; struct audio_cal_info_adm_top { - int32_t topology; - int32_t acdb_id; + __s32 topology; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t app_type; - int32_t sample_rate; + __s32 path; + __s32 app_type; + __s32 sample_rate; }; struct audio_cal_info_audproc { - int32_t acdb_id; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t app_type; - int32_t sample_rate; + __s32 path; + __s32 app_type; + __s32 sample_rate; }; struct audio_cal_info_audvol { - int32_t acdb_id; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t app_type; - int32_t vol_index; + __s32 path; + __s32 app_type; + __s32 vol_index; }; struct audio_cal_info_afe { - int32_t acdb_id; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t sample_rate; + __s32 path; + __s32 sample_rate; }; struct audio_cal_info_afe_top { - int32_t topology; - int32_t acdb_id; + __s32 topology; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t sample_rate; + __s32 path; + __s32 sample_rate; }; struct audio_cal_info_asm_top { - int32_t topology; - int32_t app_type; + __s32 topology; + __s32 app_type; }; struct audio_cal_info_audstrm { - int32_t app_type; + __s32 app_type; }; struct audio_cal_info_aanc { - int32_t acdb_id; + __s32 acdb_id; }; #define MAX_HW_DELAY_ENTRIES 25 struct audio_cal_hw_delay_entry { - uint32_t sample_rate; - uint32_t delay_usec; + __u32 sample_rate; + __u32 delay_usec; }; struct audio_cal_hw_delay_data { - uint32_t num_entries; + __u32 num_entries; struct audio_cal_hw_delay_entry entry[MAX_HW_DELAY_ENTRIES]; }; struct audio_cal_info_hw_delay { - int32_t acdb_id; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t property_type; + __s32 path; + __s32 property_type; struct audio_cal_hw_delay_data data; }; @@ -309,18 +309,18 @@ enum msm_spkr_count { }; struct audio_cal_info_spk_prot_cfg { - int32_t r0[SP_V2_NUM_MAX_SPKRS]; - int32_t t0[SP_V2_NUM_MAX_SPKRS]; - uint32_t quick_calib_flag; - uint32_t mode; + __s32 r0[SP_V2_NUM_MAX_SPKRS]; + __s32 t0[SP_V2_NUM_MAX_SPKRS]; + __u32 quick_calib_flag; + __u32 mode; /* * 0 - Start spk prot * 1 - Start calib * 2 - Disable spk prot */ #ifdef MSM_SPKR_PROT_SPV3 - uint32_t sp_version; - int32_t limiter_th[SP_V2_NUM_MAX_SPKRS]; + __u32 sp_version; + __s32 limiter_th[SP_V2_NUM_MAX_SPKRS]; #endif }; @@ -330,14 +330,14 @@ struct audio_cal_info_sp_th_vi_ftm_cfg { * we use this mode(first 4 bytes) to differentiate * whether it is TH_VI FTM or v-validation. */ - uint32_t mode; + __u32 mode; /* * 0 - normal running mode * 1 - Calibration * 2 - FTM mode */ - uint32_t wait_time[SP_V2_NUM_MAX_SPKRS]; - uint32_t ftm_time[SP_V2_NUM_MAX_SPKRS]; + __u32 wait_time[SP_V2_NUM_MAX_SPKRS]; + __u32 ftm_time[SP_V2_NUM_MAX_SPKRS]; }; struct audio_cal_info_sp_th_vi_v_vali_cfg { @@ -346,22 +346,22 @@ struct audio_cal_info_sp_th_vi_v_vali_cfg { * we use this mode(first 4 bytes) to differentiate * whether it is TH_VI FTM or v-validation. */ - uint32_t mode; + __u32 mode; /* * 0 - normal running mode * 1 - Calibration * 2 - FTM mode * 3 - V-Validation mode */ - uint32_t wait_time[SP_V2_NUM_MAX_SPKRS]; - uint32_t vali_time[SP_V2_NUM_MAX_SPKRS]; + __u32 wait_time[SP_V2_NUM_MAX_SPKRS]; + __u32 vali_time[SP_V2_NUM_MAX_SPKRS]; }; struct audio_cal_info_sp_ex_vi_ftm_cfg { - uint32_t wait_time[SP_V2_NUM_MAX_SPKRS]; - uint32_t ftm_time[SP_V2_NUM_MAX_SPKRS]; - uint32_t mode; + __u32 wait_time[SP_V2_NUM_MAX_SPKRS]; + __u32 ftm_time[SP_V2_NUM_MAX_SPKRS]; + __u32 mode; /* * 0 - normal running mode * 2 - FTM mode @@ -369,10 +369,10 @@ struct audio_cal_info_sp_ex_vi_ftm_cfg { }; struct audio_cal_info_sp_ex_vi_param { - int32_t freq_q20[SP_V2_NUM_MAX_SPKRS]; - int32_t resis_q24[SP_V2_NUM_MAX_SPKRS]; - int32_t qmct_q24[SP_V2_NUM_MAX_SPKRS]; - int32_t status[SP_V2_NUM_MAX_SPKRS]; + __s32 freq_q20[SP_V2_NUM_MAX_SPKRS]; + __s32 resis_q24[SP_V2_NUM_MAX_SPKRS]; + __s32 qmct_q24[SP_V2_NUM_MAX_SPKRS]; + __s32 status[SP_V2_NUM_MAX_SPKRS]; }; struct audio_cal_info_sp_th_vi_param { @@ -381,10 +381,10 @@ struct audio_cal_info_sp_th_vi_param { * we use this mode(first 4 bytes) to differentiate * whether it is TH_VI FTM or v-validation. */ - uint32_t mode; - int32_t r_dc_q24[SP_V2_NUM_MAX_SPKRS]; - int32_t temp_q22[SP_V2_NUM_MAX_SPKRS]; - int32_t status[SP_V2_NUM_MAX_SPKRS]; + __u32 mode; + __s32 r_dc_q24[SP_V2_NUM_MAX_SPKRS]; + __s32 temp_q22[SP_V2_NUM_MAX_SPKRS]; + __s32 status[SP_V2_NUM_MAX_SPKRS]; }; struct audio_cal_info_sp_th_vi_v_vali_param { @@ -393,68 +393,68 @@ struct audio_cal_info_sp_th_vi_v_vali_param { * we use this mode(first 4 bytes) to differentiate * whether it is TH_VI FTM or v-validation. */ - uint32_t mode; - uint32_t vrms_q24[SP_V2_NUM_MAX_SPKRS]; - int32_t status[SP_V2_NUM_MAX_SPKRS]; + __u32 mode; + __u32 vrms_q24[SP_V2_NUM_MAX_SPKRS]; + __s32 status[SP_V2_NUM_MAX_SPKRS]; }; struct audio_cal_info_msm_spk_prot_status { - int32_t r0[SP_V2_NUM_MAX_SPKRS]; - int32_t status; + __s32 r0[SP_V2_NUM_MAX_SPKRS]; + __s32 status; }; struct audio_cal_info_sidetone { - uint16_t enable; - uint16_t gain; - int32_t tx_acdb_id; - int32_t rx_acdb_id; - int32_t mid; - int32_t pid; + __u16 enable; + __u16 gain; + __s32 tx_acdb_id; + __s32 rx_acdb_id; + __s32 mid; + __s32 pid; }; #define MAX_SIDETONE_IIR_DATA_SIZE 224 #define MAX_NO_IIR_FILTER_STAGE 10 struct audio_cal_info_sidetone_iir { - uint16_t iir_enable; - uint16_t num_biquad_stages; - uint16_t pregain; - int32_t tx_acdb_id; - int32_t rx_acdb_id; - int32_t mid; - int32_t pid; - uint8_t iir_config[MAX_SIDETONE_IIR_DATA_SIZE]; + __u16 iir_enable; + __u16 num_biquad_stages; + __u16 pregain; + __s32 tx_acdb_id; + __s32 rx_acdb_id; + __s32 mid; + __s32 pid; + __u8 iir_config[MAX_SIDETONE_IIR_DATA_SIZE]; }; struct audio_cal_info_lsm_top { - int32_t topology; - int32_t acdb_id; - int32_t app_type; + __s32 topology; + __s32 acdb_id; + __s32 app_type; }; struct audio_cal_info_lsm { - int32_t acdb_id; + __s32 acdb_id; /* RX_DEVICE or TX_DEVICE */ - int32_t path; - int32_t app_type; + __s32 path; + __s32 app_type; }; #define VSS_NUM_CHANNELS_MAX 32 struct audio_cal_info_voc_top { - int32_t topology; - int32_t acdb_id; + __s32 topology; + __s32 acdb_id; #ifdef TOPOLOGY_SPECIFIC_CHANNEL_INFO - uint32_t num_channels; - uint8_t channel_mapping[VSS_NUM_CHANNELS_MAX]; + __u32 num_channels; + __u8 channel_mapping[VSS_NUM_CHANNELS_MAX]; #endif }; struct audio_cal_info_vocproc { - int32_t tx_acdb_id; - int32_t rx_acdb_id; - int32_t tx_sample_rate; - int32_t rx_sample_rate; + __s32 tx_acdb_id; + __s32 rx_acdb_id; + __s32 tx_sample_rate; + __s32 rx_sample_rate; }; enum { @@ -463,41 +463,41 @@ enum { }; struct audio_cal_info_vocvol { - int32_t tx_acdb_id; - int32_t rx_acdb_id; + __s32 tx_acdb_id; + __s32 rx_acdb_id; /* DEFAULT_ or VOL_BOOST_FEATURE_SET */ - int32_t feature_set; + __s32 feature_set; }; struct audio_cal_info_vocdev_cfg { - int32_t tx_acdb_id; - int32_t rx_acdb_id; + __s32 tx_acdb_id; + __s32 rx_acdb_id; }; #define MAX_VOICE_COLUMNS 20 union audio_cal_col_na { - uint8_t val8; - uint16_t val16; - uint32_t val32; - uint64_t val64; + __u8 val8; + __u16 val16; + __u32 val32; + __u64 val64; } __packed; struct audio_cal_col { - uint32_t id; - uint32_t type; + __u32 id; + __u32 type; union audio_cal_col_na na_value; } __packed; struct audio_cal_col_data { - uint32_t num_columns; + __u32 num_columns; struct audio_cal_col column[MAX_VOICE_COLUMNS]; } __packed; struct audio_cal_info_voc_col { - int32_t table_id; - int32_t tx_acdb_id; - int32_t rx_acdb_id; + __s32 table_id; + __s32 tx_acdb_id; + __s32 rx_acdb_id; struct audio_cal_col_data data; }; diff --git a/include/uapi/audio/linux/msm_audio_g711.h b/include/uapi/audio/linux/msm_audio_g711.h index 48ebd6a113..3cfe5460e4 100644 --- a/include/uapi/audio/linux/msm_audio_g711.h +++ b/include/uapi/audio/linux/msm_audio_g711.h @@ -2,9 +2,10 @@ #define _UAPI_MSM_AUDIO_G711_H #include +#include struct msm_audio_g711_enc_config { - uint32_t sample_rate; + __u32 sample_rate; }; #define AUDIO_SET_G711_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ diff --git a/include/uapi/audio/linux/msm_audio_g711_dec.h b/include/uapi/audio/linux/msm_audio_g711_dec.h index ff7e4ce39f..3f17870c94 100644 --- a/include/uapi/audio/linux/msm_audio_g711_dec.h +++ b/include/uapi/audio/linux/msm_audio_g711_dec.h @@ -2,9 +2,10 @@ #define _UAPI_MSM_AUDIO_G711_H #include +#include struct msm_audio_g711_dec_config { - uint32_t sample_rate; + __u32 sample_rate; }; #define AUDIO_SET_G711_DEC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ diff --git a/include/uapi/audio/linux/msm_audio_mvs.h b/include/uapi/audio/linux/msm_audio_mvs.h index 5b76bf99a7..348cfaf683 100644 --- a/include/uapi/audio/linux/msm_audio_mvs.h +++ b/include/uapi/audio/linux/msm_audio_mvs.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_MVS_H #include +#include #define AUDIO_GET_MVS_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM + 0), unsigned int) @@ -106,50 +107,50 @@ enum msm_audio_g729a_frame_type { }; struct min_max_rate { - uint32_t min_rate; - uint32_t max_rate; + __u32 min_rate; + __u32 max_rate; }; struct msm_audio_mvs_config { - uint32_t mvs_mode; - uint32_t rate_type; + __u32 mvs_mode; + __u32 rate_type; struct min_max_rate min_max_rate; - uint32_t dtx_mode; + __u32 dtx_mode; }; #define MVS_MAX_VOC_PKT_SIZE 640 struct gsm_header { - uint8_t bfi; - uint8_t sid; - uint8_t taf; - uint8_t ufi; + __u8 bfi; + __u8 sid; + __u8 taf; + __u8 ufi; }; struct q6_msm_audio_mvs_frame { union { - uint32_t frame_type; - uint32_t packet_rate; + __u32 frame_type; + __u32 packet_rate; struct gsm_header gsm_frame_type; } header; - uint32_t len; - uint8_t voc_pkt[MVS_MAX_VOC_PKT_SIZE]; + __u32 len; + __u8 voc_pkt[MVS_MAX_VOC_PKT_SIZE]; }; struct msm_audio_mvs_frame { - uint32_t frame_type; - uint32_t len; - uint8_t voc_pkt[MVS_MAX_VOC_PKT_SIZE]; + __u32 frame_type; + __u32 len; + __u8 voc_pkt[MVS_MAX_VOC_PKT_SIZE]; }; #define Q5V2_MVS_MAX_VOC_PKT_SIZE 320 struct q5v2_msm_audio_mvs_frame { - uint32_t frame_type; - uint32_t len; - uint8_t voc_pkt[Q5V2_MVS_MAX_VOC_PKT_SIZE]; + __u32 frame_type; + __u32 len; + __u8 voc_pkt[Q5V2_MVS_MAX_VOC_PKT_SIZE]; }; #endif /* _UAPI_MSM_AUDIO_MVS_H */ diff --git a/include/uapi/audio/linux/msm_audio_qcp.h b/include/uapi/audio/linux/msm_audio_qcp.h index fdb234e91a..3bfd229acd 100644 --- a/include/uapi/audio/linux/msm_audio_qcp.h +++ b/include/uapi/audio/linux/msm_audio_qcp.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_QCP_H #include +#include #define AUDIO_SET_QCELP_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ 0, struct msm_audio_qcelp_enc_config) @@ -23,15 +24,15 @@ #define CDMA_RATE_ERASURE 0x05 struct msm_audio_qcelp_enc_config { - uint32_t cdma_rate; - uint32_t min_bit_rate; - uint32_t max_bit_rate; + __u32 cdma_rate; + __u32 min_bit_rate; + __u32 max_bit_rate; }; struct msm_audio_evrc_enc_config { - uint32_t cdma_rate; - uint32_t min_bit_rate; - uint32_t max_bit_rate; + __u32 cdma_rate; + __u32 min_bit_rate; + __u32 max_bit_rate; }; #endif /* _UAPI_MSM_AUDIO_QCP_H */ diff --git a/include/uapi/audio/linux/msm_audio_sbc.h b/include/uapi/audio/linux/msm_audio_sbc.h index 1c7c63da3d..c004d6c53a 100644 --- a/include/uapi/audio/linux/msm_audio_sbc.h +++ b/include/uapi/audio/linux/msm_audio_sbc.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_SBC_H #include +#include #define AUDIO_SET_SBC_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), struct msm_audio_sbc_enc_config) @@ -25,12 +26,12 @@ #define AUDIO_SBC_BLOCKS_16 0x3 struct msm_audio_sbc_enc_config { - uint32_t channels; - uint32_t sample_rate; - uint32_t bit_allocation; - uint32_t number_of_subbands; - uint32_t number_of_blocks; - uint32_t bit_rate; - uint32_t mode; + __u32 channels; + __u32 sample_rate; + __u32 bit_allocation; + __u32 number_of_subbands; + __u32 number_of_blocks; + __u32 bit_rate; + __u32 mode; }; #endif /* _UAPI_MSM_AUDIO_SBC_H */ diff --git a/include/uapi/audio/linux/msm_audio_voicememo.h b/include/uapi/audio/linux/msm_audio_voicememo.h index a7a7a4df17..34d2913177 100644 --- a/include/uapi/audio/linux/msm_audio_voicememo.h +++ b/include/uapi/audio/linux/msm_audio_voicememo.h @@ -2,6 +2,7 @@ #define _UAPI_MSM_AUDIO_VOICEMEMO_H #include +#include #define AUDIO_GET_VOICEMEMO_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), unsigned int) @@ -52,15 +53,15 @@ enum rpc_voc_pb_len_rate_var_type { }; struct msm_audio_voicememo_config { - uint32_t rec_type; - uint32_t rec_interval_ms; - uint32_t auto_stop_ms; - uint32_t capability; - uint32_t max_rate; - uint32_t min_rate; - uint32_t frame_format; - uint32_t dtx_enable; - uint32_t data_req_ms; + __u32 rec_type; + __u32 rec_interval_ms; + __u32 auto_stop_ms; + __u32 capability; + __u32 max_rate; + __u32 min_rate; + __u32 frame_format; + __u32 dtx_enable; + __u32 data_req_ms; }; #endif /* _UAPI_MSM_AUDIO_VOICEMEMO_H */ diff --git a/include/uapi/audio/linux/msm_audio_wma.h b/include/uapi/audio/linux/msm_audio_wma.h index 523fadef08..da7ede9e8b 100644 --- a/include/uapi/audio/linux/msm_audio_wma.h +++ b/include/uapi/audio/linux/msm_audio_wma.h @@ -1,6 +1,8 @@ #ifndef _UAPI_MSM_AUDIO_WMA_H #define _UAPI_MSM_AUDIO_WMA_H +#include + #define AUDIO_GET_WMA_CONFIG _IOR(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), unsigned int) #define AUDIO_SET_WMA_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ @@ -22,11 +24,11 @@ struct msm_audio_wma_config { struct msm_audio_wma_config_v2 { unsigned short format_tag; unsigned short numchannels; - uint32_t samplingrate; - uint32_t avgbytespersecond; + __u32 samplingrate; + __u32 avgbytespersecond; unsigned short block_align; unsigned short validbitspersample; - uint32_t channelmask; + __u32 channelmask; unsigned short encodeopt; }; diff --git a/include/uapi/audio/linux/msm_audio_wmapro.h b/include/uapi/audio/linux/msm_audio_wmapro.h index 64cbf9e079..9acac69e43 100644 --- a/include/uapi/audio/linux/msm_audio_wmapro.h +++ b/include/uapi/audio/linux/msm_audio_wmapro.h @@ -1,6 +1,8 @@ #ifndef _UAPI_MSM_AUDIO_WMAPRO_H #define _UAPI_MSM_AUDIO_WMAPRO_H +#include + #define AUDIO_GET_WMAPRO_CONFIG _IOR(AUDIO_IOCTL_MAGIC, \ (AUDIO_MAX_COMMON_IOCTL_NUM+0), struct msm_audio_wmapro_config) #define AUDIO_SET_WMAPRO_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \ @@ -8,15 +10,15 @@ struct msm_audio_wmapro_config { unsigned short armdatareqthr; - uint8_t validbitspersample; - uint8_t numchannels; + __u8 validbitspersample; + __u8 numchannels; unsigned short formattag; - uint32_t samplingrate; - uint32_t avgbytespersecond; + __u32 samplingrate; + __u32 avgbytespersecond; unsigned short asfpacketlength; - uint32_t channelmask; + __u32 channelmask; unsigned short encodeopt; unsigned short advancedencodeopt; - uint32_t advancedencodeopt2; + __u32 advancedencodeopt2; }; #endif /* _UAPI_MSM_AUDIO_WMAPRO_H */ diff --git a/include/uapi/audio/sound/audio_effects.h b/include/uapi/audio/sound/audio_effects.h index f38b2121a5..a2dcea96f9 100644 --- a/include/uapi/audio/sound/audio_effects.h +++ b/include/uapi/audio/sound/audio_effects.h @@ -1,6 +1,8 @@ #ifndef _AUDIO_EFFECTS_H #define _AUDIO_EFFECTS_H +#include + /** AUDIO EFFECTS **/ @@ -147,209 +149,209 @@ /* Command Payload length and size for Non-IID commands */ #define COMMAND_PAYLOAD_LEN 3 -#define COMMAND_PAYLOAD_SZ (COMMAND_PAYLOAD_LEN * sizeof(uint32_t)) +#define COMMAND_PAYLOAD_SZ (COMMAND_PAYLOAD_LEN * sizeof(__u32)) /* Command Payload length and size for IID commands */ #define COMMAND_IID_PAYLOAD_LEN 4 -#define COMMAND_IID_PAYLOAD_SZ (COMMAND_IID_PAYLOAD_LEN * sizeof(uint32_t)) +#define COMMAND_IID_PAYLOAD_SZ (COMMAND_IID_PAYLOAD_LEN * sizeof(__u32)) #define MAX_INBAND_PARAM_SZ 4096 #define Q27_UNITY (1 << 27) #define Q8_UNITY (1 << 8) #define CUSTOM_OPENSL_PRESET 18 #define VIRTUALIZER_ENABLE_PARAM_SZ \ - (VIRTUALIZER_ENABLE_PARAM_LEN*sizeof(uint32_t)) + (VIRTUALIZER_ENABLE_PARAM_LEN*sizeof(__u32)) #define VIRTUALIZER_STRENGTH_PARAM_SZ \ - (VIRTUALIZER_STRENGTH_PARAM_LEN*sizeof(uint32_t)) + (VIRTUALIZER_STRENGTH_PARAM_LEN*sizeof(__u32)) #define VIRTUALIZER_OUT_TYPE_PARAM_SZ \ - (VIRTUALIZER_OUT_TYPE_PARAM_LEN*sizeof(uint32_t)) + (VIRTUALIZER_OUT_TYPE_PARAM_LEN*sizeof(__u32)) #define VIRTUALIZER_GAIN_ADJUST_PARAM_SZ \ - (VIRTUALIZER_GAIN_ADJUST_PARAM_LEN*sizeof(uint32_t)) + (VIRTUALIZER_GAIN_ADJUST_PARAM_LEN*sizeof(__u32)) struct virtualizer_params { - uint32_t device; - uint32_t enable_flag; - uint32_t strength; - uint32_t out_type; - int32_t gain_adjust; + __u32 device; + __u32 enable_flag; + __u32 strength; + __u32 out_type; + __s32 gain_adjust; }; #define NUM_OSL_REVERB_PRESETS_SUPPORTED 6 #define REVERB_ENABLE_PARAM_SZ \ - (REVERB_ENABLE_PARAM_LEN*sizeof(uint32_t)) + (REVERB_ENABLE_PARAM_LEN*sizeof(__u32)) #define REVERB_MODE_PARAM_SZ \ - (REVERB_MODE_PARAM_LEN*sizeof(uint32_t)) + (REVERB_MODE_PARAM_LEN*sizeof(__u32)) #define REVERB_PRESET_PARAM_SZ \ - (REVERB_PRESET_PARAM_LEN*sizeof(uint32_t)) + (REVERB_PRESET_PARAM_LEN*sizeof(__u32)) #define REVERB_WET_MIX_PARAM_SZ \ - (REVERB_WET_MIX_PARAM_LEN*sizeof(uint32_t)) + (REVERB_WET_MIX_PARAM_LEN*sizeof(__u32)) #define REVERB_GAIN_ADJUST_PARAM_SZ \ - (REVERB_GAIN_ADJUST_PARAM_LEN*sizeof(uint32_t)) + (REVERB_GAIN_ADJUST_PARAM_LEN*sizeof(__u32)) #define REVERB_ROOM_LEVEL_PARAM_SZ \ - (REVERB_ROOM_LEVEL_PARAM_LEN*sizeof(uint32_t)) + (REVERB_ROOM_LEVEL_PARAM_LEN*sizeof(__u32)) #define REVERB_ROOM_HF_LEVEL_PARAM_SZ \ - (REVERB_ROOM_HF_LEVEL_PARAM_LEN*sizeof(uint32_t)) + (REVERB_ROOM_HF_LEVEL_PARAM_LEN*sizeof(__u32)) #define REVERB_DECAY_TIME_PARAM_SZ \ - (REVERB_DECAY_TIME_PARAM_LEN*sizeof(uint32_t)) + (REVERB_DECAY_TIME_PARAM_LEN*sizeof(__u32)) #define REVERB_DECAY_HF_RATIO_PARAM_SZ \ - (REVERB_DECAY_HF_RATIO_PARAM_LEN*sizeof(uint32_t)) + (REVERB_DECAY_HF_RATIO_PARAM_LEN*sizeof(__u32)) #define REVERB_REFLECTIONS_LEVEL_PARAM_SZ \ - (REVERB_REFLECTIONS_LEVEL_PARAM_LEN*sizeof(uint32_t)) + (REVERB_REFLECTIONS_LEVEL_PARAM_LEN*sizeof(__u32)) #define REVERB_REFLECTIONS_DELAY_PARAM_SZ \ - (REVERB_REFLECTIONS_DELAY_PARAM_LEN*sizeof(uint32_t)) + (REVERB_REFLECTIONS_DELAY_PARAM_LEN*sizeof(__u32)) #define REVERB_LEVEL_PARAM_SZ \ - (REVERB_LEVEL_PARAM_LEN*sizeof(uint32_t)) + (REVERB_LEVEL_PARAM_LEN*sizeof(__u32)) #define REVERB_DELAY_PARAM_SZ \ - (REVERB_DELAY_PARAM_LEN*sizeof(uint32_t)) + (REVERB_DELAY_PARAM_LEN*sizeof(__u32)) #define REVERB_DIFFUSION_PARAM_SZ \ - (REVERB_DIFFUSION_PARAM_LEN*sizeof(uint32_t)) + (REVERB_DIFFUSION_PARAM_LEN*sizeof(__u32)) #define REVERB_DENSITY_PARAM_SZ \ - (REVERB_DENSITY_PARAM_LEN*sizeof(uint32_t)) + (REVERB_DENSITY_PARAM_LEN*sizeof(__u32)) struct reverb_params { - uint32_t device; - uint32_t enable_flag; - uint32_t mode; - uint32_t preset; - uint32_t wet_mix; - int32_t gain_adjust; - int32_t room_level; - int32_t room_hf_level; - uint32_t decay_time; - uint32_t decay_hf_ratio; - int32_t reflections_level; - uint32_t reflections_delay; - int32_t level; - uint32_t delay; - uint32_t diffusion; - uint32_t density; + __u32 device; + __u32 enable_flag; + __u32 mode; + __u32 preset; + __u32 wet_mix; + __s32 gain_adjust; + __s32 room_level; + __s32 room_hf_level; + __u32 decay_time; + __u32 decay_hf_ratio; + __s32 reflections_level; + __u32 reflections_delay; + __s32 level; + __u32 delay; + __u32 diffusion; + __u32 density; }; #define BASS_BOOST_ENABLE_PARAM_SZ \ - (BASS_BOOST_ENABLE_PARAM_LEN*sizeof(uint32_t)) + (BASS_BOOST_ENABLE_PARAM_LEN*sizeof(__u32)) #define BASS_BOOST_MODE_PARAM_SZ \ - (BASS_BOOST_MODE_PARAM_LEN*sizeof(uint32_t)) + (BASS_BOOST_MODE_PARAM_LEN*sizeof(__u32)) #define BASS_BOOST_STRENGTH_PARAM_SZ \ - (BASS_BOOST_STRENGTH_PARAM_LEN*sizeof(uint32_t)) + (BASS_BOOST_STRENGTH_PARAM_LEN*sizeof(__u32)) struct bass_boost_params { - uint32_t device; - uint32_t enable_flag; - uint32_t mode; - uint32_t strength; + __u32 device; + __u32 enable_flag; + __u32 mode; + __u32 strength; }; #define MAX_EQ_BANDS 12 #define MAX_OSL_EQ_BANDS 5 #define EQ_ENABLE_PARAM_SZ \ - (EQ_ENABLE_PARAM_LEN*sizeof(uint32_t)) + (EQ_ENABLE_PARAM_LEN*sizeof(__u32)) #define EQ_CONFIG_PARAM_SZ \ - (EQ_CONFIG_PARAM_LEN*sizeof(uint32_t)) + (EQ_CONFIG_PARAM_LEN*sizeof(__u32)) #define EQ_CONFIG_PER_BAND_PARAM_SZ \ - (EQ_CONFIG_PER_BAND_PARAM_LEN*sizeof(uint32_t)) + (EQ_CONFIG_PER_BAND_PARAM_LEN*sizeof(__u32)) #define EQ_CONFIG_PARAM_MAX_LEN (EQ_CONFIG_PARAM_LEN+\ MAX_EQ_BANDS*EQ_CONFIG_PER_BAND_PARAM_LEN) #define EQ_CONFIG_PARAM_MAX_SZ \ - (EQ_CONFIG_PARAM_MAX_LEN*sizeof(uint32_t)) + (EQ_CONFIG_PARAM_MAX_LEN*sizeof(__u32)) #define EQ_NUM_BANDS_PARAM_SZ \ - (EQ_NUM_BANDS_PARAM_LEN*sizeof(uint32_t)) + (EQ_NUM_BANDS_PARAM_LEN*sizeof(__u32)) #define EQ_BAND_LEVELS_PARAM_SZ \ - (EQ_BAND_LEVELS_PARAM_LEN*sizeof(uint32_t)) + (EQ_BAND_LEVELS_PARAM_LEN*sizeof(__u32)) #define EQ_BAND_LEVEL_RANGE_PARAM_SZ \ - (EQ_BAND_LEVEL_RANGE_PARAM_LEN*sizeof(uint32_t)) + (EQ_BAND_LEVEL_RANGE_PARAM_LEN*sizeof(__u32)) #define EQ_BAND_FREQS_PARAM_SZ \ - (EQ_BAND_FREQS_PARAM_LEN*sizeof(uint32_t)) + (EQ_BAND_FREQS_PARAM_LEN*sizeof(__u32)) #define EQ_SINGLE_BAND_FREQ_RANGE_PARAM_SZ \ - (EQ_SINGLE_BAND_FREQ_RANGE_PARAM_LEN*sizeof(uint32_t)) + (EQ_SINGLE_BAND_FREQ_RANGE_PARAM_LEN*sizeof(__u32)) #define EQ_SINGLE_BAND_FREQ_PARAM_SZ \ - (EQ_SINGLE_BAND_FREQ_PARAM_LEN*sizeof(uint32_t)) + (EQ_SINGLE_BAND_FREQ_PARAM_LEN*sizeof(__u32)) #define EQ_BAND_INDEX_PARAM_SZ \ - (EQ_BAND_INDEX_PARAM_LEN*sizeof(uint32_t)) + (EQ_BAND_INDEX_PARAM_LEN*sizeof(__u32)) #define EQ_PRESET_ID_PARAM_SZ \ - (EQ_PRESET_ID_PARAM_LEN*sizeof(uint32_t)) + (EQ_PRESET_ID_PARAM_LEN*sizeof(__u32)) #define EQ_NUM_PRESETS_PARAM_SZ \ - (EQ_NUM_PRESETS_PARAM_LEN*sizeof(uint8_t)) + (EQ_NUM_PRESETS_PARAM_LEN*sizeof(__u8)) struct eq_config_t { - int32_t eq_pregain; - int32_t preset_id; - uint32_t num_bands; + __s32 eq_pregain; + __s32 preset_id; + __u32 num_bands; }; struct eq_per_band_config_t { - int32_t band_idx; - uint32_t filter_type; - uint32_t freq_millihertz; - int32_t gain_millibels; - uint32_t quality_factor; + __s32 band_idx; + __u32 filter_type; + __u32 freq_millihertz; + __s32 gain_millibels; + __u32 quality_factor; }; struct eq_per_band_freq_range_t { - uint32_t band_index; - uint32_t min_freq_millihertz; - uint32_t max_freq_millihertz; + __u32 band_index; + __u32 min_freq_millihertz; + __u32 max_freq_millihertz; }; struct eq_params { - uint32_t device; - uint32_t enable_flag; + __u32 device; + __u32 enable_flag; struct eq_config_t config; struct eq_per_band_config_t per_band_cfg[MAX_EQ_BANDS]; struct eq_per_band_freq_range_t per_band_freq_range[MAX_EQ_BANDS]; - uint32_t band_index; - uint32_t freq_millihertz; + __u32 band_index; + __u32 freq_millihertz; }; #define PBE_ENABLE_PARAM_SZ \ - (PBE_ENABLE_PARAM_LEN*sizeof(uint32_t)) + (PBE_ENABLE_PARAM_LEN*sizeof(__u32)) #define PBE_CONFIG_PARAM_SZ \ - (PBE_CONFIG_PARAM_LEN*sizeof(uint16_t)) + (PBE_CONFIG_PARAM_LEN*sizeof(__u16)) struct pbe_config_t { - int16_t real_bass_mix; - int16_t bass_color_control; - uint16_t main_chain_delay; - uint16_t xover_filter_order; - uint16_t bandpass_filter_order; - int16_t drc_delay; - uint16_t rms_tav; - int16_t exp_threshold; - uint16_t exp_slope; - int16_t comp_threshold; - uint16_t comp_slope; - uint16_t makeup_gain; - uint32_t comp_attack; - uint32_t comp_release; - uint32_t exp_attack; - uint32_t exp_release; - int16_t limiter_bass_threshold; - int16_t limiter_high_threshold; - int16_t limiter_bass_makeup_gain; - int16_t limiter_high_makeup_gain; - int16_t limiter_bass_gc; - int16_t limiter_high_gc; - int16_t limiter_delay; - uint16_t reserved; + __s16 real_bass_mix; + __s16 bass_color_control; + __u16 main_chain_delay; + __u16 xover_filter_order; + __u16 bandpass_filter_order; + __s16 drc_delay; + __u16 rms_tav; + __s16 exp_threshold; + __u16 exp_slope; + __s16 comp_threshold; + __u16 comp_slope; + __u16 makeup_gain; + __u32 comp_attack; + __u32 comp_release; + __u32 exp_attack; + __u32 exp_release; + __s16 limiter_bass_threshold; + __s16 limiter_high_threshold; + __s16 limiter_bass_makeup_gain; + __s16 limiter_high_makeup_gain; + __s16 limiter_bass_gc; + __s16 limiter_high_gc; + __s16 limiter_delay; + __u16 reserved; /* place holder for filter coeffs to be followed */ - int32_t p1LowPassCoeffs[5*2]; - int32_t p1HighPassCoeffs[5*2]; - int32_t p1BandPassCoeffs[5*3]; - int32_t p1BassShelfCoeffs[5]; - int32_t p1TrebleShelfCoeffs[5]; + __s32 p1LowPassCoeffs[5*2]; + __s32 p1HighPassCoeffs[5*2]; + __s32 p1BandPassCoeffs[5*3]; + __s32 p1BassShelfCoeffs[5]; + __s32 p1TrebleShelfCoeffs[5]; } __packed; struct pbe_params { - uint32_t device; - uint32_t enable_flag; - uint32_t cfg_len; + __u32 device; + __u32 enable_flag; + __u32 cfg_len; struct pbe_config_t config; }; #define SOFT_VOLUME_ENABLE_PARAM_SZ \ - (SOFT_VOLUME_ENABLE_PARAM_LEN*sizeof(uint32_t)) + (SOFT_VOLUME_ENABLE_PARAM_LEN*sizeof(__u32)) #define SOFT_VOLUME_GAIN_MASTER_PARAM_SZ \ - (SOFT_VOLUME_GAIN_MASTER_PARAM_LEN*sizeof(uint32_t)) + (SOFT_VOLUME_GAIN_MASTER_PARAM_LEN*sizeof(__u32)) #define SOFT_VOLUME_GAIN_2CH_PARAM_SZ \ - (SOFT_VOLUME_GAIN_2CH_PARAM_LEN*sizeof(uint16_t)) + (SOFT_VOLUME_GAIN_2CH_PARAM_LEN*sizeof(__u16)) struct soft_volume_params { - uint32_t device; - uint32_t enable_flag; - uint32_t master_gain; - uint32_t left_gain; - uint32_t right_gain; + __u32 device; + __u32 enable_flag; + __u32 master_gain; + __u32 left_gain; + __u32 right_gain; }; struct msm_nt_eff_all_config { diff --git a/include/uapi/audio/sound/devdep_params.h b/include/uapi/audio/sound/devdep_params.h index abdf10636f..f598a0fcfe 100644 --- a/include/uapi/audio/sound/devdep_params.h +++ b/include/uapi/audio/sound/devdep_params.h @@ -1,18 +1,20 @@ #ifndef _DEV_DEP_H #define _DEV_DEP_H +#include + struct dolby_param_data { - int32_t version; - int32_t device_id; - int32_t be_id; - int32_t param_id; - int32_t length; - int32_t __user *data; + __s32 version; + __s32 device_id; + __s32 be_id; + __s32 param_id; + __s32 length; + __s32 __user *data; }; struct dolby_param_license { - int32_t dmid; - int32_t license_key; + __s32 dmid; + __s32 license_key; }; #define SNDRV_DEVDEP_DAP_IOCTL_SET_PARAM\ @@ -47,24 +49,24 @@ struct dolby_param_license { #define DTS_EAGLE_FLAG_ALSA_GET (1<<31) struct dts_eagle_param_desc { - uint32_t id; - uint32_t size; - int32_t offset; - uint32_t device; + __u32 id; + __u32 size; + __s32 offset; + __u32 device; } __packed; #define HWDEP_FE_BASE 3000 /*unique base for FE hw dep nodes*/ struct snd_pcm_mmap_fd { - int32_t dir; - int32_t fd; - int32_t size; - int32_t actual_size; + __s32 dir; + __s32 fd; + __s32 size; + __s32 actual_size; }; struct snd_pcm_prsnt_position { - uint64_t timestamp; - uint64_t frames; - int32_t clock_id; + __u64 timestamp; + __u64 frames; + __s32 clock_id; }; #define SNDRV_PCM_IOCTL_MMAP_DATA_FD _IOWR('U', 0xd2, struct snd_pcm_mmap_fd) diff --git a/include/uapi/audio/sound/lsm_params.h b/include/uapi/audio/sound/lsm_params.h index 57dc3be5d4..d7b8eeafd2 100644 --- a/include/uapi/audio/sound/lsm_params.h +++ b/include/uapi/audio/sound/lsm_params.h @@ -88,7 +88,7 @@ struct snd_lsm_ep_det_thres { */ struct snd_lsm_detect_mode { enum lsm_detection_mode mode; - bool detect_failure; + _Bool detect_failure; }; /* @@ -104,7 +104,7 @@ struct snd_lsm_gain { * @poll_en: Polling enable or disable */ struct snd_lsm_poll_enable { - bool poll_en; + _Bool poll_en; }; /* @@ -123,7 +123,7 @@ struct snd_lsm_sound_model_v2 { __u32 data_size; enum lsm_detection_mode detection_mode; __u8 num_confidence_levels; - bool detect_failure; + _Bool detect_failure; }; struct snd_lsm_session_data { @@ -178,8 +178,8 @@ struct snd_lsm_detection_params { __u8 *conf_level; enum lsm_detection_mode detect_mode; __u8 num_confidence_levels; - bool detect_failure; - bool poll_enable; + _Bool detect_failure; + _Bool poll_enable; }; /* @@ -203,7 +203,7 @@ struct lsm_params_info { __u32 param_id; __u32 param_size; __u8 __user *param_data; - uint32_t param_type; + __u32 param_type; }; /* @@ -233,7 +233,7 @@ struct lsm_params_info_v2 { __u32 param_id; __u32 param_size; __u8 __user *param_data; - uint32_t param_type; + __u32 param_type; __u16 instance_id; __u16 stage_idx; }; @@ -292,7 +292,7 @@ struct snd_lsm_input_hw_params { #define SNDRV_LSM_SET_SESSION_DATA _IOW('U', 0x06, struct snd_lsm_session_data) #define SNDRV_LSM_REG_SND_MODEL_V2 _IOW('U', 0x07,\ struct snd_lsm_sound_model_v2) -#define SNDRV_LSM_LAB_CONTROL _IOW('U', 0x08, uint32_t) +#define SNDRV_LSM_LAB_CONTROL _IOW('U', 0x08, __u32) #define SNDRV_LSM_STOP_LAB _IO('U', 0x09) #define SNDRV_LSM_SET_PARAMS _IOW('U', 0x0A, \ struct snd_lsm_detection_params) @@ -301,7 +301,7 @@ struct snd_lsm_input_hw_params { #define SNDRV_LSM_OUT_FORMAT_CFG _IOW('U', 0x0C, \ struct snd_lsm_output_format_cfg) #define SNDRV_LSM_SET_PORT _IO('U', 0x0D) -#define SNDRV_LSM_SET_FWK_MODE_CONFIG _IOW('U', 0x0E, uint32_t) +#define SNDRV_LSM_SET_FWK_MODE_CONFIG _IOW('U', 0x0E, __u32) #define SNDRV_LSM_EVENT_STATUS_V3 _IOW('U', 0x0F, \ struct snd_lsm_event_status_v3) #define SNDRV_LSM_GENERIC_DET_EVENT _IOW('U', 0x10, struct snd_lsm_event_status)