Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multibyte reads over i2c

Browse Source
This commit is contained in:
Dominic Spill
2016-12-13 19:05:49 -07:00
parent fac6dd086d
commit cde5ef5bb7
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/common/i2c_lpc.c
View File

@ -44,17 +44,23 @@ void i2c_lpc_transfer(i2c_bus_t* const bus,
uint8_t* const data_rx, const size_t count_rx uint8_t* const data_rx, const size_t count_rx
) { ) {
const uint32_t port = (uint32_t)bus->obj; const uint32_t port = (uint32_t)bus->obj;
size_t i;
bool ack = false;
if (data_tx && (count_tx > 0)) {
i2c_tx_start(port); i2c_tx_start(port);
i2c_tx_byte(port, (slave_address << 1) | I2C_WRITE); i2c_tx_byte(port, (slave_address << 1) | I2C_WRITE);
for(size_t i=0; i<count_tx; i++) { for(i=0; i<count_tx; i++) {
i2c_tx_byte(port, data_tx[i]); i2c_tx_byte(port, data_tx[i]);
} }
}
if( data_rx ) { if (data_rx && (count_rx > 0)) {
i2c_tx_start(port); i2c_tx_start(port);
i2c_tx_byte(port, (slave_address << 1) | I2C_READ); i2c_tx_byte(port, (slave_address << 1) | I2C_READ);
for(size_t i=0; i<count_rx; i++) { for(i=0; i<count_rx; i++) {
data_rx[i] = i2c_rx_byte(port); /* ACK each byte except the last */
ack = (i!=count_rx-1);
data_rx[i] = i2c_rx_byte(port, ack);
} }
} }

2
firmware/libopencm3

Submodule firmware/libopencm3 updated: 50c51c7b5f...0ca8913944