From fc65423ee270a91d2860fb0778650af07040c8d1 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 26 Sep 2023 10:24:41 -0600 Subject: [PATCH] sys_patch: Add missing Xserve3,1 handling --- resources/build/misc.py | 4 ++-- resources/sys_patch/sys_patch_detect.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/build/misc.py b/resources/build/misc.py index dad44c013..25d5c4c69 100644 --- a/resources/build/misc.py +++ b/resources/build/misc.py @@ -276,13 +276,13 @@ class BuildMiscellaneous: # Add UHCI/OHCI drivers # All Penryn Macs lack an internal USB hub to route USB 1.1 devices to the EHCI controller - # And MacPro4,1 and MacPro5,1 are the only post-Penryn Macs that lack an internal USB hub + # And MacPro4,1, MacPro5,1 and Xserve3,1 are the only post-Penryn Macs that lack an internal USB hub # - Ref: https://techcommunity.microsoft.com/t5/microsoft-usb-blog/reasons-to-avoid-companion-controllers/ba-p/270710 # # To be paired for sys_patch_dict.py's 'Legacy USB 1.1' patchset if ( smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value or \ - self.model in ["MacPro4,1", "MacPro5,1"] + self.model in ["MacPro4,1", "MacPro5,1", "Xserve3,1"] ): logging.info("- Adding UHCI/OHCI USB support") shutil.copy(self.constants.apple_usb_11_injector_path, self.constants.kexts_path) diff --git a/resources/sys_patch/sys_patch_detect.py b/resources/sys_patch/sys_patch_detect.py index be8fc2cf4..947296423 100644 --- a/resources/sys_patch/sys_patch_detect.py +++ b/resources/sys_patch/sys_patch_detect.py @@ -516,11 +516,11 @@ class DetectRootPatch: return False # If we're on a Mac, check for Penryn or older - # This is due to Apple implementing an internal USB hub on post-Penryn (excluding MacPro4,1 and MacPro5,1) + # This is due to Apple implementing an internal USB hub on post-Penryn (excluding MacPro4,1, MacPro5,1 and Xserve3,1) # Ref: https://techcommunity.microsoft.com/t5/microsoft-usb-blog/reasons-to-avoid-companion-controllers/ba-p/270710 if ( smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value or \ - self.model in ["MacPro4,1", "MacPro5,1"] + self.model in ["MacPro4,1", "MacPro5,1", "Xserve3,1"] ): return True