riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/stm32l1: i2c: Fix array out of bounds before check and Clang input check warnings

Browse Source
This commit is contained in:
Joakim Nohlgård 2016-01-17 12:14:10 +01:00
parent 8bf9230d15
commit e01e6892ff
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cpu/stm32l1/periph/i2c.c
View File

@ -66,16 +66,14 @@ static mutex_t locks[] = {
int i2c_init_master(i2c_t dev, i2c_speed_t speed) int i2c_init_master(i2c_t dev, i2c_speed_t speed)
{ {
I2C_TypeDef *i2c = i2c_config[dev].dev;
int ccr; int ccr;
if (dev >= I2C_NUMOF) { if ((unsigned int)dev >= I2C_NUMOF) {
return -1; return -1;
} }
/* read speed configuration */ /* read speed configuration */
switch (speed) { switch (speed) {
case I2C_SPEED_NORMAL: case I2C_SPEED_NORMAL:
ccr = I2C_APBCLK / 200000; ccr = I2C_APBCLK / 200000;
break; break;
@ -87,6 +85,7 @@ int i2c_init_master(i2c_t dev, i2c_speed_t speed)
default: default:
return -2; return -2;
} }
I2C_TypeDef *i2c = i2c_config[dev].dev;
/* enable I2C clock */ /* enable I2C clock */
i2c_poweron(dev); i2c_poweron(dev);
@ -148,14 +147,14 @@ int i2c_read_byte(i2c_t dev, uint8_t address, char *data)
int i2c_read_bytes(i2c_t dev, uint8_t address, char *data, int length) int i2c_read_bytes(i2c_t dev, uint8_t address, char *data, int length)
{ {
I2C_TypeDef *i2c = i2c_config[dev].dev;
unsigned int state; unsigned int state;
int i = 0; int i = 0;
if (dev >= I2C_NUMOF) { if ((unsigned int)dev >= I2C_NUMOF) {
return -1; return -1;
} }
I2C_TypeDef *i2c = i2c_config[dev].dev;
switch (length) { switch (length) {
case 1: case 1:
DEBUG("Send Slave address and wait for ADDR == 1\n"); DEBUG("Send Slave address and wait for ADDR == 1\n");
@ -272,12 +271,12 @@ int i2c_read_reg(i2c_t dev, uint8_t address, uint8_t reg, char *data)
int i2c_read_regs(i2c_t dev, uint8_t address, uint8_t reg, char *data, int length) int i2c_read_regs(i2c_t dev, uint8_t address, uint8_t reg, char *data, int length)
{ {
I2C_TypeDef *i2c = i2c_config[dev].dev; if ((unsigned int)dev >= I2C_NUMOF) {
if (dev >= I2C_NUMOF) {
return -1; return -1;
} }
I2C_TypeDef *i2c = i2c_config[dev].dev;
/* send start condition and slave address */ /* send start condition and slave address */
DEBUG("Send slave address and clear ADDR flag\n"); DEBUG("Send slave address and clear ADDR flag\n");
_start(i2c, address, I2C_FLAG_WRITE); _start(i2c, address, I2C_FLAG_WRITE);
@ -296,12 +295,12 @@ int i2c_write_byte(i2c_t dev, uint8_t address, char data)
int i2c_write_bytes(i2c_t dev, uint8_t address, char *data, int length) int i2c_write_bytes(i2c_t dev, uint8_t address, char *data, int length)
{ {
I2C_TypeDef *i2c = i2c_config[dev].dev; if ((unsigned int)dev >= I2C_NUMOF) {
if (dev >= I2C_NUMOF) {
return -1; return -1;
} }
I2C_TypeDef *i2c = i2c_config[dev].dev;
/* start transmission and send slave address */ /* start transmission and send slave address */
DEBUG("sending start sequence\n"); DEBUG("sending start sequence\n");
_start(i2c, address, I2C_FLAG_WRITE); _start(i2c, address, I2C_FLAG_WRITE);
@ -322,12 +321,12 @@ int i2c_write_reg(i2c_t dev, uint8_t address, uint8_t reg, char data)
int i2c_write_regs(i2c_t dev, uint8_t address, uint8_t reg, char *data, int length) int i2c_write_regs(i2c_t dev, uint8_t address, uint8_t reg, char *data, int length)
{ {
I2C_TypeDef *i2c = i2c_config[dev].dev; if ((unsigned int)dev >= I2C_NUMOF) {
if (dev >= I2C_NUMOF) {
return -1; return -1;
} }
I2C_TypeDef *i2c = i2c_config[dev].dev;
/* start transmission and send slave address */ /* start transmission and send slave address */
_start(i2c, address, I2C_FLAG_WRITE); _start(i2c, address, I2C_FLAG_WRITE);
_clear_addr(i2c); _clear_addr(i2c);
@ -343,14 +342,14 @@ int i2c_write_regs(i2c_t dev, uint8_t address, uint8_t reg, char *data, int leng
void i2c_poweron(i2c_t dev) void i2c_poweron(i2c_t dev)
{ {
if (dev < I2C_NUMOF) { if ((unsigned int)dev < I2C_NUMOF) {
RCC->APB1ENR |= (RCC_APB1ENR_I2C1EN << dev); RCC->APB1ENR |= (RCC_APB1ENR_I2C1EN << dev);
} }
} }
void i2c_poweroff(i2c_t dev) void i2c_poweroff(i2c_t dev)
{ {
if (dev < I2C_NUMOF) { if ((unsigned int)dev < I2C_NUMOF) {
while (i2c_config[dev].dev->SR2 & I2C_SR2_BUSY); while (i2c_config[dev].dev->SR2 & I2C_SR2_BUSY);
RCC->APB1ENR &= ~(RCC_APB1ENR_I2C1EN << dev); RCC->APB1ENR &= ~(RCC_APB1ENR_I2C1EN << dev);
} }