From 69d060b639f6f0968b59f02cbc104e752f78d0a8 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 19 Sep 2018 17:50:18 +0800 Subject: [PATCH] drtio: fix satellite i_status handling --- artiq/gateware/drtio/rt_packet_satellite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/gateware/drtio/rt_packet_satellite.py b/artiq/gateware/drtio/rt_packet_satellite.py index 02a5a98b1..8d7281bfa 100644 --- a/artiq/gateware/drtio/rt_packet_satellite.py +++ b/artiq/gateware/drtio/rt_packet_satellite.py @@ -161,8 +161,8 @@ class RTPacketSatellite(Module): tx_fsm.act("IDLE", If(echo_req, NextState("ECHO")), If(buffer_space_req, NextState("BUFFER_SPACE")), - If(read_request_pending, - If(~self.cri.i_status[2], NextState("READ")), + If(read_request_pending & ~self.cri.i_status[2], + NextState("READ"), If(self.cri.i_status[0], NextState("READ_TIMEOUT")), If(self.cri.i_status[1], NextState("READ_OVERFLOW")) )