Skip to content

Commit 2b37115

Browse files
koblonczekjfng
authored andcommitted
Rename wiring.Interface to wiring.PureInterface
Due to Amaranth renaming its Interface class to PureInterface in commit amaranth-lang/amaranth@0cdcab0 importing anything that uses wiring.Interface fails. This commit introduces necessary renames to make it compatible with the latest Amaranth. Internal-tag: [#52252] Signed-off-by: Krzysztof Obłonczek <[email protected]>
1 parent dff6abd commit 2b37115

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

amaranth_soc/csr/bus.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
__all__ = ["Element", "Signature", "Interface", "Decoder", "Multiplexer"]
1111

1212

13-
class Element(wiring.Interface):
13+
class Element(wiring.PureInterface):
1414
class Access(enum.Enum):
1515
"""Register access mode.
1616
@@ -138,7 +138,7 @@ def __repr__(self):
138138
access : :class:`Element.Access`
139139
Register access mode.
140140
path : iter(:class:`str`)
141-
Path to this CSR interface. Optional. See :class:`wiring.Interface`.
141+
Path to this CSR interface. Optional. See :class:`wiring.PureInterface`.
142142
143143
Raises
144144
------
@@ -280,7 +280,7 @@ def __repr__(self):
280280
return f"csr.Signature({self.members!r})"
281281

282282

283-
class Interface(wiring.Interface):
283+
class Interface(wiring.PureInterface):
284284
"""CPU-side CSR interface.
285285
286286
A low-level interface to a set of atomically readable and writable peripheral CSR registers.
@@ -307,7 +307,7 @@ class Interface(wiring.Interface):
307307
memory_map: :class:`MemoryMap`
308308
Memory map of the bus. Optional. See :class:`Signature`.
309309
path : iter(:class:`str`)
310-
Path to this CSR interface. Optional. See :class:`wiring.Interface`.
310+
Path to this CSR interface. Optional. See :class:`wiring.PureInterface`.
311311
312312
Raises
313313
------

amaranth_soc/event.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
__all__ = ["Source", "EventMap", "Monitor"]
77

88

9-
class Source(wiring.Interface):
9+
class Source(wiring.PureInterface):
1010
class Trigger(enum.Enum):
1111
"""Event trigger mode."""
1212
LEVEL = "level"
@@ -110,7 +110,7 @@ def __repr__(self):
110110
trigger : :class:`Source.Trigger`
111111
Trigger mode. An event can be edge- or level-triggered by the input line.
112112
path : iter(:class:`str`)
113-
Path to this event source interface. Optional. See :class:`wiring.Interface`.
113+
Path to this event source interface. Optional. See :class:`wiring.PureInterface`.
114114
115115
Attributes
116116
----------

amaranth_soc/wishbone/bus.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def __repr__(self):
235235
return f"wishbone.Signature({self.members!r})"
236236

237237

238-
class Interface(wiring.Interface):
238+
class Interface(wiring.PureInterface):
239239
"""Wishbone bus interface.
240240
241241
Note that the data width of the underlying memory map of the interface is equal to port
@@ -255,7 +255,7 @@ class Interface(wiring.Interface):
255255
memory_map: :class:`MemoryMap`
256256
Memory map of the bus. Optional. See :class:`Signature`.
257257
path : iter(:class:`str`)
258-
Path to this Wishbone interface. Optional. See :class:`wiring.Interface`.
258+
Path to this Wishbone interface. Optional. See :class:`wiring.PureInterface`.
259259
260260
Raises
261261
------

0 commit comments

Comments
 (0)