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

STM32: Remove IAR compilation warning

pull/5327/head
bcostm 2017-10-18 10:07:06 +02:00
parent ad55bc26dc
commit 35bf526ca4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
targets/TARGET_STM/i2c_api.c
View File

@ -725,8 +725,10 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
int count = I2C_ERROR_BUS_BUSY, ret = 0; int count = I2C_ERROR_BUS_BUSY, ret = 0;
uint32_t timeout = 0; uint32_t timeout = 0;
if ((obj_s->XferOperation == I2C_FIRST_AND_LAST_FRAME) || // Trick to remove compiler warning "left and right operands are identical" in some cases
(obj_s->XferOperation == I2C_LAST_FRAME)) { uint32_t op1 = I2C_FIRST_AND_LAST_FRAME;
uint32_t op2 = I2C_LAST_FRAME;
if ((obj_s->XferOperation == op1) || (obj_s->XferOperation == op2)) {
if (stop) if (stop)
obj_s->XferOperation = I2C_FIRST_AND_LAST_FRAME; obj_s->XferOperation = I2C_FIRST_AND_LAST_FRAME;
else else
@ -777,8 +779,10 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
int count = I2C_ERROR_BUS_BUSY, ret = 0; int count = I2C_ERROR_BUS_BUSY, ret = 0;
uint32_t timeout = 0; uint32_t timeout = 0;
if ((obj_s->XferOperation == I2C_FIRST_AND_LAST_FRAME) || // Trick to remove compiler warning "left and right operands are identical" in some cases
(obj_s->XferOperation == I2C_LAST_FRAME)) { uint32_t op1 = I2C_FIRST_AND_LAST_FRAME;
uint32_t op2 = I2C_LAST_FRAME;
if ((obj_s->XferOperation == op1) || (obj_s->XferOperation == op2)) {
if (stop) if (stop)
obj_s->XferOperation = I2C_FIRST_AND_LAST_FRAME; obj_s->XferOperation = I2C_FIRST_AND_LAST_FRAME;
else else
@ -1065,8 +1069,10 @@ void i2c_transfer_asynch(i2c_t *obj, const void *tx, size_t tx_length, void *rx,
/* Set operation step depending if stop sending required or not */ /* Set operation step depending if stop sending required or not */
if ((tx_length && !rx_length) || (!tx_length && rx_length)) { if ((tx_length && !rx_length) || (!tx_length && rx_length)) {
if ((obj_s->XferOperation == I2C_FIRST_AND_LAST_FRAME) || // Trick to remove compiler warning "left and right operands are identical" in some cases
(obj_s->XferOperation == I2C_LAST_FRAME)) { uint32_t op1 = I2C_FIRST_AND_LAST_FRAME;
uint32_t op2 = I2C_LAST_FRAME;
if ((obj_s->XferOperation == op1) || (obj_s->XferOperation == op2)) {
if (stop) if (stop)
obj_s->XferOperation = I2C_FIRST_AND_LAST_FRAME; obj_s->XferOperation = I2C_FIRST_AND_LAST_FRAME;
else else
@ -1088,8 +1094,10 @@ void i2c_transfer_asynch(i2c_t *obj, const void *tx, size_t tx_length, void *rx,
} }
else if (tx_length && rx_length) { else if (tx_length && rx_length) {
/* Two steps operation, don't modify XferOperation, keep it for next step */ /* Two steps operation, don't modify XferOperation, keep it for next step */
if ((obj_s->XferOperation == I2C_FIRST_AND_LAST_FRAME) || // Trick to remove compiler warning "left and right operands are identical" in some cases
(obj_s->XferOperation == I2C_LAST_FRAME)) { uint32_t op1 = I2C_FIRST_AND_LAST_FRAME;
uint32_t op2 = I2C_LAST_FRAME;
if ((obj_s->XferOperation == op1) || (obj_s->XferOperation == op2)) {
HAL_I2C_Master_Sequential_Transmit_IT(handle, address, (uint8_t*)tx, tx_length, I2C_FIRST_FRAME); HAL_I2C_Master_Sequential_Transmit_IT(handle, address, (uint8_t*)tx, tx_length, I2C_FIRST_FRAME);
} else if ((obj_s->XferOperation == I2C_FIRST_FRAME) || } else if ((obj_s->XferOperation == I2C_FIRST_FRAME) ||
(obj_s->XferOperation == I2C_NEXT_FRAME)) { (obj_s->XferOperation == I2C_NEXT_FRAME)) {