From b3f6607768c70125ee611ad4d5d5c4664631c9c4 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 13 Jun 2023 08:38:00 -0600 Subject: [PATCH] Strip Content Cache references Setting no longer required with new RestrictEvents setup --- resources/build/misc.py | 3 +++ resources/constants.py | 1 - resources/defaults.py | 5 ----- resources/wx_gui/gui_settings.py | 10 +--------- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/resources/build/misc.py b/resources/build/misc.py index dd36673a1..1118d11b3 100644 --- a/resources/build/misc.py +++ b/resources/build/misc.py @@ -119,6 +119,9 @@ class BuildMiscellaneous: re_patch_args = [] + # Alternative approach to the kern.hv_vmm_present patch + # Dynamically sets the property to 1 if software update/installer is detected + # Always enabled in installers/recovery environments if self.constants.allow_oc_everywhere is False and self.constants.serial_settings == "None": re_patch_args.append("sbvmm") diff --git a/resources/constants.py b/resources/constants.py index e629b7209..abcc0ce85 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -215,7 +215,6 @@ class Constants: self.software_demux: bool = False # Enable Software Demux patch set self.force_vmm: bool = False # Force VMM patch self.disable_connectdrivers: bool = False # Disable ConnectDrivers (hibernation) - self.set_content_caching: bool = False # Set Content Caching self.set_vmm_cpuid: bool = False # Set VMM bit inside CPUID self.disable_cat_colorsync: bool = False # Disable the ColorSync patch to regain Display Profiles self.set_alc_usage: bool = True # Set AppleALC usage diff --git a/resources/defaults.py b/resources/defaults.py index ce85e72da..a818c1d2a 100644 --- a/resources/defaults.py +++ b/resources/defaults.py @@ -56,11 +56,6 @@ class GenerateDefaults: General probe for data """ - if "Book" in self.model: - self.constants.set_content_caching = False - else: - self.constants.set_content_caching = True - if self.model in ["MacBookPro8,2", "MacBookPro8,3"]: # Users disabling TS2 most likely have a faulty dGPU # users can override this in settings diff --git a/resources/wx_gui/gui_settings.py b/resources/wx_gui/gui_settings.py index 77613cf97..87999d928 100644 --- a/resources/wx_gui/gui_settings.py +++ b/resources/wx_gui/gui_settings.py @@ -275,14 +275,6 @@ class SettingsFrame(wx.Frame): "wrap_around 2": { "type": "wrap_around", }, - "Content Caching": { - "type": "checkbox", - "value": self.constants.set_content_caching, - "variable": "set_content_caching", - "description": [ - # "Enable Content Caching.", - ], - }, "APFS Trim": { "type": "checkbox", "value": self.constants.apfs_trim_timeout, @@ -1275,4 +1267,4 @@ Hardware Information: def on_test_exception(self, event: wx.Event) -> None: - raise Exception("Test Exception") \ No newline at end of file + raise Exception("Test Exception")