saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup IRQ handling

Browse source 
- disable IRQs on departure
- put EV enable outside of the HAL function
this is necessary because we need all HAL calls to be finished
before an interrupt happens to avoid locking problems
This commit is contained in:
bunnie 2024-12-22 00:30:27 +08:00
parent b66b60497b
commit e07ab36984
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
loader/src/platform/cramium/update.rs
View file

@ -21,8 +21,7 @@ use utralib::generated::*;
use crate::SIGBLOCK_SIZE;
use crate::platform::cramium::gfx;
use crate::platform::cramium::sha512_digest::Sha512Prehash;
use crate::platform::cramium::usb;
use crate::platform::cramium::usb::SliceCursor;
use crate::platform::cramium::usb::{self, SliceCursor, disable_all_irqs};
use crate::platform::delay;
// TODO:
@ -163,6 +162,9 @@ pub fn process_update(perclk: u32) {
usb.init();
usb.start();
usb.update_current_speed();
// IRQ enable must happen without dependency on the hardware lock
usb.irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, 0xffff_ffff); // blanket clear
usb.irq_csr.wfo(utralib::utra::irqarray1::EV_ENABLE_USBC_DUPE, 1);
let mut last_usb_state = usb.get_device_state();
let mut portsc = usb.portsc_val();
@ -472,6 +474,9 @@ pub fn process_update(perclk: u32) {
crate::println!("Couldn't list dir: {:?}", e);
}
}
// unmap IRQs
disable_all_irqs();
usb.stop();
} else {
crate::println!("USB core not allocated, can't do update!");
}