stream: Fix BFM implementations

lambdalib/interface/stream.py

@@ -3,6 +3,7 @@
 from amaranth import *
 from amaranth.hdl.rec import *
 from amaranth.lib import fifo
+from amaranth.sim import Settle, Passive
 
 
 __all__ = ["Endpoint", "SyncFIFO", "AsyncFIFO"]
@@ -66,17 +67,16 @@ def bfm_send(self, pkts, timeout=100):
             for key, val in pkt.items():
                 yield getattr(self, key).eq(val)
 
-            yield
-            elapsed = 1
-
             yield Settle()
+            elapsed = 1
             while not (yield self.ready):
                 yield
                 yield Settle()
                 elapsed += 1
                 if elapsed >= timeout:
                     raise Exception("timeout")
 
+            yield
             yield self.valid.eq(0)
 
     def bfm_read(self, timeout=100):
@@ -91,10 +91,14 @@ def bfm_read(self, timeout=100):
             if elapsed >= timeout:
                 raise Exception("timeout")
 
+        res = {}
+        for key, _ in self.description.payload_layout:
+            res[key] = yield getattr(self, key)
+
         yield
         yield self.ready.eq(0)
 
-        return {key: getattr(self, key) for key, _ in self.description}        
+        return res
 
 
 class _FIFOWrapper: