From 88748bd74fbd2a9394b1a4b8e3837c0a165e8652 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Sat, 23 Mar 2013 12:26:22 +0100
Subject: [PATCH] simplify recorder

---
 miscope/recorder.py | 56 ++++++++++++++++-----------------------------
 miscope/trigger.py  |  8 +++----
 2 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/miscope/recorder.py b/miscope/recorder.py
index af6c6cfc9..caebb7a5e 100644
--- a/miscope/recorder.py
+++ b/miscope/recorder.py
@@ -71,7 +71,7 @@ class Storage:
 		sync =[ 
 			If(fsm.entering(fsm.ACTIVE),
 				self._push_ptr_stop.eq(self._push_ptr + self.size - self.offset),
-				self._pull_ptr.eq(self._push_ptr-self.offset - 1)	
+				self._pull_ptr.eq(self._push_ptr - self.offset - 1)	
 			).Else(
 				If(self.pull_stb, self._pull_ptr.eq(self._pull_ptr + 1))
 			),
@@ -85,26 +85,18 @@ class Sequencer:
 	# 
 	# Definition
 	#
-	def __init__(self,depth):
-		self.depth = depth
-		self.depth_width = bits_for(self.depth)
+	def __init__(self):
 		
 		# Controller interface
-		self.ctl_rst = Signal()
-		self.ctl_offset = Signal(self.depth_width)
-		self.ctl_size = Signal(self.depth_width)
-		self.ctl_arm = Signal()
-		self.ctl_done = Signal()
-		self._ctl_arm_d = Signal()
+		self.rst = Signal()
+		self.arm = Signal()
 		
 		# Trigger interface
 		self.hit  = Signal()
 		
 		# Recorder interface
-		self.rec_offset = Signal(self.depth_width)
-		self.rec_size = Signal(self.depth_width)
-		self.rec_start = Signal()
-		self.rec_done  = Signal()
+		self.start = Signal()
+		self.done = Signal()
 		
 		# Others
 		self.enable = Signal()
@@ -116,28 +108,23 @@ class Sequencer:
 		
 		# Idle
 		fsm.act(fsm.IDLE, 
-			If(self.ctl_arm, 
+			If(self.arm, 
 				fsm.next_state(fsm.ACTIVE),
 			)
 		)
 		
 		# Active
 		fsm.act(fsm.ACTIVE,
-			If(self.rec_done | self.ctl_rst,
+			If(self.done | self.rst,
 				fsm.next_state(fsm.IDLE),
 			),
 			self.enable.eq(1)
 		)
 		
+		# Start
 		hit_rising = RisingEdge(self.hit)
-		
-		# connexion
-		comb = [
-			self.rec_offset.eq(self.ctl_offset),
-			self.rec_size.eq(self.ctl_size),
-			self.rec_start.eq(self.enable & hit_rising.o),
-			self.ctl_done.eq(~self.enable),
-			]
+		comb =[self.start.eq(self.enable & hit_rising.o)]
+
 		return Fragment(comb) + fsm.get_fragment() + hit_rising.get_fragment()
 
 
@@ -159,7 +146,7 @@ class Recorder:
 		self.depth_width = bits_for(self.depth-1)
 		
 		self.storage = Storage(self.width, self.depth)
-		self.sequencer = Sequencer(self.depth)
+		self.sequencer = Sequencer()
 		
 		# csr interface
 		self._rst = RegisterField("rst", reset=1)
@@ -198,14 +185,14 @@ class Recorder:
 
 		# Bank <--> Storage / Sequencer
 		comb = [
-			self.sequencer.ctl_rst.eq(self._rst.field.r),
+			self.sequencer.rst.eq(self._rst.field.r),
 			self.storage.rst.eq(self._rst.field.r),
 			
-			self.sequencer.ctl_offset.eq(self._offset.field.r),
-			self.sequencer.ctl_size.eq(self._size.field.r),
-			self.sequencer.ctl_arm.eq(self._arm.field.r),
-			
-			self._done.field.w.eq(self.sequencer.ctl_done),
+			self.sequencer.arm.eq(self._arm.field.r),
+			self.storage.offset.eq(self._offset.field.r),
+			self.storage.size.eq(self._size.field.r),
+
+			self._done.field.w.eq(~self.sequencer.enable),
 			
 			self.storage.pull_stb.eq(_pull_stb_rising.o),
 			self._pull_dat.field.w.eq(self.storage.pull_dat)
@@ -213,11 +200,8 @@ class Recorder:
 		
 		# Storage <--> Sequencer <--> Trigger
 		comb += [
-			self.storage.offset.eq(self.sequencer.rec_offset),
-			self.storage.size.eq(self.sequencer.rec_size),
-			self.storage.start.eq(self.sequencer.rec_start),
-			
-			self.sequencer.rec_done.eq(self.storage.done),
+			self.storage.start.eq(self.sequencer.start),
+			self.sequencer.done.eq(self.storage.done),
 			self.sequencer.hit.eq(self.hit),
 			
 			self.storage.push_stb.eq(self.sequencer.enable),
diff --git a/miscope/trigger.py b/miscope/trigger.py
index 33fe873e8..d0346c18b 100644
--- a/miscope/trigger.py
+++ b/miscope/trigger.py
@@ -97,7 +97,7 @@ class EdgeDetector:
 	# 
 	# Definition
 	#
-	def __init__(self, width, mode = "RFB"):
+	def __init__(self, width, mode="RFB"):
 		self.width = width
 		self.mode = mode
 		self.interface = None
@@ -198,7 +198,6 @@ class Sum:
 		self.interface = None
 		
 		self.i = Signal(self.width)
-		self._o = Signal()
 		self.o = Signal()
 		
 		self.reg_p = RegParams("sum_reg", 0, 8, 4)
@@ -223,13 +222,12 @@ class Sum:
 	def get_fragment(self):
 		comb = [
 				self._lut_port.adr.eq(self.i),
-				self._o.eq(self._lut_port.dat_r),
 				
 				self._prog_port.adr.eq(self.prog_adr),
 				self._prog_port.we.eq(self.prog_stb),
 				self._prog_port.dat_w.eq(self.prog_dat),
-				
-				self.o.eq(self._o)
+
+				self.o.eq(self._lut_port.dat_r),				
 		]
 		comb += self.get_registers_comb()
 		return Fragment(comb, specials={self._mem})