diff --git a/app/cosmo/src/tracing.rs b/app/cosmo/src/tracing.rs index 224aa30f7c..a61b92de4c 100644 --- a/app/cosmo/src/tracing.rs +++ b/app/cosmo/src/tracing.rs @@ -27,8 +27,8 @@ enum Event { #[derive(Copy, Clone, PartialEq)] enum Trace { - Event(Event), None, + Event(Event), } ringbuf!(Trace, 128, Trace::None); diff --git a/app/gimlet/src/tracing.rs b/app/gimlet/src/tracing.rs index 224aa30f7c..a61b92de4c 100644 --- a/app/gimlet/src/tracing.rs +++ b/app/gimlet/src/tracing.rs @@ -27,8 +27,8 @@ enum Event { #[derive(Copy, Clone, PartialEq)] enum Trace { - Event(Event), None, + Event(Event), } ringbuf!(Trace, 128, Trace::None); diff --git a/drv/cosmo-seq-server/src/main.rs b/drv/cosmo-seq-server/src/main.rs index 6dfd6e9ad4..42219401c5 100644 --- a/drv/cosmo-seq-server/src/main.rs +++ b/drv/cosmo-seq-server/src/main.rs @@ -38,6 +38,8 @@ task_slot!(PACKRAT, packrat); #[derive(Copy, Clone, PartialEq, Count)] enum Trace { + #[count(skip)] + None, FpgaInit, StartFailed(#[count(children)] SeqError), ContinueBitstreamLoad(usize), @@ -78,8 +80,6 @@ enum Trace { sp5r3: bool, sp5r4: bool, }, - #[count(skip)] - None, } counted_ringbuf!(Trace, 128, Trace::None); diff --git a/drv/gimlet-seq-server/src/main.rs b/drv/gimlet-seq-server/src/main.rs index 7a3feeaa7b..6d4d072f7f 100644 --- a/drv/gimlet-seq-server/src/main.rs +++ b/drv/gimlet-seq-server/src/main.rs @@ -67,6 +67,8 @@ enum I2cTxn { #[derive(Copy, Clone, PartialEq, Count)] enum Trace { + #[count(skip)] + None, Ice40Rails(bool, bool), IdentValid(#[count(children)] bool), ChecksumValid(#[count(children)] bool), @@ -150,8 +152,6 @@ enum Trace { retries_remaining: u8, }, StartFailed(#[count(children)] SeqError), - #[count(skip)] - None, } counted_ringbuf!(Trace, 128, Trace::None); diff --git a/drv/gimlet-seq-server/src/vcore.rs b/drv/gimlet-seq-server/src/vcore.rs index b294593e87..4e886e887e 100644 --- a/drv/gimlet-seq-server/src/vcore.rs +++ b/drv/gimlet-seq-server/src/vcore.rs @@ -41,6 +41,7 @@ pub struct VCore { #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Initializing, Initialized, LimitLoaded, @@ -49,7 +50,6 @@ enum Trace { Fault, Reading { timestamp: u64, volts: units::Volts }, Error(ResponseCode), - None, } ringbuf!(Trace, 120, Trace::None); diff --git a/drv/grapefruit-seq-server/src/main.rs b/drv/grapefruit-seq-server/src/main.rs index f5e7f538a7..9c2f0dcc6a 100644 --- a/drv/grapefruit-seq-server/src/main.rs +++ b/drv/grapefruit-seq-server/src/main.rs @@ -22,11 +22,11 @@ task_slot!(LOADER, spartan7_loader); #[derive(Copy, Clone, PartialEq, Count)] enum Trace { - MacsAlreadySet(MacAddressBlock), - IdentityAlreadySet(VpdIdentity), - #[count(skip)] None, + + MacsAlreadySet(MacAddressBlock), + IdentityAlreadySet(VpdIdentity), } counted_ringbuf!(Trace, 128, Trace::None); diff --git a/drv/i2c-devices/src/adm1272.rs b/drv/i2c-devices/src/adm1272.rs index b2d05dcdee..ba549c3a2b 100644 --- a/drv/i2c-devices/src/adm1272.rs +++ b/drv/i2c-devices/src/adm1272.rs @@ -81,10 +81,10 @@ impl core::fmt::Display for Adm1272 { #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Coefficients(pmbus::Coefficients), Config(adm1272::PMON_CONFIG::CommandData), WriteConfig(adm1272::PMON_CONFIG::CommandData), - None, } ringbuf!(Trace, 8, Trace::None); diff --git a/drv/i2c-devices/src/ds2482.rs b/drv/i2c-devices/src/ds2482.rs index 225cac9136..c99946e489 100644 --- a/drv/i2c-devices/src/ds2482.rs +++ b/drv/i2c-devices/src/ds2482.rs @@ -67,11 +67,11 @@ pub enum Error { #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Read(Register, u8), ReadError(Register, ResponseCode), Command(Command), CommandError(Command, ResponseCode), - None, } ringbuf!(Trace, 196, Trace::None); diff --git a/drv/i2c-devices/src/emc2305.rs b/drv/i2c-devices/src/emc2305.rs index 23f4d7fe15..83469dfb5c 100644 --- a/drv/i2c-devices/src/emc2305.rs +++ b/drv/i2c-devices/src/emc2305.rs @@ -216,10 +216,10 @@ fn write_reg16( #[derive(Copy, Clone, PartialEq)] enum Trace { + None, ZeroTach(Fan), TachOverflow(u32), BadFanCount(u8), - None, } ringbuf!(Trace, 6, Trace::None); diff --git a/drv/i2c-devices/src/lm5066.rs b/drv/i2c-devices/src/lm5066.rs index 4a00dc6520..e10b8ae71f 100644 --- a/drv/i2c-devices/src/lm5066.rs +++ b/drv/i2c-devices/src/lm5066.rs @@ -101,10 +101,10 @@ impl core::fmt::Display for Lm5066 { #[derive(Copy, Clone, PartialEq)] pub enum Trace { + None, CurrentCoefficients(pmbus::Coefficients), PowerCoefficients(pmbus::Coefficients), DeviceSetup(lm5066::DEVICE_SETUP::CommandData), - None, } ringbuf!(Trace, 8, Trace::None); diff --git a/drv/i2c-devices/src/lm5066i.rs b/drv/i2c-devices/src/lm5066i.rs index 381acd91b7..ddabb6c919 100644 --- a/drv/i2c-devices/src/lm5066i.rs +++ b/drv/i2c-devices/src/lm5066i.rs @@ -23,10 +23,10 @@ pub use crate::lm5066::{CurrentLimitStrap, Error}; #[derive(Copy, Clone, PartialEq)] pub(crate) enum Trace { + None, CurrentCoefficients(pmbus::Coefficients), PowerCoefficients(pmbus::Coefficients), DeviceSetup(lm5066i::DEVICE_SETUP::CommandData), - None, } pub struct Lm5066I { diff --git a/drv/i2c-devices/src/max31790.rs b/drv/i2c-devices/src/max31790.rs index 93d2a1607b..ad455fd211 100644 --- a/drv/i2c-devices/src/max31790.rs +++ b/drv/i2c-devices/src/max31790.rs @@ -254,8 +254,8 @@ fn write_reg16( #[derive(Copy, Clone, PartialEq)] enum Trace { - ZeroTach(Fan), None, + ZeroTach(Fan), } ringbuf!(Trace, 6, Trace::None); diff --git a/drv/lpc55-spi-server/src/main.rs b/drv/lpc55-spi-server/src/main.rs index c91c85f315..8d2d0ca64d 100644 --- a/drv/lpc55-spi-server/src/main.rs +++ b/drv/lpc55-spi-server/src/main.rs @@ -19,10 +19,10 @@ task_slot!(GPIO, gpio_driver); #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Irq, Tx(u8), Rx(u8), - None, } ringbuf!(Trace, 64, Trace::None); diff --git a/drv/lpc55-swd/src/main.rs b/drv/lpc55-swd/src/main.rs index 88e366a320..c5b41ada05 100644 --- a/drv/lpc55-swd/src/main.rs +++ b/drv/lpc55-swd/src/main.rs @@ -112,12 +112,12 @@ use zerocopy::IntoBytes; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Idcode(u32), Idr(u32), MemVal(u32), ReadCmd, WriteCmd, - None, AckErr(Ack), DongleDetected, Dhcsr(Dhcsr), diff --git a/drv/oxide-vpd/src/lib.rs b/drv/oxide-vpd/src/lib.rs index 3b7db7191a..49d26fc913 100644 --- a/drv/oxide-vpd/src/lib.rs +++ b/drv/oxide-vpd/src/lib.rs @@ -36,9 +36,9 @@ struct EepromReader<'a> { #[derive(Copy, Clone, PartialEq)] enum Trace { + None, EepromError(drv_i2c_devices::at24csw080::Error), Error(VpdError), - None, } ringbuf!(Trace, 4, Trace::None); diff --git a/drv/spartan7-loader/src/main.rs b/drv/spartan7-loader/src/main.rs index 3678b40051..6fc6e5be5b 100644 --- a/drv/spartan7-loader/src/main.rs +++ b/drv/spartan7-loader/src/main.rs @@ -47,15 +47,14 @@ pub fn claim_spi(_sys: &sys_api::Sys) -> drv_spi_api::Spi { #[derive(Copy, Clone, PartialEq, Count)] enum Trace { + #[count(skip)] + None, FpgaInit, FpgaInitFailed(#[count(children)] Spartan7Error), StartFailed(#[count(children)] LoaderError), ContinueBitstreamLoad(usize), WaitForDone, Programmed, - - #[count(skip)] - None, } #[derive(Copy, Clone, PartialEq, Count)] diff --git a/drv/stm32h7-spi-server-core/src/lib.rs b/drv/stm32h7-spi-server-core/src/lib.rs index caef849dbe..9d7448dc97 100644 --- a/drv/stm32h7-spi-server-core/src/lib.rs +++ b/drv/stm32h7-spi-server-core/src/lib.rs @@ -64,12 +64,12 @@ pub struct SpiServerCore { #[derive(Copy, Clone, PartialEq, counters::Count)] enum Trace { + #[count(skip)] + None, Start(#[count(children)] SpiOperation, (u16, u16)), Tx(u8), Rx(u8), WaitISR(u32), - #[count(skip)] - None, } counted_ringbuf!(Trace, 64, Trace::None); diff --git a/drv/stm32h7-update-server/src/main.rs b/drv/stm32h7-update-server/src/main.rs index 0e8f94be96..b9910c9166 100644 --- a/drv/stm32h7-update-server/src/main.rs +++ b/drv/stm32h7-update-server/src/main.rs @@ -47,6 +47,7 @@ extern "C" { #[derive(Copy, Clone, PartialEq)] enum Trace { + None, EraseStart, EraseEnd, WriteStart, @@ -54,7 +55,6 @@ enum Trace { FinishStart, FinishEnd, WriteBlock(usize), - None, } enum UpdateState { diff --git a/drv/stm32xx-i2c-server/src/main.rs b/drv/stm32xx-i2c-server/src/main.rs index 5073c77505..1633f8fe5a 100644 --- a/drv/stm32xx-i2c-server/src/main.rs +++ b/drv/stm32xx-i2c-server/src/main.rs @@ -226,6 +226,7 @@ fn configure_mux( #[derive(Copy, Clone, PartialEq)] enum Trace { + None, SegmentOnError((Mux, Segment)), Error(u8, ResponseCodeU8), MuxError(ResponseCodeU8), @@ -237,7 +238,6 @@ enum Trace { SegmentFailed(ResponseCodeU8), ConfigureFailed(ResponseCodeU8), Wiggles(u8), - None, } ringbuf!(Trace, 160, Trace::None); diff --git a/drv/stm32xx-i2c/src/lib.rs b/drv/stm32xx-i2c/src/lib.rs index 846145ffaf..82412938f6 100644 --- a/drv/stm32xx-i2c/src/lib.rs +++ b/drv/stm32xx-i2c/src/lib.rs @@ -171,6 +171,8 @@ enum Register { #[derive(Copy, Clone, Eq, PartialEq, counters::Count)] enum Trace { + #[count(skip)] + None, Wait(Register, u32), Write(Register, u32), WriteWait(Register, u32), @@ -205,8 +207,6 @@ enum Trace { enabled: bool, posted: bool, }, - #[count(skip)] - None, } counted_ringbuf!(Trace, 48, Trace::None); diff --git a/drv/stm32xx-i2c/src/max7358.rs b/drv/stm32xx-i2c/src/max7358.rs index 71f28f8214..d78572fd27 100644 --- a/drv/stm32xx-i2c/src/max7358.rs +++ b/drv/stm32xx-i2c/src/max7358.rs @@ -63,9 +63,9 @@ bitfield! { #[derive(Copy, Clone, Eq, PartialEq)] enum Trace { + None, Read(Register, u8), Write(Register, u8), - None, } ringbuf!(Trace, 32, Trace::None); diff --git a/task/attest/src/main.rs b/task/attest/src/main.rs index 0342685080..30e152a311 100644 --- a/task/attest/src/main.rs +++ b/task/attest/src/main.rs @@ -40,6 +40,7 @@ use build::{ALIAS_DATA, CERT_DATA, PERMIT_LOG_RESET}; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Cert, CertChainLen(u32), CertLen(usize), @@ -58,7 +59,6 @@ enum Trace { ClientError(ClientError), StartAttest, FinishAttest, - None, } ringbuf!(Trace, 16, Trace::None); diff --git a/task/dump-agent/src/main.rs b/task/dump-agent/src/main.rs index ce78762af6..d8d7e24ec2 100644 --- a/task/dump-agent/src/main.rs +++ b/task/dump-agent/src/main.rs @@ -34,9 +34,9 @@ struct ServerImpl { #[cfg(not(feature = "no-rot"))] #[derive(Copy, Clone, PartialEq)] enum Trace { + None, SpRotDump, SpRotDumpResult(Result<(), DumpAgentError>), - None, } #[cfg(not(feature = "no-rot"))] diff --git a/task/dumper/src/main.rs b/task/dumper/src/main.rs index 3d15b61190..decc53a9d1 100644 --- a/task/dumper/src/main.rs +++ b/task/dumper/src/main.rs @@ -16,6 +16,7 @@ use zerocopy::FromBytes; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, DumpInitiated(u32), SetupFailed(SpCtrlError), DumpHeader([u8; 4]), @@ -33,7 +34,6 @@ enum Trace { ReinitFailed, ReinitSucceededButResumeFailed, ReinitResumed, - None, } task_slot!(SP_CTRL, swd); diff --git a/task/gimlet-spd/src/main.rs b/task/gimlet-spd/src/main.rs index 696cbf6d04..a1721025ab 100644 --- a/task/gimlet-spd/src/main.rs +++ b/task/gimlet-spd/src/main.rs @@ -62,6 +62,7 @@ const LTC4306_ADDRESS: u8 = 0b1001_010; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Ready, Initiate(u8, bool), Rx(u8, u8), @@ -69,7 +70,6 @@ enum Trace { MemInitiate(u8), MemSetOffset(usize, u8), MuxState(ltc4306::State, ltc4306::State), - None, } ringbuf!(Trace, 16, Trace::None); diff --git a/task/hiffy/src/lpc55.rs b/task/hiffy/src/lpc55.rs index b7735aa603..98da5af101 100644 --- a/task/hiffy/src/lpc55.rs +++ b/task/hiffy/src/lpc55.rs @@ -18,10 +18,10 @@ task_slot!(SP_CTRL, swd); #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Execute((usize, hif::Op)), Failure(Failure), Success, - None, } ringbuf!(Trace, 64, Trace::None); diff --git a/task/hiffy/src/stm32h7.rs b/task/hiffy/src/stm32h7.rs index 7f46acd43f..7fc0f47b61 100644 --- a/task/hiffy/src/stm32h7.rs +++ b/task/hiffy/src/stm32h7.rs @@ -27,6 +27,7 @@ task_slot!(SYS, sys); #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Execute((usize, Op)), Failure(Failure), #[cfg(feature = "gpio")] @@ -42,7 +43,6 @@ enum Trace { #[cfg(feature = "gpio")] GpioInput(drv_stm32xx_sys_api::Port), Success, - None, } ringbuf!(Trace, 64, Trace::None); diff --git a/task/hiffy/src/tests.rs b/task/hiffy/src/tests.rs index 272c5e114e..c6c902a9ee 100644 --- a/task/hiffy/src/tests.rs +++ b/task/hiffy/src/tests.rs @@ -81,11 +81,11 @@ pub(crate) fn run_a_test( #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Execute((usize, hif::Op)), Failure(Failure), Success, RunTest(u32), - None, } ringbuf!(Trace, 64, Trace::None); diff --git a/task/power/src/bsp/cosmo_a.rs b/task/power/src/bsp/cosmo_a.rs index edec0d859f..cc56d7a1a9 100644 --- a/task/power/src/bsp/cosmo_a.rs +++ b/task/power/src/bsp/cosmo_a.rs @@ -129,6 +129,7 @@ const TRACE_DEPTH: usize = 52; /// Tooling can then collect this ringbuf periodically and get recent events. #[derive(Copy, Clone, PartialEq)] enum Trace { + None, /// Configuration of the MAX5970 failed Max5970ConfigFailed { u2_index: usize, @@ -177,7 +178,6 @@ enum Trace { crossbounce_min_vout: f32, crossbounce_max_vout: f32, }, - None, } ringbuf!(Trace, TRACE_DEPTH, Trace::None); diff --git a/task/power/src/bsp/gimlet_bcdef.rs b/task/power/src/bsp/gimlet_bcdef.rs index de81dca8ed..dd8767df61 100644 --- a/task/power/src/bsp/gimlet_bcdef.rs +++ b/task/power/src/bsp/gimlet_bcdef.rs @@ -104,6 +104,7 @@ const TRACE_DEPTH: usize = 52; /// Tooling can then collect this ringbuf periodically and get recent events. #[derive(Copy, Clone, PartialEq)] enum Trace { + None, /// Written before trace records; the `u32` is the number of times the task /// has woken up to process its timer. This is not exactly equivalent to /// seconds because of the way the timer is maintained, but is approximately @@ -134,7 +135,6 @@ enum Trace { crossbounce_min_vout: f32, crossbounce_max_vout: f32, }, - None, } ringbuf!(Trace, TRACE_DEPTH, Trace::None); diff --git a/task/power/src/main.rs b/task/power/src/main.rs index 7a3dbce033..761833c483 100644 --- a/task/power/src/main.rs +++ b/task/power/src/main.rs @@ -39,9 +39,9 @@ use drv_i2c_devices::{ #[derive(Copy, Clone, PartialEq)] enum Trace { + None, GotVersion(u32), GotAddr(u32), - None, } ringbuf!(Trace, 2, Trace::None); diff --git a/task/sp_measure/src/main.rs b/task/sp_measure/src/main.rs index d64d69f499..52683b2d6f 100644 --- a/task/sp_measure/src/main.rs +++ b/task/sp_measure/src/main.rs @@ -18,11 +18,11 @@ task_slot!(SP_CTRL, swd); #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Start(u64), End(u64), ShaGood, ShaBad, - None, } ringbuf!(Trace, 16, Trace::None); diff --git a/task/validate/src/main.rs b/task/validate/src/main.rs index 78009f4321..796512464a 100644 --- a/task/validate/src/main.rs +++ b/task/validate/src/main.rs @@ -18,9 +18,9 @@ struct ServerImpl; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Validate(usize), ValidateFailure(drv_i2c_api::ResponseCode), - None, } ringbuf!(Trace, 64, Trace::None); diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs index 7bd5ce95d2..af4ae6dce0 100644 --- a/test/test-runner/src/main.rs +++ b/test/test-runner/src/main.rs @@ -62,13 +62,13 @@ const TEST_TASK: usize = 1; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, Notification, TestComplete(TaskId), TestResult(TaskId), SoftIrq(TaskId, u32), AutoRestart(bool), RestartingTask(usize), - None, } ringbuf!(Trace, 64, Trace::None); diff --git a/test/test-suite/src/main.rs b/test/test-suite/src/main.rs index fb9553c14d..6cf0eec489 100644 --- a/test/test-suite/src/main.rs +++ b/test/test-suite/src/main.rs @@ -35,9 +35,9 @@ use zerocopy::IntoBytes; #[derive(Copy, Clone, PartialEq)] enum Trace { + None, TestStart, TestFinish, - None, } ringbuf!(Trace, 64, Trace::None);