[Sky9x] EEPROM code moved to driver
This commit is contained in:
+22
-31
@@ -46,7 +46,7 @@
|
|||||||
#define EEPROM_ZONE_SIZE (8*1024)
|
#define EEPROM_ZONE_SIZE (8*1024)
|
||||||
#define EEPROM_BUFFER_SIZE 256
|
#define EEPROM_BUFFER_SIZE 256
|
||||||
#define EEPROM_FAT_SIZE 128
|
#define EEPROM_FAT_SIZE 128
|
||||||
#define EEPROM_MAX_ZONES (EEPROM_SIZE / EEPROM_ZONE_SIZE)
|
#define EEPROM_MAX_ZONES ((EEPROM_SIZE / EEPROM_ZONE_SIZE) - 1)
|
||||||
#define FIRST_FILE_AVAILABLE (1+MAX_MODELS)
|
#define FIRST_FILE_AVAILABLE (1+MAX_MODELS)
|
||||||
|
|
||||||
PACK(struct EepromHeaderFile
|
PACK(struct EepromHeaderFile
|
||||||
@@ -71,10 +71,6 @@ uint32_t eepromWriteDestinationAddr;
|
|||||||
uint16_t eepromFatAddr = 0;
|
uint16_t eepromFatAddr = 0;
|
||||||
uint8_t eepromWriteBuffer[EEPROM_BUFFER_SIZE];
|
uint8_t eepromWriteBuffer[EEPROM_BUFFER_SIZE];
|
||||||
|
|
||||||
#define COMMAND_BLOCK_ERASE 0x20
|
|
||||||
#define COMMAND_WRITE 0x02
|
|
||||||
#define COMMAND_READ 0x03
|
|
||||||
|
|
||||||
void eepromWaitSpiComplete()
|
void eepromWaitSpiComplete()
|
||||||
{
|
{
|
||||||
while (!Spi_complete) {
|
while (!Spi_complete) {
|
||||||
@@ -103,13 +99,8 @@ void eepromEraseBlock(uint32_t address, bool blocking=true)
|
|||||||
Spi_complete = false;
|
Spi_complete = false;
|
||||||
sem_post(eeprom_write_sem);
|
sem_post(eeprom_write_sem);
|
||||||
#else
|
#else
|
||||||
eeprom_write_enable();
|
eepromWriteEnable();
|
||||||
uint8_t * p = Spi_tx_buf;
|
eepromBlockErase(address);
|
||||||
*p = COMMAND_BLOCK_ERASE;
|
|
||||||
*(p+1) = address >> 16;
|
|
||||||
*(p+2) = address >> 8;
|
|
||||||
*(p+3) = address;
|
|
||||||
spi_PDC_action(p, 0, 0, 4, 0);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (blocking) {
|
if (blocking) {
|
||||||
@@ -131,12 +122,7 @@ void eepromRead(uint32_t address, uint8_t * buffer, uint32_t size, bool blocking
|
|||||||
Spi_complete = false;
|
Spi_complete = false;
|
||||||
sem_post(eeprom_write_sem);
|
sem_post(eeprom_write_sem);
|
||||||
#else
|
#else
|
||||||
uint8_t * p = Spi_tx_buf;
|
eepromReadArray(address, buffer, size);
|
||||||
*p = COMMAND_READ;
|
|
||||||
*(p+1) = address >> 16;
|
|
||||||
*(p+2) = address >> 8;
|
|
||||||
*(p+3) = address;
|
|
||||||
spi_PDC_action(p, 0, buffer, 4, size);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (blocking) {
|
if (blocking) {
|
||||||
@@ -157,13 +143,8 @@ void eepromWrite(uint32_t address, uint8_t * buffer, uint32_t size, bool blockin
|
|||||||
Spi_complete = false;
|
Spi_complete = false;
|
||||||
sem_post(eeprom_write_sem);
|
sem_post(eeprom_write_sem);
|
||||||
#else
|
#else
|
||||||
eeprom_write_enable();
|
eepromWriteEnable();
|
||||||
uint8_t * p = Spi_tx_buf;
|
eepromByteProgram(address, buffer, size);
|
||||||
*p = COMMAND_WRITE;
|
|
||||||
*(p+1) = address >> 16;
|
|
||||||
*(p+2) = address >> 8;
|
|
||||||
*(p+3) = address;
|
|
||||||
spi_PDC_action(p, buffer, 0, 4, size);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (blocking) {
|
if (blocking) {
|
||||||
@@ -196,7 +177,7 @@ bool eepromOpen()
|
|||||||
|
|
||||||
uint32_t readFile(int index, uint8_t * data, uint32_t size)
|
uint32_t readFile(int index, uint8_t * data, uint32_t size)
|
||||||
{
|
{
|
||||||
uint16_t fileSize;
|
uint16_t fileSize = 0;
|
||||||
uint32_t address = eepromHeader.files[index].zoneIndex * EEPROM_ZONE_SIZE;
|
uint32_t address = eepromHeader.files[index].zoneIndex * EEPROM_ZONE_SIZE;
|
||||||
eepromRead(address, (uint8_t *)&fileSize, sizeof(fileSize));
|
eepromRead(address, (uint8_t *)&fileSize, sizeof(fileSize));
|
||||||
if (size < fileSize) {
|
if (size < fileSize) {
|
||||||
@@ -292,7 +273,6 @@ void eeSwapModels(uint8_t id1, uint8_t id2)
|
|||||||
modelHeaders[id1] = modelHeaders[id2];
|
modelHeaders[id1] = modelHeaders[id2];
|
||||||
modelHeaders[id2] = tmp;
|
modelHeaders[id2] = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// For conversions ...
|
// For conversions ...
|
||||||
@@ -322,10 +302,14 @@ bool eeLoadGeneral()
|
|||||||
|
|
||||||
if (g_eeGeneral.version != EEPROM_VER) {
|
if (g_eeGeneral.version != EEPROM_VER) {
|
||||||
TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
|
TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
|
||||||
if (!eeConvert())
|
#if defined(PCBSKY9X)
|
||||||
|
if (!eeConvert()) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -423,7 +407,6 @@ void eeErase(bool warn)
|
|||||||
MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING);
|
MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING);
|
||||||
|
|
||||||
eepromFormat();
|
eepromFormat();
|
||||||
|
|
||||||
eeDirty(EE_GENERAL);
|
eeDirty(EE_GENERAL);
|
||||||
eeDirty(EE_MODEL);
|
eeDirty(EE_MODEL);
|
||||||
eeCheck(true);
|
eeCheck(true);
|
||||||
@@ -446,6 +429,7 @@ void eeCheck(bool immediately)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (s_eeDirtyMsk & EE_GENERAL) {
|
if (s_eeDirtyMsk & EE_GENERAL) {
|
||||||
|
TRACE("eeprom write general");
|
||||||
s_eeDirtyMsk -= EE_GENERAL;
|
s_eeDirtyMsk -= EE_GENERAL;
|
||||||
writeGeneralSettings();
|
writeGeneralSettings();
|
||||||
if (immediately)
|
if (immediately)
|
||||||
@@ -455,6 +439,7 @@ void eeCheck(bool immediately)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (s_eeDirtyMsk & EE_MODEL) {
|
if (s_eeDirtyMsk & EE_MODEL) {
|
||||||
|
TRACE("eeprom write model");
|
||||||
s_eeDirtyMsk -= EE_MODEL;
|
s_eeDirtyMsk -= EE_MODEL;
|
||||||
writeModel(g_eeGeneral.currModel);
|
writeModel(g_eeGeneral.currModel);
|
||||||
if (immediately)
|
if (immediately)
|
||||||
@@ -591,8 +576,10 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
|
|||||||
return SDCARD_ERROR(result);
|
return SDCARD_ERROR(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(PCBSKY9X)
|
||||||
strcpy(statusLineMsg, PSTR("File "));
|
strcpy(statusLineMsg, PSTR("File "));
|
||||||
strcpy(statusLineMsg+5, &buf[sizeof(MODELS_PATH)]);
|
strcpy(statusLineMsg+5, &buf[sizeof(MODELS_PATH)]);
|
||||||
|
#endif
|
||||||
|
|
||||||
uint16_t size = eeModelSize(i_fileSrc);
|
uint16_t size = eeModelSize(i_fileSrc);
|
||||||
|
|
||||||
@@ -621,7 +608,11 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
|
|||||||
}
|
}
|
||||||
|
|
||||||
f_close(&archiveFile);
|
f_close(&archiveFile);
|
||||||
|
|
||||||
|
#if defined(PCBSKY9X)
|
||||||
showStatusLine();
|
showStatusLine();
|
||||||
|
#endif
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -700,7 +691,7 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name)
|
|||||||
|
|
||||||
eeLoadModelHeader(i_fileDst, &modelHeaders[i_fileDst]);
|
eeLoadModelHeader(i_fileDst, &modelHeaders[i_fileDst]);
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(PCBSKY9X)
|
||||||
if (version < EEPROM_VER) {
|
if (version < EEPROM_VER) {
|
||||||
ConvertModel(i_fileDst, version);
|
ConvertModel(i_fileDst, version);
|
||||||
loadModel(g_eeGeneral.currModel);
|
loadModel(g_eeGeneral.currModel);
|
||||||
|
|||||||
@@ -38,9 +38,8 @@
|
|||||||
|
|
||||||
volatile uint32_t Spi_complete;
|
volatile uint32_t Spi_complete;
|
||||||
uint8_t Spi_tx_buf[24] ;
|
uint8_t Spi_tx_buf[24] ;
|
||||||
uint8_t Spi_rx_buf[24] ;
|
|
||||||
|
|
||||||
uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count )
|
uint32_t eepromTransmitData(register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count )
|
||||||
{
|
{
|
||||||
#ifndef SIMU
|
#ifndef SIMU
|
||||||
|
|
||||||
@@ -98,103 +97,90 @@ uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, regist
|
|||||||
return 0 ;
|
return 0 ;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t spi_operation( register uint8_t *tx, register uint8_t *rx, register uint32_t count )
|
uint8_t eepromTransmitByte(uint8_t out, bool skipFirst)
|
||||||
{
|
{
|
||||||
register Spi *spiptr;
|
register Spi *spiptr;
|
||||||
register uint32_t result;
|
register uint32_t delay;
|
||||||
|
|
||||||
result = 0;
|
|
||||||
spiptr = SPI;
|
spiptr = SPI;
|
||||||
spiptr->SPI_CR = 1; // Enable
|
spiptr->SPI_CR = 1; // Enable
|
||||||
(void) spiptr->SPI_RDR; // Dump any rx data
|
(void) spiptr->SPI_RDR; // Dump any rx data
|
||||||
|
|
||||||
while (count) {
|
spiptr->SPI_TDR = out;
|
||||||
result = 0;
|
|
||||||
while ((spiptr->SPI_SR & SPI_SR_TXEMPTY) == 0) {
|
delay = 0;
|
||||||
// wait
|
while ((spiptr->SPI_SR & SPI_SR_RDRF) == 0) {
|
||||||
if (++result > 10000) {
|
// wait for received
|
||||||
result = 0xFFFF;
|
if (++delay > 10000) {
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (result > 10000) {
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
spiptr->SPI_TDR = *tx++;
|
if (skipFirst) {
|
||||||
result = 0;
|
(void) spiptr->SPI_RDR; // Dump the rx data
|
||||||
|
spiptr->SPI_TDR = 0;
|
||||||
|
delay = 0;
|
||||||
while ((spiptr->SPI_SR & SPI_SR_RDRF) == 0) {
|
while ((spiptr->SPI_SR & SPI_SR_RDRF) == 0) {
|
||||||
// wait for received
|
// wait for received
|
||||||
if (++result > 10000) {
|
if (++delay > 10000) {
|
||||||
result = 0x2FFFF;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (result > 10000) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
*rx++ = spiptr->SPI_RDR;
|
|
||||||
count -= 1;
|
|
||||||
}
|
}
|
||||||
if (result <= 10000) {
|
|
||||||
result = 0;
|
|
||||||
}
|
|
||||||
spiptr->SPI_CR = 2; // Disable
|
|
||||||
|
|
||||||
return result ;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t eeprom_write_one(uint8_t byte, uint8_t count)
|
|
||||||
{
|
|
||||||
#ifndef SIMU
|
|
||||||
register Spi *spiptr;
|
|
||||||
register uint32_t result;
|
|
||||||
|
|
||||||
spiptr = SPI;
|
|
||||||
spiptr->SPI_CR = 1; // Enable
|
|
||||||
(void) spiptr->SPI_RDR; // Dump any rx data
|
|
||||||
|
|
||||||
spiptr->SPI_TDR = byte;
|
|
||||||
|
|
||||||
result = 0;
|
|
||||||
while ((spiptr->SPI_SR & SPI_SR_RDRF) == 0) {
|
|
||||||
// wait for received
|
|
||||||
if (++result > 10000) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (count == 0) {
|
|
||||||
spiptr->SPI_CR = 2; // Disable
|
|
||||||
return spiptr->SPI_RDR;
|
|
||||||
}
|
|
||||||
(void) spiptr->SPI_RDR; // Dump the rx data
|
|
||||||
spiptr->SPI_TDR = 0;
|
|
||||||
result = 0;
|
|
||||||
while ((spiptr->SPI_SR & SPI_SR_RDRF) == 0) {
|
|
||||||
// wait for received
|
|
||||||
if (++result > 10000) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
spiptr->SPI_CR = 2; // Disable
|
spiptr->SPI_CR = 2; // Disable
|
||||||
return spiptr->SPI_RDR ;
|
return spiptr->SPI_RDR ;
|
||||||
#else
|
|
||||||
return !Spi_complete;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void eeprom_write_enable()
|
enum EepromCommand {
|
||||||
|
COMMAND_WRITE_STATUS_REGISTER = 0x01,
|
||||||
|
COMMAND_BYTE_PROGRAM = 0x02,
|
||||||
|
COMMAND_READ_ARRAY = 0x03,
|
||||||
|
COMMAND_READ_STATUS = 0x05,
|
||||||
|
COMMAND_WRITE_ENABLE = 0x06,
|
||||||
|
COMMAND_BLOCK_ERASE = 0x20,
|
||||||
|
};
|
||||||
|
|
||||||
|
void eepromPrepareCommand(EepromCommand command, uint32_t address)
|
||||||
{
|
{
|
||||||
eeprom_write_one(6, 0);
|
uint8_t * p = Spi_tx_buf;
|
||||||
|
*p = command;
|
||||||
|
*(p+1) = address >> 16;
|
||||||
|
*(p+2) = address >> 8;
|
||||||
|
*(p+3) = address;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t eepromReadStatus()
|
uint32_t eepromReadStatus()
|
||||||
{
|
{
|
||||||
#if defined(SIMU)
|
return eepromTransmitByte(COMMAND_READ_STATUS, true);
|
||||||
return 0;
|
}
|
||||||
#else
|
|
||||||
return eeprom_write_one(5, 1);
|
void eepromWriteStatusRegister()
|
||||||
#endif
|
{
|
||||||
|
eepromTransmitByte(COMMAND_WRITE_STATUS_REGISTER, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void eepromByteProgram(uint32_t address, uint8_t * buffer, uint32_t size)
|
||||||
|
{
|
||||||
|
eepromPrepareCommand(COMMAND_BYTE_PROGRAM, address);
|
||||||
|
eepromTransmitData(Spi_tx_buf, buffer, 0, 4, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void eepromReadArray(uint32_t address, uint8_t * buffer, uint32_t size)
|
||||||
|
{
|
||||||
|
eepromPrepareCommand(COMMAND_READ_ARRAY, address);
|
||||||
|
eepromTransmitData(Spi_tx_buf, 0, buffer, 4, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void eepromWriteEnable()
|
||||||
|
{
|
||||||
|
eepromTransmitByte(COMMAND_WRITE_ENABLE, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void eepromBlockErase(uint32_t address)
|
||||||
|
{
|
||||||
|
eepromPrepareCommand(COMMAND_BLOCK_ERASE, address);
|
||||||
|
eepromTransmitData(Spi_tx_buf, 0, 0, 4, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// SPI i/f to EEPROM (4Mb)
|
// SPI i/f to EEPROM (4Mb)
|
||||||
@@ -209,8 +195,6 @@ void eepromInit()
|
|||||||
{
|
{
|
||||||
register Spi *spiptr ;
|
register Spi *spiptr ;
|
||||||
register uint32_t timer ;
|
register uint32_t timer ;
|
||||||
register uint8_t *p ;
|
|
||||||
uint8_t spi_buf[4] ;
|
|
||||||
|
|
||||||
PMC->PMC_PCER0 |= 0x00200000L ; // Enable peripheral clock to SPI
|
PMC->PMC_PCER0 |= 0x00200000L ; // Enable peripheral clock to SPI
|
||||||
/* Configure PIO */
|
/* Configure PIO */
|
||||||
@@ -222,20 +206,8 @@ void eepromInit()
|
|||||||
spiptr->SPI_CSR[0] = 0x01180009 | timer ; // 0000 0001 0001 1000 xxxx xxxx 0000 1001
|
spiptr->SPI_CSR[0] = 0x01180009 | timer ; // 0000 0001 0001 1000 xxxx xxxx 0000 1001
|
||||||
NVIC_EnableIRQ(SPI_IRQn) ;
|
NVIC_EnableIRQ(SPI_IRQn) ;
|
||||||
|
|
||||||
p = spi_buf ;
|
eepromWriteEnable();
|
||||||
|
eepromWriteStatusRegister();
|
||||||
// *p = 0x39 ; // Unprotect sector command
|
|
||||||
// *(p+1) = 0 ;
|
|
||||||
// *(p+2) = 0 ;
|
|
||||||
// *(p+3) = 0 ; // 3 bytes address
|
|
||||||
|
|
||||||
// spi_operation( p, spi_buf, 4 ) ;
|
|
||||||
|
|
||||||
eeprom_write_enable() ;
|
|
||||||
|
|
||||||
*p = 1 ; // Write status register command
|
|
||||||
*(p+1) = 0 ;
|
|
||||||
spi_operation( p, spi_buf, 2 ) ;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef SIMU
|
#ifndef SIMU
|
||||||
@@ -255,28 +227,3 @@ extern "C" void SPI_IRQHandler()
|
|||||||
// PMC->PMC_PCER0 &= ~0x00200000L ; // Disable peripheral clock to SPI
|
// PMC->PMC_PCER0 &= ~0x00200000L ; // Disable peripheral clock to SPI
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void end_spi()
|
|
||||||
{
|
|
||||||
SPI->SPI_CR = 2 ; // Disable
|
|
||||||
SPI->SPI_IDR = 0x07FF ; // All interrupts off
|
|
||||||
NVIC_DisableIRQ(SPI_IRQn) ;
|
|
||||||
}
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
uint32_t unprotect_eeprom()
|
|
||||||
{
|
|
||||||
register uint8_t *p;
|
|
||||||
|
|
||||||
eeprom_write_enable();
|
|
||||||
|
|
||||||
p = Spi_tx_buf;
|
|
||||||
*p = 0x39; // Unprotect sector command
|
|
||||||
*(p + 1) = 0;
|
|
||||||
*(p + 2) = 0;
|
|
||||||
*(p + 3) = 0; // 3 bytes address
|
|
||||||
|
|
||||||
return spi_operation( p, Spi_rx_buf, 4 ) ;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user