Move Token to migen.flow.transactions

diff --git a/examples/dataflow/dma.py b/examples/dataflow/dma.py
index 8e221edcce599c31bd0f32632c5b1f97dbe5967c..dad3d47a7f606311caad732fc10e69cf035bc531 100644 (file)
--- a/examples/dataflow/dma.py
+++ b/examples/dataflow/dma.py
@@ -1,6 +1,7 @@
 from random import Random
 
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib import dma_wishbone, dma_asmi
 from migen.actorlib.sim import *
 from migen.bus import wishbone, asmibus

diff --git a/examples/dataflow/misc.py b/examples/dataflow/misc.py
index a4dc71d6f4ee93753a13bde9656a4ecfdbd114d0..c8c0b734a360806a584151f4ac3d01f0d8a0e52e 100644 (file)
--- a/examples/dataflow/misc.py
+++ b/examples/dataflow/misc.py
@@ -1,4 +1,5 @@
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib import misc
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator

diff --git a/examples/dataflow/structuring.py b/examples/dataflow/structuring.py
index 2a6dd24e172aba4ba38111fcac27898f9eac823d..9551e375c84c835e08ab17b783574d48f64849e8 100644 (file)
--- a/examples/dataflow/structuring.py
+++ b/examples/dataflow/structuring.py
@@ -4,6 +4,7 @@ import networkx as nx
 import matplotlib.pyplot as plt
 
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib import structuring
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator

diff --git a/examples/pytholite/basic.py b/examples/pytholite/basic.py
index 921b0e5e2051a602f67af7ecbc3840e7a768dac3..d00b1ddc1748e66a313586af1fd5f977ebcfdd7a 100644 (file)
--- a/examples/pytholite/basic.py
+++ b/examples/pytholite/basic.py
@@ -1,4 +1,5 @@
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib.sim import *
 from migen.pytholite.compiler import make_pytholite
 from migen.sim.generic import Simulator

diff --git a/examples/pytholite/uio.py b/examples/pytholite/uio.py
index 1a0690cdc78d5a3062670cd35e26775a30bc2a3e..9a55856cf6a85b6fd9838efec5d213f85b379f9b 100644 (file)
--- a/examples/pytholite/uio.py
+++ b/examples/pytholite/uio.py
@@ -1,5 +1,5 @@
 from migen.flow.network import *
-from migen.actorlib.sim import *
+from migen.flow.transactions import *
 from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.uio.ioo import UnifiedIOSimulation

diff --git a/examples/sim/dataflow.py b/examples/sim/dataflow.py
index 318206a25bac2d452d2f00706a6e461b5ec9bc04..172d2b9b0db3b77c61c8faf81152890efe7f684c 100644 (file)
--- a/examples/sim/dataflow.py
+++ b/examples/sim/dataflow.py
@@ -1,5 +1,6 @@
 from migen.fhdl.structure import *
 from migen.flow.actor import *
+from migen.flow.transactions import *
 from migen.flow.network import *
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator

diff --git a/migen/actorlib/sim.py b/migen/actorlib/sim.py
index e6885225eb7426c0629c8a9e29c33d912f3378ff..153dbe13f84d246d5437f678270e6408b43bc451 100644 (file)
--- a/migen/actorlib/sim.py
+++ b/migen/actorlib/sim.py
@@ -1,12 +1,8 @@
 from migen.fhdl.structure import *
 from migen.flow.actor import *
+from migen.flow.transactions import *
 from migen.sim.generic import PureSimulable
 
-class Token:
-       def __init__(self, endpoint, value=None):
-               self.endpoint = endpoint
-               self.value = value
-
 # Generators yield None or a tuple of Tokens.
 # Tokens for Sink endpoints are pulled and the "value" field filled in.
 # Tokens for Source endpoints are pushed according to their "value" field.

diff --git a/migen/flow/transactions.py b/migen/flow/transactions.py
new file mode 100644 (file)
index 0000000..5c3ceab
--- /dev/null
+++ b/migen/flow/transactions.py
@@ -0,0 +1,5 @@
+class Token:
+       def __init__(self, endpoint, value=None):
+               self.endpoint = endpoint
+               self.value = value
+ 

diff --git a/migen/pytholite/io.py b/migen/pytholite/io.py
index 973a33efde2b3a54aa4dc01d62319162bd41c88f..66efa6e2310e1aca89f61588730659d11835f3bf 100644 (file)
--- a/migen/pytholite/io.py
+++ b/migen/pytholite/io.py
@@ -3,7 +3,8 @@ from itertools import zip_longest
 
 from migen.fhdl.structure import *
 from migen.uio.ioo import UnifiedIOObject
-from migen.actorlib.sim import *
+from migen.flow.actor import Source, Sink
+from migen.flow.transactions import *
 from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.pytholite.fsm import *

diff --git a/migen/uio/ioo.py b/migen/uio/ioo.py
index 2759eb7c6225e5be820deabd882d2f6b0c462b9b..35500e695b579302b9db95c5d6ddd54af700b4ab 100644 (file)
--- a/migen/uio/ioo.py
+++ b/migen/uio/ioo.py
@@ -1,6 +1,7 @@
 from migen.fhdl.structure import *
 from migen.flow.actor import *
-from migen.actorlib.sim import TokenExchanger, Token
+from migen.flow.transactions import *
+from migen.actorlib.sim import TokenExchanger
 from migen.bus import wishbone, memory
 from migen.bus.transactions import *
 from migen.uio.trampoline import Trampoline