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

runtime: refactor rtio_output_list.

This commit is contained in:
whitequark 2016-11-23 16:35:02 +00:00
parent 79e70fa465
commit cf12a888e7
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/runtime.rs/libksupport/api.rs
View File

@ -102,7 +102,7 @@ static mut API: &'static [(&'static str, *const ())] = &[
api!(rtio_get_counter = ::rtio::get_counter), api!(rtio_get_counter = ::rtio::get_counter),
api!(rtio_log), api!(rtio_log),
api!(rtio_output = ::rtio::output), api!(rtio_output = ::rtio::output),
api!(rtio_output_list = ::rtio::output_list), api!(rtio_output_wide = ::rtio::output_wide),
api!(rtio_input_timestamp = ::rtio::input_timestamp), api!(rtio_input_timestamp = ::rtio::input_timestamp),
api!(rtio_input_data = ::rtio::input_data), api!(rtio_input_data = ::rtio::input_data),

25
artiq/runtime.rs/libksupport/rtio.rs
View File

@ -1,6 +1,5 @@
use board::csr; use board::csr;
use core::ptr::{read_volatile, write_volatile}; use core::ptr::{read_volatile, write_volatile};
use core::slice;
use ::ArtiqList; use ::ArtiqList;
const RTIO_O_STATUS_FULL: u32 = 1; const RTIO_O_STATUS_FULL: u32 = 1;
@ -27,16 +26,16 @@ pub extern fn get_counter() -> i64 {
} }
#[inline(always)] #[inline(always)]
pub unsafe fn rtio_o_data_write(w: u32) { pub unsafe fn rtio_o_data_write(offset: usize, data: u32) {
write_volatile( write_volatile(
csr::rtio::O_DATA_ADDR.offset((csr::rtio::O_DATA_SIZE - 1) as isize), csr::rtio::O_DATA_ADDR.offset((csr::rtio::O_DATA_SIZE - 1 - offset) as isize),
w); data);
} }
#[inline(always)] #[inline(always)]
pub unsafe fn rtio_i_data_read() -> u32 { pub unsafe fn rtio_i_data_read(offset: usize) -> u32 {
read_volatile( read_volatile(
csr::rtio::I_DATA_ADDR.offset((csr::rtio::I_DATA_SIZE - 1) as isize)) csr::rtio::I_DATA_ADDR.offset((csr::rtio::I_DATA_SIZE - 1 - offset) as isize))
} }
#[inline(never)] #[inline(never)]
@ -75,7 +74,7 @@ pub extern fn output(timestamp: i64, channel: u32, addr: u32, data: u32) {
csr::rtio::chan_sel_write(channel); csr::rtio::chan_sel_write(channel);
csr::rtio::o_timestamp_write(timestamp as u64); csr::rtio::o_timestamp_write(timestamp as u64);
csr::rtio::o_address_write(addr); csr::rtio::o_address_write(addr);
rtio_o_data_write(data); rtio_o_data_write(0, data);
csr::rtio::o_we_write(1); csr::rtio::o_we_write(1);
let status = csr::rtio::o_status_read(); let status = csr::rtio::o_status_read();
if status != 0 { if status != 0 {
@ -84,16 +83,14 @@ pub extern fn output(timestamp: i64, channel: u32, addr: u32, data: u32) {
} }
} }
pub extern fn output_list(timestamp: i64, channel: u32, addr: u32, list: ArtiqList<i32>) { pub extern fn output_wide(timestamp: i64, channel: u32, addr: u32, list: ArtiqList<i32>) {
unsafe { unsafe {
csr::rtio::chan_sel_write(channel); csr::rtio::chan_sel_write(channel);
csr::rtio::o_timestamp_write(timestamp as u64); csr::rtio::o_timestamp_write(timestamp as u64);
csr::rtio::o_address_write(addr); csr::rtio::o_address_write(addr);
let data = list.as_slice(); let data = list.as_slice();
for i in 0..data.len() { for i in 0..data.len() {
write_volatile( rtio_o_data_write(i, data[i] as u32)
csr::rtio::O_DATA_ADDR.offset((csr::rtio::O_DATA_SIZE - 1 - i) as isize),
data[i] as u32);
} }
csr::rtio::o_we_write(1); csr::rtio::o_we_write(1);
let status = csr::rtio::o_status_read(); let status = csr::rtio::o_status_read();
@ -154,7 +151,7 @@ pub extern fn input_data(channel: u32) -> u32 {
} }
} }
let data = rtio_i_data_read(); let data = rtio_i_data_read(0);
csr::rtio::i_re_write(1); csr::rtio::i_re_write(1);
data data
} }
@ -171,14 +168,14 @@ pub fn log(timestamp: i64, data: &[u8]) {
word <<= 8; word <<= 8;
word |= data[i] as u32; word |= data[i] as u32;
if i % 4 == 0 { if i % 4 == 0 {
rtio_o_data_write(word); rtio_o_data_write(0, word);
csr::rtio::o_we_write(1); csr::rtio::o_we_write(1);
word = 0; word = 0;
} }
} }
word <<= 8; word <<= 8;
rtio_o_data_write(word); rtio_o_data_write(0, word);
csr::rtio::o_we_write(1); csr::rtio::o_we_write(1);
} }
} }