uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deal with NAKs in the I2C callback while the EEPROM is busy persisting the data.

Browse Source
This commit is contained in:
László Monda
2017-07-26 00:49:30 +02:00
parent 35f78f542d
commit f5d794ec98
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/eeprom.c
+5 -5
View File
@@ -14,6 +14,7 @@ static i2c_master_transfer_t i2cTransfer;
static uint8_t *sourceBuffer; static uint8_t *sourceBuffer;
static uint16_t sourceOffset; static uint16_t sourceOffset;
static uint16_t sourceLength; static uint16_t sourceLength;
static uint8_t writeLength;
static status_t i2cAsyncWrite(uint8_t *data, size_t dataSize) static status_t i2cAsyncWrite(uint8_t *data, size_t dataSize)
{ {
@@ -38,19 +39,15 @@ static status_t writePage()
static uint8_t buffer[EEPROM_BUFFER_SIZE]; static uint8_t buffer[EEPROM_BUFFER_SIZE];
buffer[0] = sourceOffset & 0xff; buffer[0] = sourceOffset & 0xff;
buffer[1] = sourceOffset >> 8; buffer[1] = sourceOffset >> 8;
uint8_t writeLength = MIN(sourceLength - sourceOffset, EEPROM_PAGE_SIZE); writeLength = MIN(sourceLength - sourceOffset, EEPROM_PAGE_SIZE);
memcpy(buffer+EEPROM_ADDRESS_LENGTH, sourceBuffer+sourceOffset, writeLength); memcpy(buffer+EEPROM_ADDRESS_LENGTH, sourceBuffer+sourceOffset, writeLength);
status_t status = i2cAsyncWrite(buffer, writeLength+EEPROM_ADDRESS_LENGTH); status_t status = i2cAsyncWrite(buffer, writeLength+EEPROM_ADDRESS_LENGTH);
sourceOffset += writeLength;
return status; return status;
} }
static void i2cCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) static void i2cCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData)
{ {
LastEepromTransferStatus = status; LastEepromTransferStatus = status;
if (status != kStatus_Success) {
return;
}
bool isHardwareConfig = CurrentEepromTransfer == EepromTransfer_ReadHardwareConfiguration; bool isHardwareConfig = CurrentEepromTransfer == EepromTransfer_ReadHardwareConfiguration;
switch (CurrentEepromTransfer) { switch (CurrentEepromTransfer) {
@@ -64,6 +61,9 @@ static void i2cCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t st
break; break;
case EepromTransfer_WriteHardwareConfiguration: case EepromTransfer_WriteHardwareConfiguration:
case EepromTransfer_WriteUserConfiguration: case EepromTransfer_WriteUserConfiguration:
if (status == kStatus_Success) {
sourceOffset += writeLength;
}
IsEepromBusy = sourceOffset < sourceLength; IsEepromBusy = sourceOffset < sourceLength;
if (!IsEepromBusy) { if (!IsEepromBusy) {
return; return;