From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Wed, 10 Jun 2020 07:15:12 +0000 (+0200)
Subject: software/libsdcard/spisdcard: add and use busy_wait_us to optimize speed.
X-Git-Tag: 24jan2021_ls180~199
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5beba178f212e3b1f9e00bf0c44627c9e82a6139;p=litex.git

software/libsdcard/spisdcard: add and use busy_wait_us to optimize speed.
---

diff --git a/litex/soc/software/liblitesdcard/spisdcard.c b/litex/soc/software/liblitesdcard/spisdcard.c
index 069d638b..b6bf9a3f 100644
--- a/litex/soc/software/liblitesdcard/spisdcard.c
+++ b/litex/soc/software/liblitesdcard/spisdcard.c
@@ -114,15 +114,25 @@ static void spisdcardread_bytes(uint8_t* buf, uint16_t n) {
 /* SPI SDCard blocks Xfer functions                                      */
 /*-----------------------------------------------------------------------*/
 
+static void busy_wait_us(unsigned int us)
+{
+    timer0_en_write(0);
+    timer0_reload_write(0);
+    timer0_load_write(CONFIG_CLOCK_FREQUENCY/1000000*us);
+    timer0_en_write(1);
+    timer0_update_value_write(1);
+    while(timer0_value_read()) timer0_update_value_write(1);
+}
+
 static uint8_t spisdcardreceive_block(uint8_t *buf) {
-    uint16_t timeout;
+    uint32_t timeout;
 
     /* Wait 100ms for a start of block */
-    timeout = 100;
+    timeout = 100000;
     while(timeout > 0) {
         if (spi_xfer(0xff) == 0xfe)
             break;
-        busy_wait(1);
+        busy_wait_us(1);
         timeout--;
     }
     if (timeout == 0)