refactor the Ticktimer API.

This commit is contained in:
bunnie 2021-03-28 18:14:41 +08:00
parent 45239c61ef
commit e889765caf
22 changed files with 144 additions and 219 deletions

2
Cargo.lock generated
View file

@ -1341,6 +1341,8 @@ dependencies = [
"heapless",
"log",
"log-server",
"num-derive",
"num-traits",
"utralib",
"xous",
]

View file

@ -54,14 +54,13 @@ impl Into<Message> for Opcode {
fn stopwatch_thread(_arg: xous::SID) {
info!("BENCHMARK|stopwatch: starting");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let shell_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_SHELL).expect("BENCHMARK|stopwatch: can't connect to main program");
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let mut last_time: u64 = ticktimer.elapsed_ms().unwrap();
let mut start_sent = false;
loop {
if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) {
if let Ok(elapsed_time) = ticktimer.elapsed_ms() {
if elapsed_time - last_time > 500 && !start_sent {
last_time = elapsed_time;
xous::send_message(shell_conn, Opcode::Start.into()).expect("BENCHMARK|stopwatch: couldn't send Start message");
@ -77,11 +76,11 @@ fn stopwatch_thread(_arg: xous::SID) {
if false {
// send a start loop message
xous::send_message(shell_conn, Opcode::Start.into()).expect("BENCHMARK|stopwatch: couldn't send Start message");
ticktimer_server::sleep_ms(ticktimer_conn, 10_000).expect("couldn't sleep");
ticktimer.sleep_ms(ticktimer_conn, 10_000).expect("couldn't sleep");
// send a stop loop message
xous::send_message(shell_conn, Opcode::Stop.into()).expect("BENCHMARK|stopwatch: couldn't send Stop message");
// give a moment for the result to update
ticktimer_server::sleep_ms(ticktimer_conn, 500).expect("couldn't sleep");
ticktimer.sleep_ms(ticktimer_conn, 500).expect("couldn't sleep");
}
xous::yield_slice();
}
@ -93,8 +92,7 @@ fn shell_main() -> ! {
info!("BENCHMARK: my PID is {}", xous::process::id());
info!("BENCHMARK: ticktimer");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let shell_server = xous_names::register_name(xous::names::SERVER_NAME_SHELL).expect("BENCHMARK: can't register server");
@ -137,10 +135,10 @@ fn shell_main() -> ! {
if let Ok(opcode) = Opcode::try_from(&envelope.body) {
match opcode {
Opcode::Start => {
start_time = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
start_time = ticktimer.elapsed_ms().unwrap();
},
Opcode::Stop => {
stop_time = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
stop_time = ticktimer.elapsed_ms().unwrap();
update_result = true;
},
}

View file

@ -69,8 +69,7 @@ mod implementation {
)
.expect("couldn't map COM CSR range");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let mut xc = XousCom {
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
@ -108,12 +107,12 @@ mod implementation {
pub fn wait_txrx(&mut self, tx: u16, timeout: Option<u32>) -> u16 {
if timeout.is_some() {
let curtime = ticktimer_server::elapsed_ms(self.ticktimer)
let curtime = self.ticktimer.elapsed_ms()
.expect("couldn't connect to ticktimer");
let mut timed_out = false;
let to = timeout.unwrap() as u64;
while self.csr.rf(utra::com::STATUS_HOLD) == 1 && !timed_out {
if (ticktimer_server::elapsed_ms(self.ticktimer)
if (self.ticktimer.elapsed_ms()
.expect("couldn't connect to ticktimer")
- curtime)
> to

View file

@ -376,17 +376,16 @@ fn do_agent(cmd: &mut String<U2048>, com_cid: xous::CID, pds_list: &mut Vec<Stri
println!("rx stats request disabled!!");
//get_rx_stats_agent(com_cid).unwrap();
} else if tokens[1].trim() == "commit_pds" {
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let mut last_time: u64 = ticktimer.elapsed_ms().unwrap();
for pds in pds_list.iter() {
let mut sendable_string = xous::String::<512>::new();
write!(&mut sendable_string, "{}", pds);
println!("{}", sendable_string);
send_pds_line(com_cid, &sendable_string);
loop {
if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) {
if let Ok(elapsed_time) = ticktimer.elapsed_ms() {
if elapsed_time - last_time > 250 {
last_time = elapsed_time;
break;
@ -480,8 +479,7 @@ fn xmain() -> ! {
let agent_server_sid = xous_names::register_name(xous::names::SERVER_NAME_FCCAGENT).expect("FCCAGENT: can't register server");
let agent_server_client = xous_names::request_connection_blocking(xous::names::SERVER_NAME_FCCAGENT).expect("FCCAGENT: can't connect to COM");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let mut uart = Uart::new(agent_server_client);
@ -501,7 +499,7 @@ fn xmain() -> ! {
uart.enable_rx();
print!("\n\r\n\r*** FCC agent ***\n\r\n\r");
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let mut last_time: u64 = ticktimer.elapsed_ms().unwrap();
let mut pds_list: Vec<String<U512>, U16> = Vec::new();
let mut repeat = false;
let mut phase = 0;
@ -543,7 +541,7 @@ fn xmain() -> ! {
_ => () //xous::yield_slice(), // no message received, idle
}
// Periodic tasks
if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) {
if let Ok(elapsed_time) = ticktimer.elapsed_ms() {
if elapsed_time - last_time > 20_000 {
last_time = elapsed_time;

View file

@ -188,8 +188,7 @@ fn xmain() -> ! {
let gam_sid = xous_names::register_name(xous::names::SERVER_NAME_GAM).expect("GAM: can't register server");
info!("GAM: starting up...");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let gfx_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_GFX).expect("GAM: can't connect to COM");
let trng_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_TRNG).expect("GAM: can't connect to TRNG");
@ -228,7 +227,7 @@ fn xmain() -> ! {
xous::create_thread_4(status_thread, gid[0] as _, gid[1] as _, gid[2] as _, gid[3] as _).expect("GAM: couldn't create status thread");
let mut powerdown_requested = false;
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let mut last_time: u64 = ticktimer.elapsed_ms().unwrap();
info!("GAM: entering main loop");
loop {
let envelope = xous::receive_message(gam_sid).unwrap();
@ -269,7 +268,7 @@ fn xmain() -> ! {
if powerdown_requested {
continue; // don't allow any redraws if a powerdown is requested
}
if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) {
if let Ok(elapsed_time) = ticktimer.elapsed_ms() {
if elapsed_time - last_time > 33 { // rate limit updates, no point in going faster than the eye can see
last_time = elapsed_time;

View file

@ -17,7 +17,7 @@ pub fn status_thread(canvas_gid_0: usize, canvas_gid_1: usize, canvas_gid_2: usi
let status_sid = xous_names::register_name(xous::names::SERVER_NAME_STATUS).expect("GAM|status: can't register server");
let gam_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_GAM).expect("GAM|status: can't connect to GAM");
let ticktimer_conn = xous::connect(xous::SID::from_bytes(b"ticktimer-server").unwrap()).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let com_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_COM).expect("GAM|status: can't connect to COM");
if debug1{info!("GAM|status: getting screen size");}
@ -46,7 +46,7 @@ pub fn status_thread(canvas_gid_0: usize, canvas_gid_1: usize, canvas_gid_2: usi
battstats_tv.margin = Point::new(0, 0);
let mut stats: BattStats;
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let mut last_time: u64 = ticktimer.elapsed_ms().unwrap();
let mut stats_phase: usize = 0;
let mut last_seconds: usize = ((last_time / 1000) % 60) as usize;
@ -92,7 +92,7 @@ pub fn status_thread(canvas_gid_0: usize, canvas_gid_1: usize, canvas_gid_2: usi
_ => xous::yield_slice(),
}
if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) {
if let Ok(elapsed_time) = ticktimer.elapsed_ms() {
let now_seconds: usize = ((elapsed_time / 1000) % 60) as usize;
if now_seconds != last_seconds {
last_seconds = now_seconds;

View file

@ -24,9 +24,9 @@ fn sleep_loop_4(main_conn: usize, sleep_ms: usize, ticktimer_conn: usize, pid: u
// sleep_ms,
// loop_count
// );
let start_time = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
ticktimer_server::sleep_ms(ticktimer_conn, sleep_ms).unwrap();
let end_time = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let start_time = ticktimer.elapsed_ms().unwrap();
ticktimer.sleep_ms(ticktimer_conn, sleep_ms).unwrap();
let end_time = ticktimer.elapsed_ms().unwrap();
log::info!(
"TEST THREAD {}:{}: target {}ms, {} loops: Sleep finished (uptime: {}, took {} ms)",
pid,
@ -60,8 +60,7 @@ fn sleep_loop_3(main_conn: usize, sleep_ms: usize, ticktimer_conn: usize) {
}
fn sleep_loop_2(main_conn: usize, sleep_ms: usize) {
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap() as usize;
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
sleep_loop_3(main_conn, sleep_ms, ticktimer_conn);
}
@ -80,8 +79,7 @@ fn sleep_loop_0() {
fn test_main() -> ! {
log_server::init_wait().unwrap();
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let main_server = xous::create_server().unwrap();
let server_conn = xous::connect(main_server).unwrap();

View file

@ -190,7 +190,7 @@ mod implementation {
/// remember the last keycode since a change event
lastcode: Option<Vec<RowCol, U16>>,
/// connection to the timer for real-time events
ticktimer: xous::CID,
ticktimer: Ticktimer,
/// mapping for ScanCode translation
map: KeyMap,
/// delay in ms before a key is considered to be repeating
@ -227,10 +227,9 @@ mod implementation {
)
.expect("couldn't map Keyboard CSR range");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let mut ticktimer = XousTickTimer::new(ticktimer_client).expect("KBD: couldn't connect to ticktimer");
let timestamp = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let timestamp = ticktimer.elapsed_ms().unwrap();
let kbd = Keyboard {
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
debounce: [[0; KBD_COLS]; KBD_ROWS],
@ -342,7 +341,7 @@ mod implementation {
// clear the pending bit
self.csr.wfo(utra::keyboard::EV_PENDING_KEYPRESSED, 1);
let elapsed = ticktimer_server::elapsed_ms(self.ticktimer).unwrap() - self.timestamp;
let elapsed = self.ticktimer.elapsed_ms().unwrap() - self.timestamp;
if elapsed <= 1 {
// skip debounce processing if time elapsed is too short
(None, None)
@ -436,7 +435,7 @@ mod implementation {
let mut keystates: Vec<char, U4> = Vec::new();
if self.chord_active || keydowns.is_some() {
let now = ticktimer_server::elapsed_ms(self.ticktimer).unwrap();
let now = self.ticktimer.elapsed_ms().unwrap();
if !self.chord_active && keydowns.is_some() {
self.chord_active = true;
@ -623,7 +622,7 @@ mod implementation {
// interpret keys in the context of the shift/alt modifiers
if let Some(kds) = &keydowns {
self.chord_timestamp = ticktimer_server::elapsed_ms(self.ticktimer).unwrap();
self.chord_timestamp = self.ticktimer.elapsed_ms().unwrap();
// if more than one is held, the key that gets picked for the repeat function is arbitrary!
for &rc in kds.iter() {
let code = match self.map {
@ -638,7 +637,7 @@ mod implementation {
}
}
}
let now = ticktimer_server::elapsed_ms(self.ticktimer).unwrap();
let now = self.ticktimer.elapsed_ms().unwrap();
let hold: bool;
if (now - self.chord_timestamp) >= self.delay as u64 {
if self.rate_timestamp <= self.chord_timestamp {

View file

@ -37,17 +37,17 @@ pub struct I2cStateMachine {
state: I2cState,
index: u32, // index of the current buffer in the state machine
timestamp: u64, // timestamp of the last transaction
ticktimer: xous::CID, // a connection to the ticktimer so we can measure timeouts
ticktimer: ticktimer_server::Ticktimer, // a connection to the ticktimer so we can measure timeouts
i2c_csr: utralib::CSR<u32>,
listeners: Vec<xous::CID, U32>,
}
#[cfg(target_os = "none")]
impl I2cStateMachine {
pub fn new(ticktimer: xous::CID, i2c_base: *mut u32) -> Self {
pub fn new(ticktimer: ticktimer_server::Ticktimer, i2c_base: *mut u32) -> Self {
I2cStateMachine {
transaction: I2cTransaction::new(),
state: I2cState::Idle,
timestamp: ticktimer_server::elapsed_ms(ticktimer).unwrap(),
timestamp: ticktimer.elapsed_ms().unwrap(),
ticktimer,
i2c_csr: CSR::new(i2c_base),
index: 0,
@ -60,7 +60,7 @@ impl I2cStateMachine {
return I2cStatus::ResponseFormatError
}
let now = ticktimer_server::elapsed_ms(self.ticktimer).unwrap();
let now = self.ticktimer.elapsed_ms().unwrap();
if self.state != I2cState::Idle && ((now - self.timestamp) < self.transaction.timeout_ms as u64) {
// we're in a transaction that hadn't timed out, can't accept a new one
I2cStatus::ResponseBusy
@ -145,7 +145,7 @@ impl I2cStateMachine {
}
pub fn handler(&mut self) {
// check if the transaction had actually timed out
let now = ticktimer_server::elapsed_ms(self.ticktimer).unwrap();
let now = self.ticktimer.elapsed_ms().unwrap();
if now - self.timestamp > self.transaction.timeout_ms as u64 {
// previous transaction had timed out...
self.report_timeout();

View file

@ -33,7 +33,7 @@ mod implementation {
power_csr: utralib::CSR<u32>,
seed_csr: utralib::CSR<u32>,
xadc_csr: utralib::CSR<u32>, // be careful with this as XADC is shared with TRNG
ticktimer_conn: xous::CID,
ticktimer: ticktimer_server::Ticktimer,
destruct_armed: bool,
}
@ -71,7 +71,7 @@ mod implementation {
.expect("couldn't map GPIO CSR range");
let mut gpio_csr = CSR::new(gpio_base.as_mut_ptr() as *mut u32);
// setup the initial logging output
gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 0); // 0 = kernel, 1 = log, 2 = app_uart
gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 1); // 0 = kernel, 1 = log, 2 = app_uart
gpio_base.as_mut_ptr() as *mut u32
}
@ -144,8 +144,7 @@ mod implementation {
)
.expect("couldn't map Xadc CSR range"); // note that Xadc is "in" the TRNG because TRNG can override Xadc in hardware
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let mut xl = Llio {
reboot_csr: CSR::new(reboot_csr.as_mut_ptr() as *mut u32),
@ -159,7 +158,7 @@ mod implementation {
power_csr: CSR::new(power_csr.as_mut_ptr() as *mut u32),
seed_csr: CSR::new(seed_csr.as_mut_ptr() as *mut u32),
xadc_csr: CSR::new(xadc_csr.as_mut_ptr() as *mut u32),
ticktimer_conn,
ticktimer,
destruct_armed: false,
};
@ -296,7 +295,7 @@ mod implementation {
}
pub fn ec_reset(&mut self) {
self.power_csr.rmwf(utra::power::POWER_RESET_EC, 1);
ticktimer_server::sleep_ms(self.ticktimer_conn, 100).unwrap();
self.ticktimer.sleep_ms(100).unwrap();
self.power_csr.rmwf(utra::power::POWER_RESET_EC, 0);
}
pub fn ec_power_on(&mut self) {
@ -316,21 +315,21 @@ mod implementation {
match pattern {
VibePattern::Short => {
self.power_csr.wfo(utra::power::VIBE_VIBE, 1);
ticktimer_server::sleep_ms(self.ticktimer_conn, 250).unwrap();
self.ticktimer.sleep_ms(250).unwrap();
self.power_csr.wfo(utra::power::VIBE_VIBE, 0);
},
VibePattern::Long => {
self.power_csr.wfo(utra::power::VIBE_VIBE, 1);
ticktimer_server::sleep_ms(self.ticktimer_conn, 1000).unwrap();
self.ticktimer.sleep_ms(1000).unwrap();
self.power_csr.wfo(utra::power::VIBE_VIBE, 0);
},
VibePattern::Double => {
self.power_csr.wfo(utra::power::VIBE_VIBE, 1);
ticktimer_server::sleep_ms(self.ticktimer_conn, 250).unwrap();
self.ticktimer.sleep_ms(250).unwrap();
self.power_csr.wfo(utra::power::VIBE_VIBE, 0);
ticktimer_server::sleep_ms(self.ticktimer_conn, 250).unwrap();
self.ticktimer.sleep_ms(250).unwrap();
self.power_csr.wfo(utra::power::VIBE_VIBE, 1);
ticktimer_server::sleep_ms(self.ticktimer_conn, 250).unwrap();
self.ticktimer.sleep_ms(250).unwrap();
self.power_csr.wfo(utra::power::VIBE_VIBE, 0);
},
}
@ -456,10 +455,9 @@ fn xmain() -> ! {
let mut llio = Llio::new(handler_conn, gpio_base);
// ticktimer is a well-known server
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
// create an i2c state machine handler
let mut i2c_machine = I2cStateMachine::new(ticktimer_conn, llio.get_i2c_base());
let mut i2c_machine = I2cStateMachine::new(ticktimer, llio.get_i2c_base());
if debug1{info!("LLIO: starting main loop");}
let mut reboot_requested: bool = false;

View file

@ -18,8 +18,7 @@ fn rkyv_test_client() -> ! {
"Hello, world! This is the client, PID {}",
xous::current_pid().unwrap().get()
);
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("couldn't create ticktimer object");
rkyv_test_server::hook_log_messages(print_log_messages);
@ -33,7 +32,7 @@ fn rkyv_test_client() -> ! {
let mut message_string = xous::String::<64>::new();
loop {
log::info!("2 + {} = {}", idx, rkyv_test_server::add(2, idx).unwrap());
ticktimer_server::sleep_ms(ticktimer_conn, 500).ok();
ticktimer.sleep_ms(500).ok();
message_string.clear();
write!(message_string, "I'm at loop # {:^4} (some numer: {})", idx, some_number).unwrap();

View file

@ -157,8 +157,7 @@ fn shell_main() -> ! {
log_server::init_wait().unwrap();
info!("SHELL: my PID is {}", xous::process::id());
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let graphics_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_GFX).expect("SHELL: can't connect to COM");
@ -175,8 +174,8 @@ fn shell_main() -> ! {
// make a thread to catch responses from the COM
xous::create_thread_simple(event_thread, 0).unwrap();
info!("SHELL: COM responder thread started");
let start_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
while ticktimer_server::elapsed_ms(ticktimer_conn).unwrap() - start_time < 1000 {
let start_time: u64 = ticktimer.elapsed_ms().unwrap();
while ticktimer.elapsed_ms().unwrap() - start_time < 1000 {
xous::yield_slice();
}
@ -218,7 +217,7 @@ fn shell_main() -> ! {
graphics_server::draw_rectangle(graphics_conn, work_clipregion)
.expect("unable to clear region");
let mut last_time: u64 = ticktimer_server::elapsed_ms(ticktimer_conn).unwrap();
let mut last_time: u64 = ticktimer.elapsed_ms().unwrap();
let mut first_time = true;
loop {
//////////////// status bar
@ -379,7 +378,7 @@ fn shell_main() -> ! {
.expect("unable to draw to screen");
// Periodic tasks
if let Ok(elapsed_time) = ticktimer_server::elapsed_ms(ticktimer_conn) {
if let Ok(elapsed_time) = ticktimer.elapsed_ms() {
if elapsed_time - last_time > 500 {
last_time = elapsed_time;
get_batt_stats_nb(com_conn).expect("Can't get battery stats from COM");
@ -391,6 +390,6 @@ fn shell_main() -> ! {
graphics_server::flush(graphics_conn).expect("unable to draw to screen");
// rate limit graphics
//ticktimer_server::sleep_ms(ticktimer_conn, 500).expect("couldn't sleep");
//ticktimer.sleep_ms(ticktimer_conn, 500).expect("couldn't sleep");
}
}

View file

@ -40,7 +40,7 @@ macro_rules! cmd_api {
pub struct CommonEnv {
llio: xous::CID,
com: xous::CID,
ticktimer: xous::CID,
ticktimer: Ticktimer,
gam: xous::CID,
}
@ -76,12 +76,12 @@ pub struct CmdEnv {
}
impl CmdEnv {
pub fn new(gam: xous::CID) -> CmdEnv {
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
CmdEnv {
common_env: CommonEnv {
llio: xous_names::request_connection_blocking(xous::names::SERVER_NAME_LLIO).expect("CMD: can't connect to LLIO"),
com: xous_names::request_connection_blocking(xous::names::SERVER_NAME_COM).expect("CMD: can't connect to COM"),
ticktimer: xous::connect(ticktimer_server_id).unwrap(),
ticktimer: ticktimer,
gam,
},
lastverb: String::<256>::new(),

View file

@ -5,15 +5,14 @@ use xous_ipc::String;
use core::sync::atomic::{AtomicBool, Ordering};
static CB_RUN: AtomicBool = AtomicBool::new(false);
pub fn callback_thread() {
let ticktimer_conn = xous::connect(xous::SID::from_bytes(b"ticktimer-server").unwrap()).unwrap();
let callback_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_SHELLCHAT).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
log::info!("callback initiator test thread started");
loop {
if CB_RUN.load(Ordering::Relaxed) {
CB_RUN.store(false, Ordering::Relaxed);
ticktimer_server::sleep_ms(ticktimer_conn, 10000).unwrap();
ticktimer.sleep_ms(10000).unwrap();
// just send a bogus message
xous::send_message(callback_conn, Message::Scalar(ScalarMessage{
id: 0xdeadbeef, arg1: 0, arg2: 0, arg3: 0, arg4: 0,

View file

@ -23,7 +23,7 @@ impl<'a> ShellCmdApi<'a> for Sleep {
Ok(Some(ret))
} else {
if Ok(true) == gam::powerdown_request(env.gam) {
ticktimer_server::sleep_ms(env.ticktimer, 500).unwrap(); // let the screen redraw
ticktimer.sleep_ms(env.ticktimer, 500).unwrap(); // let the screen redraw
// allow EC to snoop, so that it can wake up the system
llio::allow_ec_snoop(env.llio, true).unwrap();
@ -34,7 +34,7 @@ impl<'a> ShellCmdApi<'a> for Sleep {
log::info!("CMD: powering down now!");
// pause execution, nothing after this should be reachable
ticktimer_server::sleep_ms(env.ticktimer, 2000).unwrap(); // should power off within 2 seconds
ticktimer.sleep_ms(env.ticktimer, 2000).unwrap(); // should power off within 2 seconds
log::info!("CMD: if you can read this, power down failed!");
}
write!(ret, "Powerdown request denied").unwrap();

View file

@ -10,6 +10,8 @@ heapless = "0.5"
log = "0.4"
log-server = {path = "../log-server"}
xous = {path = "../../xous-rs"}
num-derive = {version = "0.3", default-features = false}
num-traits = {version = "0.2", default-features = false}
[target.'cfg(not(any(windows,unix)))'.dependencies]
utralib = {path = "../../utralib"}

View file

@ -1,93 +1,11 @@
use xous::{Message, ScalarMessage};
#[derive(Debug)]
pub struct TimerToken {
token: u64, // this field is 48 bits wide, random number
}
#[derive(Debug)]
pub enum Opcode {
/// Reset the timer
// Reset, // This is a bad idea, in retrospect.
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub(crate) enum Opcode {
/// Get the elapsed time in milliseconds
ElapsedMs,
/// Sleep for the specified numer of milliseconds
SleepMs(usize),
SleepMs,
/// Recalculate the sleep time
RecalculateSleep,
/*
////////// new APIs
/// Subscribe to wakeup alarms. Takes in the server name that's subcribed, returns a Token to refer to the subscription.
SubscribeWakeup(xous::String::<64>),
/// set an alarm in milliseconds, which is returned via the SubscribeWakeup registration token
WakeupAlarm(u16, TimerToken),
/// The generic message that gets sent to other servers, at the alarm time
WakeupMessage,
/// Request a blocking, in-line delay server -- returns a CID that can be used to send the BlockingDelayMs message
/// each request consumes a thread in the ticktimer that tracks & responds to a blockingdelay
RequestBlockingDelay,
/// Do a blocking delay. Responds with the current ElapsedMs by default.
BlockingDelayMs(u32),
*/
}
impl<'a> core::convert::TryFrom<&'a Message> for Opcode {
type Error = &'static str;
fn try_from(message: &'a Message) -> Result<Self, Self::Error> {
match message {
Message::Scalar(m) => match m.id {
// 1 => Ok(Opcode::Reset),
131072 => Ok(Opcode::RecalculateSleep),
_ => Err("unrecognized opcode"),
},
Message::BlockingScalar(m) => match m.id {
4919 => Ok(Opcode::ElapsedMs),
3 => Ok(Opcode::SleepMs(m.arg1)),
_ => Err("unrecognized opcode"),
},
_ => Err("unhandled message type"),
}
}
}
impl Into<Message> for Opcode {
fn into(self) -> Message {
match self {
/* Opcode::Reset => Message::Scalar(ScalarMessage {
id: 1,
arg1: 0,
arg2: 0,
arg3: 0,
arg4: 0,
}),*/
Opcode::RecalculateSleep => Message::Scalar(ScalarMessage {
id: 131072,
arg1: 0,
arg2: 0,
arg3: 0,
arg4: 0,
}),
Opcode::ElapsedMs => Message::BlockingScalar(ScalarMessage {
id: 4919,
arg1: 0,
arg2: 0,
arg3: 0,
arg4: 0,
}),
Opcode::SleepMs(ms) => Message::BlockingScalar(ScalarMessage {
id: 3,
arg1: ms,
arg2: 0,
arg3: 0,
arg4: 0,
}),
}
}
}

View file

@ -3,22 +3,40 @@
pub mod api;
use xous::{send_message, Error, CID};
use num_traits::ToPrimitive;
pub fn elapsed_ms(cid: CID) -> Result<u64, Error> {
let response = send_message(cid, api::Opcode::ElapsedMs.into())?;
if let xous::Result::Scalar2(upper, lower) = response {
Ok(upper as u64 | ((lower as u64) << 32))
} else {
panic!("unexpected return value: {:#?}", response);
pub struct Ticktimer {
conn: CID,
}
impl Ticktimer {
pub fn new() -> Result<Self, Error> {
let conn = xous::connect(xous::SID::from_bytes(b"ticktimer-server").unwrap())?;
Ok(Ticktimer {
conn,
})
}
pub fn elapsed_ms(&self) -> Result<u64, Error> {
let response = send_message(self.conn,
xous::Message::BlockingScalar(xous::ScalarMessage {
id: api::Opcode::ElapsedMs.to_usize().unwrap(),
arg1: 0, arg2: 0, arg3: 0, arg4: 0
})
)?;
if let xous::Result::Scalar2(upper, lower) = response {
Ok(upper as u64 | ((lower as u64) << 32))
} else {
panic!("unexpected return value: {:#?}", response);
}
}
pub fn sleep_ms(&self, ms: usize) -> Result<(), Error> {
send_message(self.conn,
xous::Message::BlockingScalar(xous::ScalarMessage {
id: api::Opcode::SleepMs.to_usize().unwrap(),
arg1: ms,
arg2: 0, arg3: 0, arg4: 0
})
).map(|_| ())
}
}
/*
pub fn reset(cid: CID) -> Result<(), xous::Error> {
send_message(cid, api::Opcode::Reset.into()).map(|_| ())
}
*/
pub fn sleep_ms(cid: CID, ms: usize) -> Result<(), xous::Error> {
send_message(cid, api::Opcode::SleepMs(ms).into()).map(|_| ())
}

View file

@ -2,15 +2,12 @@
#![cfg_attr(target_os = "none", no_main)]
mod api;
use api::Opcode;
mod os_timer;
use heapless::binary_heap::{BinaryHeap, Min};
use heapless::consts::*;
use core::convert::TryFrom;
use log::{error, info};
#[derive(Eq)]
@ -110,7 +107,13 @@ mod implementation {
// This is dangerous and may return an error if the queue is full.
// Which is fine, because the queue is always recalculated any time a message arrives.
xous::try_send_message(xtt.connection, crate::api::Opcode::RecalculateSleep.into()).ok();
use num_traits::ToPrimitive;
xous::try_send_message(xtt.connection,
xous::Message::Scalar(xous::ScalarMessage {
id: crate::api::Opcode::RecalculateSleep.to_usize().unwrap(),
arg1: 0, arg2: 0, arg3: 0, arg4: 0
})
).ok();
}
impl XousTickTimer {
@ -440,39 +443,36 @@ fn xmain() -> ! {
#[cfg(feature = "watchdog")]
ticktimer.reset_wdt();
let envelope = xous::receive_message(ticktimer_server).unwrap();
if let Ok(opcode) = Opcode::try_from(&envelope.body) {
// info!("TickTimer: Opcode: {:?}", opcode);
match opcode {
/*Opcode::Reset => {
info!("TickTimer: reset called");
ticktimer.reset();
}*/
Opcode::ElapsedMs => {
let time = ticktimer.elapsed_ms() as i64;
xous::return_scalar2(
envelope.sender,
(time & 0xFFFF_FFFFi64) as usize,
((time >> 32) & 0xFFF_FFFFi64) as usize,
)
.expect("TickTimer: couldn't return time request");
}
Opcode::SleepMs(ms) => {
let msg = xous::receive_message(ticktimer_server).unwrap();
match num_traits::FromPrimitive::from_usize(msg.body.id()) {
Some(api::Opcode::ElapsedMs) => {
let time = ticktimer.elapsed_ms() as i64;
xous::return_scalar2(
msg.sender,
(time & 0xFFFF_FFFFi64) as usize,
((time >> 32) & 0xFFF_FFFFi64) as usize,
)
.expect("TickTimer: couldn't return time request");
}
Some(api::Opcode::SleepMs) => {
if let xous::Message::BlockingScalar(xous::ScalarMessage {
id: _, arg1: ms, arg2: _, arg3: _, arg4: _}) = msg.body {
recalculate_sleep(
&mut ticktimer,
&mut sleep_heap,
Some(SleepRequest {
msec: ms as i64,
sender: envelope.sender,
sender: msg.sender,
}),
);
}
Opcode::RecalculateSleep => {
recalculate_sleep(&mut ticktimer, &mut sleep_heap, None);
}
}
} else {
error!("couldn't convert opcode");
Some(api::Opcode::RecalculateSleep) => {
recalculate_sleep(&mut ticktimer, &mut sleep_heap, None);
}
None => {
error!("couldn't convert opcode");
}
}
}
}

View file

@ -237,8 +237,7 @@ fn xmain() -> ! {
let log_server_id = xous::SID::from_bytes(b"xous-log-server ").unwrap();
let log_conn = xous::connect(log_server_id).unwrap();
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
// Create a new com object
let mut trng = Trng::new();
@ -263,12 +262,12 @@ fn xmain() -> ! {
if false {
// to test the powerdown feature
trng.wait_full();
ticktimer_server::sleep_ms(ticktimer_conn, 5000).expect("couldn't sleep");
ticktimer.sleep_ms(5000).expect("couldn't sleep");
}
if false {
// select this to print XADC data to info!()
ticktimer_server::sleep_ms(ticktimer_conn, 20).expect("couldn't sleep"); // sleep to allow xadc sampling in case we're in a very tight TRNG request loop
ticktimer.sleep_ms(20).expect("couldn't sleep"); // sleep to allow xadc sampling in case we're in a very tight TRNG request loop
info!("temperature: {}C", trng.read_temperature());
info!("vccint: {}mV", trng.read_vccint());
info!("vccaux: {}mV", trng.read_vccaux());

View file

@ -25,8 +25,7 @@ fn xmain() -> ! {
let name_server = xous::create_server_with_address(b"xous-name-server")
.expect("Couldn't create xousnames-server");
let ticktimer_server_id = xous::SID::from_bytes(b"ticktimer-server").unwrap();
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
// this limits the number of available servers to be requested to 128...!
let mut name_table = FnvIndexMap::<_, _, U128>::new();
@ -57,13 +56,13 @@ fn xmain() -> ! {
rkyv::Archived::<api::Request>::SID(new_sid.into())
} else {
// compute the next interval, rounded to a multiple of FAIL_TIMEOUT_MS to reduce timing side channels
let target_time: u64 = ((ticktimer_server::elapsed_ms(ticktimer_conn)
let target_time: u64 = ((ticktimer.elapsed_ms()
.unwrap()
/ FAIL_TIMEOUT_MS)
+ 1)
* FAIL_TIMEOUT_MS;
info!("NS: request failed, waiting for deterministic timeout");
while ticktimer_server::elapsed_ms(ticktimer_conn).unwrap() < target_time {
while ticktimer.elapsed_ms().unwrap() < target_time {
xous::yield_slice();
}
info!("NS: deterministic timeout done");

View file

@ -78,7 +78,8 @@ fn try_main() -> Result<(), DynError> {
"xous-names",
"trng",
"llio",
"kernel-test",
"rkyv-test-client",
"rkyv-test-server",
];
let task = env::args().nth(1);
match task.as_deref() {