rtio: always read full DMA sequence

sbourdeauducq · sbourdeauducq · commit f3c50a37caa9 · 2016-12-06T01:05:47.000+08:00
diff --git a/artiq/gateware/rtio/dma.py b/artiq/gateware/rtio/dma.py
@@ -350,12 +350,12 @@ def __init__(self, membus):
         self.submodules += fsm
 
         fsm.act("IDLE",
-            If(self.enable.re & self.enable.r, NextState("FLOWING"))
+            If(self.enable.re, NextState("FLOWING"))
         )
         fsm.act("FLOWING",
             self.enable.w.eq(1),
             flow_enable.eq(1),
-            If(self.slicer.end_marker_found | (self.enable.re & ~self.enable.r),
+            If(self.slicer.end_marker_found,
                 NextState("FLUSH")
             )
         )

Original file line number	Diff line number	Diff line change
`@@ -350,12 +350,12 @@ def __init__(self, membus):`
`350`	`350`	`self.submodules += fsm`
`351`	`351`
`352`	`352`	`fsm.act("IDLE",`
`353`		`- If(self.enable.re & self.enable.r, NextState("FLOWING"))`
	`353`	`+ If(self.enable.re, NextState("FLOWING"))`
`354`	`354`	`)`
`355`	`355`	`fsm.act("FLOWING",`
`356`	`356`	`self.enable.w.eq(1),`
`357`	`357`	`flow_enable.eq(1),`
`358`		`- If(self.slicer.end_marker_found \| (self.enable.re & ~self.enable.r),`
	`358`	`+ If(self.slicer.end_marker_found,`
`359`	`359`	`NextState("FLUSH")`
`360`	`360`	`)`
`361`	`361`	`)`