jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32: i2c-v2: simplify boolean functions

Browse Source 
No need to check results and return 1 or 0.  The result itself is
suitable for use directly as a boolean, and a boolean is the intended
outcome.
This commit is contained in:
Karl Palsson 2017-03-22 22:01:25 +00:00
parent 8b99b56c59
commit 24225816a1
2 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/libopencm3/stm32/common/i2c_common_v2.h
View File

@ -414,14 +414,14 @@ void i2c_set_10bit_address(uint32_t i2c, uint16_t addr);
void i2c_set_write_transfer_dir(uint32_t i2c); void i2c_set_write_transfer_dir(uint32_t i2c);
void i2c_set_read_transfer_dir(uint32_t i2c); void i2c_set_read_transfer_dir(uint32_t i2c);
void i2c_set_bytes_to_transfer(uint32_t i2c, uint32_t n_bytes); void i2c_set_bytes_to_transfer(uint32_t i2c, uint32_t n_bytes);
uint8_t i2c_is_start(uint32_t i2c); bool i2c_is_start(uint32_t i2c);
void i2c_enable_autoend(uint32_t i2c); void i2c_enable_autoend(uint32_t i2c);
void i2c_disable_autoend(uint32_t i2c); void i2c_disable_autoend(uint32_t i2c);
uint8_t i2c_nack(uint32_t i2c); bool i2c_nack(uint32_t i2c);
uint8_t i2c_busy(uint32_t i2c); bool i2c_busy(uint32_t i2c);
uint8_t i2c_transmit_int_status(uint32_t i2c); bool i2c_transmit_int_status(uint32_t i2c);
uint8_t i2c_transfer_complete(uint32_t i2c); bool i2c_transfer_complete(uint32_t i2c);
uint8_t i2c_received_data(uint32_t i2c); bool i2c_received_data(uint32_t i2c);
void i2c_enable_interrupt(uint32_t i2c, uint32_t interrupt); void i2c_enable_interrupt(uint32_t i2c, uint32_t interrupt);
void i2c_disable_interrupt(uint32_t i2c, uint32_t interrupt); void i2c_disable_interrupt(uint32_t i2c, uint32_t interrupt);
void i2c_enable_rxdma(uint32_t i2c); void i2c_enable_rxdma(uint32_t i2c);

48
lib/stm32/common/i2c_common_v2.c
View File

@ -281,13 +281,9 @@ void i2c_set_bytes_to_transfer(uint32_t i2c, uint32_t n_bytes)
(n_bytes << I2C_CR2_NBYTES_SHIFT); (n_bytes << I2C_CR2_NBYTES_SHIFT);
} }
uint8_t i2c_is_start(uint32_t i2c) bool i2c_is_start(uint32_t i2c)
{ {
if ((I2C_CR2(i2c) & I2C_CR2_START) != 0) { return (I2C_CR2(i2c) & I2C_CR2_START);
return 1;
}
return 0;
} }
void i2c_enable_autoend(uint32_t i2c) void i2c_enable_autoend(uint32_t i2c)
@ -300,49 +296,29 @@ void i2c_disable_autoend(uint32_t i2c)
I2C_CR2(i2c) &= ~I2C_CR2_AUTOEND; I2C_CR2(i2c) &= ~I2C_CR2_AUTOEND;
} }
uint8_t i2c_nack(uint32_t i2c) bool i2c_nack(uint32_t i2c)
{ {
if ((I2C_ISR(i2c) & I2C_ISR_NACKF) != 0) { return (I2C_ISR(i2c) & I2C_ISR_NACKF);
return 1;
}
return 0;
} }
uint8_t i2c_busy(uint32_t i2c) bool i2c_busy(uint32_t i2c)
{ {
if ((I2C_ISR(i2c) & I2C_ISR_BUSY) != 0) { return (I2C_ISR(i2c) & I2C_ISR_BUSY);
return 1;
}
return 0;
} }
uint8_t i2c_transmit_int_status(uint32_t i2c) bool i2c_transmit_int_status(uint32_t i2c)
{ {
if ((I2C_ISR(i2c) & I2C_ISR_TXIS) != 0) { return (I2C_ISR(i2c) & I2C_ISR_TXIS);
return 1;
}
return 0;
} }
uint8_t i2c_transfer_complete(uint32_t i2c) bool i2c_transfer_complete(uint32_t i2c)
{ {
if ((I2C_ISR(i2c) & I2C_ISR_TC) != 0) { return (I2C_ISR(i2c) & I2C_ISR_TC);
return 1;
}
return 0;
} }
uint8_t i2c_received_data(uint32_t i2c) bool i2c_received_data(uint32_t i2c)
{ {
if ((I2C_ISR(i2c) & I2C_ISR_RXNE) != 0) { return (I2C_ISR(i2c) & I2C_ISR_RXNE);
return 1;
}
return 0;
} }