From e473c6f29ef99d9ecd6cbce4d13f7a066be3c929 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 6 Jul 2020 20:07:06 +0200 Subject: [PATCH] liblitesdcard/sdcard: add timeout when waiting card to be ready. --- litex/soc/software/liblitesdcard/sdcard.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/litex/soc/software/liblitesdcard/sdcard.c b/litex/soc/software/liblitesdcard/sdcard.c index 48959b50..440c8f61 100644 --- a/litex/soc/software/liblitesdcard/sdcard.c +++ b/litex/soc/software/liblitesdcard/sdcard.c @@ -448,6 +448,7 @@ void sdcard_decode_csd(void) { int sdcard_init(void) { unsigned short rca; + uint16_t timeout; /* initialize freq */ sdcard_set_clk_freq(16000000); @@ -461,15 +462,18 @@ int sdcard_init(void) { busy_wait(1); sdcard_send_ext_csd(); /* wait for card to be ready */ - /* FIXME: 1.8v support */ - for(;;) { + timeout = 10; + while (timeout) { sdcard_app_cmd(0); sdcard_app_send_op_cond(1, 0); if (sdcard_response[3] & 0x80000000) { break; } busy_wait(1); + timeout--; } + if (timeout == 0) + return 0; /* send identification */ sdcard_all_send_cid(); -- 2.30.2