use new APIs from #2225

Author: hawkw

Cargo.lock

@@ -10,14 +10,12 @@ drv-stm32xx-sys-api = { path = "../../drv/stm32xx-sys-api", features = ["family-
 drv-i2c-api = { path ="../../drv/i2c-api", features = ["component-id"] }
 drv-i2c-devices.path = "../../drv/i2c-devices"
 task-jefe-api.path = "../../task/jefe-api"
-task-packrat-api.path = "../../task/packrat-api"
+task-packrat-api = { path = "../../task/packrat-api", features = ["serde"] }
 userlib = { path = "../../sys/userlib", features = ["panic-messages"] }
 ringbuf = { path = "../../lib/ringbuf", features = ["counters"] }
 counters = { path = "../../lib/counters" }
 static-cell = { path = "../../lib/static-cell" }
 serde.workspace = true
-minicbor.workspace = true
-minicbor-serde.workspace = true
 
 [build-dependencies]
 idol.workspace = true

drv/psc-seq-server/Cargo.toml

@@ -250,13 +250,21 @@ enum Trace {
         psu: Slot,
         err: mwocp68::Error,
     },
-    EreportSentOff {
+    EreportSent {
         now: u64,
         #[count(children)]
         psu: Slot,
         class: ereport::Class,
         len: usize,
     },
+    EreportLost {
+        now: u64,
+        #[count(children)]
+        psu: Slot,
+        class: ereport::Class,
+        len: usize,
+        err: task_packrat_api::EreportWriteError,
+    },
     EreportTooBig {
         now: u64,
         #[count(children)]
@@ -671,7 +679,41 @@ fn main() -> ! {
                 }
             }
             if let Some(ereport) = step.ereport {
-                ereport.deliver(&packrat, now, ereport_buf);
+                match packrat.serialize_ereport(&ereport, &mut ereport_buf[..])
+                {
+                    Ok(len) => ringbuf_entry!(
+                        __TRACE,
+                        Trace::EreportSent {
+                            now,
+                            psu: ereport.psu_slot,
+                            len,
+                            class: ereport.class,
+                        }
+                    ),
+                    Err(task_packrat_api::EreportSerializeError::Packrat {
+                        err,
+                        len,
+                    }) => ringbuf_entry!(
+                        __TRACE,
+                        Trace::EreportLost {
+                            now,
+                            psu: ereport.psu_slot,
+                            len,
+                            class: ereport.class,
+                            err,
+                        }
+                    ),
+                    Err(
+                        task_packrat_api::EreportSerializeError::Serialize(_),
+                    ) => ringbuf_entry!(
+                        __TRACE,
+                        Trace::EreportTooBig {
+                            now,
+                            psu: ereport.psu_slot,
+                            class: ereport.class,
+                        }
+                    ),
+                }
             }
         }
 
@@ -1153,47 +1195,6 @@ mod ereport {
         pub(super) pmbus_status: Option<PmbusStatus>,
     }
 
-    impl Ereport {
-        #[inline(never)]
-        pub(super) fn deliver(
-            &self,
-            packrat: &Packrat,
-            now: u64,
-            buf: &mut [u8],
-        ) {
-            let writer = minicbor::encode::write::Cursor::new(buf);
-            let mut s = minicbor_serde::Serializer::new(writer);
-            match self.serialize(&mut s) {
-                Ok(_) => {
-                    let writer = s.into_encoder().into_writer();
-                    let len = writer.position();
-                    let buf = writer.into_inner();
-                    packrat.deliver_ereport(&buf[..len]);
-                    ringbuf_entry!(
-                        __TRACE,
-                        Trace::EreportSentOff {
-                            now,
-                            psu: self.psu_slot,
-                            class: self.class,
-                            len,
-                        }
-                    );
-                }
-                Err(_) => {
-                    // XXX(eliza): ereport didn't fit in buffer...what do
-                    ringbuf_entry!(
-                        __TRACE,
-                        Trace::EreportTooBig {
-                            now,
-                            psu: self.psu_slot,
-                            class: self.class
-                        }
-                    );
-                }
-            }
-        }
-    }
-
     #[derive(Copy, Clone, Default, Serialize)]
     pub(super) struct PmbusStatus {
         pub(super) word: Option<u16>,