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

Correctly maintain the state of the isEepromBusy flag during reads. Make sure the correct EEPROM memory offsets are sent when dealing with the user configuration.

Browse Source
This commit is contained in:
László Monda
2017-07-26 13:34:24 +02:00
parent b48e2b42d3
commit 19b3a73e3d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
right/src/eeprom.c
View File

@@ -13,8 +13,10 @@ 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 eepromStartAddress;
static uint16_t sourceLength; static uint16_t sourceLength;
static uint8_t writeLength; static uint8_t writeLength;
static bool isReadSent;
static status_t i2cAsyncWrite(uint8_t *data, size_t dataSize) static status_t i2cAsyncWrite(uint8_t *data, size_t dataSize)
{ {
@@ -37,8 +39,9 @@ static status_t i2cAsyncRead(uint8_t *data, size_t dataSize)
static status_t writePage() static status_t writePage()
{ {
static uint8_t buffer[EEPROM_BUFFER_SIZE]; static uint8_t buffer[EEPROM_BUFFER_SIZE];
buffer[0] = sourceOffset & 0xff; uint16_t targetEepromOffset = sourceOffset + eepromStartAddress;
buffer[1] = sourceOffset >> 8; buffer[0] = targetEepromOffset & 0xff;
buffer[1] = targetEepromOffset >> 8;
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);
@@ -53,14 +56,16 @@ static void i2cCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t st
switch (CurrentEepromTransfer) { switch (CurrentEepromTransfer) {
case EepromTransfer_ReadHardwareConfiguration: case EepromTransfer_ReadHardwareConfiguration:
case EepromTransfer_ReadUserConfiguration: case EepromTransfer_ReadUserConfiguration:
if (!IsEepromBusy) { if (isReadSent) {
IsEepromBusy = false;
return; return;
} }
LastEepromTransferStatus = i2cAsyncRead( LastEepromTransferStatus = i2cAsyncRead(
isHardwareConfig ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer, isHardwareConfig ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer,
isHardwareConfig ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE isHardwareConfig ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE
); );
IsEepromBusy = false; IsEepromBusy = true;
isReadSent = true;
break; break;
case EepromTransfer_WriteHardwareConfiguration: case EepromTransfer_WriteHardwareConfiguration:
case EepromTransfer_WriteUserConfiguration: case EepromTransfer_WriteUserConfiguration:
@@ -90,15 +95,15 @@ status_t EEPROM_LaunchTransfer(eeprom_transfer_t transferType)
return kStatus_I2C_Busy; return kStatus_I2C_Busy;
} }
uint16_t eepromStartAddress;
CurrentEepromTransfer = transferType; CurrentEepromTransfer = transferType;
bool isHardwareConfig = CurrentEepromTransfer == EepromTransfer_ReadHardwareConfiguration || bool isHardwareConfig = CurrentEepromTransfer == EepromTransfer_ReadHardwareConfiguration ||
CurrentEepromTransfer == EepromTransfer_WriteHardwareConfiguration; CurrentEepromTransfer == EepromTransfer_WriteHardwareConfiguration;
eepromStartAddress = isHardwareConfig ? 0 : HARDWARE_CONFIG_SIZE;
switch (transferType) { switch (transferType) {
case EepromTransfer_ReadHardwareConfiguration: case EepromTransfer_ReadHardwareConfiguration:
case EepromTransfer_ReadUserConfiguration: case EepromTransfer_ReadUserConfiguration:
eepromStartAddress = isHardwareConfig ? 0 : HARDWARE_CONFIG_SIZE; isReadSent = false;
LastEepromTransferStatus = i2cAsyncWrite((uint8_t*)&eepromStartAddress, EEPROM_ADDRESS_LENGTH); LastEepromTransferStatus = i2cAsyncWrite((uint8_t*)&eepromStartAddress, EEPROM_ADDRESS_LENGTH);
break; break;
case EepromTransfer_WriteHardwareConfiguration: case EepromTransfer_WriteHardwareConfiguration: