Flatten the output of RecordObject.ports()

If a record contains records, calling ports on it will give a result
that cannot be passed to the nmigen simulation backend. This flattens
it, so that ports() will just return signals

diff --git a/src/nmutil/iocontrol.py b/src/nmutil/iocontrol.py
index 853a1d040d9f6dcdfd48daee06674f94953b2f58..e403da7112cf575b0b74288307ae7b628f8f54f9 100644 (file)
--- a/src/nmutil/iocontrol.py
+++ b/src/nmutil/iocontrol.py
@@ -103,7 +103,15 @@ class RecordObject(Record):
                 yield x
 
     def ports(self): # would be better being called "keys"
-        return list(self)
+        results = []
+        # If the record itself contains records, flatten them
+        for item in list(self):
+            ports_fun = getattr(item, "ports", None)
+            if callable(ports_fun):
+                results.extend(ports_fun())
+            else:
+                results.append(item)
+        return results
 
 
 class PrevControl(Elaboratable):