Reorganize resource taxonomy.

The current hierarchy isn't particularly well suited to resources
like SDRAM or NOR flash, so make it much less fine-grained but easier
to use and less nitpicky.

8 files changed, 0 insertions, 247 deletions

diff --git a/nmigen_boards/dev/__init__.py b/nmigen_boards/dev/__init__.py
deleted file mode 100644
index db4703f..0000000
--- a/nmigen_boards/dev/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from .user import LEDResources, RGBLEDResource, ButtonResources, SwitchResources
-from .uart import UARTResource
-from .spi import SPIResource
-from .flash import SPIFlashResources
-from .sram import SRAMResource
diff --git a/nmigen_boards/dev/display.py b/nmigen_boards/dev/display.py
deleted file mode 100644
index 0431b58..0000000
--- a/nmigen_boards/dev/display.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["Display7SegResource"]
-
-
-def Display7SegResource(*args, a, b, c, d, e, f, g, dp=None, invert=False, attrs=None):
-    ios = []
-    ios.append(Subsignal("a", Pins(a, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("b", Pins(b, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("c", Pins(c, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("d", Pins(d, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("e", Pins(e, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("f", Pins(f, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("g", Pins(g, dir="o", invert=invert, assert_width=1)))
-    if dp is not None:
-        ios.append(Subsignal("dp", Pins(dp, dir="o", assert_width=1)))
-    if attrs is not None:
-        ios.append(attrs)
-    return Resource.family(*args, default_name="display_7seg", ios=ios)
diff --git a/nmigen_boards/dev/flash.py b/nmigen_boards/dev/flash.py
deleted file mode 100644
index 817b6d4..0000000
--- a/nmigen_boards/dev/flash.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["SPIFlashResources"]
-
-
-def SPIFlashResources(*args, cs, clk, mosi, miso, wp=None, hold=None, attrs=None):
-    resources = []
-
-    io_all = []
-    if attrs is not None:
-        io_all.append(attrs)
-    io_all.append(Subsignal("cs",  PinsN(cs, dir="o")))
-    io_all.append(Subsignal("clk", Pins(clk, dir="o", assert_width=1)))
-
-    io_1x = list(io_all)
-    io_1x.append(Subsignal("mosi", Pins(mosi, dir="o", assert_width=1)))
-    io_1x.append(Subsignal("miso", Pins(miso, dir="i", assert_width=1)))
-    if wp is not None and hold is not None:
-        io_1x.append(Subsignal("wp",   PinsN(wp,   dir="o", assert_width=1)))
-        io_1x.append(Subsignal("hold", PinsN(hold, dir="o", assert_width=1)))
-    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",
-                                      assert_width=2)))
-    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",
-                                          assert_width=4)))
-        resources.append(Resource.family(*args, default_name="spi_flash", ios=io_4x,
-                                         name_suffix="4x"))
-
-    return resources
diff --git a/nmigen_boards/dev/sd.py b/nmigen_boards/dev/sd.py
deleted file mode 100644
index 8fdbcbe..0000000
--- a/nmigen_boards/dev/sd.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["SDCardResources"]
-
-
-def SDCardResources(*args, clk, cmd, dat0, dat1=None, dat2=None, dat3=None,
-                    cd=None, wp=None, attrs=None):
-    resources = []
-
-    io_common = []
-    if attrs is not None:
-        io_common.append(attrs)
-    if cd is not None:
-        io_common.append(Subsignal("cd", Pins(cd, dir="i", assert_width=1)))
-    if wp is not None:
-        io_common.append(Subsignal("wp", PinsN(wp, dir="i", assert_width=1)))
-
-    io_native = list(io_common)
-    io_native.append(Subsignal("clk", Pins(clk, dir="o", assert_width=1)))
-    io_native.append(Subsignal("cmd", Pins(cmd, dir="o", assert_width=1)))
-
-    io_1bit = list(io_native)
-    io_1bit.append(Subsignal("dat", Pins(dat0, dir="io", assert_width=1)))
-    if dat3 is not None: # works as electronic card detect
-        io_1bit.append(Subsignal("ecd", Pins(dat3, dir="i", assert_width=1)))
-    resources.append(Resource.family(*args, default_name="sd_card", ios=io_1bit,
-                                     name_suffix="1bit"))
-
-    if dat1 is not None and dat2 is not None and dat3 is not None:
-        io_4bit = list(io_native)
-        io_4bit.append(Subsignal("dat", Pins(" ".join((dat0, dat1, dat2, dat3)), dir="io",
-                                             assert_width=4)))
-        resources.append(Resource.family(*args, default_name="sd_card", ios=io_4bit,
-                                         name_suffix="4bit"))
-
-    if dat3 is not None:
-        io_spi = list(io_common)
-        io_spi.append(Subsignal("cs", PinsN(dat3, dir="io"))) # doubles as electronic card detect
-        io_spi.append(Subsignal("clk", Pins(clk, dir="o", assert_width=1)))
-        io_spi.append(Subsignal("mosi", Pins(cmd, dir="o", assert_width=1)))
-        io_spi.append(Subsignal("miso", Pins(dat0, dir="i", assert_width=1)))
-        resources.append(Resource.family(*args, default_name="sd_card", ios=io_spi,
-                                         name_suffix="spi"))
-
-    return resources
diff --git a/nmigen_boards/dev/spi.py b/nmigen_boards/dev/spi.py
deleted file mode 100644
index 2d045bc..0000000
--- a/nmigen_boards/dev/spi.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["SPIResource"]
-
-
-def SPIResource(*args, cs, clk, mosi, miso, int=None, reset=None, attrs=None, role="host"):
-    assert role in ("host", "device")
-
-    io = []
-    if role == "host":
-        io.append(Subsignal("cs", PinsN(cs, dir="o")))
-        io.append(Subsignal("clk", Pins(clk, dir="o", assert_width=1)))
-        io.append(Subsignal("mosi", Pins(mosi, dir="o", assert_width=1)))
-        io.append(Subsignal("miso", Pins(miso, dir="i", assert_width=1)))
-    else:  # device
-        io.append(Subsignal("cs", PinsN(cs, dir="i", assert_width=1)))
-        io.append(Subsignal("clk", Pins(clk, dir="i", assert_width=1)))
-        io.append(Subsignal("mosi", Pins(mosi, dir="i", assert_width=1)))
-        io.append(Subsignal("miso", Pins(miso, dir="oe", assert_width=1)))
-    if int is not None:
-        if role == "host":
-            io.append(Subsignal("int", Pins(int, dir="i")))
-        else:
-            io.append(Subsignal("int", Pins(int, dir="oe", assert_width=1)))
-    if reset is not None:
-        if role == "host":
-            io.append(Subsignal("reset", Pins(reset, dir="o")))
-        else:
-            io.append(Subsignal("reset", Pins(reset, dir="i", assert_width=1)))
-    if attrs is not None:
-        io.append(attrs)
-    return Resource.family(*args, default_name="spi", ios=io)
diff --git a/nmigen_boards/dev/sram.py b/nmigen_boards/dev/sram.py
deleted file mode 100644
index 14e31ce..0000000
--- a/nmigen_boards/dev/sram.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["SRAMResource"]
-
-
-def SRAMResource(*args, cs, oe=None, we, a, d, dm=None, attrs=None):
-    io = []
-    io.append(Subsignal("cs", PinsN(cs, dir="o", assert_width=1)))
-    if oe is not None:
-        # Asserted WE# deactivates the D output buffers, so WE# can be used to replace OE#.
-        io.append(Subsignal("oe", PinsN(oe, dir="o", assert_width=1)))
-    io.append(Subsignal("we", PinsN(we, dir="o", assert_width=1)))
-    io.append(Subsignal("a", Pins(a, dir="o")))
-    io.append(Subsignal("d", Pins(d, dir="io")))
-    if dm is not None:
-        io.append(Subsignal("dm", PinsN(dm, dir="o"))) # dm="LB# UB#"
-    if attrs is not None:
-        io.append(attrs)
-    return Resource.family(*args, default_name="sram", ios=io)
diff --git a/nmigen_boards/dev/uart.py b/nmigen_boards/dev/uart.py
deleted file mode 100644
index 706e50c..0000000
--- a/nmigen_boards/dev/uart.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["UARTResource", "IrDAResource"]
-
-
-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", assert_width=1)))
-    io.append(Subsignal("tx", Pins(tx, dir="o", assert_width=1)))
-    if rts is not None:
-        io.append(Subsignal("rts", Pins(rts, dir="o", assert_width=1)))
-    if cts is not None:
-        io.append(Subsignal("cts", Pins(cts, dir="i", assert_width=1)))
-    if dtr is not None:
-        io.append(Subsignal("dtr", Pins(dtr, dir="o", assert_width=1)))
-    if dsr is not None:
-        io.append(Subsignal("dsr", Pins(dsr, dir="i", assert_width=1)))
-    if dcd is not None:
-        io.append(Subsignal("dcd", Pins(dcd, dir="i", assert_width=1)))
-    if ri is not None:
-        io.append(Subsignal("ri", Pins(ri, dir="i", assert_width=1)))
-    if attrs is not None:
-        io.append(attrs)
-    return Resource.family(*args, default_name="uart", ios=io)
-
-
-def IrDAResource(number, *, rx, tx, en=None, sd=None, attrs=None):
-    # Exactly one of en (active-high enable) or sd (shutdown, active-low enable) should
-    # be specified, and it is mapped to a logic level en subsignal.
-    assert (en is not None) ^ (sd is not None)
-    io = []
-    io.append(Subsignal("rx", Pins(rx, dir="i", assert_width=1)))
-    io.append(Subsignal("tx", Pins(tx, dir="o", assert_width=1)))
-    if en is not None:
-        io.append(Subsignal("en", Pins(en, dir="o", assert_width=1)))
-    if sd is not None:
-        io.append(Subsignal("en", PinsN(sd, dir="o", assert_width=1)))
-    if attrs is not None:
-        io.append(attrs)
-    return Resource("irda", number, *io)
diff --git a/nmigen_boards/dev/user.py b/nmigen_boards/dev/user.py
deleted file mode 100644
index 8faa736..0000000
--- a/nmigen_boards/dev/user.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from nmigen.build import *
-
-
-__all__ = ["LEDResources", "RGBLEDResource", "ButtonResources", "SwitchResources"]
-
-
-def _SplitResources(*args, pins, invert=False, attrs=None, default_name, dir):
-    assert isinstance(pins, (str, list, dict))
-
-    if isinstance(pins, str):
-        pins = pins.split()
-    if isinstance(pins, list):
-        pins = dict(enumerate(pins))
-
-    resources = []
-    for number, pin in pins.items():
-        ios = [Pins(pin, dir=dir, invert=invert)]
-        if attrs is not None:
-            ios.append(attrs)
-        resources.append(Resource.family(*args, number, default_name=default_name, ios=ios))
-    return resources
-
-
-def LEDResources(*args, **kwargs):
-    return _SplitResources(*args, **kwargs, default_name="led", dir="o")
-
-
-def RGBLEDResource(*args, r, g, b, invert=False, attrs=None):
-    ios = []
-    ios.append(Subsignal("r", Pins(r, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("g", Pins(g, dir="o", invert=invert, assert_width=1)))
-    ios.append(Subsignal("b", Pins(b, dir="o", invert=invert, assert_width=1)))
-    if attrs is not None:
-        ios.append(attrs)
-    return Resource.family(*args, default_name="rgb_led", ios=ios)
-
-
-def ButtonResources(*args, **kwargs):
-    return _SplitResources(*args, **kwargs, default_name="button", dir="i")
-
-
-def SwitchResources(*args, **kwargs):
-    return _SplitResources(*args, **kwargs, default_name="switch", dir="i")