Merge pull request #34 from FrameworkComputer/serial-config

smbios: Decode config digit 0 of serialnumber

Author: JohnAZoidberg

framework_lib/src/commandline/mod.rs

@@ -7,6 +7,7 @@ use alloc::string::String;
 use alloc::string::ToString;
 use alloc::vec::Vec;
 use log::Level;
+use num_traits::FromPrimitive;
 
 #[cfg(not(feature = "uefi"))]
 pub mod clap_std;
@@ -39,6 +40,7 @@ use crate::ec_binary;
 use crate::esrt;
 use crate::power;
 use crate::smbios;
+use crate::smbios::ConfigDigit0;
 use crate::smbios::{dmidecode_string_val, get_smbios, is_framework};
 #[cfg(feature = "uefi")]
 use crate::uefi::enable_page_break;
@@ -786,7 +788,16 @@ fn smbios_info() {
             DefinedStruct::SystemInformation(data) => {
                 println!("System Information");
                 if let Some(version) = dmidecode_string_val(&data.version()) {
-                    println!("  Version:      {}", version);
+                    // 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).unwrap();
+                    if let Some(version_config) =
+                        <ConfigDigit0 as FromPrimitive>::from_u8(config_digit0)
+                    {
+                        println!("  Version:      {:?} ({})", version_config, version);
+                    } else {
+                        println!("  Version:      {}", version);
+                    }
                 }
                 if let Some(manufacturer) = dmidecode_string_val(&data.manufacturer()) {
                     println!("  Manufacturer: {}", manufacturer);

framework_lib/src/smbios.rs

@@ -6,6 +6,7 @@ use std::prelude::v1::*;
 use std::io::ErrorKind;
 
 use crate::util::Platform;
+use num_derive::FromPrimitive;
 use smbioslib::*;
 #[cfg(feature = "uefi")]
 use spin::Mutex;
@@ -18,6 +19,25 @@ 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 {
     let smbios = if let Some(smbios) = get_smbios() {