Merge pull request #3 from ym2008/master

Update Lilu to 1.2.0, Add support for High Sierra

Author: coderobe

AzulPatcher4600.xcodeproj/project.pbxproj

@@ -328,7 +328,7 @@
 				MODULE_NAME = net.coderobe.macos.AzulPatcher4600;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.1.4;
+				MODULE_VERSION = 1.2.0;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -372,7 +372,7 @@
 				MODULE_NAME = net.coderobe.macos.AzulPatcher4600;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.1.4;
+				MODULE_VERSION = 1.2.0;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",

genericPatcher/Info.plist

@@ -41,7 +41,7 @@
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>as.vit9696.Lilu</key>
-		<string>1.1.1</string>
+		<string>1.2.0</string>
 		<key>com.apple.kpi.bsd</key>
 		<string>12.0.0</string>
 		<key>com.apple.kpi.dsep</key>

genericPatcher/kern_patchset.cpp

@@ -20,7 +20,7 @@ static const char* kextPaths[] {
 };
 
 static KernelPatcher::KextInfo kextList[] {
-    { "com.apple.driver.AppleIntelFramebufferAzul", &kextPaths[0], 1, true, {}, KernelPatcher::KextInfo::Unloaded },
+    { "com.apple.driver.AppleIntelFramebufferAzul", &kextPaths[0], 1, {true,true}, {}, KernelPatcher::KextInfo::Unloaded },
 };
 
 template <typename T,unsigned S>
@@ -35,7 +35,7 @@ bool PatchSet::init() {
 	}, this);
 
 	if(error != LiluAPI::Error::NoError) {
-		SYSLOG("coderobe.AzulPatcher4600: failed to register onPatcherLoad method %d", error);
+		SYSLOG("coderobe.AzulPatcher4600", "failed to register onPatcherLoad method %d", error);
 		return false;
 	}
 
@@ -50,37 +50,37 @@ void PatchSet::processKext(KernelPatcher& patcher, size_t index, mach_vm_address
         for(size_t i = 0; i < kextListSize; i++) {
             if(kextList[i].loadIndex == index) {
                 if(!(progressState & ProcessingState::EverythingDone) && !strcmp(kextList[i].id, kextList[0].id)) {
-                    SYSLOG("coderobe.AzulPatcher4600: found %s", kextList[i].id);
+                    SYSLOG("coderobe.AzulPatcher4600", "found %s", kextList[i].id);
 
                     // Disable port 0204
                     const uint8_t find[]    = {0x02, 0x04, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00};
                     const uint8_t replace[] = {0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00};
                     KextPatch kext_patch {
                         {&kextList[i], find, replace, sizeof(find), 2},
-                        KernelVersion::Sierra, KernelVersion::Sierra
+                        KernelVersion::HighSierra, KernelVersion::HighSierra
                     };
                     applyPatches(patcher, index, &kext_patch, 1);
-                    SYSLOG("coderobe.AzulPatcher4600: disabled port 0204");
+                    SYSLOG("coderobe.AzulPatcher4600", "disabled port 0204");
 
                     // 9MB cursor bytes, 2 ports only
                     const uint8_t find1[]    = {0x06, 0x00, 0x26, 0x0a, 0x01, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00, 0x60, 0x00};
                     const uint8_t replace1[] = {0x06, 0x00, 0x26, 0x0a, 0x01, 0x03, 0x02, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00, 0x90, 0x00};
                     KextPatch kext_patch1 {
                         {&kextList[i], find1, replace1, sizeof(find1), 2},
-                        KernelVersion::Sierra, KernelVersion::Sierra
+                        KernelVersion::HighSierra, KernelVersion::HighSierra
                     };
                     applyPatches(patcher, index, &kext_patch1, 1);
-                    SYSLOG("coderobe.AzulPatcher4600: 9MB cursor byte patch (2 ports only) applied");
+                    SYSLOG("coderobe.AzulPatcher4600", "9MB cursor byte patch (2 ports only) applied");
 
                     // HDMI audio
                     const uint8_t find2[]    = {0x01, 0x05, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00};
                     const uint8_t replace2[] = {0x01, 0x05, 0x12, 0x00, 0x00, 0x08, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00};
                     KextPatch kext_patch2 {
                         {&kextList[i], find2, replace2, sizeof(find2), 2},
-                        KernelVersion::Sierra, KernelVersion::Sierra
+                        KernelVersion::HighSierra, KernelVersion::HighSierra
                     };
                     applyPatches(patcher, index, &kext_patch2, 1);
-                    SYSLOG("coderobe.AzulPatcher4600: HDMI audio patch applied");
+                    SYSLOG("coderobe.AzulPatcher4600", "HDMI audio patch applied");
                     progressState |= ProcessingState::EverythingDone;
                 }
             }
@@ -94,7 +94,7 @@ void PatchSet::applyPatches(KernelPatcher& patcher, size_t index, const KextPatc
         auto &patch = patches[p];
         if (patch.patch.kext->loadIndex == index) {
             if (patcher.compatibleKernel(patch.minKernel, patch.maxKernel)) {
-                SYSLOG("coderobe.AzulPatcher4600: patching %s (%ld/%ld)...", patch.patch.kext->id, p+1, patchNum);
+                SYSLOG("coderobe.AzulPatcher4600", "patching %s (%ld/%ld)...", patch.patch.kext->id, p+1, patchNum);
                 patcher.applyLookupPatch(&patch.patch);
                 patcher.clearError();
             }

genericPatcher/kern_start.cpp

@@ -27,14 +27,15 @@ static const char *bootargBeta[] {
 PluginConfiguration ADDPR(config) {
 	xStringify(PRODUCT_NAME),
     parseModuleVersion(xStringify(MODULE_VERSION)),
+    LiluAPI::AllowNormal | LiluAPI::AllowInstallerRecovery,
 	bootargOff,
-	sizeof(bootargOff)/sizeof(bootargOff[0]),
+	arrsize(bootargOff),
 	bootargDebug,
-	sizeof(bootargDebug)/sizeof(bootargDebug[0]),
+	arrsize(bootargDebug),
 	bootargBeta,
-	sizeof(bootargBeta)/sizeof(bootargBeta[0]),
+	arrsize(bootargBeta),
 	KernelVersion::Yosemite,
-	KernelVersion::Sierra,
+	KernelVersion::HighSierra,
 	[]() {
 		patchset.init();
 	}