add T2 Chip Check to judge whether modern Audio can be used

Author: pyquick

oclp_r/constants.py

@@ -250,7 +250,7 @@ def __init__(self) -> None:
         self.set_vmm_cpuid:          bool = False  # Set VMM bit inside CPUID
         self.disable_mediaanalysisd: bool = False  # Set mediaanalysisd to spawn
         self.force_quad_thread:      bool = False  #  Force quad thread mode (cpus=4)
-        self.allow_usb_patch:        bool = True   # Allow USB patch on macOS 26+
+        self.allow_usb_patch:        bool = False   # Allow USB patch on macOS 26+
         self.set_alc_usage:          bool = True   #  Set AppleALC usage
         self.allow_3rd_party_drives: bool = True   #  Allow ThridPartyDrives quirk
         self.allow_nvme_fixing:      bool = True   #  Allow NVMe Kernel Space Patches

oclp_r/detections/device_probe.py

@@ -686,6 +686,7 @@ class Computer:
     oclp_sys_signed: Optional[bool] = False
     firmware_vendor: Optional[str] = None
     rosetta_active: Optional[bool] = False
+    t2_chip: Optional[bool] = False
 
     @staticmethod
     def probe():
@@ -704,6 +705,7 @@ def probe():
         computer.bluetooth_probe()
         computer.topcase_probe()
         computer.t1_probe()
+        computer.t2_probe()
         computer.ambient_light_sensor_probe()
         computer.pcie_webcam_probe()
         computer.sata_disk_probe()
@@ -1014,7 +1016,27 @@ def t1_probe(self):
                     continue
                 self.t1_chip = True
                 break
-
+    def t2_probe(self):
+        """Detect Apple T2 controllers by their physical PCI identifiers."""
+        matching = {
+            "IOProviderClass": "IOPCIDevice",
+            "IOPropertyMatch": [
+                {
+                    "vendor-id": (0x106B).to_bytes(4, byteorder="little"),
+                    "device-id": device_id.to_bytes(4, byteorder="little"),
+                }
+                for device_id in (0x1801, 0x1802)
+            ],
+        }
+        devices = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, matching, None)[1]
+        )
+        device = next(devices, None)
+        if device:
+            self.t2_chip = True
+            ioreg.IOObjectRelease(device)
+        for device in devices:
+            ioreg.IOObjectRelease(device)
     def sata_disk_probe(self):
         # Get all SATA Controllers/Disks from 'system_profiler SPSerialATADataType'
         # Determine whether SATA SSD is present and Apple-made

oclp_r/support/translate_language.py

@@ -1902,7 +1902,7 @@ def gui_settings(self):
                 "   - VoodooHDA: VoodooHDA patch ,":"   - VoodooHDA: VoodooHDA patch ,",
                 "  on Monterey and newer.":"  on Monterey and newer.",
                 "  Not recommended.":"  Not recommended.",
-                "Allow Tahoe Modern USB Patch":"Allow Tahoe Modern USB Patch",
+                "Allow Tahoe Modern USB Patch (Deprecated)":"Allow Tahoe Modern USB Patch (Deprecated)",
                 "When enabled, this will patch the Old USB":"When enabled, this will patch the Old USB",
                 "extensions on Tahoe.":"extensions on Tahoe.",
                 "Allow APFS Patch For Non-T2":"Allow APFS Patch For Non-T2",
@@ -2332,7 +2332,7 @@ def gui_settings(self):
                 "   - VoodooHDA: VoodooHDA patch ,":"   - VoodooHDA: VoodooHDA 补丁，",
                 "  on Monterey and newer.":"  在 Monterey 及更高版本上。",
                 "  Not recommended.":"  不推荐。",
-                "Allow Tahoe Modern USB Patch":"允许 Tahoe 现代 USB 补丁",
+                "Allow Tahoe Modern USB Patch (Deprecated)":"允许 Tahoe 现代 USB 补丁(已弃用)",
                 "When enabled, this will patch the Old USB":"启用时，这将修补旧 USB",
                 "extensions on Tahoe.":"在 Tahoe 上的扩展。",
                 "Allow APFS Patch For Non-T2":"允许非 T2 设备的 APFS 补丁",

oclp_r/sys_patch/patchsets/hardware/audio/modern_audio.py

@@ -35,7 +35,7 @@ def present(self) -> bool:
         """
         AppleHDA was outright removed in macOS 26, so this patch set is always present if OS requires it
         """
-        return self._constants.audio_type == "AppleHDA"
+        return self._constants.audio_type == "AppleHDA" and not self._computer.t2_chip
 
     def requires_kernel_debug_kit(self) -> bool:
         """

oclp_r/wx_gui/gui_settings.py

@@ -751,7 +751,7 @@ def _settings(self) -> dict:
                 "wrap_around 1": {
                     "type": "wrap_around",
                 },
-                self.trans["Allow Tahoe Modern USB Patch"]: {
+                self.trans["Allow Tahoe Modern USB Patch (Deprecated)"]: {
                     "type": "checkbox",
                     "value": self.constants.allow_usb_patch,
                     "variable": "allow_usb_patch",