Change PCI names according to https://pci-ids.ucw.cz/read/PC

daigong · Jan 16, 2019 · 65daf87 · 65daf87
1 parent 0b18487
commit 65daf87
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 50 deletions.
diff --git a/EFI/CLOVER/ACPI/patched/SSDT-PXSX.aml b/EFI/CLOVER/ACPI/patched/SSDT-PXSX.aml
diff --git a/EFI/CLOVER/ACPI/patched/SSDT-PXSX.dsl b/EFI/CLOVER/ACPI/patched/SSDT-PXSX.dsl
@@ -1,4 +1,5 @@
 // Maintained by: daliansky and stevezhengshiqi
+// Reference: https://pci-ids.ucw.cz/read/PC
 // Add device information, and can be seen in AppleLogo-About This Mac-System Report-PCI.
 
 DefinitionBlock ("", "SSDT", 2, "hack", "_PXSX", 0x00000000)
@@ -37,9 +38,9 @@ DefinitionBlock ("", "SSDT", 2, "hack", "_PXSX", 0x00000000)
                 }, 
 
                 "model", 
-                Buffer (0x2A)
+                Buffer (0x30)
                 {
-                    "Sunrise Point-LP PCI Express Root Port #5"
+                    "Intel Sunrise Point-LP PCI Express Root Port #5"
                 }
             }
         DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
@@ -57,9 +58,9 @@ DefinitionBlock ("", "SSDT", 2, "hack", "_PXSX", 0x00000000)
                 }, 
 
                 "model", 
-                Buffer (0x21)
+                Buffer (0x14)
                 {
-                    "Intel Dual Band Wireless-AC 8265"
+                    "Intel Wireless 8265"
                 }
             }
         DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
@@ -71,49 +72,25 @@ DefinitionBlock ("", "SSDT", 2, "hack", "_PXSX", 0x00000000)
         Name (NVME, One)
         Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
         {
-            If ((NVME == One))
-            {
-                Local0 = Package (0x08)
+            Local0 = Package (0x08)
+                {
+                    "AAPL,slot-name", 
+                    Buffer (0x0A)
                     {
-                        "AAPL,slot-name", 
-                        Buffer (0x0A)
-                        {
-                            "M.2 key M"
-                        }, 
-
-                        "model", 
-                        Buffer (0x2A)
-                        {
-                            "Sunrise Point-LP PCI Express Root Port #9"
-                        }, 
+                        "M.2 key M"
+                    }, 
 
-                        "use-msi", 
-                        One, 
-                        "nvme-LPSR-during-S3-S4", 
-                        One
-                    }
-            }
-            Else
-            {
-                Local0 = Package (0x06)
+                    "model", 
+                    Buffer (0x30)
                     {
-                        "AAPL,slot-name", 
-                        Buffer (0x0A)
-                        {
-                            "M.2 key M"
-                        }, 
-
-                        "model", 
-                        Buffer (0x2A)
-                        {
-                            "Sunrise Point-LP PCI Express Root Port #9"
-                        }, 
-
-                        "use-msi", 
-                        One
-                    }
-            }
+                        "Intel Sunrise Point-LP PCI Express Root Port #9"
+                    }, 
 
+                    "use-msi", 
+                    One, 
+                    "nvme-LPSR-during-S3-S4", 
+                    One
+                }
             DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
             Return (Local0)
         }

diff --git a/EFI/CLOVER/config.plist b/EFI/CLOVER/config.plist
@@ -193,7 +193,7 @@
 				<key>AAPL,slot-name</key>
 				<string>PCI-Express</string>
 				<key>model</key>
-				<string>Sunrise Point-LP USB 3.0 xHCI Controller</string>
+				<string>Intel Sunrise Point-LP USB 3.0 xHCI Controller</string>
 				<key>name</key>
 				<string>pci8086,9d2f</string>
 			</dict>
@@ -204,7 +204,7 @@
 				<key>device_type</key>
 				<string>I2C</string>
 				<key>model</key>
-				<string>Sunrise Point-LP Serial IO I2C Controller #0</string>
+				<string>Intel Sunrise Point-LP Serial IO I2C Controller #0</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x15,0x1)</key>
 			<dict>
@@ -213,7 +213,7 @@
 				<key>device_type</key>
 				<string>I2C</string>
 				<key>model</key>
-				<string>Sunrise Point-LP Serial IO I2C Controller #1</string>
+				<string>Intel Sunrise Point-LP Serial IO I2C Controller #1</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x16,0x0)</key>
 			<dict>
@@ -222,7 +222,7 @@
 				<key>device_type</key>
 				<string>IMEI</string>
 				<key>model</key>
-				<string>Sunrise Point-LP CSME HECI #1</string>
+				<string>Intel Sunrise Point-LP CSME HECI #1</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x0)</key>
 			<dict>
@@ -251,7 +251,7 @@
 				<key>device_type</key>
 				<string>PCHPMC Controller</string>
 				<key>model</key>
-				<string>Sunrise Point-LP PMC</string>
+				<string>Intel Sunrise Point-LP PMC</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1f,0x3)</key>
 			<dict>
@@ -264,14 +264,14 @@
 				<key>layout-id</key>
 				<integer>99</integer>
 				<key>model</key>
-				<string>Realtek ALC298 Audio Controller</string>
+				<string>Intel Sunrise Point-LP HD Audio</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1f,0x4)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>PCI-Express</string>
 				<key>model</key>
-				<string>Sunrise Point-LP SMBus</string>
+				<string>Intel Sunrise Point-LP SMBus</string>
 			</dict>
 		</dict>
 		<key>USB</key>