From 19cf06052230831e6d899aa3cf71539fe746a43e Mon Sep 17 00:00:00 2001 From: ECP5-PCIe <65254322+ECP5-PCIe@users.noreply.github.com> Date: Thu, 16 Jul 2020 10:22:51 +0200 Subject: [breaking-change] Update SPI pin names. The new names follow the OSHWA convention described at: https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/ --- nmigen_boards/resources/interface.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'nmigen_boards/resources/interface.py') diff --git a/nmigen_boards/resources/interface.py b/nmigen_boards/resources/interface.py index 848e1b8..9073cc7 100644 --- a/nmigen_boards/resources/interface.py +++ b/nmigen_boards/resources/interface.py @@ -53,28 +53,28 @@ def IrDAResource(number, *, rx, tx, en=None, sd=None, return Resource("irda", number, *io) -def SPIResource(*args, cs, clk, mosi, miso, int=None, reset=None, - conn=None, attrs=None, role="host"): - assert role in ("host", "device") +def SPIResource(*args, cs, clk, copi, cipo, int=None, reset=None, + conn=None, attrs=None, role="controller"): + assert role in ("controller", "peripheral") io = [] - if role == "host": + if role == "controller": io.append(Subsignal("cs", PinsN(cs, dir="o", conn=conn))) io.append(Subsignal("clk", Pins(clk, dir="o", conn=conn, assert_width=1))) - io.append(Subsignal("mosi", Pins(mosi, dir="o", conn=conn, assert_width=1))) - io.append(Subsignal("miso", Pins(miso, dir="i", conn=conn, assert_width=1))) - else: # device + io.append(Subsignal("copi", Pins(copi, dir="o", conn=conn, assert_width=1))) + io.append(Subsignal("cipo", Pins(cipo, dir="i", conn=conn, assert_width=1))) + else: # peripheral io.append(Subsignal("cs", PinsN(cs, dir="i", conn=conn, assert_width=1))) io.append(Subsignal("clk", Pins(clk, dir="i", conn=conn, assert_width=1))) - io.append(Subsignal("mosi", Pins(mosi, dir="i", conn=conn, assert_width=1))) - io.append(Subsignal("miso", Pins(miso, dir="oe", conn=conn, assert_width=1))) + io.append(Subsignal("copi", Pins(copi, dir="i", conn=conn, assert_width=1))) + io.append(Subsignal("cipo", Pins(cipo, dir="oe", conn=conn, assert_width=1))) if int is not None: - if role == "host": + if role == "controller": io.append(Subsignal("int", Pins(int, dir="i", conn=conn))) else: io.append(Subsignal("int", Pins(int, dir="oe", conn=conn, assert_width=1))) if reset is not None: - if role == "host": + if role == "controller": io.append(Subsignal("reset", Pins(reset, dir="o", conn=conn))) else: io.append(Subsignal("reset", Pins(reset, dir="i", conn=conn, assert_width=1))) -- cgit v1.2.3