Changeset 595 for trunk/modules/vci_spi/caba

Timestamp:

Dec 9, 2013, 6:51:12 PM (11 years ago)

Author:

bouyer

Message:

Sync with VHDL, make IRQ work for DMA.

Location:

trunk/modules/vci_spi/caba/source

Files:

• include/vci_spi.h (modified) (1 diff)
• src/vci_spi.cpp (modified) (7 diffs)

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

@@ -122 +122 @@
     M_READ_CMD          = 2,
     M_READ_RSP          = 3,
-    M_READ_END          = 4,
+    M_INTR              = 4,
     M_WRITE_WAIT        = 5,
     M_WRITE_CMD         = 6,

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

@@ -59 +59 @@
         r_spi_bsy         = false;
         r_dma_count       = 0;
+        r_dma_error       = false;
         r_spi_clk_counter = 0xffff;
         r_spi_clk         = 0;
@@ -178 +179 @@
 #endif
                     } else {
-                        r_irq = r_irq & r_spi_bsy;
+                        r_irq = false;
                     }
                     r_target_fsm = (p_vci_target.cmd.read() == vci_param::CMD_WRITE) ? T_RSP_WRITE : T_RSP_READ;
@@ -417 +418 @@
                 r_dma_count = 0;
                 r_dma_error = true;
-                r_initiator_fsm = M_READ_END;
+                r_initiator_fsm = M_INTR;
 #ifdef SOCLIB_MODULE_DEBUG
                 std::cout << "vci_bd M_READ_ERROR" << std::endl;
@@ -425 +426 @@
             {
                 r_dma_count = 0;
-                r_initiator_fsm = M_READ_END;
+                r_initiator_fsm = M_INTR;
                 r_dma_error = false;
 #ifdef SOCLIB_MODULE_DEBUG
@@ -440 +441 @@
     }
     ///////////////////
-    case M_READ_END: 
-        // wait one cycle because VHDL can't update r_dma_count
-        // in the same cycle as going back IDLE
+    case M_INTR: 
         r_initiator_fsm = M_IDLE;
+        r_irq = true;
         break;
     ///////////////////
@@ -502 +502 @@
     {
         if (r_spi_fsm == S_IDLE) { // write complete
-            r_initiator_fsm  = M_IDLE;
+            r_initiator_fsm  = M_INTR;
         }
         break;
@@ -739 +739 @@
                 "M_READ_CMD",
                 "M_READ_RSP",
-                "M_READ_END",
+                "M_INTR",
 
                 "M_WRITE_WAIT",