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

runtime/rtio: rtio_process_exceptional_status() has only one user

This commit is contained in:
Robert Jördens 2016-03-01 21:38:51 +01:00
parent 0456169558
commit 5ba753425d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/runtime/rtio.c
View File

@ -15,7 +15,8 @@ long long int rtio_get_counter(void)
return rtio_counter_read(); return rtio_counter_read();
} }
void rtio_process_exceptional_status(int status, long long int timestamp, int channel) static void rtio_process_exceptional_status(
long long int timestamp, int channel, int status)
{ {
if(status & RTIO_O_STATUS_FULL) if(status & RTIO_O_STATUS_FULL)
while(rtio_o_status_read() & RTIO_O_STATUS_FULL); while(rtio_o_status_read() & RTIO_O_STATUS_FULL);
@ -52,7 +53,7 @@ void rtio_output(long long int timestamp, int channel, unsigned int addr,
rtio_o_we_write(1); rtio_o_we_write(1);
status = rtio_o_status_read(); status = rtio_o_status_read();
if(status) if(status)
rtio_process_exceptional_status(status, timestamp, channel); rtio_process_exceptional_status(timestamp, channel, status);
} }

1
artiq/runtime/rtio.h
View File

@ -14,7 +14,6 @@
void rtio_init(void); void rtio_init(void);
long long int rtio_get_counter(void); long long int rtio_get_counter(void);
void rtio_process_exceptional_status(int status, long long int timestamp, int channel);
void rtio_log(long long int timestamp, const char *format, ...); void rtio_log(long long int timestamp, const char *format, ...);
void rtio_log_va(long long int timestamp, const char *format, va_list args); void rtio_log_va(long long int timestamp, const char *format, va_list args);
void rtio_output(long long int timestamp, int channel, unsigned int address, void rtio_output(long long int timestamp, int channel, unsigned int address,