giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed space between keyword and parentheses

Browse Source
This commit is contained in:
Edvard Pettersen 2018-07-23 17:49:18 +02:00
parent 54e8adfdec
commit 640570cd38
17 changed files with 124 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/cpu/cc13xx-cc26xx/dev/clock-arch.c
View File

@ -65,7 +65,7 @@ clock_update_cb(void)
HwiP_restore(key);
/* Notify the etimer system. */
if (etimer_pending()) {
if(etimer_pending()) {
etimer_request_poll();
}
}

2
arch/cpu/cc13xx-cc26xx/dev/dbg-arch.c
View File

@ -71,7 +71,7 @@ dbg_send_bytes(const unsigned char *seq, unsigned int len)
seq_len = strlen((const char *)seq);
max_len = MIN(seq_len, (size_t)len);
if (max_len == 0) {
if(max_len == 0) {
return 0;
}

38
arch/cpu/cc13xx-cc26xx/dev/gpio-hal-arch.c
View File

@ -60,16 +60,16 @@ from_hal_cfg(gpio_hal_pin_cfg_t cfg, PIN_Config *pin_cfg, PIN_Config *pin_mask)
cfg &= GPIO_HAL_PIN_BM_ALL;
/* Input config */
if (cfg & GPIO_HAL_PIN_BM_INPUT) {
if(cfg & GPIO_HAL_PIN_BM_INPUT) {
*pin_mask |= PIN_BM_INPUT_MODE;
/* Hysteresis config */
if ((cfg & GPIO_HAL_PIN_BM_INPUT_HYSTERESIS) == GPIO_HAL_PIN_CFG_INPUT_HYSTERESIS) {
if((cfg & GPIO_HAL_PIN_BM_INPUT_HYSTERESIS) == GPIO_HAL_PIN_CFG_INPUT_HYSTERESIS) {
*pin_cfg |= PIN_HYSTERESIS;
}
/* Pulling config */
switch (cfg & GPIO_HAL_PIN_BM_INPUT_PULLING) {
switch(cfg & GPIO_HAL_PIN_BM_INPUT_PULLING) {
case GPIO_HAL_PIN_CFG_INPUT_NOPULL: *pin_cfg |= PIN_NOPULL; break;
case GPIO_HAL_PIN_CFG_INPUT_PULLUP: *pin_cfg |= PIN_PULLUP; break;
case GPIO_HAL_PIN_CFG_INPUT_PULLDOWN: *pin_cfg |= PIN_PULLDOWN; break;
@ -77,23 +77,23 @@ from_hal_cfg(gpio_hal_pin_cfg_t cfg, PIN_Config *pin_cfg, PIN_Config *pin_mask)
}
/* Output config */
if (cfg & GPIO_HAL_PIN_BM_OUTPUT) {
if(cfg & GPIO_HAL_PIN_BM_OUTPUT) {
*pin_mask |= PIN_BM_OUTPUT_MODE;
/* Output buffer type config */
switch (cfg & GPIO_HAL_PIN_BM_OUTPUT_BUF) {
switch(cfg & GPIO_HAL_PIN_BM_OUTPUT_BUF) {
case GPIO_HAL_PIN_CFG_OUTPUT_PUSHPULL: *pin_cfg |= PIN_PUSHPULL; break;
case GPIO_HAL_PIN_CFG_OUTPUT_OPENDRAIN: *pin_cfg |= PIN_OPENDRAIN; break;
case GPIO_HAL_PIN_CFG_OUTPUT_OPENSOURCE: *pin_cfg |= PIN_OPENSOURCE; break;
}
/* Slew control config */
if ((cfg & GPIO_HAL_PIN_BM_OUTPUT_SLEWCTRL) == GPIO_HAL_PIN_CFG_OUTPUT_SLEWCTRL) {
if((cfg & GPIO_HAL_PIN_BM_OUTPUT_SLEWCTRL) == GPIO_HAL_PIN_CFG_OUTPUT_SLEWCTRL) {
*pin_cfg |= PIN_SLEWCTRL;
}
/* Drive strength config */
switch (cfg & GPIO_HAL_PIN_BM_OUTPUT_DRVSTR) {
switch(cfg & GPIO_HAL_PIN_BM_OUTPUT_DRVSTR) {
case GPIO_HAL_PIN_CFG_OUTPUT_DRVSTR_MIN: *pin_cfg |= PIN_DRVSTR_MIN; break;
case GPIO_HAL_PIN_CFG_OUTPUT_DRVSTR_MED: *pin_cfg |= PIN_DRVSTR_MED; break;
case GPIO_HAL_PIN_CFG_OUTPUT_DRVSTR_MAX: *pin_cfg |= PIN_DRVSTR_MAX; break;
@ -101,11 +101,11 @@ from_hal_cfg(gpio_hal_pin_cfg_t cfg, PIN_Config *pin_cfg, PIN_Config *pin_mask)
}
/* Interrupt config */
if (cfg & GPIO_HAL_PIN_BM_INT) {
if(cfg & GPIO_HAL_PIN_BM_INT) {
*pin_mask |= PIN_BM_IRQ;
/* Interrupt edge config */
switch (cfg & GPIO_HAL_PIN_BM_INT) {
switch(cfg & GPIO_HAL_PIN_BM_INT) {
case GPIO_HAL_PIN_CFG_INT_DISABLE: *pin_cfg |= PIN_IRQ_DIS; break;
case GPIO_HAL_PIN_CFG_INT_FALLING: *pin_cfg |= PIN_IRQ_NEGEDGE; break;
case GPIO_HAL_PIN_CFG_INT_RISING: *pin_cfg |= PIN_IRQ_POSEDGE; break;
@ -118,14 +118,14 @@ static void
to_hal_cfg(PIN_Config pin_cfg, gpio_hal_pin_cfg_t *cfg)
{
/* Input config */
if (pin_cfg & PIN_BM_INPUT_MODE) {
if(pin_cfg & PIN_BM_INPUT_MODE) {
/* Hysteresis config */
if ((pin_cfg & PIN_BM_HYSTERESIS) == PIN_HYSTERESIS) {
if((pin_cfg & PIN_BM_HYSTERESIS) == PIN_HYSTERESIS) {
*cfg |= GPIO_HAL_PIN_BM_INPUT_HYSTERESIS;
}
/* Pulling config */
switch (pin_cfg & PIN_BM_PULLING) {
switch(pin_cfg & PIN_BM_PULLING) {
case PIN_NOPULL: *cfg |= GPIO_HAL_PIN_CFG_INPUT_NOPULL; break;
case PIN_PULLUP: *cfg |= GPIO_HAL_PIN_CFG_INPUT_PULLUP; break;
case PIN_PULLDOWN: *cfg |= GPIO_HAL_PIN_CFG_INPUT_PULLDOWN; break;
@ -133,21 +133,21 @@ to_hal_cfg(PIN_Config pin_cfg, gpio_hal_pin_cfg_t *cfg)
}
/* Output config */
if (pin_cfg & PIN_BM_OUTPUT_MODE) {
if(pin_cfg & PIN_BM_OUTPUT_MODE) {
/* Output buffer type config */
switch (pin_cfg & PIN_BM_OUTPUT_BUF) {
switch(pin_cfg & PIN_BM_OUTPUT_BUF) {
case PIN_PUSHPULL: *cfg |= GPIO_HAL_PIN_CFG_OUTPUT_PUSHPULL; break;
case PIN_OPENDRAIN: *cfg |= GPIO_HAL_PIN_CFG_OUTPUT_OPENDRAIN; break;
case PIN_OPENSOURCE: *cfg |= GPIO_HAL_PIN_CFG_OUTPUT_OPENSOURCE; break;
}
/* Slew control config */
if ((pin_cfg & PIN_BM_SLEWCTRL) == PIN_SLEWCTRL) {
if((pin_cfg & PIN_BM_SLEWCTRL) == PIN_SLEWCTRL) {
*cfg |= GPIO_HAL_PIN_CFG_OUTPUT_SLEWCTRL;
}
/* Drive strength config */
switch (pin_cfg & PIN_BM_DRVSTR) {
switch(pin_cfg & PIN_BM_DRVSTR) {
case PIN_DRVSTR_MIN: *cfg |= GPIO_HAL_PIN_CFG_OUTPUT_DRVSTR_MIN; break;
case PIN_DRVSTR_MED: *cfg |= GPIO_HAL_PIN_CFG_OUTPUT_DRVSTR_MED; break;
case PIN_DRVSTR_MAX: *cfg |= GPIO_HAL_PIN_CFG_OUTPUT_DRVSTR_MAX; break;
@ -155,9 +155,9 @@ to_hal_cfg(PIN_Config pin_cfg, gpio_hal_pin_cfg_t *cfg)
}
/* Interrupt config */
if (pin_cfg & PIN_BM_IRQ) {
if(pin_cfg & PIN_BM_IRQ) {
/* Interrupt edge config */
switch (pin_cfg & PIN_BM_IRQ) {
switch(pin_cfg & PIN_BM_IRQ) {
case PIN_IRQ_DIS: *cfg |= GPIO_HAL_PIN_CFG_INT_DISABLE; break;
case PIN_IRQ_NEGEDGE: *cfg |= GPIO_HAL_PIN_CFG_INT_FALLING; break;
case PIN_IRQ_POSEDGE: *cfg |= GPIO_HAL_PIN_CFG_INT_RISING; break;
@ -193,7 +193,7 @@ gpio_hal_arch_interrupt_enable(gpio_hal_pin_t pin, gpio_hal_pin_cfg_t cfg)
cfg &= GPIO_HAL_PIN_BM_INT;
PIN_Config int_cfg = PIN_IRQ_DIS;
switch (cfg) {
switch(cfg) {
case GPIO_HAL_PIN_CFG_INT_FALLING: int_cfg |= PIN_IRQ_NEGEDGE; break;
case GPIO_HAL_PIN_CFG_INT_RISING: int_cfg |= PIN_IRQ_POSEDGE; break;
case GPIO_HAL_PIN_CFG_INT_BOTH: int_cfg |= PIN_IRQ_BOTHEDGES; break;

12
arch/cpu/cc13xx-cc26xx/dev/rtimer-arch.c
View File

@ -73,7 +73,7 @@ static void rtimer_clock_stub(uintptr_t unused) { (void)unused; /* do nothing */
static void
rtimer_isr_hook(void)
{
if (AONRTCEventGet(RTIMER_RTC_CH))
if(AONRTCEventGet(RTIMER_RTC_CH))
{
AONRTCEventClear(RTIMER_RTC_CH);
AONRTCChannelDisable(RTIMER_RTC_CH);
@ -84,7 +84,7 @@ rtimer_isr_hook(void)
* HWI Dispatch clears the interrupt. If HWI wasn't triggered, clear
* the interrupt manually.
*/
if (AONRTCEventGet(HWIP_RTC_CH))
if(AONRTCEventGet(HWIP_RTC_CH))
{
hwi_dispatch_fxn();
}
@ -122,13 +122,13 @@ rtimer_arch_init(void)
/* Try to access the RAM vector table. */
ramvec_table = (isr_fxn_t*)HWREG(NVIC_VTABLE);
if (!ramvec_table)
if(!ramvec_table)
{
/*
* Unable to find the RAM vector table is a serious fault.
* Spin-lock forever.
*/
for (;;) { /* hang */ }
for(;;) { /* hang */ }
}
/*
@ -136,13 +136,13 @@ rtimer_arch_init(void)
* in the RAM vector table. Fetch and store it.
*/
hwi_dispatch_fxn = (hwi_dispatch_fxn_t)ramvec_table[INT_AON_RTC_COMB];
if (!hwi_dispatch_fxn)
if(!hwi_dispatch_fxn)
{
/*
* Unable to find the HWI dispatch ISR in the RAM vector table is
* a serious fault. Spin-lock forever.
*/
for (;;) { /* hang */ }
for(;;) { /* hang */ }
}
/*

6
arch/cpu/cc13xx-cc26xx/rf/ble-addr.c
View File

@ -104,7 +104,7 @@ ble_addr_cpy(uint8_t *dst)
int
ble_addr_to_eui64(uint8_t *dst, uint8_t *src)
{
if (!dst || !src) {
if(!dst || !src) {
return -1;
}
@ -119,7 +119,7 @@ ble_addr_to_eui64(uint8_t *dst, uint8_t *src)
int
ble_addr_to_eui64_cpy(uint8_t *dst)
{
if (!dst) {
if(!dst) {
return -1;
}
@ -127,7 +127,7 @@ ble_addr_to_eui64_cpy(uint8_t *dst)
uint8_t ble_addr[BLE_ADDR_SIZE];
res = ble_addr_cpy(ble_addr);
if (res) {
if(res) {
return -1;
}

8
arch/cpu/cc13xx-cc26xx/rf/ieee-mode.c
View File

@ -729,7 +729,7 @@ get_value(radio_param_t param, radio_value_t *value)
return RADIO_RESULT_INVALID_VALUE;
}
switch (param) {
switch(param) {
/* Power Mode */
case RADIO_PARAM_POWER_MODE:
@ -831,7 +831,7 @@ set_value(radio_param_t param, radio_value_t value)
{
rf_result_t res;
switch (param) {
switch(param) {
/* Power Mode */
case RADIO_PARAM_POWER_MODE:
@ -965,7 +965,7 @@ get_object(radio_param_t param, void *dest, size_t size)
return RADIO_RESULT_INVALID_VALUE;
}
switch (param) {
switch(param) {
/* 64bit address */
case RADIO_PARAM_64BIT_ADDR: {
const size_t srcSize = sizeof(cmd_rx.localExtAddr);
@ -1005,7 +1005,7 @@ set_object(radio_param_t param, const void *src, size_t size)
return RADIO_RESULT_INVALID_VALUE;
}
switch (param) {
switch(param) {
/* 64-bit address */
case RADIO_PARAM_64BIT_ADDR: {
const size_t destSize = sizeof(cmd_rx.localExtAddr);

2
arch/cpu/cc13xx-cc26xx/rf/prop-mode.c
View File

@ -554,7 +554,7 @@ get_value(radio_param_t param, radio_value_t *value)
return RADIO_RESULT_INVALID_VALUE;
}
switch (param) {
switch(param) {
case RADIO_PARAM_POWER_MODE:
/* On / off */
*value = (prop_radio.rf_is_on)

7
arch/platform/simplelink/cc13xx-cc26xx/batmon-sensor.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
* Copyright (c) 2018, Texas Instruments Incorporated - http://www.ti.com/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -27,13 +27,12 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*---------------------------------------------------------------------------*/
/**
* \addtogroup cc26xx-batmon
* \addtogroup cc13xx-cc26xx-batmon
* @{
*
* \file
* Driver for the CC13xx/CC26xx AON battery monitor
* Driver for the CC13xx/CC26xx AON battery monitor.
*/
/*---------------------------------------------------------------------------*/
#include "contiki.h"

9
arch/platform/simplelink/cc13xx-cc26xx/batmon-sensor.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
* Copyright (c) 2018, Texas Instruments Incorporated - http://www.ti.com/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -27,18 +27,17 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*---------------------------------------------------------------------------*/
/**
* \addtogroup cc26xx
* \addtogroup cc13xx-cc26xx-platform
* @{
*
* \defgroup cc26xx-batmon CC13xx/CC26xx BatMon sensor driver
* \defgroup cc13xx-cc26xx-batmon CC13xx/CC26xx Battery Monitor sensor driver.
*
* Driver for the on-chip battery voltage and chip temperature sensor.
* @{
*
* \file
* Header file for the CC13xx/CC26xx battery monitor
* Header file for the CC13xx/CC26xx battery monitor.
*/
/*---------------------------------------------------------------------------*/
#ifndef BATMON_SENSOR_H_

14
arch/platform/simplelink/cc13xx-cc26xx/platform.c
View File

@ -108,9 +108,9 @@ fade(PIN_Id pin)
j = (k > pivot_half) ? pivot - k : k;
PINCC26XX_setOutputValue(pin, 1);
for (i = 0; i < j; ++i) { __asm__ __volatile__ ("nop"); }
for(i = 0; i < j; ++i) { __asm__ __volatile__ ("nop"); }
PINCC26XX_setOutputValue(pin, 0);
for (i = 0; i < pivot_half - j; ++i) { __asm__ __volatile__ ("nop"); }
for(i = 0; i < pivot_half - j; ++i) { __asm__ __volatile__ ("nop"); }
}
}
/*---------------------------------------------------------------------------*/
@ -149,12 +149,12 @@ platform_init_stage_one(void)
Power_init();
/* BoardGpioInitTable declared in Board.h */
if (PIN_init(BoardGpioInitTable) != PIN_SUCCESS) {
if(PIN_init(BoardGpioInitTable) != PIN_SUCCESS) {
/*
* Something is seriously wrong if PIN initialization of the Board GPIO
* table fails.
*/
for (;;);
for(;;) { /* hang */ }
}
/* Perform board-specific initialization */
@ -203,7 +203,7 @@ platform_init_stage_two(void)
/* Use TRNG to seed PRNG. If TRNG fails, use a hard-coded seed. */
unsigned short seed = 0;
if (!trng_rand((uint8_t*)&seed, sizeof(seed), TRNG_WAIT_FOREVER)) {
if(!trng_rand((uint8_t*)&seed, sizeof(seed), TRNG_WAIT_FOREVER)) {
/* Default to some hard-coded seed. */
seed = 0x1234;
}
@ -239,9 +239,9 @@ platform_init_stage_three(void)
ChipInfo_SupportsPROPRIETARY() ? "Yes" : "No",
ChipInfo_SupportsBLE() ? "Yes" : "No");
#if (RF_MODE == RF_MODE_SUB_1_GHZ)
#if(RF_MODE == RF_MODE_SUB_1_GHZ)
LOG_INFO("Operating frequency on Sub-1 GHz\n");
#elif (RF_MODE == RF_MODE_2_4_GHZ)
#elif(RF_MODE == RF_MODE_2_4_GHZ)
LOG_INFO("Operating frequency on 2.4 GHz\n");
#endif
LOG_INFO("RF: Channel %d, PANID 0x%04X\n", chan, pan);

20
arch/platform/simplelink/cc13xx-cc26xx/sensortag/bmp-280-sensor.c
View File

@ -181,7 +181,7 @@ i2c_write_read(void *writeBuf, size_t writeCount, void *readBuf, size_t readCoun
static bool
init(void)
{
if (i2c_handle) {
if(i2c_handle) {
return true;
}
@ -192,7 +192,7 @@ init(void)
i2cParams.bitRate = I2C_400kHz;
i2c_handle = I2C_open(Board_I2C0, &i2cParams);
if (i2c_handle == NULL) {
if(i2c_handle == NULL) {
return false;
}
@ -310,7 +310,7 @@ convert(uint8_t *data, int32_t *temp, uint32_t *press)
(32768 + v_x1_u32r) * (int32_t)p->dig_p1
) >> 15;
if (v_x1_u32r == 0) {
if(v_x1_u32r == 0) {
/* Avoid exception caused by division by zero */
*press = 0;
return;
@ -322,7 +322,7 @@ convert(uint8_t *data, int32_t *temp, uint32_t *press)
v_x2_u32r >> 12
)
) * 3125;
if ((int32_t)pressure < 0) {
if((int32_t)pressure < 0) {
pressure = (pressure << 1) / (uint32_t)v_x1_u32r;
} else {
pressure = (pressure / (uint32_t)v_x1_u32r) * 2;
@ -360,7 +360,7 @@ value(int type)
int32_t temp = 0;
uint32_t pres = 0;
if (sensor_status != SENSOR_STATUS_READY) {
if(sensor_status != SENSOR_STATUS_READY) {
PRINTF("Sensor disabled or starting up (%d)\n", sensor_status);
return BMP_280_READING_ERROR;
}
@ -368,11 +368,11 @@ value(int type)
/* A buffer for the raw reading from the sensor */
uint8_t sensor_value[MEAS_DATA_SIZE];
switch (type) {
switch(type) {
case BMP_280_SENSOR_TYPE_TEMP:
case BMP_280_SENSOR_TYPE_PRESS:
memset(sensor_value, 0, MEAS_DATA_SIZE);
if (!read_data(sensor_value, MEAS_DATA_SIZE)) {
if(!read_data(sensor_value, MEAS_DATA_SIZE)) {
return BMP_280_READING_ERROR;
}
@ -409,7 +409,7 @@ configure(int type, int enable)
{
switch(type) {
case SENSORS_HW_INIT:
if (init()) {
if(init()) {
enable_sensor(false);
sensor_status = SENSOR_STATUS_INITIALISED;
} else {
@ -419,10 +419,10 @@ configure(int type, int enable)
case SENSORS_ACTIVE:
/* Must be initialised first */
if (sensor_status == SENSOR_STATUS_DISABLED) {
if(sensor_status == SENSOR_STATUS_DISABLED) {
break;
}
if (enable) {
if(enable) {
enable_sensor(true);
ctimer_set(&startup_timer, SENSOR_STARTUP_DELAY, notify_ready, NULL);
sensor_status = SENSOR_STATUS_NOT_READY;

16
arch/platform/simplelink/cc13xx-cc26xx/sensortag/buzzer.c
View File

@ -74,7 +74,7 @@ static volatile bool is_running;
bool
buzzer_init()
{
if (has_init) {
if(has_init) {
return true;
}
@ -86,7 +86,7 @@ buzzer_init()
gpt_params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;
gpt_handle = GPTimerCC26XX_open(Board_GPTIMER0A, &gpt_params);
if (!gpt_handle) {
if(!gpt_handle) {
return false;
}
@ -105,20 +105,20 @@ buzzer_running()
bool
buzzer_start(uint32_t freq)
{
if (!has_init) {
if(!has_init) {
return false;
}
if (freq == 0) {
if(freq == 0) {
return false;
}
if (is_running) {
if(is_running) {
return true;
}
pin_handle = PIN_open(&pin_state, pin_table);
if (!pin_handle) {
if(!pin_handle) {
return false;
}
@ -139,11 +139,11 @@ buzzer_start(uint32_t freq)
void
buzzer_stop()
{
if (!gpt_handle) {
if(!gpt_handle) {
return;
}
if (!is_running) {
if(!is_running) {
return;
}

24
arch/platform/simplelink/cc13xx-cc26xx/sensortag/hdc-1000-sensor.c
View File

@ -170,7 +170,7 @@ i2c_read(void *rbuf, size_t rcount)
static bool
sensor_init(void)
{
if (i2c_handle) {
if(i2c_handle) {
return true;
}
@ -181,7 +181,7 @@ sensor_init(void)
i2c_params.bitRate = I2C_400kHz;
i2c_handle = I2C_open(Board_I2C0, &i2c_params);
if (i2c_handle == NULL) {
if(i2c_handle == NULL) {
return false;
}
@ -230,7 +230,7 @@ notify_ready(void *unused)
(void)unused;
/* Latch readings */
if (i2c_read(&sensor_data, sizeof(sensor_data))) {
if(i2c_read(&sensor_data, sizeof(sensor_data))) {
sensor_status = HDC_1000_SENSOR_STATUS_READINGS_READY;
} else {
sensor_status = HDC_1000_SENSOR_STATUS_I2C_ERROR;
@ -250,20 +250,20 @@ value(int type)
int32_t temp = 0;
int32_t hum = 0;
if (sensor_status != HDC_1000_SENSOR_STATUS_READINGS_READY) {
if(sensor_status != HDC_1000_SENSOR_STATUS_READINGS_READY) {
PRINTF("Sensor disabled or starting up (%d)\n", sensor_status);
return HDC_1000_READING_ERROR;
}
switch (type) {
switch(type) {
case HDC_1000_SENSOR_TYPE_TEMP:
case HDC_1000_SENSOR_TYPE_HUMID:
convert(&temp, &hum);
PRINTF("HDC: t=%d h=%d\n", (int)temp, (int)hum);
if (type == HDC_1000_SENSOR_TYPE_TEMP) {
if(type == HDC_1000_SENSOR_TYPE_TEMP) {
return (int)temp;
} else if (type == HDC_1000_SENSOR_TYPE_HUMID) {
} else if(type == HDC_1000_SENSOR_TYPE_HUMID) {
return (int)hum;
} else {
return HDC_1000_READING_ERROR;
@ -286,11 +286,11 @@ value(int type)
static int
configure(int type, int enable)
{
switch (type) {
switch(type) {
case SENSORS_HW_INIT:
memset(&sensor_data, 0, sizeof(sensor_data));
if (sensor_init()) {
if(sensor_init()) {
sensor_status = HDC_1000_SENSOR_STATUS_INITIALISED;
} else {
sensor_status = HDC_1000_SENSOR_STATUS_I2C_ERROR;
@ -299,12 +299,12 @@ configure(int type, int enable)
case SENSORS_ACTIVE:
/* Must be initialised first */
if (sensor_status == HDC_1000_SENSOR_STATUS_DISABLED) {
if(sensor_status == HDC_1000_SENSOR_STATUS_DISABLED) {
break;
}
if (enable) {
if (!start()) {
if(enable) {
if(!start()) {
sensor_status = HDC_1000_SENSOR_STATUS_I2C_ERROR;
break;
}

42
arch/platform/simplelink/cc13xx-cc26xx/sensortag/mpu-9250-sensor.c
View File

@ -283,7 +283,7 @@ static bool
sensor_init(void)
{
pin_handle = PIN_open(&pin_state, mpu_9250_pin_table);
if (pin_handle == NULL) {
if(pin_handle == NULL) {
return false;
}
@ -293,7 +293,7 @@ sensor_init(void)
i2cParams.bitRate = I2C_400kHz;
i2c_handle = I2C_open(Board_I2C0, &i2cParams);
if (i2c_handle == NULL) {
if(i2c_handle == NULL) {
PIN_close(&pin_state);
return false;
}
@ -399,14 +399,14 @@ sensor_data_ready(uint8_t* int_status)
static bool
acc_read(uint8_t int_status, uint16_t *data)
{
if (!(int_status & BIT_RAW_RDY_EN)) {
if(!(int_status & BIT_RAW_RDY_EN)) {
return false;
}
/* Burst read of all accelerometer values */
uint8_t accel_xout_h[] = { REG_ACCEL_XOUT_H };
bool spi_ok = i2c_write_read(accel_xout_h, sizeof(accel_xout_h), data, DATA_SIZE);
if (!spi_ok) {
if(!spi_ok) {
return false;
}
@ -422,14 +422,14 @@ acc_read(uint8_t int_status, uint16_t *data)
static bool
gyro_read(uint8_t int_status, uint16_t *data)
{
if (!(int_status & BIT_RAW_RDY_EN)) {
if(!(int_status & BIT_RAW_RDY_EN)) {
return false;
}
/* Burst read of all accelerometer values */
uint8_t gyro_xout_h[] = { REG_GYRO_XOUT_H };
bool spi_ok = i2c_write_read(gyro_xout_h, sizeof(gyro_xout_h), data, DATA_SIZE);
if (!spi_ok) {
if(!spi_ok) {
return false;
}
@ -446,7 +446,7 @@ gyro_read(uint8_t int_status, uint16_t *data)
static int32_t
acc_convert(int32_t raw_data)
{
switch (mpu_9250.acc_range) {
switch(mpu_9250.acc_range) {
case MPU_9250_SENSOR_ACC_RANGE_2G: return raw_data * 100 * 2 / 32768;
case MPU_9250_SENSOR_ACC_RANGE_4G: return raw_data * 100 * 4 / 32768;
case MPU_9250_SENSOR_ACC_RANGE_8G: return raw_data * 100 * 8 / 32768;
@ -481,7 +481,7 @@ initialise_cb(void *unused)
{
(void)unused;
if (mpu_9250.type == MPU_9250_SENSOR_TYPE_NONE) {
if(mpu_9250.type == MPU_9250_SENSOR_TYPE_NONE) {
return;
}
@ -489,7 +489,7 @@ initialise_cb(void *unused)
sensor_wakeup();
/* Configure the accelerometer range */
if ((mpu_9250.type & MPU_9250_SENSOR_TYPE_ACC) != 0) {
if((mpu_9250.type & MPU_9250_SENSOR_TYPE_ACC) != 0) {
sensor_set_acc_range(mpu_9250.acc_range);
}
@ -514,14 +514,14 @@ value(int type)
return MPU_9250_READING_ERROR;
}
if (mpu_9250.type == MPU_9250_SENSOR_TYPE_NONE) {
if(mpu_9250.type == MPU_9250_SENSOR_TYPE_NONE) {
return MPU_9250_READING_ERROR;
}
uint8_t int_status = 0;
const rtimer_clock_t t0 = RTIMER_NOW();
while (!sensor_data_ready(&int_status)) {
if (!(RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + READING_WAIT_TIMEOUT))) {
while(!sensor_data_ready(&int_status)) {
if(!(RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + READING_WAIT_TIMEOUT))) {
return MPU_9250_READING_ERROR;
}
}
@ -530,9 +530,9 @@ value(int type)
memset(sensor_value, 0, sizeof(sensor_value));
/* Read accel data */
if ((type & MPU_9250_SENSOR_TYPE_ACC) != 0) {
if((type & MPU_9250_SENSOR_TYPE_ACC) != 0) {
if (!acc_read(int_status, sensor_value)) {
if(!acc_read(int_status, sensor_value)) {
return MPU_9250_READING_ERROR;
}
@ -540,7 +540,7 @@ value(int type)
sensor_value[0], sensor_value[1], sensor_value[2]);
/* Convert */
switch (type) {
switch(type) {
case MPU_9250_SENSOR_TYPE_ACC_X: return acc_convert(sensor_value[0]);
case MPU_9250_SENSOR_TYPE_ACC_Y: return acc_convert(sensor_value[1]);
case MPU_9250_SENSOR_TYPE_ACC_Z: return acc_convert(sensor_value[2]);
@ -550,7 +550,7 @@ value(int type)
/* Read gyro data */
} else if((type & MPU_9250_SENSOR_TYPE_GYRO) != 0) {
if (!gyro_read(int_status, sensor_value)) {
if(!gyro_read(int_status, sensor_value)) {
return MPU_9250_READING_ERROR;
}
@ -558,7 +558,7 @@ value(int type)
sensor_value[0], sensor_value[1], sensor_value[2]);
/* Convert */
switch (type) {
switch(type) {
case MPU_9250_SENSOR_TYPE_GYRO_X: return gyro_convert(sensor_value[0]);
case MPU_9250_SENSOR_TYPE_GYRO_Y: return gyro_convert(sensor_value[1]);
case MPU_9250_SENSOR_TYPE_GYRO_Z: return gyro_convert(sensor_value[2]);
@ -588,7 +588,7 @@ configure(int type, int enable)
switch(type) {
case SENSORS_HW_INIT:
if (sensor_init()) {
if(sensor_init()) {
mpu_9250.status = MPU_9250_SENSOR_STATUS_ENABLED;
} else {
mpu_9250.status = MPU_9250_SENSOR_STATUS_DISABLED;
@ -596,7 +596,7 @@ configure(int type, int enable)
break;
case SENSORS_ACTIVE:
if (enable_type != MPU_9250_SENSOR_TYPE_NONE) {
if(enable_type != MPU_9250_SENSOR_TYPE_NONE) {
PRINTF("MPU: Enabling\n");
mpu_9250.type = enable_type;
@ -610,7 +610,7 @@ configure(int type, int enable)
ctimer_stop(&startup_timer);
if (PIN_getOutputValue(Board_MPU_POWER)) {
if(PIN_getOutputValue(Board_MPU_POWER)) {
sensor_sleep();
I2C_cancel(i2c_handle);
@ -636,7 +636,7 @@ configure(int type, int enable)
static int
status(int type)
{
switch (type) {
switch(type) {
case SENSORS_ACTIVE:
case SENSORS_READY:
return mpu_9250.status;

16
arch/platform/simplelink/cc13xx-cc26xx/sensortag/opt-3001-sensor.c
View File

@ -195,7 +195,7 @@ i2c_read(void *rbuf, size_t rcount)
static bool
sensor_init(void)
{
if (i2c_handle) {
if(i2c_handle) {
return true;
}
@ -206,7 +206,7 @@ sensor_init(void)
i2c_params.bitRate = I2C_400kHz;
i2c_handle = I2C_open(Board_I2C0, &i2c_params);
if (i2c_handle == NULL) {
if(i2c_handle == NULL) {
return false;
}
@ -249,12 +249,12 @@ notify_ready_cb(void *unused)
uint16_t cfg_value = 0;
bool spi_ok = i2c_write_read(cfg_data, sizeof(cfg_data), &cfg_value, sizeof(cfg_value));
if (!spi_ok) {
if(!spi_ok) {
opt_3001.status = OPT_3001_STATUS_I2C_ERROR;
return;
}
if (cfg_value & CFG_CRF) {
if(cfg_value & CFG_CRF) {
opt_3001.status = OPT_3001_STATUS_DATA_READY;
sensors_changed(&opt_3001_sensor);
} else {
@ -273,7 +273,7 @@ value(int type)
/* Unused args */
(void)type;
if (opt_3001.status != OPT_3001_STATUS_DATA_READY) {
if(opt_3001.status != OPT_3001_STATUS_DATA_READY) {
return OPT_3001_READING_ERROR;
}
@ -281,7 +281,7 @@ value(int type)
uint16_t cfg_value = 0;
bool spi_ok = i2c_write_read(cfg_data, sizeof(cfg_data), &cfg_value, sizeof(cfg_value));
if (!spi_ok) {
if(!spi_ok) {
opt_3001.status = OPT_3001_STATUS_I2C_ERROR;
return OPT_3001_READING_ERROR;
}
@ -290,7 +290,7 @@ value(int type)
uint16_t result_value = 0;
spi_ok = i2c_write_read(result_data, sizeof(result_data), &result_value, sizeof(result_value));
if (!spi_ok) {
if(!spi_ok) {
opt_3001.status = OPT_3001_STATUS_I2C_ERROR;
return OPT_3001_READING_ERROR;
}
@ -322,7 +322,7 @@ configure(int type, int enable)
int rv = 0;
switch(type) {
case SENSORS_HW_INIT:
if (sensor_init()) {
if(sensor_init()) {
opt_3001.status = OPT_3001_STATUS_STANDBY;
} else {
opt_3001.status = OPT_3001_STATUS_DISABLED;

28
arch/platform/simplelink/cc13xx-cc26xx/sensortag/tmp-007-sensor.c
View File

@ -183,12 +183,12 @@ i2c_read(void *rbuf, size_t rcount)
static bool
sensor_init(void)
{
if (pin_handle && i2c_handle) {
if(pin_handle && i2c_handle) {
return true;
}
pin_handle = PIN_open(&pin_state, pin_table);
if (!pin_handle) {
if(!pin_handle) {
return false;
}
@ -199,7 +199,7 @@ sensor_init(void)
i2c_params.bitRate = I2C_400kHz;
i2c_handle = I2C_open(Board_I2C0, &i2c_params);
if (i2c_handle == NULL) {
if(i2c_handle == NULL) {
PIN_close(pin_handle);
return false;
}
@ -252,12 +252,12 @@ read_data(uint16_t *local_tmp, uint16_t *obj_tmp)
spi_ok = i2c_write_read(status_data, sizeof(status_data),
&status_value, sizeof(status_value));
if (!spi_ok) {
if(!spi_ok) {
return false;
}
status_value = SWAP16(status_value);
if ((status_value & CONV_RDY_BIT) == 0) {
if((status_value & CONV_RDY_BIT) == 0) {
return false;
}
@ -266,7 +266,7 @@ read_data(uint16_t *local_tmp, uint16_t *obj_tmp)
spi_ok = i2c_write_read(local_temp_data, sizeof(local_temp_data),
&local_temp_value, sizeof(local_temp_value));
if (!spi_ok) {
if(!spi_ok) {
return false;
}
@ -275,7 +275,7 @@ read_data(uint16_t *local_tmp, uint16_t *obj_tmp)
spi_ok = i2c_write_read(obj_temp_data, sizeof(obj_temp_data),
&obj_temp_value, sizeof(obj_temp_value));
if (!spi_ok) {
if(!spi_ok) {
return false;
}
@ -316,17 +316,17 @@ value(int type)
uint16_t raw_local_tmp = 0, local_tmp = 0;
uint16_t raw_obj_tmp = 0, obj_tmp = 0;
if (tmp_007.status != TMP_007_STATUS_READY) {
if(tmp_007.status != TMP_007_STATUS_READY) {
PRINTF("Sensor disabled or starting up (%d)\n", tmp_007.status);
return TMP_007_READING_ERROR;
}
switch (type) {
switch(type) {
case TMP_007_TYPE_OBJECT: return tmp_007.obj_tmp_latched;
case TMP_007_TYPE_AMBIENT: return tmp_007.local_tmp_latched;
case TMP_007_TYPE_ALL:
if (!read_data(&raw_local_tmp, &raw_obj_tmp)) {
if(!read_data(&raw_local_tmp, &raw_obj_tmp)) {
return TMP_007_READING_ERROR;
}
@ -360,9 +360,9 @@ value(int type)
static int
configure(int type, int enable)
{
switch (type) {
switch(type) {
case SENSORS_HW_INIT:
if (!sensor_init()) {
if(!sensor_init()) {
return TMP_007_STATUS_DISABLED;
}
@ -373,10 +373,10 @@ configure(int type, int enable)
case SENSORS_ACTIVE:
/* Must be initialised first */
if (tmp_007.status == TMP_007_STATUS_DISABLED) {
if(tmp_007.status == TMP_007_STATUS_DISABLED) {
return TMP_007_STATUS_DISABLED;
}
if (enable) {
if(enable) {
enable_sensor(true);
ctimer_set(&startup_timer, SENSOR_STARTUP_DELAY, notify_ready_cb, NULL);
tmp_007.status = TMP_007_STATUS_NOT_READY;

4
arch/platform/simplelink/cc13xx-cc26xx/srf06/als-sensor.c
View File

@ -59,7 +59,7 @@ init(void)
ADC_Params_init(&adc_params);
adc_handle = ADC_open(Board_ADCALS, &adc_params);
if (adc_handle == NULL) {
if(adc_handle == NULL) {
return 0;
}
@ -97,7 +97,7 @@ value(int type)
uint16_t adc_value = 0;
int_fast16_t res = ADC_convert(adc_handle, &adc_value);
if (res != ADC_STATUS_SUCCESS) {
if(res != ADC_STATUS_SUCCESS) {
return -1;
}