From 7ee867d7c4ef3a2a7f0889cb8bde8572ea877626 Mon Sep 17 00:00:00 2001 From: morgan Date: Tue, 3 Sep 2024 12:49:49 +0800 Subject: [PATCH] cxp upconn fw: update trigger csr --- src/libboard_artiq/src/cxp_upconn.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libboard_artiq/src/cxp_upconn.rs b/src/libboard_artiq/src/cxp_upconn.rs index 21e1bc3..ba00b59 100644 --- a/src/libboard_artiq/src/cxp_upconn.rs +++ b/src/libboard_artiq/src/cxp_upconn.rs @@ -3,25 +3,25 @@ use libboard_zynq::{println, timer::GlobalTimer}; use crate::pl::csr; -pub fn trigger_test(timer: &mut GlobalTimer) { +pub fn trigger_test(timer: &mut GlobalTimer, linktrig_mode: u8) { const LEN: usize = 4 * 8; let mut pak_arr: [u8; LEN] = [0; LEN]; unsafe { - csr::cxp::trig_trig_delay_write(0x05); - csr::cxp::trig_linktrigger_write(0x05); // mode 0 - csr::cxp::trig_stb_write(1); // send trig + csr::cxp::upconn_trig_delay_write(0x05); + csr::cxp::upconn_linktrigger_write(linktrig_mode); + csr::cxp::upconn_trig_stb_write(1); // send trig timer.delay_us(1); let mut i: usize = 0; - while csr::cxp::trig_dout_valid_read() == 1 { - pak_arr[i] = csr::cxp::trig_dout_pak_read(); + while csr::cxp::upconn_trig_dout_valid_read() == 1 { + pak_arr[i] = csr::cxp::upconn_trig_dout_pak_read(); // println!("received {:#04X}", pak_arr[i]); - csr::cxp::trig_inc_write(1); + csr::cxp::upconn_trig_inc_write(1); i += 1; } - println!("trigger packet"); + println!("trigger packet | linktrigger = {}", linktrig_mode); println!("arr = ["); for i in 0..(LEN / 4) { println!(