Merge pull request #623 from betrusted-io/modals-refactor

Fix doc-deps issue
This commit is contained in:
bunnie 2025-02-20 18:41:35 +08:00 committed by GitHub
commit 7ad661658a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

View file

@ -170,6 +170,8 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
let cid = xous::connect(sid).unwrap(); // self-connection always succeeds
// register interrupt handler
#[cfg(not(feature = "hosted-baosec"))]
let cam_irq; // this binding has to out-live the temporaries below
#[cfg(not(feature = "hosted-baosec"))]
{
let irq = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::irqarray8::HW_IRQARRAY8_BASE),
@ -181,9 +183,9 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
let mut irq_csr = utralib::CSR::new(irq.as_mut_ptr() as *mut u32);
irq_csr.wo(utra::irqarray8::EV_PENDING, 0xFFFF); // clear any pending interrupts
let cam_irq = CamIrq { csr: utralib::CSR::new(irq.as_mut_ptr() as *mut u32), cid };
cam_irq = CamIrq { csr: utralib::CSR::new(irq.as_mut_ptr() as *mut u32), cid };
let irq_arg = &cam_irq as *const CamIrq as *mut usize;
log::debug!("irq_arg: {:x}", irq_arg as usize);
log::info!("irq_arg: {:x}", irq_arg as usize);
xous::claim_interrupt(utra::irqarray8::IRQARRAY8_IRQ, handle_irq, irq_arg)
.expect("couldn't claim IRQ8");
// enable camera Rx IRQ

View file

@ -189,6 +189,7 @@ impl Modals {
REFCOUNT.fetch_add(1, Ordering::Relaxed);
let conn =
xns.request_connection_blocking(api::SERVER_NAME_MODALS).expect("Can't connect to Modals server");
#[cfg(not(feature = "doc-deps"))]
let trng = Trng::new(&xns).unwrap();
#[allow(unused_mut)]
let mut token = [0u32; 4];