Changeset 557

Timestamp:

Oct 23, 2013, 12:12:44 AM (10 years ago)

Author:

bouyer

Message:

Switch to using a mealy function. This seems to be the only way to get output
signals in sync with the spi_clk in all cases.
Now this model works in cosimulation with the VHDL spi controller.

Location:

trunk/modules/sdmmc/caba/source

Files:

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

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

@@ -81 +81 @@
 
     // methods
-    void transition();
-    void genMoore();
+    void genMealy();
 
     void handle_sdmmc_cmd(uint8_t, uint32_t);

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

@@ -40 +40 @@
 
 ////////////////////////
-void SdMMC::transition()
+void SdMMC::genMealy()
 {
     if(p_resetn.read() == false) 
@@ -200 +200 @@
             break;
     }
-    spi_clk = p_spi_clk.read();
-}  // end transition
-
-//////////////////////
-void SdMMC::genMoore()
-{
+
+//// now genrate output signal
+
     switch(spi_fsm) {
     case S_IDLE:
@@ -217 +214 @@
         break;
     }
-} // end GenMoore()
+    spi_clk = p_spi_clk.read();
+} // end GenMealy()
 
 
@@ -487 +485 @@
     std::cout << "  - Building SdMMC " << name << std::endl;
 
-        SC_METHOD(transition);
-    dont_initialize();
-    sensitive << p_clk.pos();
-
-        SC_METHOD(genMoore);
+    SC_METHOD(genMealy);
     dont_initialize();
     sensitive << p_clk.neg();
+    sensitive << p_resetn;
+    sensitive << p_spi_ss;
+    sensitive << p_spi_clk;
 
     m_fd = ::open(filename.c_str(), O_RDWR);