Skip to content

Commit c5e1e66

Browse files
jfngwhitequark
andcommitted
wishbone.bus: migrate to lib.wiring interfaces.
Also, use Amaranth's lib.enum instead of standard enums. Co-authored-by: Catherine <whitequark@whitequark.org>
1 parent 7b52e93 commit c5e1e66

File tree

3 files changed

+463
-263
lines changed

3 files changed

+463
-263
lines changed

amaranth_soc/csr/wishbone.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from amaranth.utils import log2_int
33

44
from . import Interface as CSRInterface
5-
from ..wishbone import Interface as WishboneInterface
5+
from .. import wishbone
66
from ..memory import MemoryMap
77

88

@@ -28,7 +28,7 @@ class WishboneCSRBridge(Elaboratable):
2828
data_width : int
2929
Wishbone bus data width. Optional. If ``None``, defaults to ``csr_bus.data_width``.
3030
name : str
31-
Window name. Optional.
31+
Window name. Optional. See :class:`..memory.MemoryMap`.
3232
3333
Attributes
3434
----------
@@ -46,11 +46,11 @@ def __init__(self, csr_bus, *, data_width=None, name=None):
4646
data_width = csr_bus.data_width
4747

4848
self.csr_bus = csr_bus
49-
self.wb_bus = WishboneInterface(
49+
self.wb_bus = wishbone.Interface(
5050
addr_width=max(0, csr_bus.addr_width - log2_int(data_width // csr_bus.data_width)),
5151
data_width=data_width,
5252
granularity=csr_bus.data_width,
53-
name="wb")
53+
path=("wb",))
5454

5555
wb_map = MemoryMap(addr_width=csr_bus.addr_width, data_width=csr_bus.data_width,
5656
name=name)

0 commit comments

Comments
 (0)