X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_sdcard.h;h=50b70c73fd24a1d63d2dc67e226fa34915586f21;hp=512439b4bc1e2b77c0d5e8eaceec521d23699efd;hb=b4eba3f3a58a9c35e3699ff14405b997c1318d91;hpb=182ceaac7d91dc6e9ebac6455d5de0c10687796b

diff --git a/src/drivers/ao_sdcard.h b/src/drivers/ao_sdcard.h
index 512439b4..50b70c73 100644
--- a/src/drivers/ao_sdcard.h
+++ b/src/drivers/ao_sdcard.h
@@ -49,9 +49,14 @@ ao_sdcard_init(void);
 #define SDCARD_APP_SEND_OP_COMD			41
 
 /* Status */
-#define SDCARD_STATUS_READY_STATE	0
-#define SDCARD_STATUS_IDLE_STATE	1
-#define SDCARD_STATUS_ILLEGAL_COMMAND	4
+#define SDCARD_STATUS_READY_STATE	0x00
+#define SDCARD_STATUS_IDLE_STATE	0x01
+#define SDCARD_STATUS_ERASE_RESET	0x02
+#define SDCARD_STATUS_ILLEGAL_COMMAND	0x04
+#define SDCARD_STATUS_COM_CRC_ERROR	0x08
+#define SDCARD_STATUS_ERASE_SEQ_ERROR	0x10
+#define SDCARD_STATUS_ADDRESS_ERROR	0x20
+#define SDCARD_STATUS_PARAMETER_ERROR	0x40
 #define SDCARD_STATUS_TIMEOUT		0xff
 
 #define SDCARD_DATA_START_BLOCK		0xfe
@@ -60,10 +65,11 @@ ao_sdcard_init(void);
 #define SDCARD_DATA_RES_MASK		0x1f
 #define SDCARD_DATA_RES_ACCEPTED	0x05
 
-#define SDCARD_CMD_TIMEOUT		100
-#define SDCARD_IDLE_WAIT		1000
-#define SDCARD_BLOCK_TIMEOUT		100
-#define SDCARD_IDLE_TIMEOUT		1000
+#define SDCARD_CMD_TIMEOUT		AO_MS_TO_TICKS(20)
+#define SDCARD_BUSY_TIMEOUT		AO_MS_TO_TICKS(20)
+#define SDCARD_BLOCK_TIMEOUT		AO_MS_TO_TICKS(200)
+#define SDCARD_IDLE_RETRY		10
+#define SDCARD_OP_COND_RETRY		10
 
 enum ao_sdtype {
 	ao_sdtype_unknown,