Minor project cleanup

pokewizardSAM · Jun 16, 2024 · e326a5f · e326a5f
1 parent 63db5bb
commit e326a5f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 14 deletions.
diff --git a/NootedRed.xcodeproj/project.pbxproj b/NootedRed.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1C748C2D1C21952C0024EED2 /* PluginStart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C748C2C1C21952C0024EED2 /* PluginStart.cpp */; };
+		1C748C2D1C21952C0024EED2 /* Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C748C2C1C21952C0024EED2 /* Plugin.cpp */; };
 		40364DB629B79DFD0070A2B4 /* Model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40364DB529B79DFD0070A2B4 /* Model.hpp */; };
 		4068898B2A229BF600028D22 /* PatcherPlus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 406889892A229BF600028D22 /* PatcherPlus.cpp */; };
 		4068898C2A229BF600028D22 /* PatcherPlus.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4068898A2A229BF600028D22 /* PatcherPlus.hpp */; };
@@ -44,7 +44,7 @@
 
 /* Begin PBXFileReference section */
 		1C748C271C21952C0024EED2 /* NootedRed.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NootedRed.kext; sourceTree = BUILT_PRODUCTS_DIR; };
-		1C748C2C1C21952C0024EED2 /* PluginStart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PluginStart.cpp; sourceTree = "<group>"; };
+		1C748C2C1C21952C0024EED2 /* Plugin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; };
 		1C748C2E1C21952C0024EED2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		40364DB529B79DFD0070A2B4 /* Model.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Model.hpp; sourceTree = "<group>"; };
 		403E67BD2AA7356D00F43943 /* psp_hdcp.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = psp_hdcp.bin; sourceTree = "<group>"; };
@@ -174,7 +174,7 @@
 				CEA03B5D20EE825A00BA842F /* NRed.hpp */,
 				406889892A229BF600028D22 /* PatcherPlus.cpp */,
 				4068898A2A229BF600028D22 /* PatcherPlus.hpp */,
-				1C748C2C1C21952C0024EED2 /* PluginStart.cpp */,
+				1C748C2C1C21952C0024EED2 /* Plugin.cpp */,
 				40FC5FD729BF995E00367F9D /* X5000.cpp */,
 				40FC5FD829BF995E00367F9D /* X5000.hpp */,
 				40FC5FDF29BF9E2500367F9D /* X6000.cpp */,
@@ -407,7 +407,7 @@
 				CEA03B5E20EE825A00BA842F /* NRed.cpp in Sources */,
 				CE405ED91E4A080700AA0B3D /* plugin_start.cpp in Sources */,
 				40FC5FD929BF995E00367F9D /* X5000.cpp in Sources */,
-				1C748C2D1C21952C0024EED2 /* PluginStart.cpp in Sources */,
+				1C748C2D1C21952C0024EED2 /* Plugin.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/NootedRed/AppleGFXHDA.hpp b/NootedRed/AppleGFXHDA.hpp
@@ -2,7 +2,6 @@
 //! See LICENSE for details.
 
 #pragma once
-#include "AMDCommon.hpp"
 #include <Headers/kern_patcher.hpp>
 #include <Headers/kern_util.hpp>
 

diff --git a/NootedRed/Firmware.hpp b/NootedRed/Firmware.hpp
@@ -3,8 +3,6 @@
 
 #pragma once
 #include <Headers/kern_util.hpp>
-#include <libkern/c++/OSData.h>
-#include <libkern/zlib.h>
 
 struct FWDescriptor {
     const char *name;

diff --git a/NootedRed/HWLibs.cpp b/NootedRed/HWLibs.cpp
@@ -2,6 +2,7 @@
 //! See LICENSE for details.
 
 #include "HWLibs.hpp"
+#include "Firmware.hpp"
 #include "NRed.hpp"
 #include "PatcherPlus.hpp"
 #include <Headers/kern_api.hpp>

diff --git a/NootedRed/NRed.cpp b/NootedRed/NRed.cpp
@@ -3,6 +3,7 @@
 
 #include "NRed.hpp"
 #include "AppleGFXHDA.hpp"
+#include "Firmware.hpp"
 #include "HWLibs.hpp"
 #include "Model.hpp"
 #include "PatcherPlus.hpp"
@@ -28,10 +29,10 @@ static KernelPatcher::KextInfo kextMCCSControl {"com.apple.driver.AppleMCCSContr
 NRed *NRed::callback = nullptr;
 
 static X6000FB x6000fb;
+static AppleGFXHDA agfxhda;
 static X5000HWLibs hwlibs;
-static X5000 x5000;
 static X6000 x6000;
-static AppleGFXHDA agfxhda;
+static X5000 x5000;
 
 void NRed::init() {
     SYSLOG("NRed", "Copyright 2022-2024 ChefKiss Inc. If you've paid for this, you've been scammed.");
@@ -40,8 +41,8 @@ void NRed::init() {
     lilu.onKextLoadForce(&kextAGDP);
     lilu.onKextLoadForce(&kextBacklight);
     lilu.onKextLoadForce(&kextMCCSControl);
-    agfxhda.init();
     x6000fb.init();
+    agfxhda.init();
     hwlibs.init();
     x6000.init();
     x5000.init();

diff --git a/NootedRed/NRed.hpp b/NootedRed/NRed.hpp
@@ -4,7 +4,6 @@
 #pragma once
 #include "AMDCommon.hpp"
 #include "ATOMBIOS.hpp"
-#include "Firmware.hpp"
 #include <Headers/kern_patcher.hpp>
 #include <IOKit/acpi/IOACPIPlatformExpert.h>
 #include <IOKit/graphics/IOFramebuffer.h>
@@ -59,9 +58,8 @@ static bool checkAtomBios(const UInt8 *bios, size_t size) {
 }
 
 class NRed {
-    friend class AppleGFXHDA;
-    friend class DYLDPatches;
     friend class X6000FB;
+    friend class AppleGFXHDA;
     friend class X5000HWLibs;
     friend class X6000;
     friend class X5000;

diff --git a/NootedRed/PluginStart.cpp → NootedRed/Plugin.cpp b/NootedRed/PluginStart.cpp → NootedRed/Plugin.cpp
diff --git a/NootedRed/X5000.cpp b/NootedRed/X5000.cpp
@@ -2,6 +2,7 @@
 //! See LICENSE for details.
 
 #include "X5000.hpp"
+#include "Firmware.hpp"
 #include "NRed.hpp"
 #include "PatcherPlus.hpp"
 #include "X6000.hpp"

diff --git a/NootedRed/X6000.hpp b/NootedRed/X6000.hpp
@@ -2,7 +2,6 @@
 //! See LICENSE for details.
 
 #pragma once
-#include "AMDCommon.hpp"
 #include <Headers/kern_patcher.hpp>
 
 class X6000 {