mila: symplify usage

examples/de0_nano/top.py

@@ -20,8 +20,7 @@ from migen.bank import csrgen
 
 from miscope.std.misc import *
 
-from miscope.trigger import Term, RangeDetector, EdgeDetector, Sum, Trigger
+from miscope.trigger import Term
-from miscope.storage import Recorder
 from miscope.miio import MiIo
 from miscope.mila import MiLa
 
@@ -37,9 +36,8 @@ from timings import *
 clk_freq	= 50*MHz
 
 # Mila Param
-trig_w		= 16
+mila_width	= 16
-dat_w		= 16
+mila_depth  = 4096
-rec_size	= 4096
 
 #==============================================================================
 #   M I S C O P E    E X A M P L E
@@ -51,17 +49,13 @@ class SoC(Module):
 		"mila":					2,
 	}
 
-
 	def __init__(self, platform):
 		# MiIo
 		self.submodules.miio = MiIo(8)
 
 		# MiLa
-		term = Term(trig_w)
+		term = Term(mila_width)
-		trigger = Trigger(trig_w, [term])
+		self.submodules.mila = MiLa(mila_width, mila_depth, [term])
-		recorder = Recorder(dat_w, rec_size)
-
-		self.submodules.mila = MiLa(trigger, recorder)
 	
 		# Uart2Csr
 		self.submodules.uart2csr = uart2csr.Uart2Csr(clk_freq, 115200)

miscope/mila.py

@@ -5,13 +5,20 @@ from migen.bus import csr
 from migen.bank import description, csrgen
 from migen.bank.description import *
 
+from miscope.trigger import Trigger
+from miscope.storage import Recorder
+
 class MiLa(Module, AutoCSR):
-	def __init__(self, trigger, recorder):
+	def __init__(self, width, depth, ports):
-		self.trigger = trigger
+		self.width = width
-		self.recorder = recorder
+
+		trigger = Trigger(width, ports)
+		recorder = Recorder(width, depth)
+
+		self.submodules.trigger = trigger
+		self.submodules.recorder = recorder
 
 		self.sink = trigger.sink
-		self.submodules += trigger, recorder
 
 		self.comb +=[
 			recorder.sink.stb.eq(trigger.source.stb),