fixup! Allow decoding of SMBIOS Type 11 serialnumbers

Author: JohnAZoidberg

framework_lib/src/commandline/mod.rs

@@ -50,8 +50,8 @@ use crate::esrt;
 #[cfg(feature = "rusb")]
 use crate::inputmodule::check_inputmodule_version;
 use crate::power;
+use crate::serialnum::Cfg0;
 use crate::smbios;
-use crate::smbios::ConfigDigit0;
 use crate::smbios::{dmidecode_string_val, get_smbios, is_framework};
 #[cfg(feature = "hidapi")]
 use crate::touchpad::print_touchpad_fw_ver;
@@ -1430,8 +1430,7 @@ fn smbios_info() {
                     // Assumes it's ASCII, which is guaranteed by SMBIOS
                     let config_digit0 = &version[0..1];
                     let config_digit0 = u8::from_str_radix(config_digit0, 16);
-                    if let Ok(version_config) =
-                        config_digit0.map(<ConfigDigit0 as FromPrimitive>::from_u8)
+                    if let Ok(version_config) = config_digit0.map(<Cfg0 as FromPrimitive>::from_u8)
                     {
                         println!("  Version:      {:?} ({})", version_config, version);
                     } else {
@@ -1469,8 +1468,7 @@ fn smbios_info() {
                     // Assumes it's ASCII, which is guaranteed by SMBIOS
                     let config_digit0 = &version[0..1];
                     let config_digit0 = u8::from_str_radix(config_digit0, 16);
-                    if let Ok(version_config) =
-                        config_digit0.map(<ConfigDigit0 as FromPrimitive>::from_u8)
+                    if let Ok(version_config) = config_digit0.map(<Cfg0 as FromPrimitive>::from_u8)
                     {
                         println!("  Version:      {:?} ({})", version_config, version);
                     } else {

framework_lib/src/serialnum.rs

@@ -1,5 +1,7 @@
 use alloc::string::{String, ToString};
 use core::str::FromStr;
+use num_derive::FromPrimitive;
+use num_traits::FromPrimitive;
 
 #[derive(Debug)]
 pub struct FrameworkSerial {
@@ -20,7 +22,8 @@ pub struct FrameworkSerial {
     pub part: String,
 }
 
-#[derive(Debug)]
+#[repr(u8)]
+#[derive(Debug, PartialEq, FromPrimitive, Clone, Copy)]
 pub enum Cfg0 {
     SKU = 0x00,
     Poc1 = 0x01,
@@ -32,7 +35,12 @@ pub enum Cfg0 {
     Dvt1 = 0x07,
     Dvt2 = 0x08,
     Pvt = 0x09,
-    Mp = 0x0A,
+    MassProduction = 0x0A,
+    MassProductionB = 0x0B,
+    MassProductionC = 0x0C,
+    MassProductionD = 0x0D,
+    MassProductionE = 0x0E,
+    MassProductionF = 0x0F,
 }
 
 #[derive(Debug)]
@@ -57,19 +65,14 @@ impl FromStr for FrameworkSerial {
 
         let caps = re.captures(s).ok_or("Invalid Serial".to_string())?;
 
-        let cfg0 = match caps.get(3).unwrap().as_str().chars().next().unwrap() {
-            '0' => Cfg0::SKU,
-            '1' => Cfg0::Poc1,
-            '2' => Cfg0::Proto1,
-            '3' => Cfg0::Proto2,
-            '4' => Cfg0::Evt1,
-            '5' => Cfg0::Evt2,
-            '6' => Cfg0::Reserved,
-            '7' => Cfg0::Dvt1,
-            '8' => Cfg0::Dvt2,
-            '9' => Cfg0::Pvt,
-            'A' => Cfg0::Mp,
-            _ => return Err("Invalid CFG0".to_string()),
+        let cfg0 = caps.get(3).unwrap().as_str().chars().next();
+        let cfg0 = cfg0.and_then(|x| str::parse::<u8>(&x.to_string()).ok());
+        let cfg0 = cfg0.and_then(<Cfg0 as FromPrimitive>::from_u8);
+        let cfg0 = if let Some(cfg0) = cfg0 {
+            cfg0
+        } else {
+            error!("Invalid CFG0 '{:?}'", cfg0);
+            return Err(format!("Invalid CFG0 '{:?}'", cfg0));
         };
         let cfg1 = caps.get(4).unwrap().as_str().chars().next().unwrap();
         let year = str::parse::<u16>(caps.get(5).unwrap().as_str()).unwrap();

framework_lib/src/smbios.rs

@@ -6,10 +6,10 @@ use std::prelude::v1::*;
 #[cfg(all(not(feature = "uefi"), not(target_os = "freebsd")))]
 use std::io::ErrorKind;
 
+use crate::serialnum::Cfg0;
 use crate::serialnum::FrameworkSerial;
 use crate::util::Config;
 pub use crate::util::{Platform, PlatformFamily};
-use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 use smbioslib::*;
 #[cfg(feature = "uefi")]
@@ -26,25 +26,6 @@ static CACHED_PLATFORM: Mutex<Option<Option<Platform>>> = Mutex::new(None);
 // TODO: Should cache SMBIOS and values gotten from it
 // SMBIOS is fixed after boot. Oh, so maybe not cache when we're running in UEFI
 
-#[repr(u8)]
-#[derive(Debug, PartialEq, FromPrimitive, Clone, Copy)]
-pub enum ConfigDigit0 {
-    Poc1 = 0x01,
-    Proto1 = 0x02,
-    Proto2 = 0x03,
-    Evt1 = 0x04,
-    Evt2 = 0x05,
-    Dvt1 = 0x07,
-    Dvt2 = 0x08,
-    Pvt = 0x09,
-    MassProduction = 0x0A,
-    MassProductionB = 0x0B,
-    MassProductionC = 0x0C,
-    MassProductionD = 0x0D,
-    MassProductionE = 0x0E,
-    MassProductionF = 0x0F,
-}
-
 /// Check whether the manufacturer in the SMBIOS says Framework
 pub fn is_framework() -> bool {
     if matches!(
@@ -241,7 +222,7 @@ pub fn get_product_name() -> Option<String> {
     })
 }
 
-pub fn get_baseboard_version() -> Option<ConfigDigit0> {
+pub fn get_baseboard_version() -> Option<Cfg0> {
     // TODO: On FreeBSD we can short-circuit and avoid parsing SMBIOS
     // #[cfg(target_os = "freebsd")]
     // if let Ok(product) = kenv_get("smbios.system.product") {
@@ -260,9 +241,7 @@ pub fn get_baseboard_version() -> Option<ConfigDigit0> {
                 // Assumes it's ASCII, which is guaranteed by SMBIOS
                 let config_digit0 = &version[0..1];
                 let config_digit0 = u8::from_str_radix(config_digit0, 16);
-                if let Ok(version_config) =
-                    config_digit0.map(<ConfigDigit0 as FromPrimitive>::from_u8)
-                {
+                if let Ok(version_config) = config_digit0.map(<Cfg0 as FromPrimitive>::from_u8) {
                     return version_config;
                 } else {
                     error!("  Invalid BaseBoard Version: {}'", version);