modify base API for GlobalConfig to auto-infer the API address

the switch based on target is now absorbed into the new() function.
This paves the way for us to add more CSR ranges into the global
configuration object, i.e. IRQ csrs for I2C.
This commit is contained in:
bunnie 2025-06-07 01:52:25 +08:00
parent 69e73ffd61
commit cfe9b3c845
5 changed files with 37 additions and 20 deletions

View file

@ -37,9 +37,36 @@ impl Into<usize> for GlobalReg {
pub struct GlobalConfig {
csr: SharedCsr<u32>,
i2c_irq: SharedCsr<u32>,
}
impl GlobalConfig {
pub fn new(base_addr: *mut u32) -> Self { GlobalConfig { csr: SharedCsr::new(base_addr) } }
pub fn new() -> Self {
#[cfg(target_os = "xous")]
let base_addr = xous::syscall::map_memory(
xous::MemoryAddress::new(utralib::generated::HW_UDMA_CTRL_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map UDMA global control")
.as_mut_ptr() as *mut u32;
#[cfg(not(target_os = "xous"))]
let base_addr = utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32;
#[cfg(target_os = "xous")]
let i2c_irq_addr = xous::syscall::map_memory(
xous::MemoryAddress::new(utralib::generated::HW_IRQARRAY7_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map I2C IRQ range")
.as_mut_ptr() as *mut u32;
#[cfg(not(target_os = "xous"))]
let i2c_irq_addr = utralib::generated::HW_IRQARRAY7_BASE as *mut u32;
GlobalConfig { csr: SharedCsr::new(base_addr), i2c_irq: SharedCsr::new(i2c_irq_addr) }
}
pub fn clock_on(&self, peripheral: PeriphId) {
// Safety: only safe when used in the context of UDMA registers.

View file

@ -235,7 +235,7 @@ pub fn early_init() -> u32 {
// Set up the UDMA_UART block to the correct baud rate and enable status
#[allow(unused_mut)] // some configs require mut
let mut udma_global = GlobalConfig::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32);
let mut udma_global = GlobalConfig::new();
udma_global.clock_on(PeriphId::Uart1);
udma_global.map_event(
PeriphId::Uart1,
@ -409,7 +409,7 @@ pub fn early_init() -> u32 {
// show the boot logo
use ux_api::minigfx::FrameBuffer;
let mut udma_global = GlobalConfig::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32);
let mut udma_global = GlobalConfig::new();
let mut sh1107 = cramium_hal::sh1107::Oled128x128::new(
cramium_hal::sh1107::MainThreadToken::new(),
perclk,
@ -456,7 +456,7 @@ pub fn early_init() -> u32 {
use crate::platform::cramium::qr;
let iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32);
let udma_global = GlobalConfig::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32);
let udma_global = GlobalConfig::new();
// setup camera pins
let (cam_pdwn_bnk, cam_pdwn_pin) = cramium_hal::board::setup_camera_pins(&iox);
@ -962,7 +962,7 @@ pub fn early_init() -> u32 {
// setup the I/O pins
let mut iox = Iox::new(utralib::generated::HW_IOX_BASE as *mut u32);
let mut udma_global = GlobalConfig::new(utralib::generated::HW_UDMA_CTRL_BASE as *mut u32);
let mut udma_global = GlobalConfig::new();
let channel = cramium_hal::board::setup_memory_pins(&iox);
udma_global.clock_off(PeriphId::from(channel));

View file

@ -41,7 +41,7 @@ pub struct SwapHal {
impl SwapHal {
pub fn new(cfg: &BootConfig, perclk_freq: u32) -> Option<SwapHal> {
if let Some(swap) = cfg.swap {
let udma_global = GlobalConfig::new(utralib::generated::HW_UDMA_CTRL_BASE as *mut u32);
let udma_global = GlobalConfig::new();
// setup the I/O pins
let iox = Iox::new(utralib::generated::HW_IOX_BASE as *mut u32);
@ -413,8 +413,7 @@ pub fn userspace_maps(cfg: &mut BootConfig) {
iox.set_gpio_dir(IoxPort::PD, 3, IoxDir::Output);
// Set up the UDMA_UART block to the correct baud rate and enable status
let udma_global =
cramium_hal::udma::GlobalConfig::new(utralib::utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32);
let udma_global = cramium_hal::udma::GlobalConfig::new();
udma_global.clock_on(PeriphId::Uart0);
udma_global.map_event(
PeriphId::Uart0,

View file

@ -110,7 +110,7 @@ pub fn process_update(perclk: u32) {
crate::println!("waiting for button press");
let mut iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32);
let mut udma_global = udma::GlobalConfig::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32);
let mut udma_global = udma::GlobalConfig::new();
let iox_kbd = iox.clone();
let mut sh1107 = cramium_hal::sh1107::Oled128x128::new(
@ -394,9 +394,7 @@ pub fn process_update(perclk: u32) {
);
progress_bar(&mut sh1107, 0);
let udma_global = GlobalConfig::new(
utralib::generated::HW_UDMA_CTRL_BASE as *mut u32,
);
let udma_global = GlobalConfig::new();
// setup the I/O pins
let iox = Iox::new(utralib::generated::HW_IOX_BASE as *mut u32);

View file

@ -185,14 +185,7 @@ fn main() {
.expect("couldn't claim the IOX hardware page");
let iox = Iox::new(iox_page.as_ptr() as *mut u32);
let udma_global_csr = xous::syscall::map_memory(
xous::MemoryAddress::new(utralib::generated::HW_UDMA_CTRL_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map UDMA global control");
let udma_global = GlobalConfig::new(udma_global_csr.as_mut_ptr() as *mut u32);
let udma_global = GlobalConfig::new();
// Note: the I2C handler can be put into a separate thread if we need the main
// HAL server to not block while a large I2C transaction is being handled. For