M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: support RTIO configurations without address (e.g. all simple TTL out)

This commit is contained in:
Sebastien Bourdeauducq 2016-07-27 19:19:44 +08:00
parent 7928ee4a6e
commit 8fab789e39
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/runtime/bridge.c
View File

@ -10,7 +10,9 @@
static void rtio_output_blind(int channel, int addr, int data) static void rtio_output_blind(int channel, int addr, int data)
{ {
rtio_chan_sel_write(channel); rtio_chan_sel_write(channel);
#ifdef CSR_RTIO_O_ADDRESS_ADDR
rtio_o_address_write(addr); rtio_o_address_write(addr);
#endif
rtio_o_data_write(data); rtio_o_data_write(data);
rtio_o_timestamp_write(rtio_get_counter() + TIME_BUFFER); rtio_o_timestamp_write(rtio_get_counter() + TIME_BUFFER);
rtio_o_we_write(1); rtio_o_we_write(1);

2
artiq/runtime/rtio.c
View File

@ -55,7 +55,9 @@ void rtio_output(long long int timestamp, int channel, unsigned int addr,
rtio_chan_sel_write(channel); rtio_chan_sel_write(channel);
rtio_o_timestamp_write(timestamp); rtio_o_timestamp_write(timestamp);
#ifdef CSR_RTIO_O_ADDRESS_ADDR
rtio_o_address_write(addr); rtio_o_address_write(addr);
#endif
rtio_o_data_write(data); rtio_o_data_write(data);
rtio_o_we_write(1); rtio_o_we_write(1);
status = rtio_o_status_read(); status = rtio_o_status_read();