From b8515d8e0376e300ed17598f0288fad0e6ae0d89 Mon Sep 17 00:00:00 2001 From: Kyle Repinski Date: Fri, 27 Nov 2015 06:56:16 -0600 Subject: Fix building with Clang. --- invensense/libinvensense_hal/SensorBase.cpp | 2 +- invensense/mlsdk/mllite/mlFIFO.c | 10 +++---- invensense/mlsdk/mllite/mlarray.c | 4 +-- invensense/mlsdk/mllite/mlcontrol.c | 2 +- invensense/mlsdk/mllite/mldl_cfg_mpu.c | 34 ++++++++++++------------ invensense/mlsdk/mllite/mlinclude.h | 2 +- invensense/mlsdk/mllite/mlstates.c | 2 +- invensense/mlsdk/mllite/mlsupervisor.c | 6 ++--- invensense/mlsdk/platform/include/mlos.h | 6 ++--- invensense/mlsdk/platform/linux/mlsl_linux_mpu.c | 26 +++++++++--------- power/power_tuna.c | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/invensense/libinvensense_hal/SensorBase.cpp b/invensense/libinvensense_hal/SensorBase.cpp index 4661a55..6d6ab25 100644 --- a/invensense/libinvensense_hal/SensorBase.cpp +++ b/invensense/libinvensense_hal/SensorBase.cpp @@ -74,7 +74,7 @@ int SensorBase::getFd() const { return data_fd; } -int SensorBase::setDelay(int32_t handle, int64_t ns) { +int SensorBase::setDelay(int32_t handle __unused, int64_t ns __unused) { return 0; } diff --git a/invensense/mlsdk/mllite/mlFIFO.c b/invensense/mlsdk/mllite/mlFIFO.c index a5d0c9f..3279b35 100644 --- a/invensense/mlsdk/mllite/mlFIFO.c +++ b/invensense/mlsdk/mllite/mlFIFO.c @@ -937,7 +937,7 @@ inv_error_t inv_get_gyro_and_accel_sensor(long *data) * @param[out] data 3-element vector of external sensor * @return 0 on success or an error code. */ -inv_error_t inv_get_external_sensor_data(long *data, int size) +inv_error_t inv_get_external_sensor_data(long *data, int size __unused) { memset(data, 0, COMPASS_NUM_AXES * sizeof(long)); return INV_ERROR_FEATURE_NOT_IMPLEMENTED; @@ -1085,7 +1085,7 @@ inv_error_t inv_send_packet_number(uint_fast16_t accuracy) * * @return INV_SUCCESS if successful, a non-zero error code otherwise. */ -inv_error_t inv_send_gravity(uint_fast16_t elements, uint_fast16_t accuracy) +inv_error_t inv_send_gravity(uint_fast16_t elements __unused, uint_fast16_t accuracy) { INVENSENSE_FUNC_START; inv_error_t result; @@ -1194,7 +1194,7 @@ inv_error_t inv_send_linear_accel(uint_fast16_t elements, * @param[in] accuracy Set to INV_32_BIT for 32-bit data, or INV_16_BIT for 16 * bit data. */ -inv_error_t inv_send_linear_accel_in_world(uint_fast16_t elements, +inv_error_t inv_send_linear_accel_in_world(uint_fast16_t elements __unused, uint_fast16_t accuracy) { INVENSENSE_FUNC_START; @@ -1324,8 +1324,8 @@ inv_error_t inv_send_sensor_data(uint_fast16_t elements, uint_fast16_t accuracy) * Sending and Stop sending are reference counted, so data actually * stops when the reference reaches zero. */ -inv_error_t inv_send_external_sensor_data(uint_fast16_t elements, - uint_fast16_t accuracy) +inv_error_t inv_send_external_sensor_data(uint_fast16_t elements __unused, + uint_fast16_t accuracy __unused) { return INV_ERROR_FEATURE_NOT_IMPLEMENTED; // Feature not supported } diff --git a/invensense/mlsdk/mllite/mlarray.c b/invensense/mlsdk/mllite/mlarray.c index 6ae85e0..2ee9a8c 100644 --- a/invensense/mlsdk/mllite/mlarray.c +++ b/invensense/mlsdk/mllite/mlarray.c @@ -214,7 +214,7 @@ inv_error_t inv_get_rot_mat(long *data) * * @return Zero if the command is successful; an ML error code otherwise. */ -inv_error_t inv_get_angular_velocity(long *data) +inv_error_t inv_get_angular_velocity(long *data __unused) { return INV_ERROR_FEATURE_NOT_IMPLEMENTED; @@ -1023,7 +1023,7 @@ inv_error_t inv_get_gyro_float(float *data) * * @return INV_SUCCESS if the command is successful; an error code otherwise. */ -inv_error_t inv_get_angular_velocity_float(float *data) +inv_error_t inv_get_angular_velocity_float(float *data __unused) { return INV_ERROR_FEATURE_NOT_IMPLEMENTED; /* not implemented. old (invalid) implementation: diff --git a/invensense/mlsdk/mllite/mlcontrol.c b/invensense/mlsdk/mllite/mlcontrol.c index 1707e47..278438a 100644 --- a/invensense/mlsdk/mllite/mlcontrol.c +++ b/invensense/mlsdk/mllite/mlcontrol.c @@ -676,7 +676,7 @@ inv_error_t inv_get_control_data(long *controlSignal, long *gridNum, * structure. * @return INV_SUCCESS or an error code. **/ -inv_error_t inv_update_control(struct inv_obj_t * inv_obj) +inv_error_t inv_update_control(struct inv_obj_t * inv_obj __unused) { INVENSENSE_FUNC_START; unsigned char i; diff --git a/invensense/mlsdk/mllite/mldl_cfg_mpu.c b/invensense/mlsdk/mllite/mldl_cfg_mpu.c index 5a6f06a..ff97348 100644 --- a/invensense/mlsdk/mllite/mldl_cfg_mpu.c +++ b/invensense/mlsdk/mllite/mldl_cfg_mpu.c @@ -202,9 +202,9 @@ void mpu_print_cfg(struct mldl_cfg * mldl_cfg) */ int inv_mpu_open(struct mldl_cfg *mldl_cfg, void *mlsl_handle, - void *accel_handle, - void *compass_handle, - void *pressure_handle) + void *accel_handle __unused, + void *compass_handle __unused, + void *pressure_handle __unused) { int result; result = ioctl((int)(uintptr_t)mlsl_handle, MPU_GET_MPU_CONFIG, mldl_cfg); @@ -235,9 +235,9 @@ int inv_mpu_open(struct mldl_cfg *mldl_cfg, */ int inv_mpu_close(struct mldl_cfg *mldl_cfg, void *mlsl_handle, - void *accel_handle, - void *compass_handle, - void *pressure_handle) + void *accel_handle __unused, + void *compass_handle __unused, + void *pressure_handle __unused) { int result = INV_SUCCESS; @@ -248,9 +248,9 @@ int inv_mpu_close(struct mldl_cfg *mldl_cfg, int inv_mpu_resume(struct mldl_cfg* mldl_cfg, void *mlsl_handle, - void *accel_handle, - void *compass_handle, - void *pressure_handle, + void *accel_handle __unused, + void *compass_handle __unused, + void *pressure_handle __unused, unsigned long sensors) { int result; @@ -279,9 +279,9 @@ int inv_mpu_resume(struct mldl_cfg* mldl_cfg, int inv_mpu_suspend(struct mldl_cfg *mldl_cfg, void *mlsl_handle, - void *accel_handle, - void *compass_handle, - void *pressure_handle, + void *accel_handle __unused, + void *compass_handle __unused, + void *pressure_handle __unused, unsigned long sensors) { int result; @@ -327,9 +327,9 @@ int inv_mpu_suspend(struct mldl_cfg *mldl_cfg, */ int inv_mpu_slave_read(struct mldl_cfg *mldl_cfg, void *gyro_handle, - void *slave_handle, + void *slave_handle __unused, struct ext_slave_descr *slave, - struct ext_slave_platform_data *pdata, + struct ext_slave_platform_data *pdata __unused, unsigned char *data) { int result; @@ -371,7 +371,7 @@ int inv_mpu_slave_read(struct mldl_cfg *mldl_cfg, */ int inv_mpu_slave_config(struct mldl_cfg *mldl_cfg, void *gyro_handle, - void *slave_handle, + void *slave_handle __unused, struct ext_slave_config *data, struct ext_slave_descr *slave, struct ext_slave_platform_data *pdata) @@ -430,10 +430,10 @@ int inv_mpu_slave_config(struct mldl_cfg *mldl_cfg, */ int inv_mpu_get_slave_config(struct mldl_cfg *mldl_cfg, void *gyro_handle, - void *slave_handle, + void *slave_handle __unused, struct ext_slave_config *data, struct ext_slave_descr *slave, - struct ext_slave_platform_data *pdata) + struct ext_slave_platform_data *pdata __unused) { int result; if (!mldl_cfg || !data || !slave) { diff --git a/invensense/mlsdk/mllite/mlinclude.h b/invensense/mlsdk/mllite/mlinclude.h index dcbe904..fdbdef3 100644 --- a/invensense/mlsdk/mllite/mlinclude.h +++ b/invensense/mlsdk/mllite/mlinclude.h @@ -18,7 +18,7 @@ #ifndef INV_INCLUDE_H__ #define INV_INCLUDE_H__ -#define INVENSENSE_FUNC_START typedef int invensensePutFunctionCallsHere +#define INVENSENSE_FUNC_START #ifdef COVERAGE #include "utestCommon.h" diff --git a/invensense/mlsdk/mllite/mlstates.c b/invensense/mlsdk/mllite/mlstates.c index 69917c8..e44f100 100644 --- a/invensense/mlsdk/mllite/mlstates.c +++ b/invensense/mlsdk/mllite/mlstates.c @@ -59,7 +59,7 @@ struct state_callback_obj { state_change_callback_t stateChangeCallbacks[MAX_STATE_CHANGE_PROCESSES]; }; -static struct state_callback_obj sStateChangeCallbacks = { 0 }; +static struct state_callback_obj sStateChangeCallbacks = { 0, 0, { NULL } }; /* --------------- */ /* - Functions. - */ diff --git a/invensense/mlsdk/mllite/mlsupervisor.c b/invensense/mlsdk/mllite/mlsupervisor.c index a7b35df..2546903 100644 --- a/invensense/mlsdk/mllite/mlsupervisor.c +++ b/invensense/mlsdk/mllite/mlsupervisor.c @@ -69,7 +69,7 @@ static yas_filter_handle_t handle; #define SUPERVISOR_DEBUG 0 -struct inv_supervisor_cb_obj ml_supervisor_cb = { 0 }; +struct inv_supervisor_cb_obj ml_supervisor_cb = { NULL, NULL, NULL, NULL, NULL }; /** * @brief This initializes all variables that should be reset on @@ -92,7 +92,7 @@ void inv_init_sensor_fusion_supervisor(void) } static int MLUpdateCompassCalibration3DOF(int command, long *data, - unsigned long deltaTime) + unsigned long deltaTime __unused) { INVENSENSE_FUNC_START; int retValue = INV_SUCCESS; @@ -335,7 +335,7 @@ static inv_error_t MLSensorFusionSupervisor(double *magFB, long *accSF, } else if ((inv_obj.acc_state == SF_NORMAL) || (inv_obj.acc_state == SF_SLOW_SETTLE)) { *accSF = inv_obj.accel_sens * 64; //Normal - } else if ((inv_obj.acc_state == SF_DISTURBANCE)) { + } else if (inv_obj.acc_state == SF_DISTURBANCE) { *accSF = inv_obj.accel_sens * 64; //Don't use accel (should be 0) } else if (inv_obj.acc_state == SF_FAST_SETTLE) { *accSF = inv_obj.accel_sens * 512; //Amplify accel diff --git a/invensense/mlsdk/platform/include/mlos.h b/invensense/mlsdk/platform/include/mlos.h index 0aeda96..97c8c88 100644 --- a/invensense/mlsdk/platform/include/mlos.h +++ b/invensense/mlsdk/platform/include/mlos.h @@ -31,7 +31,7 @@ extern "C" { #if defined(LINUX) || defined(__KERNEL__) #include -typedef uintptr_t HANDLE; +typedef uintptr_t HANDLE; // TODO: shouldn't this be pthread_mutex_t* ??? #endif /* ------------ */ @@ -76,11 +76,11 @@ typedef uintptr_t HANDLE; /* Kernel implmentations */ #define GFP_KERNEL (0x70) static inline void *kmalloc(size_t size, - unsigned int gfp_flags) + unsigned int gfp_flags __unused) { return inv_malloc((unsigned int)size); } - static inline void *kzalloc(size_t size, unsigned int gfp_flags) + static inline void *kzalloc(size_t size, unsigned int gfp_flags __unused) { void *tmp = inv_malloc((unsigned int)size); if (tmp) diff --git a/invensense/mlsdk/platform/linux/mlsl_linux_mpu.c b/invensense/mlsdk/platform/linux/mlsl_linux_mpu.c index 51cbebe..00d5973 100644 --- a/invensense/mlsdk/platform/linux/mlsl_linux_mpu.c +++ b/invensense/mlsdk/platform/linux/mlsl_linux_mpu.c @@ -250,7 +250,7 @@ inv_error_t inv_serial_close(void *sl_handle) return INV_SUCCESS; } -inv_error_t inv_serial_reset(void *sl_handle) +inv_error_t inv_serial_reset(void *sl_handle __unused) { return INV_ERROR_FEATURE_NOT_IMPLEMENTED; } @@ -267,7 +267,7 @@ inv_error_t inv_serial_single_write(void *sl_handle, } inv_error_t inv_serial_write(void *sl_handle, - unsigned char slaveAddr, + unsigned char slaveAddr __unused, unsigned short length, unsigned char const *data) { @@ -293,7 +293,7 @@ inv_error_t inv_serial_write(void *sl_handle, int ii; for (ii = 0; ii < length; ii++) { snprintf(strchar, sizeof(strchar), "%02x", data[0]); - strncat(data_buff, strchar, sizeof(data_buff)); + strncat(data_buff, strchar, (sizeof(data_buff) - strlen(data_buff) - 1)); } MPL_LOGI("I2C Write Success %02x %02x: %s \n", data[0], length, data_buff); @@ -303,7 +303,7 @@ inv_error_t inv_serial_write(void *sl_handle, } inv_error_t inv_serial_read(void *sl_handle, - unsigned char slaveAddr, + unsigned char slaveAddr __unused, unsigned char registerAddr, unsigned short length, unsigned char *data) @@ -332,7 +332,7 @@ inv_error_t inv_serial_read(void *sl_handle, int ii; for (ii = 0; ii < length; ii++) { snprintf(strchar, sizeof(strchar), "%02x", data[0]); - strncat(data_buff, strchar, sizeof(data_buff)); + strncat(data_buff, strchar, (sizeof(data_buff) - strlen(data_buff) - 1)); } MPL_LOGI("I2C Read Success %02x %02x: %s \n", registerAddr, length, data_buff); @@ -342,7 +342,7 @@ inv_error_t inv_serial_read(void *sl_handle, } inv_error_t inv_serial_write_mem(void *sl_handle, - unsigned char mpu_addr, + unsigned char mpu_addr __unused, unsigned short memAddr, unsigned short length, const unsigned char *data) @@ -365,7 +365,7 @@ inv_error_t inv_serial_write_mem(void *sl_handle, int ii; for (ii = 0; ii < length; ii++) { snprintf(strchar, sizeof(strchar), "%02x", data[0]); - strncat(data_buff, strchar, sizeof(data_buff)); + strncat(data_buff, strchar, (sizeof(data_buff) - strlen(data_buff) - 1)); } MPL_LOGI("I2C WriteMem Success %04x %04x: %s \n", memAddr, length, data_buff); @@ -374,7 +374,7 @@ inv_error_t inv_serial_write_mem(void *sl_handle, } inv_error_t inv_serial_read_mem(void *sl_handle, - unsigned char mpu_addr, + unsigned char mpu_addr __unused, unsigned short memAddr, unsigned short length, unsigned char *data) @@ -402,7 +402,7 @@ inv_error_t inv_serial_read_mem(void *sl_handle, int ii; for (ii = 0; ii < length; ii++) { snprintf(strchar, sizeof(strchar), "%02x", data[0]); - strncat(data_buff, strchar, sizeof(data_buff)); + strncat(data_buff, strchar, (sizeof(data_buff) - strlen(data_buff) - 1)); } MPL_LOGI("I2C ReadMem Success %04x %04x: %s\n", memAddr, length, data_buff); @@ -411,7 +411,7 @@ inv_error_t inv_serial_read_mem(void *sl_handle, } inv_error_t inv_serial_write_fifo(void *sl_handle, - unsigned char mpu_addr, + unsigned char mpu_addr __unused, unsigned short length, const unsigned char *data) { @@ -438,7 +438,7 @@ inv_error_t inv_serial_write_fifo(void *sl_handle, int ii; for (ii = 0; ii < length; ii++) { snprintf(strchar, sizeof(strchar), "%02x", data[0]); - strncat(data_buff, strchar, sizeof(data_buff)); + strncat(data_buff, strchar, (sizeof(data_buff) - strlen(data_buff) - 1)); } MPL_LOGI("I2C Write Success %02x %02x: %s\n", MPUREG_FIFO_R_W, length, data_buff); @@ -447,7 +447,7 @@ inv_error_t inv_serial_write_fifo(void *sl_handle, } inv_error_t inv_serial_read_fifo(void *sl_handle, - unsigned char mpu_addr, + unsigned char mpu_addr __unused, unsigned short length, unsigned char *data) { @@ -474,7 +474,7 @@ inv_error_t inv_serial_read_fifo(void *sl_handle, int ii; for (ii = 0; ii < length; ii++) { snprintf(strchar, sizeof(strchar), "%02x", data[0]); - strncat(data_buff, strchar, sizeof(data_buff)); + strncat(data_buff, strchar, (sizeof(data_buff) - strlen(data_buff) - 1)); } MPL_LOGI("I2C ReadFifo Success %02x %02x: %s\n", MPUREG_FIFO_R_W, length, data_buff); diff --git a/power/power_tuna.c b/power/power_tuna.c index c2029a3..d0157d7 100644 --- a/power/power_tuna.c +++ b/power/power_tuna.c @@ -151,7 +151,7 @@ static void tuna_power_set_interactive(struct power_module *module, int on) } static void tuna_power_hint(struct power_module *module, power_hint_t hint, - void *data) + void *data __unused) { struct tuna_power_module *tuna = (struct tuna_power_module *) module; char buf[80]; -- cgit v1.1