WebSVN – freemyipod – Diff – /embios/trunk/target/ipodnano2g/ftl.c

 #endif
 static struct mutex ftl_mtx;
+bool ftl_initialized;
 /* Finds a device info page for the specified bank and returns its number.
    Used to check if one is present, and to read the lowlevel BBT. */
+{
     uint32_t i, j;
     uint32_t ppb = ftl_nand_type->pagesperblock * ftl_banks;
     uint32_t error = 0;
+    if (!ftl_initialized) return 1;
 #ifdef FTL_TRACE
     DEBUGF("FTL: Reading %d sectors starting at %d", count, sector);
 #endif
 	if ((uint32_t)buffer & (CACHEALIGN_SIZE - 1))
 uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer)
+{
     uint32_t i, j, k;
     uint32_t ppb = ftl_nand_type->pagesperblock * ftl_banks;
+    if (!ftl_initialized) return 1;
 #ifdef FTL_TRACE
     DEBUGF("FTL: Writing %d sectors starting at %d", count, sector);
 #endif
 	if ((uint32_t)buffer & (CACHEALIGN_SIZE - 1))
 uint32_t ftl_sync(void)
+{
     uint32_t i;
     uint32_t rc = 0;
     uint32_t ppb = ftl_nand_type->pagesperblock * ftl_banks;
+    if (!ftl_initialized) return 1;
     if (ftl_cxt.clean_flag == 1) return 0;
     mutex_lock(&ftl_mtx, TIMEOUT_BLOCK);
 #ifdef FTL_TRACE
         return 1;
+    }
     if (ftl_vfl_open() == 0)
+	{
         if (ftl_open() == 0)
+        {
+            ftl_initialized = true;
             return 0;
+        }
 		cprintf(CONSOLE_BOOT, "The FTL seems to be damaged. Forcing check.\n");
 		if (ftl_repair() != 0)
 			cprintf(CONSOLE_BOOT, "FTL recovery failed. Use disk mode to recover.\n");
 		else
+		{
 			cprintf(CONSOLE_BOOT, "FTL recovery finished. Trying to mount again...\n");
 	        if (ftl_open() == 0)
+            {
+                ftl_initialized = true;
-	            return 0;
+                return 0;
+            }
 			cprintf(CONSOLE_BOOT, "Mounting FTL failed again, use disk mode to recover.\n");
+		}
+	}
     DEBUGF("FTL: Initialization failed!");

Subversion Repositories freemyipod

(root)/embios/trunk/target/ipodnano2g/ftl.c @ 133 – Rev 124 → 128