move trigger/recorder

This commit is contained in:
Florent Kermarrec 2013-09-22 11:45:30 +02:00
parent 452d266b14
commit 980a83a74c
5 changed files with 11 additions and 11 deletions

View File

@ -19,9 +19,11 @@ from migen.bus import csr
from migen.bank import csrgen
from miscope.std.misc import *
from miscope.triggering import *
from miscope.recording import *
from miscope import miio, mila
from miscope.trigger import Term, Sum, Trigger
from miscope.storage import Recorder
from miscope.miio import MiIo
from miscope.mila import MiLa
from miscope.com import uart2csr
@ -52,14 +54,14 @@ class SoC(Module):
def __init__(self, platform):
# MiIo
self.submodules.miio = miio.MiIo(8)
self.submodules.miio = MiIo(8)
# MiLa
term = Term(trig_w)
trigger = Trigger(trig_w, [term])
recorder = Recorder(dat_w, rec_size)
self.submodules.mila = mila.MiLa(trigger, recorder)
self.submodules.mila = MiLa(trigger, recorder)
# Uart2Csr
self.submodules.uart2csr = uart2csr.Uart2Csr(clk_freq, 115200)

View File

@ -5,10 +5,9 @@ from migen.sim.generic import Simulator, TopLevel
from migen.sim.icarus import Runner
from migen.bus.transactions import *
from miscope.recording import *
from miscope.std.truthtable import *
from miscope.std import cif
from miscope.std.truthtable import *
from miscope.storage import *
from mibuild.tools import write_to_file

View File

@ -5,10 +5,9 @@ from migen.sim.generic import Simulator, TopLevel
from migen.sim.icarus import Runner
from migen.bus.transactions import *
from miscope.triggering import *
from miscope.std.truthtable import *
from miscope.std import cif
from miscope.std.truthtable import *
from miscope.trigger import *
from mibuild.tools import write_to_file