From 86090e1cbd78d8dfbce8b9e1a6afac6c0a01badf Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Sat, 17 Nov 2012 19:42:39 +0100
Subject: [PATCH] bus/asmibus: swap port position to be consistent with
 wishbone API

---
 examples/sim/abstract_transactions.py |  4 ++--
 migen/bus/asmibus.py                  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/sim/abstract_transactions.py b/examples/sim/abstract_transactions.py
index 09a5dfe74..a27e90d1f 100644
--- a/examples/sim/abstract_transactions.py
+++ b/examples/sim/abstract_transactions.py
@@ -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):
diff --git a/migen/bus/asmibus.py b/migen/bus/asmibus.py
index 39a60b35e..ff2080c0b 100644
--- a/migen/bus/asmibus.py
+++ b/migen/bus/asmibus.py
@@ -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