Merge branch 'automation' into bunnie-dev

This commit is contained in:
bunnie 2022-05-24 16:58:55 +08:00
commit a468733ea6
2 changed files with 12 additions and 1 deletions

View file

@ -23,7 +23,7 @@ impl<'a> ShellCmdApi<'a> for Ver {
let dirtystr = if dirty { "dirty" } else { "clean" };
write!(ret, "EC gateware commit: {:x}, {}\n", rev, dirtystr).unwrap();
let (maj, min, rev, commit) = env.com.get_ec_sw_tag().unwrap();
log::info!("EC sw tag: {}.{}.{}+{}", maj, min, rev, commit);
log::info!("{}ECREV,{},{},{},{},{}", xous::BOOKEND_START, maj, min, rev, commit, xous::BOOKEND_END);
write!(ret, "EC sw tag: {}.{}.{}+{}", maj, min, rev, commit).unwrap();
}
"wf200" => {
@ -33,12 +33,14 @@ impl<'a> ShellCmdApi<'a> for Ver {
"soc" => {
let (maj, min, rev, extra, gitrev) = env.llio.soc_gitrev().unwrap();
write!(ret, "SoC git rev {}.{}.{}+{}, commit {:x}", maj, min, rev, extra, gitrev).unwrap();
log::info!("{}SOCREV,{},{},{},{},{}", xous::BOOKEND_START, maj, min, rev, gitrev, xous::BOOKEND_END);
}
"dna" => {
write!(ret, "SoC silicon DNA: 0x{:x}", env.llio.soc_dna().unwrap()).unwrap();
}
"xous" => {
write!(ret, "Xous version: {}", env.ticktimer.get_version()).unwrap();
log::info!("{}XOUSREV,{},{}", xous::BOOKEND_START, env.ticktimer.get_version(), xous::BOOKEND_END);
}
_ => {
write!(ret, "{}", helpstring).unwrap();

View file

@ -45,6 +45,15 @@ pub const PDDB_LEN: u32 = EC_REGION_LOC - PDDB_LOC; // must be 64k-aligned (bulk
// quantum alloted to each process before a context switch is forced
pub const BASE_QUANTA_MS: u32 = 10;
// sentinel used by test infrastructure to assist with parsing
// The format of any test infrastructure output to recover is as follows:
// _|TT|_<ident>,<data separated by commas>,_|TE|_
// where _|TT|_ and _|TE|_ are bookends around the data to be reported
// <ident> is a single-word identifier that routes the data to a given parser
// <data> is free-form data, which will be split at comma boundaries by the parser
pub const BOOKEND_START: &'static str = "_|TT|_";
pub const BOOKEND_END: &'static str = "_|TE|_";
#[cfg(not(any(target_os = "none", target_os = "xous")))]
use core::sync::atomic::AtomicU64;