ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Squash warnings by defining 'NC' as unsigned type

pull/5584/head
Steven Cooreman 2017-11-24 16:14:56 +01:00
parent 73bd5ff5fb
commit e900d5a04d
8 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_Silicon_Labs/TARGET_EFM32/analogin_api.c
View File

@ -40,10 +40,10 @@ void analogin_init(analogin_t *obj, PinName pin)
/* Init structure */
obj->adc = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT((int) obj->adc != NC);
MBED_ASSERT((unsigned int) obj->adc != NC);
obj->channel = pin_location(pin, PinMap_ADC);
MBED_ASSERT((int) obj->channel != NC);
MBED_ASSERT((unsigned int) obj->channel != NC);
/* Only initialize the ADC once */
if (!adc_initialized) {

8
targets/TARGET_Silicon_Labs/TARGET_EFM32/analogout_api.c
View File

@ -41,11 +41,11 @@ void analogout_init(dac_t *obj, PinName pin)
{
/* init in-memory structure */
obj->dac = (DAC_TypeDef *) pinmap_peripheral(pin, PinMap_DAC);
MBED_ASSERT((int) obj->dac != NC);
MBED_ASSERT((unsigned int) obj->dac != NC);
obj->channel = pin_location(pin, PinMap_DAC);
MBED_ASSERT((int) obj->channel != NC);
MBED_ASSERT((unsigned int) obj->channel != NC);
pin_mode(pin, Disabled);
if (!dac_initialized) {
@ -78,7 +78,7 @@ void analogout_free(dac_t *obj)
DAC_InitChannel_TypeDef initChannel = DAC_INITCHANNEL_DEFAULT;
initChannel.enable = false;
DAC_InitChannel(obj->dac, &initChannel, obj->channel);
//Check all channels to see if we can disable the DAC completely
if((DAC0->CH0CTRL & DAC_CH0CTRL_EN) == 0 && (DAC0->CH1CTRL & DAC_CH1CTRL_EN) == 0) {
CMU_ClockEnable(cmuClock_DAC0, false);

2
targets/TARGET_Silicon_Labs/TARGET_EFM32/common/CommonPinNames.h
View File

@ -41,7 +41,7 @@
PI0 = 8 << 4, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12, PI13, PI14, PI15, \
PJ0 = 9 << 4, PJ1, PJ2, PJ3, PJ4, PJ5, PJ6, PJ7, PJ8, PJ9, PJ10, PJ11, PJ12, PJ13, PJ14, PJ15, \
PK0 = 10 << 4, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14, PK15, \
NC = (int) 0xFFFFFFFF
NC = (unsigned int) 0xFFFFFFFFUL
#ifdef __cplusplus
extern "C" {

7
targets/TARGET_Silicon_Labs/TARGET_EFM32/flash_api.c
View File

@ -93,10 +93,17 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
(void)obj;
(void)address;
#if FLASH_BASE > 0
if (address < FLASH_BASE || address >= FLASH_BASE + FLASH_SIZE) {
// Address outside of flash -- invalid sector
return MBED_FLASH_INVALID_SIZE;
}
#else
if (address >= FLASH_BASE + FLASH_SIZE) {
// Address outside of flash -- invalid sector
return MBED_FLASH_INVALID_SIZE;
}
#endif
return FLASH_PAGE_SIZE;
}

14
targets/TARGET_Silicon_Labs/TARGET_EFM32/i2c_api.c
View File

@ -99,11 +99,11 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl)
I2CName i2c_sda = (I2CName) pinmap_peripheral(sda, PinMap_I2C_SDA);
I2CName i2c_scl = (I2CName) pinmap_peripheral(scl, PinMap_I2C_SCL);
obj->i2c.i2c = (I2C_TypeDef*) pinmap_merge(i2c_sda, i2c_scl);
MBED_ASSERT(((int) obj->i2c.i2c) != NC);
MBED_ASSERT(((unsigned int) obj->i2c.i2c) != NC);
/* You need both SDA and SCL for I2C, so configuring one of them to NC is illegal */
MBED_ASSERT((uint32_t)sda != (uint32_t)NC);
MBED_ASSERT((uint32_t)scl != (uint32_t)NC);
MBED_ASSERT((unsigned int)sda != NC);
MBED_ASSERT((unsigned int)scl != NC);
/* Enable clock for the peripheral */
CMU_ClockEnable(i2c_get_clock(obj), true);
@ -116,9 +116,9 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl)
/* Enable pins at correct location */
#ifdef I2C_ROUTE_SDAPEN
/* Find common location in pinmap */
int loc_sda = pin_location(sda, PinMap_I2C_SDA);
int loc_scl = pin_location(scl, PinMap_I2C_SCL);
int loc = pinmap_merge(loc_sda, loc_scl);
unsigned int loc_sda = pin_location(sda, PinMap_I2C_SDA);
unsigned int loc_scl = pin_location(scl, PinMap_I2C_SCL);
unsigned int loc = pinmap_merge(loc_sda, loc_scl);
MBED_ASSERT(loc != NC);
/* Set location */
obj->i2c.location = I2C_ROUTE_SDAPEN | I2C_ROUTE_SCLPEN | (loc << _I2C_ROUTE_LOCATION_SHIFT);

8
targets/TARGET_Silicon_Labs/TARGET_EFM32/pwmout_api.c
View File

@ -214,7 +214,7 @@ void pwmout_init(pwmout_t *obj, PinName pin)
if(pwmout_all_inactive()) {
PWM_TIMER->ROUTE |= pinmap_find_function(pin,PinMap_PWM) << _TIMER_ROUTE_LOCATION_SHIFT;
} else {
MBED_ASSERT(PWM_TIMER->ROUTE & _TIMER_ROUTE_LOCATION_MASK == pinmap_find_function(pin,PinMap_PWM) << _TIMER_ROUTE_LOCATION_SHIFT);
MBED_ASSERT((PWM_TIMER->ROUTE & _TIMER_ROUTE_LOCATION_MASK) == pinmap_find_function(pin,PinMap_PWM) << _TIMER_ROUTE_LOCATION_SHIFT);
}
#endif
@ -230,14 +230,14 @@ void pwmout_free(pwmout_t *obj)
} else {
//This channel was disabled already
}
pwmout_enable_pins(obj, false);
if(pwmout_all_inactive()) {
//Stop timer
PWM_TIMER->CMD = TIMER_CMD_STOP;
while(PWM_TIMER->STATUS & TIMER_STATUS_RUNNING);
//Disable clock
CMU_ClockEnable(PWM_TIMER_CLOCK, false);
}

20
targets/TARGET_Silicon_Labs/TARGET_EFM32/serial_api.c
View File

@ -467,7 +467,7 @@ void serial_preinit(serial_t *obj, PinName tx, PinName rx)
UARTName uart_rx = (UARTName) pinmap_peripheral(rx, PinMap_UART_RX);
/* Check that pins are connected to same UART */
UARTName uart = (UARTName) pinmap_merge(uart_tx, uart_rx);
MBED_ASSERT((int) uart != NC);
MBED_ASSERT((unsigned int) uart != NC);
obj->serial.periph.uart = (USART_TypeDef *) uart;
@ -478,7 +478,7 @@ void serial_preinit(serial_t *obj, PinName tx, PinName rx)
#if defined(_SILICON_LABS_32B_PLATFORM_1)
/* Check that pins are used by same location for the given UART */
obj->serial.location = pinmap_merge(uart_tx_loc, uart_rx_loc);
MBED_ASSERT(obj->serial.location != (uint32_t)NC);
MBED_ASSERT(obj->serial.location != NC);
#else
obj->serial.location_tx = uart_tx_loc;
obj->serial.location_rx = uart_rx_loc;
@ -588,25 +588,25 @@ static void serial_set_route(serial_t *obj)
if(LEUART_REF_VALID(obj->serial.periph.leuart)) {
#ifdef _LEUART_ROUTE_LOCATION_SHIFT
obj->serial.periph.leuart->ROUTE = (obj->serial.location << _LEUART_ROUTE_LOCATION_SHIFT);
if(obj->serial.tx_pin != (uint32_t)NC) {
if(obj->serial.tx_pin != NC) {
obj->serial.periph.leuart->ROUTE |= LEUART_ROUTE_TXPEN;
} else {
obj->serial.periph.leuart->ROUTE &= ~LEUART_ROUTE_TXPEN;
}
if(obj->serial.rx_pin != (uint32_t)NC) {
if(obj->serial.rx_pin != NC) {
obj->serial.periph.leuart->ROUTE |= LEUART_ROUTE_RXPEN;
} else {
obj->serial.periph.leuart->CMD = LEUART_CMD_RXBLOCKEN;
obj->serial.periph.leuart->ROUTE &= ~LEUART_ROUTE_RXPEN;
}
#else
if(obj->serial.location_tx != (uint32_t)NC) {
if(obj->serial.location_tx != NC) {
obj->serial.periph.leuart->ROUTELOC0 = (obj->serial.periph.leuart->ROUTELOC0 & (~_LEUART_ROUTELOC0_TXLOC_MASK)) | (obj->serial.location_tx << _LEUART_ROUTELOC0_TXLOC_SHIFT);
obj->serial.periph.leuart->ROUTEPEN = (obj->serial.periph.leuart->ROUTEPEN & (~_LEUART_ROUTEPEN_TXPEN_MASK)) | LEUART_ROUTEPEN_TXPEN;
} else {
obj->serial.periph.leuart->ROUTEPEN = (obj->serial.periph.leuart->ROUTEPEN & (~_LEUART_ROUTEPEN_TXPEN_MASK));
}
if(obj->serial.location_rx != (uint32_t)NC) {
if(obj->serial.location_rx != NC) {
obj->serial.periph.leuart->ROUTELOC0 = (obj->serial.periph.leuart->ROUTELOC0 & (~_LEUART_ROUTELOC0_RXLOC_MASK)) | (obj->serial.location_rx << _LEUART_ROUTELOC0_RXLOC_SHIFT);
obj->serial.periph.leuart->ROUTEPEN = (obj->serial.periph.leuart->ROUTEPEN & (~_LEUART_ROUTEPEN_RXPEN_MASK)) | LEUART_ROUTEPEN_RXPEN;
} else {
@ -617,25 +617,25 @@ static void serial_set_route(serial_t *obj)
} else {
#ifdef _USART_ROUTE_LOCATION_SHIFT
obj->serial.periph.uart->ROUTE = (obj->serial.location << _LEUART_ROUTE_LOCATION_SHIFT);
if(obj->serial.tx_pin != (uint32_t)NC) {
if(obj->serial.tx_pin != NC) {
obj->serial.periph.uart->ROUTE |= USART_ROUTE_TXPEN;
} else {
obj->serial.periph.uart->ROUTE &= ~USART_ROUTE_TXPEN;
}
if(obj->serial.rx_pin != (uint32_t)NC) {
if(obj->serial.rx_pin != NC) {
obj->serial.periph.uart->ROUTE |= USART_ROUTE_RXPEN;
} else {
obj->serial.periph.uart->CMD = USART_CMD_RXBLOCKEN;
obj->serial.periph.uart->ROUTE &= ~USART_ROUTE_RXPEN;
}
#else
if(obj->serial.location_tx != (uint32_t)NC) {
if(obj->serial.location_tx != NC) {
obj->serial.periph.uart->ROUTELOC0 = (obj->serial.periph.uart->ROUTELOC0 & (~_USART_ROUTELOC0_TXLOC_MASK)) | (obj->serial.location_tx << _USART_ROUTELOC0_TXLOC_SHIFT);
obj->serial.periph.uart->ROUTEPEN = (obj->serial.periph.uart->ROUTEPEN & (~_USART_ROUTEPEN_TXPEN_MASK)) | USART_ROUTEPEN_TXPEN;
} else {
obj->serial.periph.uart->ROUTEPEN = (obj->serial.periph.uart->ROUTEPEN & (~_USART_ROUTEPEN_TXPEN_MASK));
}
if(obj->serial.location_rx != (uint32_t)NC) {
if(obj->serial.location_rx != NC) {
obj->serial.periph.uart->ROUTELOC0 = (obj->serial.periph.uart->ROUTELOC0 & (~_USART_ROUTELOC0_RXLOC_MASK)) | (obj->serial.location_rx << _USART_ROUTELOC0_RXLOC_SHIFT);
obj->serial.periph.uart->ROUTEPEN = (obj->serial.periph.uart->ROUTEPEN & (~_USART_ROUTEPEN_RXPEN_MASK)) | USART_ROUTEPEN_RXPEN;
} else {

4
targets/TARGET_Silicon_Labs/TARGET_EFM32/spi_api.c
View File

@ -150,7 +150,7 @@ void spi_preinit(spi_t *obj, PinName mosi, PinName miso, PinName clk, PinName cs
SPIName spi_ctrl = (SPIName) pinmap_merge(spi_clk, spi_cs);
obj->spi.spi = (USART_TypeDef *) pinmap_merge(spi_data, spi_ctrl);
MBED_ASSERT((int) obj->spi.spi != NC);
MBED_ASSERT((unsigned int) obj->spi.spi != NC);
if (cs != NC) { /* Slave mode */
obj->spi.master = false;
@ -1306,7 +1306,7 @@ uint32_t spi_irq_handler_asynch(spi_t* obj)
rx_pointer = ((uint16_t *)obj->rx_buff.buffer) + obj->rx_buff.pos;
} else {
rx_pointer = ((uint8_t *)obj->rx_buff.buffer) + obj->rx_buff.pos;
}
}
}
uint32_t rx_length = obj->rx_buff.length - obj->rx_buff.pos;