Index: branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1825) +++ branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1826) @@ -1303,10 +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_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain_o.png; sourceTree = ""; }; - B43E407714EE869800CD79F9 /* device_hfsplus_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain.png; sourceTree = ""; }; - B43E407814EE869A00CD79F9 /* device_hfsraid_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain_o.png; sourceTree = ""; }; - B43E407914EE869C00CD79F9 /* device_hfsraid_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain.png; 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 = ""; }; @@ -3355,8 +3355,8 @@ 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, - B43E407614EE869700CD79F9 /* device_hfsplus_mountain_o.png */, - B43E407714EE869800CD79F9 /* device_hfsplus_mountain.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 */, @@ -3367,8 +3367,8 @@ 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, - B43E407814EE869A00CD79F9 /* device_hfsraid_mountain_o.png */, - B43E407914EE869C00CD79F9 /* device_hfsraid_mountain.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_mountain.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/artwork/themes/default/device_hfsraid_mountain_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/artwork/themes/default/device_hfsplus_mountain_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/artwork/themes/default/device_hfsraid_mountain.png =================================================================== Cannot display: file marked as a binary type. 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/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/i386/boot2/gui.c =================================================================== --- branches/ErmaC/Trunk/i386/boot2/gui.c (revision 1825) +++ branches/ErmaC/Trunk/i386/boot2/gui.c (revision 1826) @@ -118,8 +118,8 @@ {.name = "device_generic_o", .image = NULL}, {.name = "device_hfsplus", .image = NULL}, {.name = "device_hfsplus_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_lion", .image = NULL}, {.name = "device_hfsplus_lion_o", .image = NULL}, {.name = "device_hfsplus_sl", .image = NULL}, @@ -131,8 +131,8 @@ {.name = "device_hfsraid", .image = NULL}, {.name = "device_hfsraid_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_lion", .image = NULL}, {.name = "device_hfsraid_lion_o", .image = NULL}, {.name = "device_hfsraid_sl", .image = NULL}, @@ -372,8 +372,8 @@ LOADPNG(device_generic_o, iDeviceGeneric); LOADPNG(device_hfsplus, iDeviceGeneric); LOADPNG(device_hfsplus_o, iDeviceHFS); - LOADPNG(device_hfsplus_mountain, iDeviceHFS_Mountain); - LOADPNG(device_hfsplus_mountain_o, iDeviceHFS_Mountain_o); + LOADPNG(device_hfsplus_ml, iDeviceHFS_Mountain); + LOADPNG(device_hfsplus_ml_o, iDeviceHFS_Mountain_o); LOADPNG(device_hfsplus_lion, iDeviceHFS_Lion); LOADPNG(device_hfsplus_lion_o, iDeviceHFS_Lion_o); LOADPNG(device_hfsplus_sl, iDeviceHFS_SL); @@ -385,8 +385,8 @@ LOADPNG(device_hfsraid, iDeviceGeneric); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); - LOADPNG(device_hfsraid_mountain, iDeviceHFSRAID_Mountain); - LOADPNG(device_hfsraid_mountain_o, iDeviceHFSRAID_Mountain_o); + LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_Mountain); + LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_Mountain_o); LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion); LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o); LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL); Index: branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1825) +++ branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1826) @@ -1299,10 +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_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain_o.png; sourceTree = ""; }; - B43E407714EE869800CD79F9 /* device_hfsplus_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain.png; sourceTree = ""; }; - B43E407814EE869A00CD79F9 /* device_hfsraid_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain_o.png; sourceTree = ""; }; - B43E407914EE869C00CD79F9 /* device_hfsraid_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain.png; 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 = ""; }; @@ -3377,8 +3377,8 @@ 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, - B43E407614EE869700CD79F9 /* device_hfsplus_mountain_o.png */, - B43E407714EE869800CD79F9 /* device_hfsplus_mountain.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 */, @@ -3389,8 +3389,8 @@ 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, - B43E407814EE869A00CD79F9 /* device_hfsraid_mountain_o.png */, - B43E407914EE869C00CD79F9 /* device_hfsraid_mountain.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_mountain.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/artwork/themes/default/device_hfsraid_mountain_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/artwork/themes/default/device_hfsplus_mountain_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/artwork/themes/default/device_hfsraid_mountain.png =================================================================== Cannot display: file marked as a binary type. 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/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/i386/libsaio/aml_generator.c =================================================================== --- branches/ErmaC/Modules/i386/libsaio/aml_generator.c (revision 1825) +++ branches/ErmaC/Modules/i386/libsaio/aml_generator.c (revision 1826) @@ -291,12 +291,12 @@ { if (size + 1 <= 0x3f) return 1; - else if (size + 2 <= 0x3fff) + else if (size + 2 <= 0xfff) /* Encode in 4 bits and 1 byte */ return 2; - else if (size + 3 <= 0x3fffff) + else if (size + 3 <= 0xfffff) /* Encode in 4 bits and 2 bytes */ return 3; - return 4; + return 4; /* Encode 0xfffffff in 4 bits and 2 bytes */ } unsigned int aml_calculate_size(struct aml_chunk* node) @@ -411,25 +411,25 @@ unsigned int aml_write_size(unsigned int size, char* buffer, unsigned int offset) { - if (size <= 0x3f) + if (size <= 0x3f) /* simple 1 byte length in 6 bits */ { buffer[offset++] = size; } - else if (size <= 0x3fff) + else if (size <= 0xfff) { - buffer[offset++] = 0x40 | (size & 0xf); - buffer[offset++] = (size >> 4) & 0xff; + buffer[offset++] = 0x40 | (size & 0xf); /* 0x40 is type, 0x0X is first nibble of length */ + buffer[offset++] = (size >> 4) & 0xff; /* +1 bytes for rest length */ } - else if (size <= 0x3fffff) + else if (size <= 0xfffff) { - buffer[offset++] = 0x80 | (size & 0xf); - buffer[offset++] = (size >> 4) & 0xff; + buffer[offset++] = 0x80 | (size & 0xf); /* 0x80 is type, 0x0X is first nibble of length */ + buffer[offset++] = (size >> 4) & 0xff; /* +2 bytes for rest length */ buffer[offset++] = (size >> 12) & 0xff; } else { - buffer[offset++] = 0xc0 | (size & 0xf); - buffer[offset++] = (size >> 4) & 0xff; + buffer[offset++] = 0xc0 | (size & 0xf); /* 0xC0 is type, 0x0X is first nibble of length */ + buffer[offset++] = (size >> 4) & 0xff; /* +3 bytes for rest length */ buffer[offset++] = (size >> 12) & 0xff; buffer[offset++] = (size >> 20) & 0xff; } Index: branches/ErmaC/Modules/i386/boot2/gui.c =================================================================== --- branches/ErmaC/Modules/i386/boot2/gui.c (revision 1825) +++ branches/ErmaC/Modules/i386/boot2/gui.c (revision 1826) @@ -118,8 +118,8 @@ {.name = "device_generic_o", .image = NULL}, {.name = "device_hfsplus", .image = NULL}, {.name = "device_hfsplus_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_lion", .image = NULL}, {.name = "device_hfsplus_lion_o", .image = NULL}, {.name = "device_hfsplus_sl", .image = NULL}, @@ -131,8 +131,8 @@ {.name = "device_hfsraid", .image = NULL}, {.name = "device_hfsraid_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_lion", .image = NULL}, {.name = "device_hfsraid_lion_o", .image = NULL}, {.name = "device_hfsraid_sl", .image = NULL}, @@ -372,8 +372,8 @@ LOADPNG(device_generic_o, iDeviceGeneric); LOADPNG(device_hfsplus, iDeviceGeneric); LOADPNG(device_hfsplus_o, iDeviceHFS); - LOADPNG(device_hfsplus_mountain, iDeviceHFS_Mountain); - LOADPNG(device_hfsplus_mountain_o, iDeviceHFS_Mountain_o); + LOADPNG(device_hfsplus_ml, iDeviceHFS_Mountain); + LOADPNG(device_hfsplus_ml_o, iDeviceHFS_Mountain_o); LOADPNG(device_hfsplus_lion, iDeviceHFS_Lion); LOADPNG(device_hfsplus_lion_o, iDeviceHFS_Lion_o); LOADPNG(device_hfsplus_sl, iDeviceHFS_SL); @@ -385,8 +385,8 @@ LOADPNG(device_hfsraid, iDeviceGeneric); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); - LOADPNG(device_hfsraid_mountain, iDeviceHFSRAID_Mountain); - LOADPNG(device_hfsraid_mountain_o, iDeviceHFSRAID_Mountain_o); + LOADPNG(device_hfsraid_ml, iDeviceHFSRAID_Mountain); + LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_Mountain_o); LOADPNG(device_hfsraid_lion, iDeviceHFSRAID_Lion); LOADPNG(device_hfsraid_lion_o, iDeviceHFSRAID_Lion_o); LOADPNG(device_hfsraid_sl, iDeviceHFSRAID_SL);