Index: branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1820) +++ branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1821) @@ -1303,6 +1303,10 @@ B4189A2214BFBF5600ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; B4189A2314BFBF7200ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; B4189A2414BFBFD100ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B43E407614EE869700CD79F9 /* Device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsplus_ml_o.png; sourceTree = ""; }; + B43E407714EE869800CD79F9 /* Device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsplus_ml.png; sourceTree = ""; }; + B43E407814EE869A00CD79F9 /* Device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsraid_ml_o.png; sourceTree = ""; }; + B43E407914EE869C00CD79F9 /* Device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsraid_ml.png; sourceTree = ""; }; B442B8C514BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ar; path = ar.lproj/License.rtf; sourceTree = ""; }; B442B8C614BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = ""; }; B442B8C714BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ar; path = ar.lproj/Description.html; sourceTree = ""; }; @@ -3351,6 +3355,8 @@ 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, + B43E407614EE869700CD79F9 /* Device_hfsplus_ml_o.png */, + B43E407714EE869800CD79F9 /* Device_hfsplus_ml.png */, 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */, 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */, 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */, @@ -3361,6 +3367,8 @@ 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, + B43E407814EE869A00CD79F9 /* Device_hfsraid_ml_o.png */, + B43E407914EE869C00CD79F9 /* Device_hfsraid_ml.png */, 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */, 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */, 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */, Index: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsplus_ml.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsplus_ml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsraid_ml_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsraid_ml_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsplus_ml_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsplus_ml_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsraid_ml.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Trunk/artwork/themes/default/Device_hfsraid_ml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Trunk/i386/boot2/gui.c =================================================================== --- branches/ErmaC/Trunk/i386/boot2/gui.c (revision 1820) +++ branches/ErmaC/Trunk/i386/boot2/gui.c (revision 1821) @@ -43,8 +43,8 @@ iDeviceGeneric_o, iDeviceHFS, iDeviceHFS_o, - iDeviceHFS_Mountain, - iDeviceHFS_Mountain_o, + iDeviceHFS_ML, + iDeviceHFS_ML_o, iDeviceHFS_Lion, iDeviceHFS_Lion_o, iDeviceHFS_SL, @@ -55,8 +55,8 @@ iDeviceHFS_Tiger_o, iDeviceHFSRAID, iDeviceHFSRAID_o, - iDeviceHFSRAID_Mountain, - iDeviceHFSRAID_Mountain_o, + iDeviceHFSRAID_ML, + iDeviceHFSRAID_ML_o, iDeviceHFSRAID_Lion, iDeviceHFSRAID_Lion_o, iDeviceHFSRAID_SL, @@ -120,8 +120,8 @@ {.name = "device_hfsplus_o", .image = NULL}, {.name = "device_hfsplus_lion", .image = NULL}, {.name = "device_hfsplus_lion_o", .image = NULL}, - {.name = "device_hfsplus_mountain", .image = NULL}, - {.name = "device_hfsplus_mountain_o", .image = NULL}, + {.name = "device_hfsplus_ml", .image = NULL}, + {.name = "device_hfsplus_ml_o", .image = NULL}, {.name = "device_hfsplus_sl", .image = NULL}, {.name = "device_hfsplus_sl_o", .image = NULL}, {.name = "device_hfsplus_leo", .image = NULL}, @@ -133,8 +133,8 @@ {.name = "device_hfsraid_o", .image = NULL}, {.name = "device_hfsraid_lion", .image = NULL}, {.name = "device_hfsraid_lion_o", .image = NULL}, - {.name = "device_hfsraid_mountain", .image = NULL}, - {.name = "device_hfsraid_mountain_o", .image = NULL}, + {.name = "device_hfsraid_ml", .image = NULL}, + {.name = "device_hfsraid_ml_o", .image = NULL}, {.name = "device_hfsraid_sl", .image = NULL}, {.name = "device_hfsraid_sl_o", .image = NULL}, {.name = "device_hfsraid_leo", .image = NULL}, @@ -374,8 +374,8 @@ LOADPNG(device_hfsplus_o, iDeviceHFS); LOADPNG(device_hfsplus_lion, iDeviceHFS_Lion); LOADPNG(device_hfsplus_lion_o, iDeviceHFS_Lion_o); - LOADPNG(device_hfsplus_mountain, iDeviceHFS_Mountain); - LOADPNG(device_hfsplus_mountain_o, iDeviceHFS_Mountain_o); + LOADPNG(device_hfsplus_ml, iDeviceHFS_ML); + LOADPNG(device_hfsplus_ml_o, iDeviceHFS_ML_o); LOADPNG(device_hfsplus_sl, iDeviceHFS_SL); LOADPNG(device_hfsplus_sl_o, iDeviceHFS_SL_o); LOADPNG(device_hfsplus_leo, iDeviceHFS_Leo); @@ -385,16 +385,16 @@ LOADPNG(device_hfsraid, iDeviceGeneric); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); - LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion); - LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o); - LOADPNG(device_hfsraid_mountain, iDeviceHFSRAID_Mountain); - LOADPNG(device_hfsraid_mountain_o, iDeviceHFSRAID_Mountain_o); - LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL); - LOADPNG(device_hfsraid_sl_o, iDeviceHFSRAID_SL_o); - LOADPNG(device_hfsraid_leo, iDeviceHFSRAID_Leo); - LOADPNG(device_hfsraid_leo_o, iDeviceHFSRAID_Leo_o); - LOADPNG(device_hfsraid_tiger, iDeviceHFSRAID_Tiger); - LOADPNG(device_hfsraid_tiger_o, iDeviceHFSRAID_Tiger_o); + LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion); + LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o); + LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_ML); + LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_ML_o); + LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL); + LOADPNG(device_hfsraid_sl_o, iDeviceHFSRAID_SL_o); + LOADPNG(device_hfsraid_leo, iDeviceHFSRAID_Leo); + LOADPNG(device_hfsraid_leo_o, iDeviceHFSRAID_Leo_o); + LOADPNG(device_hfsraid_tiger, iDeviceHFSRAID_Tiger); + LOADPNG(device_hfsraid_tiger_o, iDeviceHFSRAID_Tiger_o); LOADPNG(device_ext3, iDeviceGeneric); LOADPNG(device_ext3_o, iDeviceEXT3); LOADPNG(device_freebsd, iDeviceGeneric); /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ @@ -906,7 +906,7 @@ switch (device->OSVersion[3]) { case '8': - devicetype = is_image_loaded(iDeviceHFSRAID_Mountain) ? iDeviceHFSRAID_Mountain : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric; + devicetype = is_image_loaded(iDeviceHFSRAID_ML) ? iDeviceHFSRAID_ML : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric; break; case '7': devicetype = is_image_loaded(iDeviceHFSRAID_Lion) ? iDeviceHFSRAID_Lion : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric; @@ -931,7 +931,7 @@ switch (device->OSVersion[3]) { case '8': - devicetype = is_image_loaded(iDeviceHFS_Mountain) ? iDeviceHFS_Mountain : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric; + devicetype = is_image_loaded(iDeviceHFS_ML) ? iDeviceHFS_ML : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric; break; case '7': devicetype = is_image_loaded(iDeviceHFS_Lion) ? iDeviceHFS_Lion : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric; Index: branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1820) +++ branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1821) @@ -1299,6 +1299,10 @@ B4189A2214BFBF5600ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; B4189A2314BFBF7200ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; B4189A2414BFBFD100ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + B43E407614EE869700CD79F9 /* Device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsplus_ml_o.png; sourceTree = ""; }; + B43E407714EE869800CD79F9 /* Device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsplus_ml.png; sourceTree = ""; }; + B43E407814EE869A00CD79F9 /* Device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsraid_ml_o.png; sourceTree = ""; }; + B43E407914EE869C00CD79F9 /* Device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Device_hfsraid_ml.png; sourceTree = ""; }; B4189A3414BFC26400ED5B0B /* ati.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ati.c; path = ATiGraphicsEnabler/ati.c; sourceTree = ""; }; B4189A3514BFC26400ED5B0B /* ati.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ati.h; path = ATiGraphicsEnabler/ati.h; sourceTree = ""; }; B4189A3614BFC26400ED5B0B /* ATiGraphicsEnabler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ATiGraphicsEnabler.c; path = ATiGraphicsEnabler/ATiGraphicsEnabler.c; sourceTree = ""; }; @@ -3373,6 +3377,8 @@ 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, + B43E407614EE869700CD79F9 /* Device_hfsplus_ml_o.png */, + B43E407714EE869800CD79F9 /* Device_hfsplus_ml.png */, 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */, 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */, 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */, @@ -3383,6 +3389,8 @@ 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, + B43E407814EE869A00CD79F9 /* Device_hfsraid_ml_o.png */, + B43E407914EE869C00CD79F9 /* Device_hfsraid_ml.png */, 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */, 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */, 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */, Index: branches/ErmaC/Modules/artwork/themes/default/Device_hfsplus_ml.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Modules/artwork/themes/default/Device_hfsplus_ml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Modules/artwork/themes/default/Device_hfsraid_ml_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Modules/artwork/themes/default/Device_hfsraid_ml_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Modules/artwork/themes/default/Device_hfsplus_ml_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Modules/artwork/themes/default/Device_hfsplus_ml_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Modules/artwork/themes/default/Device_hfsraid_ml.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/ErmaC/Modules/artwork/themes/default/Device_hfsraid_ml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/ErmaC/Modules/i386/libsaio/bootstruct.c =================================================================== --- branches/ErmaC/Modules/i386/libsaio/bootstruct.c (revision 1820) +++ branches/ErmaC/Modules/i386/libsaio/bootstruct.c (revision 1821) @@ -110,7 +110,7 @@ reserveKernBootStruct(void) { if ((gMacOSVersion[0] == '1') && (gMacOSVersion[1] == '0') - && (gMacOSVersion[2] == '.') && (gMacOSVersion[3] == '7')) + && (gMacOSVersion[2] == '.') && ((gMacOSVersion[3] == '7') || (gMacOSVersion[3] == '8'))) { void *oldAddr = bootArgs; bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args)); Index: branches/ErmaC/Modules/i386/boot0/boot0hfs.s =================================================================== --- branches/ErmaC/Modules/i386/boot0/boot0hfs.s (revision 1820) +++ branches/ErmaC/Modules/i386/boot0/boot0hfs.s (revision 1821) @@ -60,6 +60,11 @@ VERBOSE EQU CONFIG_BOOT0_VERBOSE ; +; Set to 1 to enable unstretch mode +; +UNSTRETCH EQU CONFIG_BOOT0_UNSTRETCH + +; ; Various constants. ; kBoot0Segment EQU 0x0000 @@ -230,6 +235,10 @@ call print_hex %endif +%if UNSTRETCH + call disable_scaler +%endif + ; ; Since this code may not always reside in the MBR, always start by ; loading the MBR to kMBRBuffer and LBA1 to kGPTBuffer. @@ -619,7 +628,7 @@ ; DS:SI = pointer to Disk Address Packet ; ; Returns: - ; AH = return status (sucess is 0) + ; AH = return status (success is 0) ; carry = 0 success ; 1 error ; @@ -758,13 +767,29 @@ ret %endif ;DEBUG - +%if UNSTRETCH ;-------------------------------------------------------------------------- +; Disable On-Chip Scaling for nVidia Cards +; +disable_scaler: + mov ax,4F14h ;VESA VBE OEM function + mov bl,2 ;Subfunction 02 = Set Panel Expansion/Centering + mov bh,1 ;00 = Return Current Setting, 01 = Set Centering/Expansion + mov cx,0001h ;Exp. mode: 00 = Scaled, 01 = Centered 1:1, 02 = Left Corner 1:1 + int 10h ;call VGA/VBE service + LogString(nv_scaler_str) + ret +%endif +;-------------------------------------------------------------------------- ; NULL terminated strings. ; log_title_str db 10, 13, 'boot0: ', 0 boot_error_str db 'error', 0 +%if UNSTRETCH +nv_scaler_str db 'Unstretch', 0 +%endif ;DEBUG + %if VERBOSE gpt_str db 'GPT', 0 test_str db 'test', 0 Index: branches/ErmaC/Modules/i386/boot2/boot.c =================================================================== --- branches/ErmaC/Modules/i386/boot2/boot.c (revision 1820) +++ branches/ErmaC/Modules/i386/boot2/boot.c (revision 1821) @@ -196,7 +196,7 @@ finalizeBootStruct(); // Jump to kernel's entry point. There's no going back now. - if (checkOSVersion("10.7")) { + if ((checkOSVersion("10.7")) || (checkOSVersion("10.8"))) { // Notify modules that the kernel is about to be started execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL); @@ -230,10 +230,10 @@ if (cacheFile[0] != 0) strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile)); else { - // Lion prelink kernel cache file - if (checkOSVersion("10.7")) { + // Mountain Lion and Lion prelink kernel cache file + if ((checkOSVersion("10.7")) || (checkOSVersion("10.8"))) { sprintf(kernelCacheFile, "%skernelcache", kDefaultCachePathSnow); - } + } // Snow Leopard prelink kernel cache file else if (checkOSVersion("10.6")) { sprintf(kernelCacheFile, "kernelcache_%s", (archCpuType == CPU_TYPE_I386) @@ -330,7 +330,7 @@ // Since the kernel cache file exists and is the most recent try to load it verbose("Loading kernel cache %s\n", kernelCachePath); - if (checkOSVersion("10.7")) { + if ((checkOSVersion("10.7")) || (checkOSVersion("10.8"))) { ret = LoadThinFatFile(kernelCachePath, binary); } else { ret = LoadFile(kernelCachePath); @@ -605,9 +605,9 @@ verbose("Loading Darwin %s\n", gMacOSVersion); - // If boot from boot helper partitions and OS is Lion use prelink kernel. + // If boot from boot helper partitions and OS is Mountain Lion or Lion use prelink kernel. // We need to find a solution to load extra mkext with a prelink kernel. - if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) + if (gBootVolume->flags & kBVFlagBooter && ((checkOSVersion("10.7")) || (checkOSVersion("10.8")))) useKernelCache = true; else useKernelCache = false; // by default don't use prelink kernel cache Index: branches/ErmaC/Modules/i386/boot2/gui.c =================================================================== --- branches/ErmaC/Modules/i386/boot2/gui.c (revision 1820) +++ branches/ErmaC/Modules/i386/boot2/gui.c (revision 1821) @@ -43,6 +43,8 @@ iDeviceGeneric_o, iDeviceHFS, iDeviceHFS_o, + iDeviceHFS_ML, + iDeviceHFS_ML_o, iDeviceHFS_Lion, iDeviceHFS_Lion_o, iDeviceHFS_SL, @@ -53,6 +55,8 @@ iDeviceHFS_Tiger_o, iDeviceHFSRAID, iDeviceHFSRAID_o, + iDeviceHFSRAID_ML, + iDeviceHFSRAID_ML_o, iDeviceHFSRAID_Lion, iDeviceHFSRAID_Lion_o, iDeviceHFSRAID_SL, @@ -116,6 +120,8 @@ {.name = "device_hfsplus_o", .image = NULL}, {.name = "device_hfsplus_lion", .image = NULL}, {.name = "device_hfsplus_lion_o", .image = NULL}, + {.name = "device_hfsplus_ml", .image = NULL}, + {.name = "device_hfsplus_ml_o", .image = NULL}, {.name = "device_hfsplus_sl", .image = NULL}, {.name = "device_hfsplus_sl_o", .image = NULL}, {.name = "device_hfsplus_leo", .image = NULL}, @@ -127,6 +133,8 @@ {.name = "device_hfsraid_o", .image = NULL}, {.name = "device_hfsraid_lion", .image = NULL}, {.name = "device_hfsraid_lion_o", .image = NULL}, + {.name = "device_hfsraid_ml", .image = NULL}, + {.name = "device_hfsraid_ml_o", .image = NULL}, {.name = "device_hfsraid_sl", .image = NULL}, {.name = "device_hfsraid_sl_o", .image = NULL}, {.name = "device_hfsraid_leo", .image = NULL}, @@ -330,9 +338,9 @@ images[i].image->pixels = images[alt_image].image->pixels; } else { - + // Unable to load or to find the image, this image not vital anyway, reseting and returning success !! - + free(images[i].image); images[i].image = NULL; } @@ -348,9 +356,9 @@ free(images[i].image); images[i].image = NULL; return 1; - + } - + } return 1; } @@ -366,6 +374,8 @@ LOADPNG(device_hfsplus_o, iDeviceHFS); LOADPNG(device_hfsplus_lion, iDeviceHFS_Lion); LOADPNG(device_hfsplus_lion_o, iDeviceHFS_Lion_o); + LOADPNG(device_hfsplus_ml, iDeviceHFS_ML); + LOADPNG(device_hfsplus_ml_o, iDeviceHFS_ML_o); LOADPNG(device_hfsplus_sl, iDeviceHFS_SL); LOADPNG(device_hfsplus_sl_o, iDeviceHFS_SL_o); LOADPNG(device_hfsplus_leo, iDeviceHFS_Leo); @@ -377,6 +387,8 @@ LOADPNG(device_hfsraid_o, iDeviceHFSRAID); LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion); LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o); + LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_ML); + LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_ML_o); LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL); LOADPNG(device_hfsraid_sl_o, iDeviceHFSRAID_SL_o); LOADPNG(device_hfsraid_leo, iDeviceHFSRAID_Leo); @@ -893,6 +905,9 @@ if (device->flags & kBVFlagBooter) { switch (device->OSVersion[3]) { + case '8': + devicetype = is_image_loaded(iDeviceHFSRAID_ML) ? iDeviceHFSRAID_ML : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric; + break; case '7': devicetype = is_image_loaded(iDeviceHFSRAID_Lion) ? iDeviceHFSRAID_Lion : is_image_loaded(iDeviceHFSRAID) ? iDeviceHFSRAID : iDeviceGeneric; break; @@ -915,6 +930,9 @@ { switch (device->OSVersion[3]) { + case '8': + devicetype = is_image_loaded(iDeviceHFS_ML) ? iDeviceHFS_ML : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric; + break; case '7': devicetype = is_image_loaded(iDeviceHFS_Lion) ? iDeviceHFS_Lion : is_image_loaded(iDeviceHFS) ? iDeviceHFS : iDeviceGeneric; break;