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: whitequark/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0fc7baca9d40
Choose a base ref
...
head repository: whitequark/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1fbf9767b58d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 23, 2018

  1. gateware.fx2: async became a reserved word. 

    Fixes GlasgowEmbedded#78.
    @whitequark
    whitequark committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    addaleax Anna Henningsen
    GPG key ID: 9C63F3A6CD2AD8F9
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1fbf976 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 software/glasgow/access/simulation/multiplexer.py
  2. +3 −3 software/glasgow/gateware/fx2.py
2 changes: 1 addition & 1 deletion software/glasgow/access/simulation/multiplexer.py
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ def get_in_fifo(self, depth=512, auto_flush=False, clock_domain=None):

self.submodules.in_fifo = self._make_fifo(
arbiter_side="read", logic_side="write", cd_logic=clock_domain, depth=depth,
wrapper=lambda x: _FIFOWithFlush(x, async=clock_domain is not None,
wrapper=lambda x: _FIFOWithFlush(x, asynchronous=clock_domain is not None,
auto_flush=auto_flush))
return self.in_fifo

6 changes: 3 additions & 3 deletions software/glasgow/gateware/fx2.py
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ def __init__(self, fifo, overflow_depth=2):


class _FIFOWithFlush(Module, _FIFOInterface):
def __init__(self, fifo, async=False, auto_flush=True):
def __init__(self, fifo, asynchronous=False, auto_flush=True):
_FIFOInterface.__init__(self, fifo.width, fifo.depth)

self.submodules.fifo = fifo
@@ -84,7 +84,7 @@ def __init__(self, fifo, async=False, auto_flush=True):
self.writable = fifo.writable

self.flush = Signal(reset=auto_flush)
if async:
if asynchronous:
self._flush_s = Signal()
self.specials += MultiReg(self.flush, self._flush_s, reset=auto_flush)
else:
@@ -325,7 +325,7 @@ def get_in_fifo(self, n, depth=512, auto_flush=True, clock_domain=None, reset=No
reset=reset,
depth=depth,
wrapper=lambda x: _FIFOWithFlush(x,
async=clock_domain is not None,
asynchronous=clock_domain is not None,
auto_flush=auto_flush))
self.in_fifos[n] = fifo
return fifo