bus/asmibus: swap port position to be consistent with wishbone API
This commit is contained in:
parent
ece786d6aa
commit
86090e1cbd
|
@ -78,8 +78,8 @@ def test_asmi():
|
|||
port = hub.get_port()
|
||||
hub.finalize()
|
||||
# Create the initiator, target and tap (similar to the Wishbone case).
|
||||
master = asmibus.Initiator(port, my_generator())
|
||||
slave = asmibus.Target(hub, MyModelASMI())
|
||||
master = asmibus.Initiator(my_generator(), port)
|
||||
slave = asmibus.Target(MyModelASMI(), hub)
|
||||
tap = asmibus.Tap(hub)
|
||||
# Run the simulation (same as the Wishbone case).
|
||||
def end_simulation(s):
|
||||
|
|
|
@ -213,13 +213,13 @@ class Tap(PureSimulable):
|
|||
self.transaction = transaction
|
||||
|
||||
class Initiator(PureSimulable):
|
||||
def __init__(self, port, generator):
|
||||
self.port = port
|
||||
def __init__(self, generator, port):
|
||||
self.generator = generator
|
||||
self.port = port
|
||||
self.done = False
|
||||
self._exe = None
|
||||
|
||||
def _execute(self, s, port, generator):
|
||||
def _execute(self, s, generator, port):
|
||||
while True:
|
||||
transaction = next(generator)
|
||||
transaction_start = s.cycle_counter
|
||||
|
@ -260,7 +260,7 @@ class Initiator(PureSimulable):
|
|||
def do_simulation(self, s):
|
||||
if not self.done:
|
||||
if self._exe is None:
|
||||
self._exe = self._execute(s, self.port, self.generator)
|
||||
self._exe = self._execute(s, self.generator, self.port)
|
||||
try:
|
||||
next(self._exe)
|
||||
except StopIteration:
|
||||
|
@ -288,9 +288,9 @@ class TargetModel:
|
|||
return self.last_slot
|
||||
|
||||
class Target(PureSimulable):
|
||||
def __init__(self, hub, model):
|
||||
self.hub = hub
|
||||
def __init__(self, model, hub):
|
||||
self.model = model
|
||||
self.hub = hub
|
||||
self._calling_tag = -1
|
||||
self._write_request_d = -1
|
||||
self._write_request = -1
|
||||
|
|
Loading…
Reference in New Issue