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

Fix mismatched signatures for the wide interface

Browse Source 
Lists are passed by-reference from python code, and so should be
&CSlice<_> not CSlice<_>.

Signed-off-by: Jonathan Coates <jonathan.coates@oxionics.com>
This commit is contained in:
Jonathan Coates 2023-05-18 11:49:52 +01:00 committed by Sebastien Bourdeauducq
parent 19059a3385
commit 0323946ffb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/firmware/ksupport/lib.rs
View File

@ -342,7 +342,7 @@ extern fn dma_record_output(target: i32, word: i32) {
} }
#[unwind(aborts)] #[unwind(aborts)]
extern fn dma_record_output_wide(target: i32, words: CSlice<i32>) { extern fn dma_record_output_wide(target: i32, words: &CSlice<i32>) {
assert!(words.len() <= 16); // enforce the hardware limit assert!(words.len() <= 16); // enforce the hardware limit
unsafe { unsafe {

4
artiq/firmware/ksupport/rtio.rs
View File

@ -89,7 +89,7 @@ mod imp {
} }
} }
pub extern fn output_wide(target: i32, data: CSlice<i32>) { pub extern fn output_wide(target: i32, data: &CSlice<i32>) {
unsafe { unsafe {
csr::rtio::target_write(target as u32); csr::rtio::target_write(target as u32);
// writing target clears o_data // writing target clears o_data
@ -235,7 +235,7 @@ mod imp {
unimplemented!("not(has_rtio)") unimplemented!("not(has_rtio)")
} }
pub extern fn output_wide(_target: i32, _data: CSlice<i32>) { pub extern fn output_wide(_target: i32, _data: &CSlice<i32>) {
unimplemented!("not(has_rtio)") unimplemented!("not(has_rtio)")
} }