mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
trying to fix renode stuff, but not quite there
This commit is contained in:
parent
2b973fa29c
commit
4ecd7c06ac
3 changed files with 7 additions and 5 deletions
|
|
@ -19,7 +19,7 @@ app_uart: UART.LiteX_UART @ {
|
||||||
-> cpu@1004
|
-> cpu@1004
|
||||||
|
|
||||||
timer0: Timers.LiteX_Timer_32 @ {
|
timer0: Timers.LiteX_Timer_32 @ {
|
||||||
sysbus 0xF0021000
|
sysbus 0xF0022000
|
||||||
}
|
}
|
||||||
frequency: 100000000
|
frequency: 100000000
|
||||||
-> cpu@1001
|
-> cpu@1001
|
||||||
|
|
@ -41,12 +41,12 @@ fbmem: Memory.MappedMemory @ sysbus 0xB0000000
|
||||||
|
|
||||||
memlcd: Video.BetrustedLCD @ sysbus 0xF000B000
|
memlcd: Video.BetrustedLCD @ sysbus 0xF000B000
|
||||||
|
|
||||||
keyboard: Input.BetrustedKbd @ sysbus 0xF0014000
|
keyboard: Input.BetrustedKbd @ sysbus 0xF0015000
|
||||||
-> cpu @ 1010
|
-> cpu @ 1010
|
||||||
|
|
||||||
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF0019000
|
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF001A000
|
||||||
|
|
||||||
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001A000
|
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001B000
|
||||||
|
|
||||||
// This peripheral doesn't actually exist, but is required
|
// This peripheral doesn't actually exist, but is required
|
||||||
// in order to keep the CPU running.
|
// in order to keep the CPU running.
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,6 @@ pub fn status_thread(canvas_gid_0: usize, canvas_gid_1: usize, canvas_gid_2: usi
|
||||||
|
|
||||||
let mut rtc = rtc::Rtc::new(&xns).unwrap();
|
let mut rtc = rtc::Rtc::new(&xns).unwrap();
|
||||||
|
|
||||||
#[cfg(target_os = "none")]
|
|
||||||
rtc.clear_wakeup_alarm().unwrap(); // clear any wakeup alarm state, if it was set
|
rtc.clear_wakeup_alarm().unwrap(); // clear any wakeup alarm state, if it was set
|
||||||
|
|
||||||
rtc.hook_rtc_callback(dt_callback).unwrap();
|
rtc.hook_rtc_callback(dt_callback).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -658,12 +658,15 @@ fn xmain() -> ! {
|
||||||
}),
|
}),
|
||||||
Some(Opcode::ClearWakeupAlarm) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
Some(Opcode::ClearWakeupAlarm) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
||||||
rtc.clear_wakeup_alarm(); // blocks until transaction is finished
|
rtc.clear_wakeup_alarm(); // blocks until transaction is finished
|
||||||
|
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
|
||||||
}),
|
}),
|
||||||
Some(Opcode::SetRtcAlarm) => msg_blocking_scalar_unpack!(msg, delay, _, _, _, {
|
Some(Opcode::SetRtcAlarm) => msg_blocking_scalar_unpack!(msg, delay, _, _, _, {
|
||||||
rtc.rtc_alarm(delay as u8); // this will block until finished, no callbacks used
|
rtc.rtc_alarm(delay as u8); // this will block until finished, no callbacks used
|
||||||
|
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
|
||||||
}),
|
}),
|
||||||
Some(Opcode::ClearRtcAlarm) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
Some(Opcode::ClearRtcAlarm) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
||||||
rtc.clear_rtc_alarm(); // blocks until transaction is finished
|
rtc.clear_rtc_alarm(); // blocks until transaction is finished
|
||||||
|
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
|
||||||
}),
|
}),
|
||||||
None => {
|
None => {
|
||||||
log::error!("unknown opcode received, exiting");
|
log::error!("unknown opcode received, exiting");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue