srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

drtio: input fixes

This commit is contained in:
Sebastien Bourdeauducq 2017-03-14 14:14:43 +08:00
parent 856a64f6d2
commit 56fd9b3b4b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/gateware/drtio/rt_controller_master.py
View File

@ -230,6 +230,7 @@ class RTController(Module):
) )
fsm.act("READ", fsm.act("READ",
i_status_wait_status.eq(1), i_status_wait_status.eq(1),
rt_packet.read_not_ack.eq(1),
rt_packet_read_request.eq(1), rt_packet_read_request.eq(1),
rt_packet.sr_stb.eq(1), rt_packet.sr_stb.eq(1),
If(rt_packet.sr_ack, If(rt_packet.sr_ack,
@ -238,6 +239,7 @@ class RTController(Module):
) )
fsm.act("GET_READ_REPLY", fsm.act("GET_READ_REPLY",
i_status_wait_status.eq(1), i_status_wait_status.eq(1),
rt_packet.read_not_ack.eq(1),
If(rt_packet.read_not, If(rt_packet.read_not,
load_read_reply.eq(1), load_read_reply.eq(1),
NextState("IDLE") NextState("IDLE")

2
artiq/gateware/drtio/rt_ios_satellite.py
View File

@ -106,6 +106,8 @@ class IOS(Module):
self.sync.rio += interface.fine_ts.eq(fifo_out.timestamp[:fine_ts_width]) self.sync.rio += interface.fine_ts.eq(fifo_out.timestamp[:fine_ts_width])
def add_input(self, n, channel): def add_input(self, n, channel):
rt_packet = self.rt_packet
interface = channel.interface.i interface = channel.interface.i
if interface is None: if interface is None:
return return