From c407db877ef35a27121a0b4eb51a1e29749efe34 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 22 Apr 2024 11:00:06 +0800 Subject: [PATCH] change DUART ports to accommodate jtag breakout --- libs/xous-pl230/src/lib.rs | 4 ++-- loader/src/platform/cramium/cramium.rs | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libs/xous-pl230/src/lib.rs b/libs/xous-pl230/src/lib.rs index 5f5d8bbe3..e898ef786 100644 --- a/libs/xous-pl230/src/lib.rs +++ b/libs/xous-pl230/src/lib.rs @@ -11,7 +11,7 @@ use utralib::*; #[repr(C, align(16))] #[derive(Default)] -struct ChannelControl { +pub struct ChannelControl { pub src_end_ptr: u32, pub dst_end_ptr: u32, pub control: u32, @@ -20,7 +20,7 @@ struct ChannelControl { #[repr(C, align(256))] #[derive(Default)] -struct ControlChannels { +pub struct ControlChannels { pub channels: [ChannelControl; 8], } diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index fca223132..ce8748a78 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -99,25 +99,27 @@ pub fn early_init() { // Set up the IO mux to map UART_A0: // UART_RX_A[0] = PA3 // UART_TX_A[0] = PA4 + // UART_RX_A[1] = PD13 + // UART_RX_A[1] = PD14 let mut iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32); - iox.set_alternate_function(IoxPort::PA, 3, IoxFunction::AF1); - iox.set_alternate_function(IoxPort::PA, 4, IoxFunction::AF1); + iox.set_alternate_function(IoxPort::PD, 13, IoxFunction::AF1); + iox.set_alternate_function(IoxPort::PD, 14, IoxFunction::AF1); // rx as input, with pull-up - iox.set_gpio_dir(IoxPort::PA, 3, IoxDir::Input); - iox.set_gpio_pullup(IoxPort::PA, 3, IoxEnable::Enable); + iox.set_gpio_dir(IoxPort::PD, 13, IoxDir::Input); + iox.set_gpio_pullup(IoxPort::PD, 13, IoxEnable::Enable); // tx as output - iox.set_gpio_dir(IoxPort::PA, 4, IoxDir::Output); + iox.set_gpio_dir(IoxPort::PD, 14, IoxDir::Output); // Set up the UDMA_UART block to the correct baud rate and enable status let mut udma_global = udma::GlobalConfig::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32); - udma_global.clock_on(udma::PeriphId::Uart0); + udma_global.clock_on(udma::PeriphId::Uart1); udma_global.map_event( - udma::PeriphId::Uart0, + udma::PeriphId::Uart1, udma::PeriphEventType::Uart(udma::EventUartOffset::Rx), udma::EventChannel::Channel0, ); udma_global.map_event( - udma::PeriphId::Uart0, + udma::PeriphId::Uart1, udma::PeriphEventType::Uart(udma::EventUartOffset::Tx), udma::EventChannel::Channel1, ); @@ -131,7 +133,7 @@ pub fn early_init() { let uart_buf_addr = UART_IFRAM_ADDR; let mut udma_uart = unsafe { // safety: this is safe to call, because we set up clock and events prior to calling new. - udma::Uart::get_handle(utra::udma_uart_0::HW_UDMA_UART_0_BASE, uart_buf_addr, uart_buf_addr) + udma::Uart::get_handle(utra::udma_uart_1::HW_UDMA_UART_1_BASE, uart_buf_addr, uart_buf_addr) }; udma_uart.set_baud(baudrate, freq);