Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/nmigen-boards
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 11971f1b13df
Choose a base ref
...
head repository: m-labs/nmigen-boards
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7eeec20d79a
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 10, 2019

  1. dev: Refactor resource abstractions to use Resource.family.

    cr1901 authored and whitequark committed Jul 10, 2019
    Copy the full SHA
    a7eeec2 View commit details
Showing with 9 additions and 6 deletions.
  1. +7 −4 nmigen_boards/dev/flash.py
  2. +2 −2 nmigen_boards/dev/uart.py
11 changes: 7 additions & 4 deletions nmigen_boards/dev/flash.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
__all__ = ["SPIFlashResources"]


def SPIFlashResources(number, *, cs, clk, mosi, miso, wp=None, hold=None, attrs=None):
def SPIFlashResources(*args, cs, clk, mosi, miso, wp=None, hold=None, attrs=None):
resources = []

io_all = []
@@ -19,15 +19,18 @@ def SPIFlashResources(number, *, cs, clk, mosi, miso, wp=None, hold=None, attrs=
if wp is not None and hold is not None:
io_1x.append(Subsignal("wp", PinsN(wp, dir="o")))
io_1x.append(Subsignal("hold", PinsN(hold, dir="o")))
resources.append(Resource("spi_flash", number, *io_1x))
resources.append(Resource.family(*args, default_name="spi_flash", ios=io_1x,
name_suffix="1x"))

io_2x = list(io_all)
io_2x.append(Subsignal("dq", Pins(" ".join([mosi, miso]), dir="io")))
resources.append(Resource("spi_flash_2x", number, *io_2x))
resources.append(Resource.family(*args, default_name="spi_flash", ios=io_2x,
name_suffix="2x"))

if wp is not None and hold is not None:
io_4x = list(io_all)
io_4x.append(Subsignal("dq", Pins(" ".join([mosi, miso, wp, hold]), dir="io")))
resources.append(Resource("spi_flash_4x", number, *io_4x))
resources.append(Resource.family(*args, default_name="spi_flash", ios=io_4x,
name_suffix="4x"))

return resources
4 changes: 2 additions & 2 deletions nmigen_boards/dev/uart.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
__all__ = ["UARTResource", "IrDAResource"]


def UARTResource(number, *, rx, tx, rts=None, cts=None, dtr=None, dsr=None, dcd=None, ri=None,
def UARTResource(*args, rx, tx, rts=None, cts=None, dtr=None, dsr=None, dcd=None, ri=None,
attrs=None):
io = []
io.append(Subsignal("rx", Pins(rx, dir="i")))
@@ -23,7 +23,7 @@ def UARTResource(number, *, rx, tx, rts=None, cts=None, dtr=None, dsr=None, dcd=
io.append(Subsignal("ri", Pins(ri, dir="i")))
if attrs is not None:
io.append(attrs)
return Resource("uart", number, *io)
return Resource.family(*args, default_name="uart", ios=io)


def IrDAResource(number, *, rx, tx, en=None, sd=None, attrs=None):