usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build.res: handle connectors in pin reuse detection.

Browse source
This commit is contained in:
Wanda 2024-04-10 22:04:01 +02:00 committed by Catherine
parent fd811831fd
commit 2ca55dd4b0
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
amaranth/build/res.py
View file

@ -138,26 +138,24 @@ class ResourceManager:
else: else:
direction = phys.dir direction = phys.dir
if isinstance(phys, Pins): if isinstance(phys, Pins):
phys_names = phys.names phys_names = phys.map_names(self._conn_pins, resource)
io = IOPort(len(phys), name="__".join(path) + "__io", metadata=[ io = IOPort(len(phys), name="__".join(path) + "__io", metadata=[
PortMetadata(name, attrs) PortMetadata(name, attrs)
for name in phys.names for name in phys_names
]) ])
port = SingleEndedPort(io, invert=phys.invert, direction=direction) port = SingleEndedPort(io, invert=phys.invert, direction=direction)
if isinstance(phys, DiffPairs): if isinstance(phys, DiffPairs):
phys_names = [] phys_names_p = phys.p.map_names(self._conn_pins, resource)
phys_names_n = phys.n.map_names(self._conn_pins, resource)
phys_names = phys_names_p + phys_names_n
p = IOPort(len(phys), name="__".join(path) + "__p", metadata=[ p = IOPort(len(phys), name="__".join(path) + "__p", metadata=[
PortMetadata(name, attrs) PortMetadata(name, attrs)
for name in phys.p.names for name in phys_names_p
]) ])
n = IOPort(len(phys), name="__".join(path) + "__n", metadata=[ n = IOPort(len(phys), name="__".join(path) + "__n", metadata=[
PortMetadata(name, attrs) PortMetadata(name, attrs)
for name in phys.n.names for name in phys_names_n
]) ])
if not self.should_skip_port_component(None, attrs, "p"):
phys_names += phys.p.names
if not self.should_skip_port_component(None, attrs, "n"):
phys_names += phys.n.names
port = DifferentialPort(p, n, invert=phys.invert, direction=direction) port = DifferentialPort(p, n, invert=phys.invert, direction=direction)
if dir == "-": if dir == "-":
pin = None pin = None