Merge pull request #84 from FrameworkComputer/13thgen

Author: JohnAZoidberg

framework_lib/src/commandline/mod.rs

@@ -230,21 +230,24 @@ fn print_versions(ec: &CrosEc) {
     if let Some(esrt) = esrt::get_esrt() {
         for entry in &esrt.entries {
             match entry.fw_class {
-                esrt::RETIMER01_GUID | esrt::RETIMER23_GUID => {
+                esrt::RETIMER01_GUID
+                | esrt::RETIMER23_GUID
+                | esrt::GEN13_RETIMER01_GUID
+                | esrt::GEN13_RETIMER23_GUID => {
                     if !found_retimer {
                         found_retimer = true;
                     }
                 }
                 _ => {}
             }
             match entry.fw_class {
-                esrt::RETIMER01_GUID => {
+                esrt::RETIMER01_GUID | esrt::GEN13_RETIMER01_GUID => {
                     println!(
                         "  Left:           0x{:X} ({})",
                         entry.fw_version, entry.fw_version
                     );
                 }
-                esrt::RETIMER23_GUID => {
+                esrt::RETIMER23_GUID | esrt::GEN13_RETIMER23_GUID => {
                     println!(
                         "  Right:          0x{:X} ({})",
                         entry.fw_version, entry.fw_version
@@ -653,10 +656,16 @@ pub fn analyze_capsule(data: &[u8]) -> Option<capsule::EfiCapsuleHeader> {
             println!("  Type:         Framework Insyde BIOS");
         }
         esrt::RETIMER01_GUID => {
-            println!("  Type:    Framework Retimer01 (Left)");
+            println!("  Type:    Framework ADL Retimer01 (Left)");
         }
         esrt::RETIMER23_GUID => {
-            println!("  Type:   Framework Retimer23 (Right)");
+            println!("  Type:   Framework ADL Retimer23 (Right)");
+        }
+        esrt::GEN13_RETIMER01_GUID => {
+            println!("  Type:    Framework RPL Retimer01 (Left)");
+        }
+        esrt::GEN13_RETIMER23_GUID => {
+            println!("  Type:   Framework RPL Retimer23 (Right)");
         }
         esrt::WINUX_GUID => {
             println!("  Type:            Windows UX capsule");

framework_lib/src/esrt/mod.rs

@@ -69,6 +69,9 @@ pub fn guid_from_str(string: &str) -> Option<Guid> {
 pub const BIOS_GUID: Guid = guid!("a30a8cf3-847f-5e59-bd59-f9ec145c1a8c");
 pub const RETIMER01_GUID: Guid = guid!("a9c91b0c-c0b8-463d-a7da-a5d6ec646333");
 pub const RETIMER23_GUID: Guid = guid!("ba2e4e6e-3b0c-4f25-8a59-4c553fc86ea2");
+pub const GEN13_RETIMER01_GUID: Guid = guid!("0c42b824-818f-428f-8687-5efcaf059bea");
+pub const GEN13_RETIMER23_GUID: Guid = guid!("268ccbde-e087-420b-bf82-2212bd3f9bfc");
+
 // In EDK2
 // Handled by MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
 // Defined by MdePkg/Include/IndustryStandard/WindowsUxCapsule.h
@@ -79,6 +82,8 @@ pub enum FrameworkGuidKind {
     Bios,
     Retimer01,
     Retimer23,
+    Gen13Retimer01,
+    Gen13Retimer23,
     WinUx,
     Unknown,
 }
@@ -88,6 +93,8 @@ pub fn match_guid_kind(guid: &Guid) -> FrameworkGuidKind {
         BIOS_GUID => FrameworkGuidKind::Bios,
         RETIMER01_GUID => FrameworkGuidKind::Retimer01,
         RETIMER23_GUID => FrameworkGuidKind::Retimer23,
+        GEN13_RETIMER01_GUID => FrameworkGuidKind::Gen13Retimer01,
+        GEN13_RETIMER23_GUID => FrameworkGuidKind::Gen13Retimer23,
         WINUX_GUID => FrameworkGuidKind::WinUx,
         _ => FrameworkGuidKind::Unknown,
     }