From ab5f397fea26cdcf2b3d585c6b5baa8ccfc57c22 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 13 Feb 2018 20:02:26 +0800
Subject: [PATCH] sed/fifos: use AsyncFIFOBuffered

(D)RTIO now passes timing at 150MHz on Kasli.
---
 artiq/gateware/rtio/sed/fifos.py | 2 +-
 conda/artiq-dev/meta.yaml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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