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

rtio: rm rtio_write_and_process_status

This commit is contained in:
Robert Jördens 2016-03-01 15:40:35 +01:00
parent 29776fae3f
commit aa10791ddf
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq/runtime/rtio.c
View File

@ -43,11 +43,16 @@ void rtio_process_exceptional_status(int status, long long int timestamp, int ch
void rtio_output(long long int timestamp, int channel, unsigned int addr, void rtio_output(long long int timestamp, int channel, unsigned int addr,
unsigned int data) unsigned int data)
{ {
int status;
rtio_chan_sel_write(channel); rtio_chan_sel_write(channel);
rtio_o_timestamp_write(timestamp); rtio_o_timestamp_write(timestamp);
rtio_o_address_write(addr); rtio_o_address_write(addr);
rtio_o_data_write(data); rtio_o_data_write(data);
rtio_write_and_process_status(timestamp, channel); rtio_o_we_write(1);
status = rtio_o_status_read();
if(status)
rtio_process_exceptional_status(status, timestamp, channel);
} }

10
artiq/runtime/rtio.h
View File

@ -21,14 +21,4 @@ void rtio_output(long long int timestamp, int channel, unsigned int address,
unsigned int data); unsigned int data);
int rtio_input_wait(long long int timeout, int channel); int rtio_input_wait(long long int timeout, int channel);
static inline void rtio_write_and_process_status(long long int timestamp, int channel)
{
int status;
rtio_o_we_write(1);
status = rtio_o_status_read();
if(status)
rtio_process_exceptional_status(status, timestamp, channel);
}
#endif /* __RTIO_H */ #endif /* __RTIO_H */