X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_sdcard.c;h=7806bc194a6b910d946498d5a95c66bd258933ed;hb=2fa87754c5c11bb86e9b1878580c3d4f4b2463f5;hp=6073677a96745ddfbc69a37976e72e9c76a5edd2;hpb=b34370cea662eb245e43aca20a6650b84b55ef6f;p=fw%2Faltos

diff --git a/src/drivers/ao_sdcard.c b/src/drivers/ao_sdcard.c
index 6073677a..7806bc19 100644
--- a/src/drivers/ao_sdcard.c
+++ b/src/drivers/ao_sdcard.c
@@ -18,9 +18,18 @@
 #include "ao.h"
 #include "ao_sdcard.h"
 
-#define ao_sdcard_get_slow()		ao_spi_get(AO_SDCARD_SPI_BUS, AO_SPI_SPEED_250kHz)
-#define ao_sdcard_get()			ao_spi_get(AO_SDCARD_SPI_BUS, AO_SPI_SPEED_FAST)
-#define ao_sdcard_put()			ao_spi_put(AO_SDCARD_SPI_BUS)
+#if HAS_RADIO
+extern uint8_t ao_radio_mutex;
+#define get_radio()	ao_mutex_get(&ao_radio_mutex)
+#define put_radio()	ao_mutex_put(&ao_radio_mutex)
+#else
+#define get_radio()
+#define put_radio()
+#endif
+
+#define ao_sdcard_get_slow() do { get_radio(); ao_spi_get(AO_SDCARD_SPI_BUS, AO_SPI_SPEED_250kHz); } while (0)
+#define ao_sdcard_get()	do { get_radio(); ao_spi_get(AO_SDCARD_SPI_BUS, AO_SPI_SPEED_FAST); } while (0)
+#define ao_sdcard_put() do { ao_spi_put(AO_SDCARD_SPI_BUS); put_radio(); } while (0)
 #define ao_sdcard_send_fixed(d,l)	ao_spi_send_fixed((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_send(d,l)		ao_spi_send((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_recv(d,l)		ao_spi_recv((d), (l), AO_SDCARD_SPI_BUS)
@@ -28,7 +37,7 @@
 #define ao_sdcard_deselect()		ao_gpio_set(AO_SDCARD_SPI_CS_PORT,AO_SDCARD_SPI_CS_PIN,AO_SDCARD_SPI_CS,1)
 
 /* Include SD card commands */
-#define SDCARD_DEBUG	1
+#define SDCARD_DEBUG	0
 
 /* Spew SD tracing */
 #define SDCARD_TRACE	0
@@ -324,11 +333,11 @@ ao_sdcard_setup(void)
 	ao_sdcard_send_fixed(0xff, 10);
 
 	/* Reset the card and get it into SPI mode */
-	for (i = 0; i < SDCARD_IDLE_WAIT; i++) {
+	for (i = 0; i < SDCARD_IDLE_RETRY; i++) {
 		if (ao_sdcard_go_idle_state() == SDCARD_STATUS_IDLE_STATE)
 			break;
 	}
-	if (i == SDCARD_IDLE_WAIT)
+	if (i == SDCARD_IDLE_RETRY)
 		goto bail;
 
 	/* Figure out what kind of card we have */
@@ -344,14 +353,16 @@ ao_sdcard_setup(void)
 			sdver2 = 1;
 		}
 
-		for (i = 0; i < SDCARD_IDLE_WAIT; i++) {
+		for (i = 0; i < SDCARD_OP_COND_RETRY; i++) {
+			ao_delay(AO_MS_TO_TICKS(10));
 			ret = ao_sdcard_app_send_op_cond(arg);
 			if (ret != SDCARD_STATUS_IDLE_STATE)
 				break;
 		}
 		if (ret != SDCARD_STATUS_READY_STATE) {
 			/* MMC */
-			for (i = 0; i < SDCARD_IDLE_WAIT; i++) {
+			for (i = 0; i < SDCARD_OP_COND_RETRY; i++) {
+				ao_delay(AO_MS_TO_TICKS(10));
 				ret = ao_sdcard_send_op_cond();
 				if (ret != SDCARD_STATUS_IDLE_STATE)
 					break;
@@ -394,11 +405,11 @@ _ao_sdcard_reset(void)
 	uint8_t	ret;
 	uint8_t	response[10];
 
-	for (i = 0; i < SDCARD_IDLE_WAIT; i++) {
+	for (i = 0; i < SDCARD_IDLE_RETRY; i++) {
 		if (ao_sdcard_go_idle_state() == SDCARD_STATUS_IDLE_STATE)
 			break;
 	}
-	if (i == SDCARD_IDLE_WAIT) {
+	if (i == SDCARD_IDLE_RETRY) {
 		ret = 0x3f;
 		goto bail;
 	}
@@ -416,7 +427,7 @@ _ao_sdcard_reset(void)
 			sdver2 = 1;
 		}
 
-		for (i = 0; i < SDCARD_IDLE_WAIT; i++) {
+		for (i = 0; i < SDCARD_IDLE_RETRY; i++) {
 			ret = ao_sdcard_app_send_op_cond(arg);
 			if (ret != SDCARD_STATUS_IDLE_STATE)
 				break;
@@ -424,7 +435,7 @@ _ao_sdcard_reset(void)
 
 		if (ret != SDCARD_STATUS_READY_STATE) {
 			/* MMC */
-			for (i = 0; i < SDCARD_IDLE_WAIT; i++) {
+			for (i = 0; i < SDCARD_IDLE_RETRY; i++) {
 				ret = ao_sdcard_send_op_cond();
 				if (ret != SDCARD_STATUS_IDLE_STATE)
 					break;
@@ -686,6 +697,9 @@ static const struct ao_cmds ao_sdcard_cmds[] = {
 void
 ao_sdcard_init(void)
 {
+	stm_pupdr_set(AO_SDCARD_SPI_PORT, AO_SDCARD_SPI_SCK_PIN, STM_PUPDR_PULL_UP);
+	stm_pupdr_set(AO_SDCARD_SPI_PORT, AO_SDCARD_SPI_MISO_PIN, STM_PUPDR_PULL_UP);
+	stm_pupdr_set(AO_SDCARD_SPI_PORT, AO_SDCARD_SPI_MOSI_PIN, STM_PUPDR_PULL_UP);
 	ao_spi_init_cs(AO_SDCARD_SPI_CS_PORT, (1 << AO_SDCARD_SPI_CS_PIN));
 #if SDCARD_DEBUG
 	ao_cmd_register(&ao_sdcard_cmds[0]);