Changeset 574 for trunk/modules/sdmmc

Timestamp:

Nov 17, 2013, 3:47:26 PM (11 years ago)

Author:

bouyer

Message:

Try to be closer to a real sdmmc device: on rising edge really use the value
we had while the clock was low, not the value at the rising edge time.
This is to make the transfer fail if the MOSI line changes at rising clock
instead of falling clock as it should.

Location:

trunk/modules/sdmmc/caba/source

Files:

• include/sdmmc.h (modified) (1 diff)
• src/sdmmc.cpp (modified) (9 diffs)

trunk/modules/sdmmc/caba/source/include/sdmmc.h

@@ -59 +59 @@
     int               spi_bitcount;
     int               spi_clk;
+    int               spi_mosi_previous; // sampled MOSI value
 
     uint8_t           command;

trunk/modules/sdmmc/caba/source/src/sdmmc.cpp

@@ -60 +60 @@
         spi_fsm  = S_IDLE;
         spi_clk = p_spi_clk;
+        spi_mosi_previous = p_spi_mosi;
         return;
     }
@@ -67 +68 @@
         if (p_spi_clk.read() == 1 && spi_clk == 0) {
                 // rising edge
-                command = (command << 1) | p_spi_mosi;
+                command = (command << 1) | spi_mosi_previous;
                 spi_bitcount = 6;
                 spi_fsm = S_RECEIVE_CMD;
@@ -75 +76 @@
         if (p_spi_clk.read() == 1 && spi_clk == 0) {
                 // rising edge
-                command = (command << 1) | p_spi_mosi;
+                command = (command << 1) | spi_mosi_previous;
                 if (spi_bitcount == 0) {
                         if ((command & 0x80) == 0) {
@@ -93 +94 @@
         if (p_spi_clk.read() == 1 && spi_clk == 0) {
                 // rising edge
-                args = (args << 1) | p_spi_mosi;
+                args = (args << 1) | spi_mosi_previous;
                 spi_bitcount = 30;
                 spi_fsm = S_RECEIVE_ARGS;
@@ -101 +102 @@
         if (p_spi_clk.read() == 1 && spi_clk == 0) {
                 // rising edge
-                args = (args << 1) | p_spi_mosi;
+                args = (args << 1) | spi_mosi_previous;
                 if (spi_bitcount == 0) {
                         spi_bitcount = 7;
@@ -113 +114 @@
         if (p_spi_clk.read() == 1 && spi_clk == 0) {
                 // rising edge
-                cmdcrc = (cmdcrc << 1) | p_spi_mosi;
+                cmdcrc = (cmdcrc << 1) | spi_mosi_previous;
                 if (spi_bitcount == 0) {
                         handle_sdmmc_cmd(command, args);
@@ -154 +155 @@
             // rising edge
             uint8_t s_data;
-            s_data = (m_databuf[0] << 1) | p_spi_mosi;
+            s_data = (m_databuf[0] << 1) | spi_mosi_previous;
             m_databuf[0] = s_data;
             if (spi_bitcount == 0) {
@@ -178 +179 @@
             if (p_spi_clk.read() == 1 && spi_clk == 0) {
                 // rising edge
-                m_databuf[m_data_idx] = (m_databuf[m_data_idx] << 1) | p_spi_mosi;
+                m_databuf[m_data_idx] = (m_databuf[m_data_idx] << 1) | spi_mosi_previous;
                 if (spi_bitcount == 0) {
                     m_data_idx++;
@@ -215 +216 @@
     }
     spi_clk = p_spi_clk.read();
+    spi_mosi_previous = p_spi_mosi;
 } // end GenMealy()