diff --git a/src/libboard_artiq/src/cxp_ctrl.rs b/src/libboard_artiq/src/cxp_ctrl.rs index 6751121..9541b5a 100644 --- a/src/libboard_artiq/src/cxp_ctrl.rs +++ b/src/libboard_artiq/src/cxp_ctrl.rs @@ -4,7 +4,7 @@ use byteorder::{ByteOrder, NetworkEndian}; use io::Cursor; use libboard_zynq::{println, time::Milliseconds, timer::GlobalTimer}; -use crate::{cxp_proto::{print_packet, DownConnPacket, Error, UpConnPacket, DATA_MAXSIZE}, +use crate::{cxp_proto::{print_packet, Error, RXPacket, TXPacket, DATA_MAXSIZE}, mem::mem::CXP_MEM, pl::csr::CXP}; @@ -12,28 +12,28 @@ const BUF_LEN: usize = 0x800; const TRANSMISSION_TIMEOUT: u64 = 200; fn packet_pending(channel: u8) -> bool { - unsafe { (CXP[channel as usize].downconn_pending_packet_read)() == 1 } + unsafe { (CXP[channel as usize].rx_pending_packet_read)() == 1 } } -fn receive(channel: u8) -> Result, Error> { +fn receive(channel: u8) -> Result, Error> { if packet_pending(channel) { let channel = channel as usize; unsafe { - let read_buffer_ptr = (CXP[channel].downconn_read_ptr_read)() as usize; + let read_buffer_ptr = (CXP[channel].rx_read_ptr_read)() as usize; println!("buffer ptr = {}", read_buffer_ptr); let ptr = (CXP_MEM[channel].base + CXP_MEM[channel].size / 2 + read_buffer_ptr * BUF_LEN) as *mut u32; let mut reader = Cursor::new(slice::from_raw_parts_mut(ptr as *mut u8, BUF_LEN)); - let packet_type = (CXP[channel].downconn_packet_type_read)(); + let packet_type = (CXP[channel].rx_packet_type_read)(); println!("packet_type = {}", packet_type); // DEBUG: // println!("RX MEM before reading"); // print_packet(&reader.get_ref()[0..40]); - let packet = DownConnPacket::read_from(&mut reader, packet_type); + let packet = RXPacket::read_from(&mut reader, packet_type); println!("{:X?}", packet); - (CXP[channel].downconn_pending_packet_write)(1); + (CXP[channel].rx_pending_packet_write)(1); Ok(Some(packet?)) } } else { @@ -41,7 +41,7 @@ fn receive(channel: u8) -> Result, Error> { } } -fn receive_timeout(channel: u8, timeout_ms: u64) -> Result { +fn receive_timeout(channel: u8, timeout_ms: u64) -> Result { // assume timer was initialized successfully let timer = unsafe { GlobalTimer::get() }; let limit = timer.get_time() + Milliseconds(timeout_ms); @@ -54,11 +54,11 @@ fn receive_timeout(channel: u8, timeout_ms: u64) -> Result Result<(), Error> { - // assume upconn tx is enabled +fn send_data_packet(channel: u8, packet: &TXPacket) -> Result<(), Error> { + // assume tx is enabled let channel = channel as usize; unsafe { - while (CXP[channel].upconn_bootstrap_tx_busy_read)() == 1 {} + while (CXP[channel].tx_bootstrap_tx_busy_read)() == 1 {} let ptr = CXP_MEM[channel].base as *mut u32; let mut writer = Cursor::new(slice::from_raw_parts_mut(ptr as *mut u8, BUF_LEN)); @@ -67,19 +67,19 @@ fn send_data_packet(channel: u8, packet: &UpConnPacket) -> Result<(), Error> { // println!("TX MEM after writing"); // print_packet(&writer.get_ref()[0..40]); - (CXP[channel].upconn_bootstrap_tx_word_len_write)(writer.position() as u16 / 4); - (CXP[channel].upconn_bootstrap_tx_write)(1); + (CXP[channel].tx_bootstrap_tx_word_len_write)(writer.position() as u16 / 4); + (CXP[channel].tx_bootstrap_tx_write)(1); } Ok(()) } pub fn send_test_packet(channel: u8) -> Result<(), Error> { - // assume upconn tx is enabled + // assume tx is enabled let channel = channel as usize; unsafe { - while (CXP[channel].upconn_bootstrap_tx_busy_read)() == 1 {} - (CXP[channel].upconn_bootstrap_tx_testseq_write)(1); + while (CXP[channel].tx_bootstrap_tx_busy_read)() == 1 {} + (CXP[channel].tx_bootstrap_tx_testseq_write)(1); } Ok(()) } @@ -89,7 +89,7 @@ pub fn send_test_packet(channel: u8) -> Result<(), Error> { // DEBUG: // // -pub fn downconn_debug_mem_print(channel: u8) { +pub fn rx_debug_mem_print(channel: u8) { unsafe { let ptr = CXP_MEM[channel as usize].base as *mut u32; let arr = slice::from_raw_parts_mut(ptr as *mut u8, BUF_LEN * 4); @@ -102,7 +102,7 @@ pub fn print_decode_error(channel: u8) { println!( "CH#{} Decode error = {}", channel, - (CXP[channel as usize].downconn_bootstrap_decoder_err_read)() + (CXP[channel as usize].rx_bootstrap_decoder_err_read)() ); } } @@ -145,11 +145,11 @@ fn check_length(length: u32) -> Result<(), Error> { fn process_ack_packet(channel: u8, timeout: u64) -> Result<(), Error> { match receive_timeout(channel, timeout) { - Ok(DownConnPacket::CtrlAck { tag }) => { + Ok(RXPacket::CtrlAck { tag }) => { check_tag(tag)?; Ok(()) } - Ok(DownConnPacket::CtrlDelay { tag, time }) => { + Ok(RXPacket::CtrlDelay { tag, time }) => { check_tag(tag)?; // info!("delaying by {} ms ....", time); @@ -162,7 +162,7 @@ fn process_ack_packet(channel: u8, timeout: u64) -> Result<(), Error> { fn process_reply_packet(channel: u8, timeout: u64, expected_length: u32) -> Result<[u8; DATA_MAXSIZE], Error> { match receive_timeout(channel, timeout) { - Ok(DownConnPacket::CtrlReply { tag, length, data }) => { + Ok(RXPacket::CtrlReply { tag, length, data }) => { check_tag(tag)?; if length != expected_length { @@ -171,7 +171,7 @@ fn process_reply_packet(channel: u8, timeout: u64, expected_length: u32) -> Resu Ok(data) } - Ok(DownConnPacket::CtrlDelay { tag, time }) => { + Ok(RXPacket::CtrlDelay { tag, time }) => { check_tag(tag)?; // info!("delaying by {} ms ....", time); @@ -192,7 +192,7 @@ pub fn write_bytes_no_ack(channel: u8, addr: u32, val: &[u8], with_tag: bool) -> let tag: Option = if with_tag { Some(unsafe { TAG }) } else { None }; send_data_packet( channel, - &UpConnPacket::CtrlWrite { + &TXPacket::CtrlWrite { tag, addr, length, @@ -225,7 +225,7 @@ pub fn write_u64(channel: u8, addr: u32, val: u64, with_tag: bool) -> Result<(), fn read(channel: u8, addr: u32, length: u32, with_tag: bool) -> Result<(), Error> { check_length(length)?; let tag: Option = if with_tag { Some(unsafe { TAG }) } else { None }; - send_data_packet(channel, &UpConnPacket::CtrlRead { tag, addr, length }) + send_data_packet(channel, &TXPacket::CtrlRead { tag, addr, length }) } pub fn read_bytes(channel: u8, addr: u32, bytes: &mut [u8], with_tag: bool) -> Result<(), Error> {