Skip to content

Commit 9a7946e

Browse files
stickbreakerme-no-dev
authored andcommitted
I2C fix READ of zero bytes hardware hang (espressif#2301)
The i2c peripheral will hang if a READ request is issued with a zero data length. The peripheral drops into a continuous timeout interrupt response. The STOP command can not be set out to the I2C bus. The SLAVE device correctly ACK'd the address byte, with READ bit set, it has control of the SDA pin. The ESP32 send out the next SCL HIGH pulse but, since the SLAVE is in READ Mode, and the First bit it is sending happened to be a ZERO, the ESP32 cannot send the STOP. When it releases SDA during the SCL HIGH, the pin does not change state. The pin stays low because the SLAVE is outputing a LOW! The ESP32 drops into a perminent WAIT state waiting for SDA to go HIGH (the STOP). **esp32-hal-i2c.c** * add databuff length checks to `i2cRead()` and `i2cWrite()`
1 parent 566b69e commit 9a7946e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Diff for: cores/esp32/esp32-hal-i2c.c

+6
Original file line numberDiff line numberDiff line change
@@ -1609,6 +1609,9 @@ i2c_err_t i2cFlush(i2c_t * i2c)
16091609
}
16101610

16111611
i2c_err_t i2cWrite(i2c_t * i2c, uint16_t address, uint8_t* buff, uint16_t size, bool sendStop, uint16_t timeOutMillis){
1612+
if((i2c==NULL)||((size>0)&&(buff==NULL))) { // need to have location to store requested data
1613+
return I2C_ERROR_DEV;
1614+
}
16121615
i2c_err_t last_error = i2cAddQueueWrite(i2c, address, buff, size, sendStop, NULL);
16131616

16141617
if(last_error == I2C_ERROR_OK) { //queued
@@ -1628,6 +1631,9 @@ i2c_err_t i2cWrite(i2c_t * i2c, uint16_t address, uint8_t* buff, uint16_t size,
16281631
}
16291632

16301633
i2c_err_t i2cRead(i2c_t * i2c, uint16_t address, uint8_t* buff, uint16_t size, bool sendStop, uint16_t timeOutMillis, uint32_t *readCount){
1634+
if((size == 0)||(i2c == NULL)||(buff==NULL)){ // hardware will hang if no data requested on READ
1635+
return I2C_ERROR_DEV;
1636+
}
16311637
i2c_err_t last_error=i2cAddQueueRead(i2c, address, buff, size, sendStop, NULL);
16321638

16331639
if(last_error == I2C_ERROR_OK) { //queued

0 commit comments

Comments
 (0)