From 64612352d3d50d31f808d745c456113b2391738e Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 2 Dec 2024 19:04:37 +0800 Subject: [PATCH] raw pointer dance for debug UART --- kernel/src/debug/macros.rs | 2 +- kernel/src/platform/cramium/uart.rs | 9 ++++++--- kernel/src/platform/precursor/uart.rs | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel/src/debug/macros.rs b/kernel/src/debug/macros.rs index 58b11321f..0cef11101 100644 --- a/kernel/src/debug/macros.rs +++ b/kernel/src/debug/macros.rs @@ -10,7 +10,7 @@ macro_rules! print { #[allow(unused_unsafe)] unsafe { use core::fmt::Write; - if let Some(stream) = crate::debug::shell::OUTPUT.as_mut() { + if let Some(stream) = &mut *(&raw mut crate::debug::shell::OUTPUT) { write!(stream, $($args)+).unwrap(); } } diff --git a/kernel/src/platform/cramium/uart.rs b/kernel/src/platform/cramium/uart.rs index fdcb1287a..2f1935dda 100644 --- a/kernel/src/platform/cramium/uart.rs +++ b/kernel/src/platform/cramium/uart.rs @@ -3,6 +3,9 @@ // SPDX-FileCopyrightText: 2024 bunnie // SPDX-License-Identifier: Apache-2.0 +// FIXME(static_mut_refs): Do not allow `static_mut_refs` lint +#![allow(static_mut_refs)] + use utralib::generated::*; use xous_kernel::{MemoryFlags, MemoryType}; @@ -119,14 +122,14 @@ pub fn init() { unsafe { UART = Some(uart); - crate::debug::shell::init(UART.as_mut().unwrap()); + crate::debug::shell::init((&mut *(&raw mut UART)).as_mut().unwrap()); // Claim UART interrupt. println!("Claiming IRQ {} via syscall...", utra::uart::UART_IRQ); xous_kernel::claim_interrupt( utra::uart::UART_IRQ, Uart::irq, - (UART.as_mut().unwrap() as *mut Uart) as *mut usize, + ((&mut *(&raw mut UART)).as_mut().unwrap() as *mut Uart) as *mut usize, ) .expect("Couldn't claim debug interrupt"); } @@ -152,7 +155,7 @@ pub fn init() { uart.init(); unsafe { UART = Some(uart); - crate::debug::shell::init(UART.as_mut().unwrap()); + crate::debug::shell::init((&mut *(&raw mut UART)).as_mut().unwrap()); } } diff --git a/kernel/src/platform/precursor/uart.rs b/kernel/src/platform/precursor/uart.rs index f9d23a487..f57f24f98 100644 --- a/kernel/src/platform/precursor/uart.rs +++ b/kernel/src/platform/precursor/uart.rs @@ -86,14 +86,14 @@ pub fn init() { unsafe { UART = Some(uart); - crate::debug::shell::init(UART.as_mut().unwrap()); + crate::debug::shell::init((&mut *(&raw mut UART)).as_mut().unwrap()); // Claim UART interrupt. println!("Claiming IRQ {} via syscall...", utra::uart::UART_IRQ); xous_kernel::claim_interrupt( utra::uart::UART_IRQ, Uart::irq, - (UART.as_mut().unwrap() as *mut Uart) as *mut usize, + ((&mut *(&raw mut UART)).as_mut().unwrap() as *mut Uart) as *mut usize, ) .expect("Couldn't claim debug interrupt"); }