It's H2O, not HO2

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

README.md

@@ -30,7 +30,7 @@ see the [Support Matrices](support-matrices.md).
     - [x] CCG5 PD (11th Gen TigerLake) (`--pd-bin`)
     - [x] CCG6 PD (12th Gen AlderLake) (`--pd-bin`)
     - [x] CCG8 PD (Framework 16) (`--pd-bin`)
-    - [x] HO2 BIOS Capsule (`--ho2-capsule`)
+    - [x] H2O BIOS Capsule (`--h2o-capsule`)
       - [x] BIOS Version
       - [x] EC Version
       - [x] CCG5/CCG6/CCG8 PD Version
@@ -182,7 +182,7 @@ Options:
       --ec-bin <EC_BIN>             Parse versions from EC firmware binary file
       --capsule <CAPSULE>           Parse UEFI Capsule information from binary file
       --dump <DUMP>                 Dump extracted UX capsule bitmap image to a file
-      --ho2-capsule <HO2_CAPSULE>   Parse UEFI Capsule information from binary file
+      --h2o-capsule <H2O_CAPSULE>   Parse UEFI Capsule information from binary file
       --intrusion                   Show status of intrusion switch
       --inputmodules                Show status of the input modules (Framework 16 only)
       --kblight [<KBLIGHT>]         Set keyboard backlight percentage or get, if no value provided

framework_lib/src/commandline/clap_std.rs

@@ -100,7 +100,7 @@ struct ClapCli {
 
     /// Parse UEFI Capsule information from binary file
     #[arg(long)]
-    ho2_capsule: Option<std::path::PathBuf>,
+    h2o_capsule: Option<std::path::PathBuf>,
 
     /// Dump EC flash contents
     #[arg(long)]
@@ -259,8 +259,8 @@ pub fn parse(args: &[String]) -> Cli {
             .capsule
             .map(|x| x.into_os_string().into_string().unwrap()),
         dump: args.dump.map(|x| x.into_os_string().into_string().unwrap()),
-        ho2_capsule: args
-            .ho2_capsule
+        h2o_capsule: args
+            .h2o_capsule
             .map(|x| x.into_os_string().into_string().unwrap()),
         dump_ec_flash: args
             .dump_ec_flash

framework_lib/src/commandline/mod.rs

@@ -152,7 +152,7 @@ pub struct Cli {
     pub ec_bin: Option<String>,
     pub capsule: Option<String>,
     pub dump: Option<String>,
-    pub ho2_capsule: Option<String>,
+    pub h2o_capsule: Option<String>,
     pub dump_ec_flash: Option<String>,
     pub flash_ec: Option<String>,
     pub flash_ro_ec: Option<String>,
@@ -932,7 +932,7 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
                 println!("Capsule is invalid.");
             }
         }
-    } else if let Some(capsule_path) = &args.ho2_capsule {
+    } else if let Some(capsule_path) = &args.h2o_capsule {
         #[cfg(feature = "uefi")]
         let data = crate::uefi::fs::shell_read_file(capsule_path);
         #[cfg(not(feature = "uefi"))]
@@ -954,7 +954,10 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
                 println!("  BIOS Version: {:>18}", cap.version);
             }
             if let Some(ec_bin) = find_ec_in_bios_cap(&data) {
+                debug!("Found EC binary in BIOS capsule");
                 analyze_ec_fw(ec_bin);
+            } else {
+                debug!("Didn't find EC binary in BIOS capsule");
             }
             if let Some(pd_bin) = find_pd_in_bios_cap(&data) {
                 debug!("Found PD binary in BIOS capsule");
@@ -1025,7 +1028,7 @@ Options:
       --ec-bin <EC_BIN>      Parse versions from EC firmware binary file
       --capsule <CAPSULE>    Parse UEFI Capsule information from binary file
       --dump <DUMP>          Dump extracted UX capsule bitmap image to a file
-      --ho2-capsule <HO2_CAPSULE>      Parse UEFI Capsule information from binary file
+      --h2o-capsule <H2O_CAPSULE>      Parse UEFI Capsule information from binary file
       --dump-ec-flash <DUMP_EC_FLASH>  Dump EC flash contents
       --flash-ec <FLASH_EC>            Flash EC with new firmware from file
       --flash-ro-ec <FLASH_EC>         Flash EC with new firmware from file
@@ -1292,13 +1295,13 @@ pub fn analyze_ec_fw(data: &[u8]) {
     if let Some(ver) = ec_binary::read_ec_version(data, true) {
         ec_binary::print_ec_version(&ver, true);
     } else {
-        println!("Failed to read version")
+        println!("Failed to read EC version")
     }
     // Readwrite firmware
     if let Some(ver) = ec_binary::read_ec_version(data, false) {
         ec_binary::print_ec_version(&ver, false);
     } else {
-        println!("Failed to read version")
+        println!("Failed to read EC version")
     }
 }
 

framework_lib/src/commandline/uefi.rs

@@ -78,7 +78,7 @@ pub fn parse(args: &[String]) -> Cli {
         flash_rw_ec: None,
         capsule: None,
         dump: None,
-        ho2_capsule: None,
+        h2o_capsule: None,
         intrusion: false,
         inputmodules: false,
         input_deck_mode: None,
@@ -374,11 +374,11 @@ pub fn parse(args: &[String]) -> Cli {
                 None
             };
             found_an_option = true;
-        } else if arg == "--ho2-capsule" {
-            cli.ho2_capsule = if args.len() > i + 1 {
+        } else if arg == "--h2o-capsule" {
+            cli.h2o_capsule = if args.len() > i + 1 {
                 Some(args[i + 1].clone())
             } else {
-                println!("--ho2-capsule requires extra argument to denote input file");
+                println!("--h2o-capsule requires extra argument to denote input file");
                 None
             };
             found_an_option = true;