mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
com: install interrupt handler after ::new()
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
d4f4a100bb
commit
5ff4498112
1 changed files with 11 additions and 9 deletions
|
|
@ -74,28 +74,29 @@ mod implementation {
|
|||
|
||||
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
|
||||
|
||||
let mut xc = XousCom {
|
||||
XousCom {
|
||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||
susres: RegManager::new(csr.as_mut_ptr() as *mut u32),
|
||||
ticktimer,
|
||||
workqueue: Vec::new(),
|
||||
busy: false,
|
||||
stby_current: None,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
pub fn init(&mut self) {
|
||||
xous::claim_interrupt(
|
||||
utra::com::COM_IRQ,
|
||||
handle_irq,
|
||||
(&mut xc) as *mut XousCom as *mut usize,
|
||||
self as *mut XousCom as *mut usize,
|
||||
)
|
||||
.expect("couldn't claim irq");
|
||||
|
||||
xc.susres.push(RegOrField::Reg(utra::com::CONTROL), None);
|
||||
xc.susres.push_fixed_value(RegOrField::Reg(utra::com::EV_PENDING), 0xFFFF_FFFF);
|
||||
xc.susres.push(RegOrField::Reg(utra::com::EV_ENABLE), None);
|
||||
|
||||
xc
|
||||
self.susres.push(RegOrField::Reg(utra::com::CONTROL), None);
|
||||
self.susres.push_fixed_value(RegOrField::Reg(utra::com::EV_PENDING), 0xFFFF_FFFF);
|
||||
self.susres.push(RegOrField::Reg(utra::com::EV_ENABLE), None);
|
||||
}
|
||||
|
||||
pub fn suspend(&mut self) {
|
||||
self.susres.suspend();
|
||||
self.csr.wo(utra::com::EV_ENABLE, 0);
|
||||
|
|
@ -347,6 +348,7 @@ fn main() -> ! {
|
|||
|
||||
// Create a new com object
|
||||
let mut com = XousCom::new();
|
||||
com.init();
|
||||
let ticktimer = ticktimer_server::Ticktimer::new().unwrap();
|
||||
|
||||
#[cfg(not(any(windows, unix)))] // avoid errors in hosted mode
|
||||
|
|
@ -1224,4 +1226,4 @@ fn parse_version(com: &mut crate::implementation::XousCom) -> u32 {
|
|||
|
||||
fn from_le_words(words: [u16; 2]) -> u32 {
|
||||
words[0] as u32 | (words[1] as u32) << 16
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue