mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
xous-ticktimer: delay installing irq handler
Wait until the outside of `new()` in order to install the irq handler. This is due to a change in the optimizer for 1.71.0 which has exposed unsoundness. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
b23f6717ef
commit
539ca0cb56
1 changed files with 21 additions and 16 deletions
|
|
@ -10,6 +10,7 @@ use utralib::generated::*;
|
||||||
|
|
||||||
pub struct XousTickTimer {
|
pub struct XousTickTimer {
|
||||||
csr: utralib::CSR<u32>,
|
csr: utralib::CSR<u32>,
|
||||||
|
initialized: bool,
|
||||||
current_response: Option<TimerRequest>,
|
current_response: Option<TimerRequest>,
|
||||||
last_response: Option<TimerRequest>,
|
last_response: Option<TimerRequest>,
|
||||||
connection: xous::CID,
|
connection: xous::CID,
|
||||||
|
|
@ -73,6 +74,7 @@ impl XousTickTimer {
|
||||||
|
|
||||||
let mut xtt = XousTickTimer {
|
let mut xtt = XousTickTimer {
|
||||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||||
|
initialized: false,
|
||||||
current_response: None,
|
current_response: None,
|
||||||
last_response: None,
|
last_response: None,
|
||||||
connection,
|
connection,
|
||||||
|
|
@ -89,22 +91,6 @@ impl XousTickTimer {
|
||||||
// xtt.wdt_sr_manager.push(RegOrField::Field(utra::wdt::WATCHDOG_ENABLE), None);
|
// xtt.wdt_sr_manager.push(RegOrField::Field(utra::wdt::WATCHDOG_ENABLE), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
xous::claim_interrupt(
|
|
||||||
utra::ticktimer::TICKTIMER_IRQ,
|
|
||||||
handle_irq,
|
|
||||||
(&mut xtt) as *mut XousTickTimer as *mut usize,
|
|
||||||
)
|
|
||||||
.expect("couldn't claim irq");
|
|
||||||
|
|
||||||
xtt.ticktimer_sr_manager
|
|
||||||
.push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET0), None);
|
|
||||||
xtt.ticktimer_sr_manager
|
|
||||||
.push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET1), None);
|
|
||||||
xtt.ticktimer_sr_manager
|
|
||||||
.push_fixed_value(RegOrField::Reg(utra::ticktimer::EV_PENDING), 0xFFFF_FFFF);
|
|
||||||
xtt.ticktimer_sr_manager
|
|
||||||
.push(RegOrField::Reg(utra::ticktimer::EV_ENABLE), None);
|
|
||||||
|
|
||||||
xtt
|
xtt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -117,6 +103,25 @@ impl XousTickTimer {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn reset(&mut self) {
|
pub fn reset(&mut self) {
|
||||||
|
if ! self.initialized {
|
||||||
|
xous::claim_interrupt(
|
||||||
|
utra::ticktimer::TICKTIMER_IRQ,
|
||||||
|
handle_irq,
|
||||||
|
self as *mut XousTickTimer as *mut usize,
|
||||||
|
)
|
||||||
|
.expect("couldn't claim irq");
|
||||||
|
|
||||||
|
self.ticktimer_sr_manager
|
||||||
|
.push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET0), None);
|
||||||
|
self.ticktimer_sr_manager
|
||||||
|
.push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET1), None);
|
||||||
|
self.ticktimer_sr_manager
|
||||||
|
.push_fixed_value(RegOrField::Reg(utra::ticktimer::EV_PENDING), 0xFFFF_FFFF);
|
||||||
|
self.ticktimer_sr_manager
|
||||||
|
.push(RegOrField::Reg(utra::ticktimer::EV_ENABLE), None);
|
||||||
|
|
||||||
|
self.initialized = true;
|
||||||
|
}
|
||||||
self.csr.wfo(utra::ticktimer::CONTROL_RESET, 0b1);
|
self.csr.wfo(utra::ticktimer::CONTROL_RESET, 0b1);
|
||||||
self.csr.wo(utra::ticktimer::CONTROL, 0); // not paused, not reset -> free-run
|
self.csr.wo(utra::ticktimer::CONTROL, 0); // not paused, not reset -> free-run
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue