From 84ffc81e80a337111f8fab63b50159e86d6a8e85 Mon Sep 17 00:00:00 2001 From: awygle Date: Fri, 30 Jul 2021 01:21:02 -0700 Subject: Migrate pmod resources from `extras` to `Attrs` --- nmigen_boards/extensions/pmod.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nmigen_boards/extensions/pmod.py b/nmigen_boards/extensions/pmod.py index 20bcf2f..dafa742 100644 --- a/nmigen_boards/extensions/pmod.py +++ b/nmigen_boards/extensions/pmod.py @@ -15,24 +15,24 @@ __all__ = [ ] -def PmodGPIOType1Resource(name, number, *, pmod, extras=None): +def PmodGPIOType1Resource(name, number, *args, pmod): return Resource(name, number, Pins("1 2 3 4", dir="io", conn=("pmod", pmod)), - extras=extras + *args ) -def PmodSPIType2Resource(name, number, *, pmod, extras=None): +def PmodSPIType2Resource(name, number, *args, pmod): return Resource(name, number, Subsignal("cs", PinsN("1", dir="o", conn=("pmod", pmod))), Subsignal("clk", Pins("2", dir="o", conn=("pmod", pmod))), Subsignal("copi", Pins("3", dir="o", conn=("pmod", pmod))), Subsignal("cipo", Pins("4", dir="i", conn=("pmod", pmod))), - extras=extras + *args ) -def PmodSPIType2AResource(name, number, *, pmod, extras=None): +def PmodSPIType2AResource(name, number, *args, pmod): return Resource(name, number, Subsignal("cs", PinsN("1", dir="o", conn=("pmod", pmod))), Subsignal("clk", Pins("2", dir="o", conn=("pmod", pmod))), @@ -40,31 +40,31 @@ def PmodSPIType2AResource(name, number, *, pmod, extras=None): Subsignal("cipo", Pins("4", dir="i", conn=("pmod", pmod))), Subsignal("int", Pins("7", dir="i", conn=("pmod", pmod))), Subsignal("reset", Pins("8", dir="o", conn=("pmod", pmod))), - extras=extras + *args ) -def PmodUARTType3Resource(name, number, *, pmod, extras=None): +def PmodUARTType3Resource(name, number, *args, pmod): return Resource(name, number, Subsignal("cts", Pins("1", dir="o", conn=("pmod", pmod))), Subsignal("rts", Pins("2", dir="i", conn=("pmod", pmod))), Subsignal("rx", Pins("3", dir="i", conn=("pmod", pmod))), Subsignal("tx", Pins("4", dir="o", conn=("pmod", pmod))), - extras=extras + *args ) -def PmodUARTType4Resource(name, number, *, pmod, extras=None): +def PmodUARTType4Resource(name, number, *args, pmod): return Resource(name, number, Subsignal("cts", Pins("1", dir="i", conn=("pmod", pmod))), Subsignal("tx", Pins("2", dir="o", conn=("pmod", pmod))), Subsignal("rx", Pins("3", dir="i", conn=("pmod", pmod))), Subsignal("rts", Pins("4", dir="o", conn=("pmod", pmod))), - extras=extras + *args ) -def PmodUARTType4AResource(name, number, *, pmod, extras=None): +def PmodUARTType4AResource(name, number, *args, pmod): return Resource(name, number, Subsignal("cts", Pins("1", dir="i", conn=("pmod", pmod))), Subsignal("tx", Pins("2", dir="o", conn=("pmod", pmod))), @@ -72,23 +72,23 @@ def PmodUARTType4AResource(name, number, *, pmod, extras=None): Subsignal("rts", Pins("4", dir="o", conn=("pmod", pmod))), Subsignal("int", Pins("7", dir="i", conn=("pmod", pmod))), Subsignal("reset", Pins("8", dir="o", conn=("pmod", pmod))), - extras=extras + *args ) -def PmodHBridgeType5Resource(name, number, *, pmod, extras=None): +def PmodHBridgeType5Resource(name, number, *args, pmod): return Resource(name, number, Subsignal("dir", Pins("1", dir="o", conn=("pmod", pmod))), Subsignal("en", Pins("2", dir="o", conn=("pmod", pmod))), Subsignal("sa", Pins("3", dir="i", conn=("pmod", pmod))), Subsignal("sb", Pins("4", dir="i", conn=("pmod", pmod))), - extras=extras + *args ) -def PmodDualHBridgeType6Resource(name, number, *, pmod, extras=None): +def PmodDualHBridgeType6Resource(name, number, *args, pmod): return Resource(name, number, Subsignal("dir", Pins("1 3", dir="o", conn=("pmod", pmod))), Subsignal("en", Pins("2 4", dir="o", conn=("pmod", pmod))), - extras=extras + *args ) -- cgit v1.2.3