diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 000000000..587532e13 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[alias] +xtask = "run --package xtask --" + +[profile.release] +overflow-checks = true diff --git a/cmd/counters/src/lib.rs b/cmd/counters/src/lib.rs index b293861f5..f90d84427 100644 --- a/cmd/counters/src/lib.rs +++ b/cmd/counters/src/lib.rs @@ -512,14 +512,12 @@ fn counters_dump_csv( ) { // Sort the counters. match opts.sort { - Some(Order::Value) => counters.sort_unstable_by( + Some(Order::Value) => counters.sort_by( &mut |_, a: &CounterVariant, _, b: &CounterVariant| { a.total().cmp(&b.total()).reverse() }, ), - Some(Order::Alpha) => { - counters.sort_unstable_by(&mut |a, _, b, _| a.cmp(b)) - } + Some(Order::Alpha) => counters.sort_by(&mut |a, _, b, _| a.cmp(b)), _ => {} } @@ -574,13 +572,13 @@ fn counter_dump(counters: &mut Counters, opts: &Options, pad: &str) { // Therefore, sort by value by default, so the highest-valued counters // are shown first. Options { sort: Some(Order::Value), .. } - | Options { sort: None, full: false, .. } => counters.sort_unstable_by( + | Options { sort: None, full: false, .. } => counters.sort_by( &mut |_, a: &CounterVariant, _, b: &CounterVariant| { a.total().cmp(&b.total()).reverse() }, ), Options { sort: Some(Order::Alpha), .. } => { - counters.sort_unstable_by(&mut |a, _, b, _| a.cmp(b)) + counters.sort_by(&mut |a, _, b, _| a.cmp(b)) } } diff --git a/cmd/dashboard/src/lib.rs b/cmd/dashboard/src/lib.rs index fa350a36e..ea152bf50 100644 --- a/cmd/dashboard/src/lib.rs +++ b/cmd/dashboard/src/lib.rs @@ -79,7 +79,7 @@ impl StatefulList { fn previous(&mut self) { self.state.select(match self.state.selected() { - Some(ndx) if ndx == 0 => Some(self.n - 1), + Some(0) => Some(self.n - 1), Some(ndx) => Some(ndx - 1), None => Some(0), }); @@ -114,8 +114,6 @@ trait Attributes { fn decrease(&mut self, _ndx: usize) -> Option { None } - - fn clear(&mut self) {} } struct TempGraph; @@ -185,12 +183,6 @@ impl Attributes for FanGraph { self.0[ndx] = if nval >= 0 { nval as u8 } else { 0 }; Some(self.0[ndx]) } - - fn clear(&mut self) { - for val in self.0.iter_mut() { - *val = 0; - } - } } struct CurrentGraph; diff --git a/cmd/monorail/src/lib.rs b/cmd/monorail/src/lib.rs index 0fa7e0db0..fb2bec2ed 100644 --- a/cmd/monorail/src/lib.rs +++ b/cmd/monorail/src/lib.rs @@ -756,7 +756,7 @@ fn monorail_status( Value::Enum(m) => { let mode = m.disc().to_uppercase(); let speed = m.contents().and_then(|speed| match speed { - Value::Tuple(t) => t.get(0).map(|t| match t { + Value::Tuple(t) => t.first().map(|t| match t { Value::Enum(t) => t.disc().replace("Speed", ""), v => panic!("Expected enum, got {:?}", v), }), diff --git a/cmd/net/src/lib.rs b/cmd/net/src/lib.rs index 5fbad8394..e85691bb5 100644 --- a/cmd/net/src/lib.rs +++ b/cmd/net/src/lib.rs @@ -14,6 +14,7 @@ //! - Sidecar //! - PSC //! - `gimletlet-mgmt` +//! //! These PCAs have the KSZ8463 switch + VSC85x2 PHY which is our standard //! management network interface. //! diff --git a/cmd/probe/src/lib.rs b/cmd/probe/src/lib.rs index 1f4df7ec1..cb93a2efc 100644 --- a/cmd/probe/src/lib.rs +++ b/cmd/probe/src/lib.rs @@ -270,7 +270,7 @@ fn probecmd(context: &mut ExecutionContext) -> Result<()> { Ok("progressing") } }) - .map_or_else(|_| "unable to step", |s| s) + .unwrap_or("unable to step") .to_string(); core.run()?; rval diff --git a/cmd/ringbuf/src/lib.rs b/cmd/ringbuf/src/lib.rs index f1b2eba6e..f1439ae6e 100644 --- a/cmd/ringbuf/src/lib.rs +++ b/cmd/ringbuf/src/lib.rs @@ -161,7 +161,7 @@ fn ringbuf_dump( // system, and can't easily be compared. Therefore, sort them by the // value of the counter, so the most frequently recorded variants // are displayed first. - counters.sort_unstable_by( + counters.sort_by( &mut |_, a: &CounterVariant, _, b: &CounterVariant| { a.total().cmp(&b.total()).reverse() }, diff --git a/cmd/rpc/src/lib.rs b/cmd/rpc/src/lib.rs index c8d1d4e69..e5a4f337c 100644 --- a/cmd/rpc/src/lib.rs +++ b/cmd/rpc/src/lib.rs @@ -157,7 +157,7 @@ fn rpc_listen_one( interface: u32, port: u32, ) -> Result> { - let socket = match UdpSocket::bind(&format!("[::]:{port}")) { + let socket = match UdpSocket::bind(format!("[::]:{port}")) { Ok(s) => s, Err(e) => { if e.kind() == std::io::ErrorKind::PermissionDenied { diff --git a/humility-core/src/core.rs b/humility-core/src/core.rs index 84a628c7f..7da27d18d 100644 --- a/humility-core/src/core.rs +++ b/humility-core/src/core.rs @@ -1040,7 +1040,7 @@ impl GDBCore { // let val = u64::from_le_bytes(buf[..].try_into().unwrap()); - if val > std::u32::MAX.into() { + if val > u32::MAX.into() { Err(anyhow!("bad 64-bit return on cmd {}: {}", cmd, rstr)) } else { Ok(val as u32) diff --git a/humility-core/src/hubris.rs b/humility-core/src/hubris.rs index 3cd0a88a5..662332c10 100644 --- a/humility-core/src/hubris.rs +++ b/humility-core/src/hubris.rs @@ -799,7 +799,7 @@ impl HubrisArchive { // is less than our base. // for (&(addr, _depth), (len, goff, origin)) in - self.inlined.range(..=(pc, std::isize::MAX)).rev() + self.inlined.range(..=(pc, isize::MAX)).rev() { if addr + len < base { break; @@ -3046,7 +3046,7 @@ impl HubrisArchive { return Ok(v.size); } - if self.ptrtypes.get(&goff).is_some() { + if self.ptrtypes.contains_key(&goff) { return Ok(4); } @@ -3970,7 +3970,7 @@ impl HubrisObjectLoader { // If this is a zero-sized symbol or not against an allocated // section (e.g., .idolatry), we don't want to keep track of it. // - if sym.st_size == 0 || allocs.get(&sym.st_shndx).is_none() { + if sym.st_size == 0 || !allocs.contains(&sym.st_shndx) { continue; } diff --git a/humility-core/src/reflect.rs b/humility-core/src/reflect.rs index 52a87cd0f..13ebd1def 100644 --- a/humility-core/src/reflect.rs +++ b/humility-core/src/reflect.rs @@ -63,9 +63,9 @@ //! The derived `Load` impls do not require _exact_ type match. In particular, //! //! - A struct will match even if it contains more fields than your Rust -//! version, and +//! version, and //! - An enum will match even if you define variants that don't exist in the -//! program. +//! program. //! //! This is deliberate, and is intended to help interpret programs across ABI //! changes. If you implement a `Load` impl by hand, you should try to emulate @@ -508,9 +508,9 @@ impl Struct { /// Returns a reference to the value of the member named `name`, if it /// exists, or `None`, if no member with that name exists. - pub fn get(&self, name: &Q) -> Option<&Value> + pub fn get(&self, name: &Q) -> Option<&Value> where - Q: std::hash::Hash + indexmap::Equivalent, + Q: std::hash::Hash + indexmap::Equivalent + ?Sized, { self.members.get(name).map(Box::as_ref) } @@ -600,7 +600,7 @@ impl Format for Tuple { // Is this a bitflags-generated type? If so, just format it as a binary // value. if self.name().contains("InternalBitFlags") { - if let Some(flags) = self.1.get(0).and_then(|v| v.as_base().ok()) { + if let Some(flags) = self.1.first().and_then(|v| v.as_base().ok()) { write!(out, "{flags:#b}")?; return Ok(()); } diff --git a/humility-doppel/src/lib.rs b/humility-doppel/src/lib.rs index 3f1cf4ba1..455ea3a45 100644 --- a/humility-doppel/src/lib.rs +++ b/humility-doppel/src/lib.rs @@ -483,7 +483,7 @@ impl Counters { self.counts.values().map(CounterVariant::total).sum() } - pub fn sort_unstable_by( + pub fn sort_by( &mut self, cmp: &mut impl FnMut( &String, @@ -494,10 +494,10 @@ impl Counters { ) { for v in self.counts.values_mut() { if let CounterVariant::Nested(ref mut c) = v { - c.sort_unstable_by(cmp); + c.sort_by(cmp); } } - self.counts.sort_unstable_by(cmp); + self.counts.sort_by(cmp); } pub fn display_padded<'a>( diff --git a/humility-dump-agent/src/lib.rs b/humility-dump-agent/src/lib.rs index 11e492261..d9e0fa4ca 100644 --- a/humility-dump-agent/src/lib.rs +++ b/humility-dump-agent/src/lib.rs @@ -203,7 +203,7 @@ impl DumpAgentCore { &mut self, headers: Vec, total: u32, - dump: &Vec, + dump: &[u8], task: Option, ) -> Result { let header = headers[0]; diff --git a/humility-idol/src/lib.rs b/humility-idol/src/lib.rs index 152c4b50b..23beac08f 100644 --- a/humility-idol/src/lib.rs +++ b/humility-idol/src/lib.rs @@ -366,15 +366,15 @@ fn lookup<'a>( /// /// The humility hiffy cmd accepts multiple encodings of array arguments: /// - When passed a string of characters like `--arguments array=5432` the -/// string is passed to the operation 'as_bytes'. An idol op that takes a -/// 4 byte array will receive [ 53, 52, 51, 50 ] given the argument string -/// above. This is intended as a mechanism for passing ASCII characters to a -/// task. +/// string is passed to the operation 'as_bytes'. An idol op that takes a +/// 4 byte array will receive [ 53, 52, 51, 50 ] given the argument string +/// above. This is intended as a mechanism for passing ASCII characters to a +/// task. /// - To pass an array that's interpreted as the decimal representation of -/// bytes instead of ASCII, provide the array as a string enclosed in square -/// brackets with each array element separated by a space. The argument string -/// `--argument array=[37 1 255 127]` will result in the task receiving the -/// byte array `[ 37, 1, 255, 127 ]`. +/// bytes instead of ASCII, provide the array as a string enclosed in square +/// brackets with each array element separated by a space. The argument string +/// `--argument array=[37 1 255 127]` will result in the task receiving the +/// byte array `[ 37, 1, 255, 127 ]`. fn bytes_from_str(value: &str) -> Result> { if value.starts_with('[') && value.ends_with(']') { // use double ended iterator to drop first and last chars diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 21ecd6d99..17116ad8d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.72.1" +channel = "1.81.0" components = ["clippy"] diff --git a/src/main.rs b/src/main.rs index fa94b5409..33c4e87d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,7 @@ mod cmd; mod cmd_repl; fn main() -> Result<()> { - let (commands, m, args) = match parse_args(&mut std::env::args_os()) { + let (commands, m, args) = match parse_args(std::env::args_os()) { Some(s) => s, None => std::process::exit(1), }; diff --git a/tests/cmd/counters-arg/counters-arg.counters.0.stdout b/tests/cmd/counters-arg/counters-arg.counters.0.stdout index de40941f6..899e4f571 100644 --- a/tests/cmd/counters-arg/counters-arg.counters.0.stdout +++ b/tests/cmd/counters-arg/counters-arg.counters.0.stdout @@ -10,28 +10,28 @@ gimlet_seq 102 A1Status 15 A0Power 2 V3P3SysA0VOut - 1 SMStatus - 1 SetState + 1 Ice40Rails + 1 IdentValid + 1 ChecksumValid + 1 Reprogram + 1 Programmed + 1 Programming + 1 Ice40PowerGoodV1P2 + 1 Ice40PowerGoodV3P3 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 Ice40PowerGoodV1P2 - 1 IdentValid 1 CPUPresent 1 Coretype - 1 Programmed - 1 Ice40Rails - 1 InterruptFlags 1 RailsOn 1 UartEnabled - 1 Ice40PowerGoodV3P3 - 1 UpdateState(A0) 1 A0 - 1 Reprogram + 1 SetState + 1 UpdateState(A0) 1 ClockConfigSuccess - 1 ChecksumValid 1 PGStatus - 1 Programming + 1 SMStatus 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound diff --git a/tests/cmd/counters-arg/counters-arg.host-panic.0.stdout b/tests/cmd/counters-arg/counters-arg.host-panic.0.stdout index 17d089511..3629359b2 100644 --- a/tests/cmd/counters-arg/counters-arg.host-panic.0.stdout +++ b/tests/cmd/counters-arg/counters-arg.host-panic.0.stdout @@ -15,27 +15,27 @@ gimlet_seq 1 UpdateState(A2) 7 V3P3SysA0VOut 6 NICPowerEnableLow - 3 InterruptFlags - 3 PowerControl - 3 SMStatus - 3 PGStatus 3 SetState - 2 UartEnabled - 2 RailsOn + 3 PGStatus + 3 SMStatus + 3 PowerControl + 3 InterruptFlags 2 A2 2 CPUPresent 2 Coretype + 2 RailsOn + 2 UartEnabled 2 A0 - 1 ClockConfigSuccess 1 Ice40Rails - 1 Programming 1 IdentValid - 1 Ice40PowerGoodV1P2 - 1 Reprogram 1 ChecksumValid + 1 Reprogram 1 Programmed - 1 A2Status - 1 Ident - 1 RailsOff + 1 Programming + 1 Ice40PowerGoodV1P2 1 Ice40PowerGoodV3P3 + 1 RailsOff + 1 Ident + 1 A2Status + 1 ClockConfigSuccess 1 SpdDimmsFound diff --git a/tests/cmd/counters-arg/counters-arg.host-panic.1.stdout b/tests/cmd/counters-arg/counters-arg.host-panic.1.stdout index a94f04178..f20e784e0 100644 --- a/tests/cmd/counters-arg/counters-arg.host-panic.1.stdout +++ b/tests/cmd/counters-arg/counters-arg.host-panic.1.stdout @@ -15,27 +15,27 @@ gimlet_seq 5 UpdateState(A2) 1 UpdateState(A0PlusHP) 11 SetState - 11 InterruptFlags - 11 PowerControl - 11 SMStatus 11 PGStatus - 6 UartEnabled - 6 RailsOn + 11 SMStatus + 11 PowerControl + 11 InterruptFlags 6 A2 6 CPUPresent 6 Coretype + 6 RailsOn + 6 UartEnabled 6 A0 - 1 Reprogram 1 Ice40Rails - 1 NICPowerEnableLow - 1 Programming 1 IdentValid - 1 Ice40PowerGoodV1P2 - 1 ClockConfigSuccess 1 ChecksumValid + 1 Reprogram 1 Programmed - 1 A2Status - 1 Ident - 1 RailsOff + 1 Programming + 1 Ice40PowerGoodV1P2 1 Ice40PowerGoodV3P3 + 1 RailsOff + 1 Ident + 1 A2Status + 1 NICPowerEnableLow + 1 ClockConfigSuccess 1 SpdDimmsFound diff --git a/tests/cmd/counters-arg/counters-arg.host-panic.2.stdout b/tests/cmd/counters-arg/counters-arg.host-panic.2.stdout index 1c2ffccbd..921474181 100644 --- a/tests/cmd/counters-arg/counters-arg.host-panic.2.stdout +++ b/tests/cmd/counters-arg/counters-arg.host-panic.2.stdout @@ -13,27 +13,27 @@ gimlet_seq 2 UpdateState(A0PlusHP) 3 NICPowerEnableLow 2 V3P3SysA0VOut - 1 SMStatus + 1 Ice40Rails + 1 IdentValid + 1 ChecksumValid + 1 Reprogram + 1 Programmed + 1 Programming 1 Ice40PowerGoodV1P2 + 1 Ice40PowerGoodV3P3 + 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 Ice40PowerGoodV3P3 - 1 IdentValid 1 CPUPresent 1 Coretype - 1 Programmed - 1 Ice40Rails 1 RailsOn 1 UartEnabled - 1 RailsOff 1 A0 - 1 ClockConfigSuccess - 1 Reprogram 1 SetState - 1 ChecksumValid + 1 ClockConfigSuccess 1 PGStatus - 1 Programming - 1 InterruptFlags + 1 SMStatus 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound diff --git a/tests/cmd/counters-arg/counters-arg.host-panic.3.stdout b/tests/cmd/counters-arg/counters-arg.host-panic.3.stdout index 152da20c8..c42b86b1e 100644 --- a/tests/cmd/counters-arg/counters-arg.host-panic.3.stdout +++ b/tests/cmd/counters-arg/counters-arg.host-panic.3.stdout @@ -21,31 +21,31 @@ gimlet_seq | 5 UpdateState(A0PlusHP) | 2 UpdateState(A2) | 7 NICPowerEnableLow - | 6 InterruptFlags - | 6 PowerControl - | 6 SMStatus - | 6 PGStatus | 6 SetState - | 3 A0 + | 6 PGStatus + | 6 SMStatus + | 6 PowerControl + | 6 InterruptFlags | 3 A2 - | 3 UartEnabled - | 3 RailsOn | 3 CPUPresent(true) | 3 Coretype + | 3 RailsOn + | 3 UartEnabled + | 3 A0 | 2 NICStatus | 1 Ice40Rails + | 1 IdentValid(false) | 1 ChecksumValid(false) - | 1 SpdDimmsFound - | 1 A2Status - | 1 Ident - | 1 RailsOff - | 1 ClockConfigSuccess - | 1 Ice40PowerGoodV3P3(true) - | 1 Ice40PowerGoodV1P2(true) + | 1 Reprogram(true) | 1 Programmed - | 1 IdentValid(false) | 1 Programming - | 1 Reprogram(true) + | 1 Ice40PowerGoodV1P2(true) + | 1 Ice40PowerGoodV3P3(true) + | 1 RailsOff + | 1 Ident + | 1 A2Status + | 1 ClockConfigSuccess + | 1 SpdDimmsFound +---> drv_gimlet_seq_server::idl::__SEQUENCER_SERVER_COUNTERS: | 4246 get_state | 5 set_state(Ok) diff --git a/tests/cmd/counters-arg/counters-arg.host-panic.4.stdout b/tests/cmd/counters-arg/counters-arg.host-panic.4.stdout index ded358a85..133067566 100644 --- a/tests/cmd/counters-arg/counters-arg.host-panic.4.stdout +++ b/tests/cmd/counters-arg/counters-arg.host-panic.4.stdout @@ -20,31 +20,31 @@ gimlet_seq | 2 UpdateState(A0) | 1 UpdateState(A2) | 1 UpdateState(A0PlusHP) - | 3 InterruptFlags - | 3 PowerControl - | 3 SMStatus - | 3 PGStatus | 3 SetState - | 2 A0 + | 3 PGStatus + | 3 SMStatus + | 3 PowerControl + | 3 InterruptFlags | 2 A2 - | 2 UartEnabled - | 2 RailsOn | 2 CPUPresent(true) | 2 Coretype - | 1 A2Status - | 1 Programming + | 2 RailsOn + | 2 UartEnabled + | 2 A0 + | 1 Ice40Rails | 1 IdentValid(false) - | 1 SpdDimmsFound | 1 ChecksumValid(false) - | 1 Ice40Rails - | 1 Ident - | 1 RailsOff - | 1 ClockConfigSuccess - | 1 Ice40PowerGoodV3P3(true) - | 1 Ice40PowerGoodV1P2(true) - | 1 NICPowerEnableLow | 1 Reprogram(true) | 1 Programmed + | 1 Programming + | 1 Ice40PowerGoodV1P2(true) + | 1 Ice40PowerGoodV3P3(true) + | 1 RailsOff + | 1 Ident + | 1 A2Status + | 1 NICPowerEnableLow + | 1 ClockConfigSuccess + | 1 SpdDimmsFound +---> drv_gimlet_seq_server::idl::__SEQUENCER_SERVER_COUNTERS: | 667 get_state | 3 set_state(Ok) diff --git a/tests/cmd/counters-arg/counters-arg.ipc-counts.0.stdout b/tests/cmd/counters-arg/counters-arg.ipc-counts.0.stdout index c3926b444..9fd543e6e 100644 --- a/tests/cmd/counters-arg/counters-arg.ipc-counts.0.stdout +++ b/tests/cmd/counters-arg/counters-arg.ipc-counts.0.stdout @@ -20,31 +20,31 @@ gimlet_seq | 2 UpdateState(A0PlusHP) | 3 NICPowerEnableLow | 2 V3P3SysA0VOut - | 1 RailsOn - | 1 SetState + | 1 Ice40Rails + | 1 IdentValid(false) + | 1 ChecksumValid(false) + | 1 Reprogram(true) + | 1 Programmed + | 1 Programming + | 1 Ice40PowerGoodV1P2(true) + | 1 Ice40PowerGoodV3P3(true) | 1 RailsOff | 1 Ident | 1 A2Status | 1 A2 - | 1 SpdDimmsFound - | 1 ChecksumValid(false) | 1 CPUPresent(true) | 1 Coretype - | 1 IdentValid(false) - | 1 Ice40PowerGoodV1P2(true) - | 1 Ice40Rails + | 1 RailsOn | 1 UartEnabled | 1 A0 - | 1 Ice40PowerGoodV3P3(true) - | 1 Programming - | 1 Programmed + | 1 SetState | 1 ClockConfigSuccess - | 1 Reprogram(true) | 1 PGStatus | 1 SMStatus | 1 NICStatus - | 1 InterruptFlags | 1 PowerControl + | 1 InterruptFlags + | 1 SpdDimmsFound +---> drv_spi_api::__SPI_CLIENT_COUNTERS: | 67580 exchange(Ok) | 530 write(Ok) diff --git a/tests/cmd/counters-arg/counters-arg.u16-ringbuf.stdout b/tests/cmd/counters-arg/counters-arg.u16-ringbuf.stdout index afc0698b6..02dd2297d 100644 --- a/tests/cmd/counters-arg/counters-arg.u16-ringbuf.stdout +++ b/tests/cmd/counters-arg/counters-arg.u16-ringbuf.stdout @@ -4,7 +4,7 @@ gimlet_seq | +---> drv_gimlet_seq_server::__RINGBUF: | 446 ClockConfigWrite - | 1 SetState + | 1 Ice40Rails | 1 IdentValid(false) | 1 ChecksumValid(false) | 1 Reprogram(true) @@ -16,10 +16,10 @@ gimlet_seq | 1 Ident | 1 A2Status | 1 A2 - | 1 SpdDimmsFound - | 1 V3P3SysA0VOut + | 1 SetState | 1 ClockConfigSuccess - | 1 Ice40Rails + | 1 V3P3SysA0VOut + | 1 SpdDimmsFound +---> drv_gimlet_seq_server::idl::__SEQUENCER_SERVER_COUNTERS: | +---> drv_spi_api::__SPI_CLIENT_COUNTERS: diff --git a/tests/cmd/counters/counters.counters.0.stdout b/tests/cmd/counters/counters.counters.0.stdout index 296cb6890..d6f39a8c2 100644 --- a/tests/cmd/counters/counters.counters.0.stdout +++ b/tests/cmd/counters/counters.counters.0.stdout @@ -20,31 +20,31 @@ gimlet_seq 102 A1Status 15 A0Power 2 V3P3SysA0VOut - 1 SMStatus - 1 SetState + 1 Ice40Rails + 1 IdentValid + 1 ChecksumValid + 1 Reprogram + 1 Programmed + 1 Programming + 1 Ice40PowerGoodV1P2 + 1 Ice40PowerGoodV3P3 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 Ice40PowerGoodV1P2 - 1 IdentValid 1 CPUPresent 1 Coretype - 1 Programmed - 1 Ice40Rails - 1 InterruptFlags 1 RailsOn 1 UartEnabled - 1 Ice40PowerGoodV3P3 - 1 UpdateState(A0) 1 A0 - 1 Reprogram + 1 SetState + 1 UpdateState(A0) 1 ClockConfigSuccess - 1 ChecksumValid 1 PGStatus - 1 Programming + 1 SMStatus 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound thermal | +---> task_thermal::__RINGBUF: diff --git a/tests/cmd/counters/counters.host-panic.0.stdout b/tests/cmd/counters/counters.host-panic.0.stdout index 2be53c0f6..db31efeae 100644 --- a/tests/cmd/counters/counters.host-panic.0.stdout +++ b/tests/cmd/counters/counters.host-panic.0.stdout @@ -25,29 +25,29 @@ gimlet_seq 1 UpdateState(A2) 7 V3P3SysA0VOut 6 NICPowerEnableLow - 3 InterruptFlags - 3 PowerControl - 3 SMStatus - 3 PGStatus 3 SetState - 2 UartEnabled - 2 RailsOn + 3 PGStatus + 3 SMStatus + 3 PowerControl + 3 InterruptFlags 2 A2 2 CPUPresent 2 Coretype + 2 RailsOn + 2 UartEnabled 2 A0 - 1 ClockConfigSuccess 1 Ice40Rails - 1 Programming 1 IdentValid - 1 Ice40PowerGoodV1P2 - 1 Reprogram 1 ChecksumValid + 1 Reprogram 1 Programmed - 1 A2Status - 1 Ident - 1 RailsOff + 1 Programming + 1 Ice40PowerGoodV1P2 1 Ice40PowerGoodV3P3 + 1 RailsOff + 1 Ident + 1 A2Status + 1 ClockConfigSuccess 1 SpdDimmsFound thermal | diff --git a/tests/cmd/counters/counters.host-panic.1.stdout b/tests/cmd/counters/counters.host-panic.1.stdout index 36fbba1da..74807c271 100644 --- a/tests/cmd/counters/counters.host-panic.1.stdout +++ b/tests/cmd/counters/counters.host-panic.1.stdout @@ -26,29 +26,29 @@ gimlet_seq 5 UpdateState(A2) 1 UpdateState(A0PlusHP) 11 SetState - 11 InterruptFlags - 11 PowerControl - 11 SMStatus 11 PGStatus - 6 UartEnabled - 6 RailsOn + 11 SMStatus + 11 PowerControl + 11 InterruptFlags 6 A2 6 CPUPresent 6 Coretype + 6 RailsOn + 6 UartEnabled 6 A0 - 1 Reprogram 1 Ice40Rails - 1 NICPowerEnableLow - 1 Programming 1 IdentValid - 1 Ice40PowerGoodV1P2 - 1 ClockConfigSuccess 1 ChecksumValid + 1 Reprogram 1 Programmed - 1 A2Status - 1 Ident - 1 RailsOff + 1 Programming + 1 Ice40PowerGoodV1P2 1 Ice40PowerGoodV3P3 + 1 RailsOff + 1 Ident + 1 A2Status + 1 NICPowerEnableLow + 1 ClockConfigSuccess 1 SpdDimmsFound thermal | diff --git a/tests/cmd/counters/counters.host-panic.2.stdout b/tests/cmd/counters/counters.host-panic.2.stdout index 1058c1217..b32999e0c 100644 --- a/tests/cmd/counters/counters.host-panic.2.stdout +++ b/tests/cmd/counters/counters.host-panic.2.stdout @@ -23,30 +23,30 @@ gimlet_seq 2 UpdateState(A0PlusHP) 3 NICPowerEnableLow 2 V3P3SysA0VOut - 1 SMStatus + 1 Ice40Rails + 1 IdentValid + 1 ChecksumValid + 1 Reprogram + 1 Programmed + 1 Programming 1 Ice40PowerGoodV1P2 + 1 Ice40PowerGoodV3P3 + 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 Ice40PowerGoodV3P3 - 1 IdentValid 1 CPUPresent 1 Coretype - 1 Programmed - 1 Ice40Rails 1 RailsOn 1 UartEnabled - 1 RailsOff 1 A0 - 1 ClockConfigSuccess - 1 Reprogram 1 SetState - 1 ChecksumValid + 1 ClockConfigSuccess 1 PGStatus - 1 Programming - 1 InterruptFlags + 1 SMStatus 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound thermal | +---> task_thermal::__RINGBUF: diff --git a/tests/cmd/counters/counters.host-panic.3.stdout b/tests/cmd/counters/counters.host-panic.3.stdout index 2d4741d5b..b281baa60 100644 --- a/tests/cmd/counters/counters.host-panic.3.stdout +++ b/tests/cmd/counters/counters.host-panic.3.stdout @@ -61,31 +61,31 @@ gimlet_seq | 5 UpdateState(A0PlusHP) | 2 UpdateState(A2) | 7 NICPowerEnableLow - | 6 InterruptFlags - | 6 PowerControl - | 6 SMStatus - | 6 PGStatus | 6 SetState - | 3 A0 + | 6 PGStatus + | 6 SMStatus + | 6 PowerControl + | 6 InterruptFlags | 3 A2 - | 3 UartEnabled - | 3 RailsOn | 3 CPUPresent(true) | 3 Coretype + | 3 RailsOn + | 3 UartEnabled + | 3 A0 | 2 NICStatus | 1 Ice40Rails + | 1 IdentValid(false) | 1 ChecksumValid(false) - | 1 SpdDimmsFound - | 1 A2Status - | 1 Ident - | 1 RailsOff - | 1 ClockConfigSuccess - | 1 Ice40PowerGoodV3P3(true) - | 1 Ice40PowerGoodV1P2(true) + | 1 Reprogram(true) | 1 Programmed - | 1 IdentValid(false) | 1 Programming - | 1 Reprogram(true) + | 1 Ice40PowerGoodV1P2(true) + | 1 Ice40PowerGoodV3P3(true) + | 1 RailsOff + | 1 Ident + | 1 A2Status + | 1 ClockConfigSuccess + | 1 SpdDimmsFound +---> drv_gimlet_seq_server::idl::__SEQUENCER_SERVER_COUNTERS: | 4246 get_state | 5 set_state(Ok) diff --git a/tests/cmd/counters/counters.host-panic.4.stdout b/tests/cmd/counters/counters.host-panic.4.stdout index b3b011dd0..cac3e4b49 100644 --- a/tests/cmd/counters/counters.host-panic.4.stdout +++ b/tests/cmd/counters/counters.host-panic.4.stdout @@ -60,31 +60,31 @@ gimlet_seq | 2 UpdateState(A0) | 1 UpdateState(A2) | 1 UpdateState(A0PlusHP) - | 3 InterruptFlags - | 3 PowerControl - | 3 SMStatus - | 3 PGStatus | 3 SetState - | 2 A0 + | 3 PGStatus + | 3 SMStatus + | 3 PowerControl + | 3 InterruptFlags | 2 A2 - | 2 UartEnabled - | 2 RailsOn | 2 CPUPresent(true) | 2 Coretype - | 1 A2Status - | 1 Programming + | 2 RailsOn + | 2 UartEnabled + | 2 A0 + | 1 Ice40Rails | 1 IdentValid(false) - | 1 SpdDimmsFound | 1 ChecksumValid(false) - | 1 Ice40Rails - | 1 Ident - | 1 RailsOff - | 1 ClockConfigSuccess - | 1 Ice40PowerGoodV3P3(true) - | 1 Ice40PowerGoodV1P2(true) - | 1 NICPowerEnableLow | 1 Reprogram(true) | 1 Programmed + | 1 Programming + | 1 Ice40PowerGoodV1P2(true) + | 1 Ice40PowerGoodV3P3(true) + | 1 RailsOff + | 1 Ident + | 1 A2Status + | 1 NICPowerEnableLow + | 1 ClockConfigSuccess + | 1 SpdDimmsFound +---> drv_gimlet_seq_server::idl::__SEQUENCER_SERVER_COUNTERS: | 667 get_state | 3 set_state(Ok) diff --git a/tests/cmd/counters/counters.ipc-counts.0.stdout b/tests/cmd/counters/counters.ipc-counts.0.stdout index 6b19a3afb..2b283f620 100644 --- a/tests/cmd/counters/counters.ipc-counts.0.stdout +++ b/tests/cmd/counters/counters.ipc-counts.0.stdout @@ -61,31 +61,31 @@ gimlet_seq | 2 UpdateState(A0PlusHP) | 3 NICPowerEnableLow | 2 V3P3SysA0VOut - | 1 RailsOn - | 1 SetState + | 1 Ice40Rails + | 1 IdentValid(false) + | 1 ChecksumValid(false) + | 1 Reprogram(true) + | 1 Programmed + | 1 Programming + | 1 Ice40PowerGoodV1P2(true) + | 1 Ice40PowerGoodV3P3(true) | 1 RailsOff | 1 Ident | 1 A2Status | 1 A2 - | 1 SpdDimmsFound - | 1 ChecksumValid(false) | 1 CPUPresent(true) | 1 Coretype - | 1 IdentValid(false) - | 1 Ice40PowerGoodV1P2(true) - | 1 Ice40Rails + | 1 RailsOn | 1 UartEnabled | 1 A0 - | 1 Ice40PowerGoodV3P3(true) - | 1 Programming - | 1 Programmed + | 1 SetState | 1 ClockConfigSuccess - | 1 Reprogram(true) | 1 PGStatus | 1 SMStatus | 1 NICStatus - | 1 InterruptFlags | 1 PowerControl + | 1 InterruptFlags + | 1 SpdDimmsFound +---> drv_spi_api::__SPI_CLIENT_COUNTERS: | 67580 exchange(Ok) | 530 write(Ok) diff --git a/tests/cmd/counters/counters.u16-ringbuf.stdout b/tests/cmd/counters/counters.u16-ringbuf.stdout index afc0698b6..02dd2297d 100644 --- a/tests/cmd/counters/counters.u16-ringbuf.stdout +++ b/tests/cmd/counters/counters.u16-ringbuf.stdout @@ -4,7 +4,7 @@ gimlet_seq | +---> drv_gimlet_seq_server::__RINGBUF: | 446 ClockConfigWrite - | 1 SetState + | 1 Ice40Rails | 1 IdentValid(false) | 1 ChecksumValid(false) | 1 Reprogram(true) @@ -16,10 +16,10 @@ gimlet_seq | 1 Ident | 1 A2Status | 1 A2 - | 1 SpdDimmsFound - | 1 V3P3SysA0VOut + | 1 SetState | 1 ClockConfigSuccess - | 1 Ice40Rails + | 1 V3P3SysA0VOut + | 1 SpdDimmsFound +---> drv_gimlet_seq_server::idl::__SEQUENCER_SERVER_COUNTERS: | +---> drv_spi_api::__SPI_CLIENT_COUNTERS: diff --git a/tests/cmd/ringbuf/ringbuf.counters.0.stdout b/tests/cmd/ringbuf/ringbuf.counters.0.stdout index 5bd31a1b2..7fa987ae6 100644 --- a/tests/cmd/ringbuf/ringbuf.counters.0.stdout +++ b/tests/cmd/ringbuf/ringbuf.counters.0.stdout @@ -6,31 +6,31 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 102 A1Status 15 A0Power 2 V3P3SysA0VOut - 1 SMStatus - 1 SetState + 1 Ice40Rails + 1 IdentValid + 1 ChecksumValid + 1 Reprogram + 1 Programmed + 1 Programming + 1 Ice40PowerGoodV1P2 + 1 Ice40PowerGoodV3P3 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 Ice40PowerGoodV1P2 - 1 IdentValid 1 CPUPresent 1 Coretype - 1 Programmed - 1 Ice40Rails - 1 InterruptFlags 1 RailsOn 1 UartEnabled - 1 Ice40PowerGoodV3P3 - 1 UpdateState(A0) 1 A0 - 1 Reprogram + 1 SetState + 1 UpdateState(A0) 1 ClockConfigSuccess - 1 ChecksumValid 1 PGStatus - 1 Programming + 1 SMStatus 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 0 254 1 1 Ice40Rails(true, true) 1 283 1 1 Ice40PowerGoodV1P2(true) diff --git a/tests/cmd/ringbuf/ringbuf.host-panic.0.stdout b/tests/cmd/ringbuf/ringbuf.host-panic.0.stdout index c84ec7206..e38322806 100644 --- a/tests/cmd/ringbuf/ringbuf.host-panic.0.stdout +++ b/tests/cmd/ringbuf/ringbuf.host-panic.0.stdout @@ -10,29 +10,29 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 1 UpdateState(A2) 7 V3P3SysA0VOut 6 NICPowerEnableLow - 3 InterruptFlags - 3 PowerControl - 3 SMStatus - 3 PGStatus 3 SetState - 2 UartEnabled - 2 RailsOn + 3 PGStatus + 3 SMStatus + 3 PowerControl + 3 InterruptFlags 2 A2 2 CPUPresent 2 Coretype + 2 RailsOn + 2 UartEnabled 2 A0 - 1 ClockConfigSuccess 1 Ice40Rails - 1 Programming 1 IdentValid - 1 Ice40PowerGoodV1P2 - 1 Reprogram 1 ChecksumValid + 1 Reprogram 1 Programmed - 1 A2Status - 1 Ident - 1 RailsOff + 1 Programming + 1 Ice40PowerGoodV1P2 1 Ice40PowerGoodV3P3 + 1 RailsOff + 1 Ident + 1 A2Status + 1 ClockConfigSuccess 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 0 254 1 1 Ice40Rails(true, true) diff --git a/tests/cmd/ringbuf/ringbuf.host-panic.1.stdout b/tests/cmd/ringbuf/ringbuf.host-panic.1.stdout index 2d7596ad9..6842e447d 100644 --- a/tests/cmd/ringbuf/ringbuf.host-panic.1.stdout +++ b/tests/cmd/ringbuf/ringbuf.host-panic.1.stdout @@ -10,29 +10,29 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 5 UpdateState(A2) 1 UpdateState(A0PlusHP) 11 SetState - 11 InterruptFlags - 11 PowerControl - 11 SMStatus 11 PGStatus - 6 UartEnabled - 6 RailsOn + 11 SMStatus + 11 PowerControl + 11 InterruptFlags 6 A2 6 CPUPresent 6 Coretype + 6 RailsOn + 6 UartEnabled 6 A0 - 1 Reprogram 1 Ice40Rails - 1 NICPowerEnableLow - 1 Programming 1 IdentValid - 1 Ice40PowerGoodV1P2 - 1 ClockConfigSuccess 1 ChecksumValid + 1 Reprogram 1 Programmed - 1 A2Status - 1 Ident - 1 RailsOff + 1 Programming + 1 Ice40PowerGoodV1P2 1 Ice40PowerGoodV3P3 + 1 RailsOff + 1 Ident + 1 A2Status + 1 NICPowerEnableLow + 1 ClockConfigSuccess 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 101 729 1 11 A0Status(0x1) diff --git a/tests/cmd/ringbuf/ringbuf.host-panic.2.stdout b/tests/cmd/ringbuf/ringbuf.host-panic.2.stdout index e2be8b401..865f280fa 100644 --- a/tests/cmd/ringbuf/ringbuf.host-panic.2.stdout +++ b/tests/cmd/ringbuf/ringbuf.host-panic.2.stdout @@ -9,30 +9,30 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 2 UpdateState(A0PlusHP) 3 NICPowerEnableLow 2 V3P3SysA0VOut - 1 SMStatus + 1 Ice40Rails + 1 IdentValid + 1 ChecksumValid + 1 Reprogram + 1 Programmed + 1 Programming 1 Ice40PowerGoodV1P2 + 1 Ice40PowerGoodV3P3 + 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 Ice40PowerGoodV3P3 - 1 IdentValid 1 CPUPresent 1 Coretype - 1 Programmed - 1 Ice40Rails 1 RailsOn 1 UartEnabled - 1 RailsOff 1 A0 - 1 ClockConfigSuccess - 1 Reprogram 1 SetState - 1 ChecksumValid + 1 ClockConfigSuccess 1 PGStatus - 1 Programming - 1 InterruptFlags + 1 SMStatus 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 0 254 1 1 Ice40Rails(true, true) 1 283 1 1 Ice40PowerGoodV1P2(true) diff --git a/tests/cmd/ringbuf/ringbuf.host-panic.3.stdout b/tests/cmd/ringbuf/ringbuf.host-panic.3.stdout index 860c78438..afad7ef7b 100644 --- a/tests/cmd/ringbuf/ringbuf.host-panic.3.stdout +++ b/tests/cmd/ringbuf/ringbuf.host-panic.3.stdout @@ -10,31 +10,31 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 5 UpdateState(A0PlusHP) 2 UpdateState(A2) 7 NICPowerEnableLow - 6 InterruptFlags - 6 PowerControl - 6 SMStatus - 6 PGStatus 6 SetState - 3 A0 + 6 PGStatus + 6 SMStatus + 6 PowerControl + 6 InterruptFlags 3 A2 - 3 UartEnabled - 3 RailsOn 3 CPUPresent(true) 3 Coretype + 3 RailsOn + 3 UartEnabled + 3 A0 2 NICStatus 1 Ice40Rails + 1 IdentValid(false) 1 ChecksumValid(false) - 1 SpdDimmsFound - 1 A2Status - 1 Ident - 1 RailsOff - 1 ClockConfigSuccess - 1 Ice40PowerGoodV3P3(true) - 1 Ice40PowerGoodV1P2(true) + 1 Reprogram(true) 1 Programmed - 1 IdentValid(false) 1 Programming - 1 Reprogram(true) + 1 Ice40PowerGoodV1P2(true) + 1 Ice40PowerGoodV3P3(true) + 1 RailsOff + 1 Ident + 1 A2Status + 1 ClockConfigSuccess + 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 17 1415 1 1 V3P3SysA0VOut(Volts(0.080078125)) 18 674 1 1 PGStatus { b_pg: 0x0, c_pg: 0x0, nic: 0x0 } diff --git a/tests/cmd/ringbuf/ringbuf.host-panic.4.stdout b/tests/cmd/ringbuf/ringbuf.host-panic.4.stdout index 4e5bbb2d6..89642acb3 100644 --- a/tests/cmd/ringbuf/ringbuf.host-panic.4.stdout +++ b/tests/cmd/ringbuf/ringbuf.host-panic.4.stdout @@ -9,31 +9,31 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 2 UpdateState(A0) 1 UpdateState(A2) 1 UpdateState(A0PlusHP) - 3 InterruptFlags - 3 PowerControl - 3 SMStatus - 3 PGStatus 3 SetState - 2 A0 + 3 PGStatus + 3 SMStatus + 3 PowerControl + 3 InterruptFlags 2 A2 - 2 UartEnabled - 2 RailsOn 2 CPUPresent(true) 2 Coretype - 1 A2Status - 1 Programming + 2 RailsOn + 2 UartEnabled + 2 A0 + 1 Ice40Rails 1 IdentValid(false) - 1 SpdDimmsFound 1 ChecksumValid(false) - 1 Ice40Rails - 1 Ident - 1 RailsOff - 1 ClockConfigSuccess - 1 Ice40PowerGoodV3P3(true) - 1 Ice40PowerGoodV1P2(true) - 1 NICPowerEnableLow 1 Reprogram(true) 1 Programmed + 1 Programming + 1 Ice40PowerGoodV1P2(true) + 1 Ice40PowerGoodV3P3(true) + 1 RailsOff + 1 Ident + 1 A2Status + 1 NICPowerEnableLow + 1 ClockConfigSuccess + 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 0 264 1 1 Ice40Rails(true, true) 1 293 1 1 Ice40PowerGoodV1P2(true) diff --git a/tests/cmd/ringbuf/ringbuf.ipc-counts.0.stdout b/tests/cmd/ringbuf/ringbuf.ipc-counts.0.stdout index 7d68903a8..5674a0043 100644 --- a/tests/cmd/ringbuf/ringbuf.ipc-counts.0.stdout +++ b/tests/cmd/ringbuf/ringbuf.ipc-counts.0.stdout @@ -9,31 +9,31 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 2 UpdateState(A0PlusHP) 3 NICPowerEnableLow 2 V3P3SysA0VOut - 1 RailsOn - 1 SetState + 1 Ice40Rails + 1 IdentValid(false) + 1 ChecksumValid(false) + 1 Reprogram(true) + 1 Programmed + 1 Programming + 1 Ice40PowerGoodV1P2(true) + 1 Ice40PowerGoodV3P3(true) 1 RailsOff 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 ChecksumValid(false) 1 CPUPresent(true) 1 Coretype - 1 IdentValid(false) - 1 Ice40PowerGoodV1P2(true) - 1 Ice40Rails + 1 RailsOn 1 UartEnabled 1 A0 - 1 Ice40PowerGoodV3P3(true) - 1 Programming - 1 Programmed + 1 SetState 1 ClockConfigSuccess - 1 Reprogram(true) 1 PGStatus 1 SMStatus 1 NICStatus - 1 InterruptFlags 1 PowerControl + 1 InterruptFlags + 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 0 248 1 1 Ice40Rails(true, true) 1 277 1 1 Ice40PowerGoodV1P2(true) diff --git a/tests/cmd/ringbuf/ringbuf.u16-ringbuf.stdout b/tests/cmd/ringbuf/ringbuf.u16-ringbuf.stdout index e0b894604..e979cff43 100644 --- a/tests/cmd/ringbuf/ringbuf.u16-ringbuf.stdout +++ b/tests/cmd/ringbuf/ringbuf.u16-ringbuf.stdout @@ -1,7 +1,7 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: TOTAL VARIANT 446 ClockConfigWrite - 1 SetState + 1 Ice40Rails 1 IdentValid(false) 1 ChecksumValid(false) 1 Reprogram(true) @@ -13,10 +13,10 @@ humility: ring buffer drv_gimlet_seq_server::__RINGBUF in gimlet_seq: 1 Ident 1 A2Status 1 A2 - 1 SpdDimmsFound - 1 V3P3SysA0VOut + 1 SetState 1 ClockConfigSuccess - 1 Ice40Rails + 1 V3P3SysA0VOut + 1 SpdDimmsFound NDX LINE GEN COUNT PAYLOAD 0 264 1 1 Ice40Rails(true, true) 1 293 1 1 Ice40PowerGoodV1P2(true)