eepromCheck called inside eepromOpen

radio/src/eeprom_common.cpp

@@ -84,8 +84,7 @@ void eeLoadModelHeaders()
 
 void eeReadAll()
 {
-  // TODO merge eepromOpen and eepromCheck
-  if (!eepromOpen() || eepromCheck() < 0 || !eeLoadGeneral()) {
+  if (!eepromOpen() || !eeLoadGeneral()) {
     eeErase(true);
   }
   else {

radio/src/eeprom_raw.cpp

@@ -195,11 +195,6 @@ bool eepromOpen()
   }
 }
 
-bool eepromCheck()
-{
-  return true;
-}
-
 uint32_t readFile(int index, uint8_t * data, uint32_t size)
 {
   uint16_t fileSize;

radio/src/eeprom_raw.h

@@ -79,6 +79,5 @@ extern EepromWriteState eepromWriteState;
 void eepromWriteProcess();
 void eepromWriteWait(EepromWriteState state = EEPROM_IDLE);
 bool eepromOpen();
-bool eepromCheck();
 
 #endif

radio/src/eeprom_rlc.cpp

@@ -187,13 +187,13 @@ static void EeFsFree(blkid_t blk)
   blkid_t i = blk;
   blkid_t tmp;
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
   freeBlocks++;
 #endif
 
   while ((tmp=EeFsGetLink(i))) {
     i = tmp;
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
     freeBlocks++;
 #endif
   }
@@ -203,7 +203,7 @@ static void EeFsFree(blkid_t blk)
   EeFsFlushFreelist();
 }
 
-int8_t eepromCheck()
+void eepromCheck()
 {
   ENABLE_SYNC_WRITE(true);
 
@@ -211,11 +211,11 @@ int8_t eepromCheck()
   memclear(bufp, BLOCKS);
   blkid_t blk ;
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
   blkid_t blocksCount;
 #endif
   for (uint8_t i=0; i<=MAXFILES; i++) {
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
     blocksCount = 0;
 #endif
     blkid_t *startP = (i==MAXFILES ? &eeFs.freeList : &eeFs.files[i].startBlk);
@@ -236,7 +236,7 @@ int8_t eepromCheck()
         blk = 0; // abort
       }
       else {
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
         blocksCount++;
 #endif
         bufp[blk] = i+1;
@@ -246,13 +246,13 @@ int8_t eepromCheck()
     }
   }
 
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
   freeBlocks = blocksCount;
 #endif
 
   for (blk=FIRSTBLK; blk<BLOCKS; blk++) {
     if (!bufp[blk]) { // unused block
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
       freeBlocks++;
 #endif
       EeFsSetLink(blk, eeFs.freeList);
@@ -262,8 +262,6 @@ int8_t eepromCheck()
   }
 
   ENABLE_SYNC_WRITE(false);
-
-  return 0;
 }
 
 void eepromFormat()
@@ -280,7 +278,7 @@ void eepromFormat()
   }
   EeFsSetLink(BLOCKS-1, 0);
   eeFs.freeList = FIRSTBLK;
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
   freeBlocks = BLOCKS;
 #endif
   EeFsFlush();
@@ -301,7 +299,12 @@ bool eepromOpen()
   }
 #endif  
 
-  return eeFs.version == EEFS_VERS && eeFs.mySize == sizeof(eeFs);
+  if (eeFs.version != EEFS_VERS || eeFs.mySize != sizeof(eeFs)) {
+    return false;
+  }
+
+  eepromCheck();
+  return true;
 }
 
 bool EFile::exists(uint8_t i_fileId)
@@ -432,7 +435,7 @@ void RlcFile::nextWriteStep()
   if (!m_currBlk && m_pos==0) {
     eeFs.files[FILE_TMP].startBlk = m_currBlk = eeFs.freeList;
     if (m_currBlk) {
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
       freeBlocks--;
 #endif
       eeFs.freeList = EeFsGetLink(m_currBlk);
@@ -471,7 +474,7 @@ void RlcFile::nextWriteStep()
     switch (m_write_step & 0x0f) {
       case WRITE_NEXT_LINK_1:
         m_currBlk = eeFs.freeList;
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
         freeBlocks--;
 #endif
         eeFs.freeList = EeFsGetLink(eeFs.freeList);
@@ -801,12 +804,12 @@ void RlcFile::nextRlcWriteStep()
         // TODO reuse EeFsFree!!!
         blkid_t prev_freeList = eeFs.freeList;
         eeFs.freeList = fri;
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
         freeBlocks++;
 #endif
         while (EeFsGetLink(fri)) {
           fri = EeFsGetLink(fri);
-#if defined(PCBTARANIS)
+#if defined(CPUARM)
           freeBlocks++;
 #endif
         }

radio/src/eeprom_rlc.h

@@ -116,7 +116,6 @@ extern EeFs eeFs;
 #define BLOCKS_OFFSET (RESV-BS)
 #endif
 
-int8_t eepromCheck();
 void eepromFormat();
 uint16_t EeFsGetFree();