[drivers] mmc.c increase timeouts

Signed-off-by: Christopher Hall <hsw@openmoko.com>
wikireader · Oct 7, 2009 · f469b93 · f469b93
1 parent 2de4326
commit f469b93
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/samo-lib/drivers/src/mmc.c b/samo-lib/drivers/src/mmc.c
@@ -84,7 +84,7 @@ static inline BYTE spi_receive(void)
 
 static BYTE wait_ready(void)
 {
-	int timeout = 500000;
+	int timeout = 2000000;
 	BYTE res = spi_receive();
 
 	while ((res != 0xff) && timeout--) {
@@ -297,16 +297,21 @@ DSTATUS disk_poll(BYTE drv)
 DSTATUS mmc_disk_initialize(BYTE drv)
 {
 	BYTE n, cmd, ty, ocr[4];
-	DWORD timeout = 10000;
-
-	cache_init();
+	DWORD timeout = 1000000;
 
 	if (drv) {
 		return STA_NOINIT;			// Supports only single drive
 	}
+
+	if (chk_power()) {
+		turn_off_power();			// Power off
+		delay_us(25000);
+	}
+
+	cache_init();
+
 //	if (Stat & STA_NODISK) return Stat;		// No card in the socket
 
-	//REG_SPI_CTL1 = 0x03 | (7 << 10) | (0 << 4);
 	REG_SPI_CTL1 =
 		BPT_8_BITS |
 		//CPHA |