Automatically Load the hiffy_call result

Author: mkeeter

Cargo.lock

@@ -10,7 +10,7 @@ use std::os::unix::io::AsRawFd;
 use std::time::Duration;
 use std::{io, thread};
 
-use anyhow::{Context, Result, anyhow, bail};
+use anyhow::{Context, Result};
 use clap::Parser;
 use crossbeam_channel::{Sender, select};
 use picocom_map::RemapRules;
@@ -53,7 +53,7 @@ impl<'a> UartConsoleHandler<'a> {
     fn uart_read(&mut self, buf: &mut [u8]) -> Result<usize> {
         let op = self.hubris.get_idol_command("ControlPlaneAgent.uart_read")?;
 
-        let value = humility_hiffy::hiffy_call(
+        let v = humility_hiffy::hiffy_call::<u32>(
             self.hubris,
             self.core,
             &mut self.context,
@@ -63,14 +63,6 @@ impl<'a> UartConsoleHandler<'a> {
             Some(buf),
         )?;
 
-        let v = match value {
-            Ok(v) => v,
-            Err(e) => bail!("Got Hiffy error: {e}"),
-        };
-
-        let v =
-            v.as_base()?.as_u32().ok_or_else(|| anyhow!("Couldn't get U32"))?;
-
         Ok(v as usize)
     }
 
@@ -80,7 +72,7 @@ impl<'a> UartConsoleHandler<'a> {
 
         let buf = &buf[..usize::min(buf.len(), HIFFY_BUF_SIZE)];
 
-        let value = humility_hiffy::hiffy_call(
+        let v = humility_hiffy::hiffy_call::<u32>(
             self.hubris,
             self.core,
             &mut self.context,
@@ -90,14 +82,6 @@ impl<'a> UartConsoleHandler<'a> {
             None,
         )?;
 
-        let v = match value {
-            Ok(v) => v,
-            Err(e) => bail!("Got Hiffy error: {e}"),
-        };
-
-        let v =
-            v.as_base()?.as_u32().ok_or_else(|| anyhow!("Couldn't get U32"))?;
-
         Ok(v as usize)
     }
 
@@ -180,7 +164,7 @@ impl<'a> UartConsoleHandler<'a> {
             .hubris
             .get_idol_command("ControlPlaneAgent.set_humility_uart_client")?;
 
-        let value = humility_hiffy::hiffy_call(
+        humility_hiffy::hiffy_call::<()>(
             self.hubris,
             self.core,
             &mut self.context,
@@ -189,19 +173,15 @@ impl<'a> UartConsoleHandler<'a> {
             None,
             None,
         )?;
-
-        match value {
-            Ok(_) => Ok(()),
-            Err(e) => bail!("Got Hiffy error: {e}"),
-        }
+        Ok(())
     }
 
     fn current_client(&mut self) -> Result<()> {
         let op = self
             .hubris
             .get_idol_command("ControlPlaneAgent.get_uart_client")?;
 
-        let value = humility_hiffy::hiffy_call(
+        let value = humility_hiffy::hiffy_call::<humility::reflect::Enum>(
             self.hubris,
             self.core,
             &mut self.context,
@@ -211,15 +191,6 @@ impl<'a> UartConsoleHandler<'a> {
             None,
         )?;
 
-        let value = match value {
-            Ok(v) => v,
-            Err(e) => bail!("Got Hiffy error: {e}"),
-        };
-
-        let value = value
-            .as_enum()
-            .context("get_uart_client did not return an enum")?;
-
         println!("Current console client: {}", value.disc());
         Ok(())
     }

cmd/console-proxy/src/posix.rs

@@ -311,15 +311,19 @@ fn hiffy(context: &mut ExecutionContext) -> Result<()> {
             };
 
             (
-                hiffy_call(
+                match hiffy_call(
                     hubris,
                     core,
                     &mut context,
                     &op,
                     &args,
                     input.as_deref(),
                     output.as_deref_mut(),
-                )?,
+                ) {
+                    Ok(s) => Ok(s),
+                    Err(HiffyCallError::Hiffy(s)) => Err(s),
+                    Err(HiffyCallError::Other(e)) => return Err(e),
+                },
                 output,
             )
         };

cmd/hiffy/src/lib.rs

@@ -353,7 +353,7 @@ fn host_post_codes(
 
     let mut context = HiffyContext::new(hubris, core, 5000)?;
     let op = hubris.get_idol_command("Sequencer.post_code_buffer_len")?;
-    let value = humility_hiffy::hiffy_call(
+    let count = humility_hiffy::hiffy_call::<u32>(
         hubris,
         core,
         &mut context,
@@ -362,12 +362,6 @@ fn host_post_codes(
         None,
         None,
     )?;
-    let Ok(reflect::Value::Base(reflect::Base::U32(count))) = value else {
-        bail!(
-            "Got bad value from post_code_buffer_len: \
-             expected U32, got {value:?}"
-        );
-    };
 
     let op = hubris.get_idol_command("Sequencer.get_post_code")?;
     let handle_value = |v| {
@@ -440,7 +434,7 @@ fn host_last_post_code(
 
     let mut context = HiffyContext::new(hubris, core, 5000)?;
     let op = hubris.get_idol_command("Sequencer.last_post_code")?;
-    let value = humility_hiffy::hiffy_call(
+    let v = humility_hiffy::hiffy_call::<u32>(
         hubris,
         core,
         &mut context,
@@ -449,9 +443,6 @@ fn host_last_post_code(
         None,
         None,
     )?;
-    let Ok(reflect::Value::Base(reflect::Base::U32(v))) = value else {
-        bail!("Got bad value from last_post_code: expected U32, got {value:?}");
-    };
     if raw {
         println!("{v:08x}");
     } else {