diff --git a/artiq/gateware/rtio/sed/fifos.py b/artiq/gateware/rtio/sed/fifos.py index f056e1a69..0452721f4 100644 --- a/artiq/gateware/rtio/sed/fifos.py +++ b/artiq/gateware/rtio/sed/fifos.py @@ -26,7 +26,7 @@ class FIFOs(Module): if mode == "sync": fifo_cls = SyncFIFOBuffered elif mode == "async": - fifo_cls = AsyncFIFO + fifo_cls = AsyncFIFOBuffered else: raise ValueError diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 7e2a3d049..08930c06e 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -14,8 +14,8 @@ requirements: run: - python >=3.5.3,<3.6 - setuptools 33.1.1 - - migen 0.6 py35_11+git78a671d - - misoc 0.9 py35_1+git2e2b7838 + - migen 0.7 py35_2+git40721b2 + - misoc 0.9 py35_2+git8435d832 - jesd204b 0.4 - microscope - binutils-or1k-linux >=2.27