Allow --pd-ports and --pd-addrs to accept 3 ports

If the platforms has only 2 or 1, pass same arguments.

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

Author: JohnAZoidberg

framework_lib/src/ccgx/device.rs

@@ -39,8 +39,9 @@ impl PdPort {
         ));
 
         Ok(match (platform, self) {
-            (Platform::GenericFramework((left, _), _), PdPort::Left01) => *left,
-            (Platform::GenericFramework((_, right), _), PdPort::Right23) => *right,
+            (Platform::GenericFramework((left, _, _), _), PdPort::Left01) => *left,
+            (Platform::GenericFramework((_, right, _), _), PdPort::Right23) => *right,
+            (Platform::GenericFramework((_, _, back), _), PdPort::Back) => *back,
             // Framework AMD Platforms (CCG8)
             (
                 Platform::Framework13Amd7080
@@ -91,8 +92,9 @@ impl PdPort {
         )));
 
         Ok(match (platform, self) {
-            (Platform::GenericFramework(_, (left, _)), PdPort::Left01) => *left,
-            (Platform::GenericFramework(_, (_, right)), PdPort::Right23) => *right,
+            (Platform::GenericFramework(_, (left, _, _)), PdPort::Left01) => *left,
+            (Platform::GenericFramework(_, (_, right, _)), PdPort::Right23) => *right,
+            (Platform::GenericFramework(_, (_, _, back)), PdPort::Back) => *back,
             (Platform::IntelGen11, _) => 6,
             (Platform::IntelGen12 | Platform::IntelGen13, PdPort::Left01) => 6,
             (Platform::IntelGen12 | Platform::IntelGen13, PdPort::Right23) => 7,

framework_lib/src/commandline/clap_std.rs

@@ -238,12 +238,12 @@ struct ClapCli {
     driver: Option<CrosEcDriverType>,
 
     /// Specify I2C addresses of the PD chips (Advanced)
-    #[clap(number_of_values = 2, requires("pd_ports"))]
+    #[clap(number_of_values = 3, requires("pd_ports"))]
     #[arg(long)]
     pd_addrs: Vec<u16>,
 
     /// Specify I2C ports of the PD chips (Advanced)
-    #[clap(number_of_values = 2, requires("pd_addrs"))]
+    #[clap(number_of_values = 3, requires("pd_addrs"))]
     #[arg(long)]
     pd_ports: Vec<u8>,
 
@@ -317,13 +317,13 @@ pub fn parse(args: &[String]) -> Cli {
         .unwrap();
 
     let pd_addrs = match args.pd_addrs.len() {
-        2 => Some((args.pd_addrs[0], args.pd_addrs[1])),
+        3 => Some((args.pd_addrs[0], args.pd_addrs[1], args.pd_addrs[2])),
         0 => None,
         // Checked by clap
         _ => unreachable!(),
     };
     let pd_ports = match args.pd_ports.len() {
-        2 => Some((args.pd_ports[0], args.pd_ports[1])),
+        3 => Some((args.pd_ports[0], args.pd_ports[1], args.pd_ports[2])),
         0 => None,
         // Checked by clap
         _ => unreachable!(),

framework_lib/src/commandline/mod.rs

@@ -193,8 +193,8 @@ pub struct Cli {
     pub reboot_ec: Option<RebootEcArg>,
     pub ec_hib_delay: Option<Option<u32>>,
     pub hash: Option<String>,
-    pub pd_addrs: Option<(u16, u16)>,
-    pub pd_ports: Option<(u8, u8)>,
+    pub pd_addrs: Option<(u16, u16, u16)>,
+    pub pd_ports: Option<(u8, u8, u8)>,
     pub help: bool,
     pub info: bool,
     pub flash_gpu_descriptor: Option<(u8, String)>,

framework_lib/src/commandline/uefi.rs

@@ -602,35 +602,39 @@ pub fn parse(args: &[String]) -> Cli {
             };
             found_an_option = true;
         } else if arg == "--pd-addrs" {
-            cli.pd_addrs = if args.len() > i + 2 {
+            cli.pd_addrs = if args.len() > i + 3 {
                 let left = args[i + 1].parse::<u16>();
                 let right = args[i + 2].parse::<u16>();
-                if left.is_ok() && right.is_ok() {
-                    Some((left.unwrap(), right.unwrap()))
+                let back = args[i + 3].parse::<u16>();
+                if left.is_ok() && right.is_ok() && back.is_ok() {
+                    Some((left.unwrap(), right.unwrap(), back.unwrap()))
                 } else {
                     println!(
-                        "Invalid values for --pd-addrs: '{} {}'. Must be u16 integers.",
+                        "Invalid values for --pd-addrs: '{} {} {}'. Must be u16 integers.",
                         args[i + 1],
-                        args[i + 2]
+                        args[i + 2],
+                        args[i + 3]
                     );
                     None
                 }
             } else {
-                println!("--pd-addrs requires two arguments, one for each address");
+                println!("--pd-addrs requires three arguments, one for each address");
                 None
             };
             found_an_option = true;
         } else if arg == "--pd-ports" {
-            cli.pd_ports = if args.len() > i + 2 {
+            cli.pd_ports = if args.len() > i + 3 {
                 let left = args[i + 1].parse::<u8>();
                 let right = args[i + 2].parse::<u8>();
-                if left.is_ok() && right.is_ok() {
-                    Some((left.unwrap(), right.unwrap()))
+                let back = args[i + 3].parse::<u8>();
+                if left.is_ok() && right.is_ok() && back.is_ok() {
+                    Some((left.unwrap(), right.unwrap(), back.unwrap()))
                 } else {
                     println!(
-                        "Invalid values for --pd-ports: '{} {}'. Must be u16 integers.",
+                        "Invalid values for --pd-ports: '{} {} {}'. Must be u16 integers.",
                         args[i + 1],
-                        args[i + 2]
+                        args[i + 2],
+                        args[i + 3]
                     );
                     None
                 }

framework_lib/src/smbios.rs

@@ -47,7 +47,7 @@ pub enum ConfigDigit0 {
 pub fn is_framework() -> bool {
     if matches!(
         get_platform(),
-        Some(Platform::GenericFramework((_, _), (_, _))) | Some(Platform::UnknownSystem)
+        Some(Platform::GenericFramework((_, _, _), (_, _, _))) | Some(Platform::UnknownSystem)
     ) {
         return true;
     }
@@ -292,7 +292,7 @@ pub fn get_platform() -> Option<Platform> {
         let platform = &(*config).as_ref().unwrap().platform;
         if matches!(
             platform,
-            Platform::GenericFramework((_, _), (_, _)) | Platform::UnknownSystem
+            Platform::GenericFramework((_, _, _), (_, _, _)) | Platform::UnknownSystem
         ) {
             return Some(*platform);
         }

framework_lib/src/util.rs

@@ -37,7 +37,7 @@ pub enum Platform {
     FrameworkDesktopAmdAiMax300,
     /// Generic Framework device
     /// pd_addrs, pd_ports
-    GenericFramework((u16, u16), (u8, u8)),
+    GenericFramework((u16, u16, u16), (u8, u8, u8)),
     UnknownSystem,
 }