From 2ed15a83883d26bbb6f9df64bd7ee45eb981285b Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 20 Apr 2015 18:08:04 +0200
Subject: [PATCH] [Sky9x] EEPROM format change Addresses remarks from Mike
 about new EEPROM format

---
 radio/src/eeprom_raw.cpp | 29 +++++++++++++++++------------
 radio/src/eeprom_raw.h   |  3 ---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/radio/src/eeprom_raw.cpp b/radio/src/eeprom_raw.cpp
index cc7fd3617..63d515101 100644
--- a/radio/src/eeprom_raw.cpp
+++ b/radio/src/eeprom_raw.cpp
@@ -58,6 +58,7 @@ PACK(struct EepromHeaderFile
 PACK(struct EepromHeader
 {
   uint32_t         mark;
+  uint32_t         index;
   EepromHeaderFile files[EEPROM_MAX_FILES];
 });
 
@@ -174,16 +175,24 @@ void eepromWrite(uint32_t address, uint8_t * buffer, uint32_t size, bool blockin
 
 bool eepromOpen()
 {
+  int32_t bestFatAddr = -1;
+  uint32_t bestFatIndex = 0;
   eepromFatAddr = 0;
   while (eepromFatAddr < EEPROM_FILE_SIZE) {
-    eepromRead(eepromFatAddr, (uint8_t *)&eepromHeader, sizeof(eepromHeader.mark));
-    if (eepromHeader.mark == EEPROM_MARK) {
-      eepromRead(eepromFatAddr, (uint8_t *)&eepromHeader, sizeof(eepromHeader));
-      return true;
+    eepromRead(eepromFatAddr, (uint8_t *)&eepromHeader, sizeof(eepromHeader.mark) + sizeof(eepromHeader.index));
+    if (eepromHeader.mark == EEPROM_MARK && eepromHeader.index >= bestFatIndex) {
+      bestFatAddr = eepromFatAddr;
     }
     eepromFatAddr += EEPROM_FAT_SIZE;
   }
-  return false;
+  if (bestFatAddr >= 0) {
+    eepromFatAddr = bestFatAddr;
+    eepromRead(eepromFatAddr, (uint8_t *)&eepromHeader, sizeof(eepromHeader));  
+    return true;
+  }
+  else {
+    return false;
+  }
 }
 
 bool eepromCheck()
@@ -212,6 +221,7 @@ uint32_t readFile(int index, uint8_t * data, uint32_t size)
 void eepromIncFatAddr()
 {
   eepromPreviousFatAddr = eepromFatAddr;
+  eepromHeader.index += 1;
   eepromFatAddr += EEPROM_FAT_SIZE;
   if (eepromFatAddr >= EEPROM_FILE_SIZE) {
     eepromFatAddr = 0;
@@ -397,11 +407,13 @@ void eepromFormat()
 {
   eepromFatAddr = 0;
   eepromHeader.mark = EEPROM_MARK;
+  eepromHeader.index = 0;
   for (int i=0; i<EEPROM_MAX_FILES; i++) {
     eepromHeader.files[i].exists = 0;
     eepromHeader.files[i].index = i+1;
   }
   eepromEraseBlock(0);
+  eepromEraseBlock(EEPROM_BLOCK_SIZE);
   eepromWrite(0, (uint8_t *)&eepromHeader, sizeof(eepromHeader));
 }
 
@@ -470,7 +482,6 @@ void eepromWriteProcess()
     case EEPROM_WRITING_BUFFER_WAIT:
     case EEPROM_ERASING_FAT_BLOCK_WAIT:
     case EEPROM_WRITING_NEW_FAT_WAIT:
-    case EEPROM_OVERWRITING_OLD_FAT_WAIT:
       if ((eepromReadStatus() & 1) == 0)
         eepromWriteState = EepromWriteState(eepromWriteState + 1);
       break;
@@ -523,12 +534,6 @@ void eepromWriteProcess()
       eepromWrite(eepromFatAddr, (uint8_t *)&eepromHeader, sizeof(eepromHeader), false);
       break;
 
-    case EEPROM_OVERWRITE_OLD_FAT:
-      memset(eepromWriteBuffer, 0, EEPROM_FAT_SIZE);
-      eepromWriteState = EEPROM_OVERWRITING_OLD_FAT;
-      eepromWrite(eepromPreviousFatAddr, eepromWriteBuffer, EEPROM_FAT_SIZE, false);
-      break;
-
     case EEPROM_END_WRITE:
       eepromWriteState = EEPROM_IDLE;
       break;
diff --git a/radio/src/eeprom_raw.h b/radio/src/eeprom_raw.h
index 3f36cbe3a..e4a990167 100644
--- a/radio/src/eeprom_raw.h
+++ b/radio/src/eeprom_raw.h
@@ -72,9 +72,6 @@ enum EepromWriteState {
   EEPROM_WRITE_NEW_FAT,
   EEPROM_WRITING_NEW_FAT,
   EEPROM_WRITING_NEW_FAT_WAIT,
-  EEPROM_OVERWRITE_OLD_FAT,
-  EEPROM_OVERWRITING_OLD_FAT,
-  EEPROM_OVERWRITING_OLD_FAT_WAIT,
   EEPROM_END_WRITE
 };