Chameleon

Chameleon Commit Details

Date:2012-02-21 22:16:39 (8 years 3 months ago)
Author:ErmaC
Commit:1826
Parents: 1825
Message:Renamed the new Icons (ML) into short "format": http://forum.voodooprojects.org/index.php/topic,2125.msg11617.html#ms g11617
Changes:
R/branches/ErmaC/Modules/artwork/themes/default/device_hfsraid_mountain.png → /branches/ErmaC/Modules/artwork/themes/default/device_hfsraid_ml.png
R/branches/ErmaC/Modules/artwork/themes/default/device_hfsplus_mountain.png → /branches/ErmaC/Modules/artwork/themes/default/device_hfsplus_ml.png
R/branches/ErmaC/Trunk/artwork/themes/default/device_hfsraid_mountain_o.png → /branches/ErmaC/Trunk/artwork/themes/default/device_hfsraid_ml_o.png
R/branches/ErmaC/Trunk/artwork/themes/default/device_hfsplus_mountain_o.png → /branches/ErmaC/Trunk/artwork/themes/default/device_hfsplus_ml_o.png
R/branches/ErmaC/Modules/artwork/themes/default/device_hfsraid_mountain_o.png → /branches/ErmaC/Modules/artwork/themes/default/device_hfsraid_ml_o.png
R/branches/ErmaC/Modules/artwork/themes/default/device_hfsplus_mountain_o.png → /branches/ErmaC/Modules/artwork/themes/default/device_hfsplus_ml_o.png
R/branches/ErmaC/Trunk/artwork/themes/default/device_hfsraid_mountain.png → /branches/ErmaC/Trunk/artwork/themes/default/device_hfsraid_ml.png
R/branches/ErmaC/Trunk/artwork/themes/default/device_hfsplus_mountain.png → /branches/ErmaC/Trunk/artwork/themes/default/device_hfsplus_ml.png
M/branches/ErmaC/Trunk/i386/boot2/gui.c
M/branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj
M/branches/ErmaC/Modules/i386/boot2/gui.c
M/branches/ErmaC/Modules/i386/libsaio/aml_generator.c
M/branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj

File differences

branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj
13031303
13041304
13051305
1306
1307
1308
1309
1306
1307
1308
1309
13101310
13111311
13121312
......
33553355
33563356
33573357
3358
3359
3358
3359
33603360
33613361
33623362
......
33673367
33683368
33693369
3370
3371
3370
3371
33723372
33733373
33743374
B4189A2214BFBF5600ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = "<group>"; };
B4189A2314BFBF7200ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = "<group>"; };
B4189A2414BFBFD100ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = "<group>"; };
B43E407614EE869700CD79F9 /* device_hfsplus_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain_o.png; sourceTree = "<group>"; };
B43E407714EE869800CD79F9 /* device_hfsplus_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain.png; sourceTree = "<group>"; };
B43E407814EE869A00CD79F9 /* device_hfsraid_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain_o.png; sourceTree = "<group>"; };
B43E407914EE869C00CD79F9 /* device_hfsraid_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain.png; sourceTree = "<group>"; };
B43E407614EE869700CD79F9 /* device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o.png; sourceTree = "<group>"; };
B43E407714EE869800CD79F9 /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = "<group>"; };
B43E407814EE869A00CD79F9 /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = "<group>"; };
B43E407914EE869C00CD79F9 /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = "<group>"; };
B442B8C514BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ar; path = ar.lproj/License.rtf; sourceTree = "<group>"; };
B442B8C614BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = "<group>"; };
B442B8C714BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ar; path = ar.lproj/Description.html; sourceTree = "<group>"; };
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 */,
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 */,
branches/ErmaC/Trunk/i386/boot2/gui.c
118118
119119
120120
121
122
121
122
123123
124124
125125
......
131131
132132
133133
134
135
134
135
136136
137137
138138
......
372372
373373
374374
375
376
375
376
377377
378378
379379
......
385385
386386
387387
388
389
388
389
390390
391391
392392
{.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},
{.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},
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);
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);
branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj
12991299
13001300
13011301
1302
1303
1304
1305
1302
1303
1304
1305
13061306
13071307
13081308
......
33773377
33783378
33793379
3380
3381
3380
3381
33823382
33833383
33843384
......
33893389
33903390
33913391
3392
3393
3392
3393
33943394
33953395
33963396
B4189A2214BFBF5600ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = "<group>"; };
B4189A2314BFBF7200ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = "<group>"; };
B4189A2414BFBFD100ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = "<group>"; };
B43E407614EE869700CD79F9 /* device_hfsplus_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain_o.png; sourceTree = "<group>"; };
B43E407714EE869800CD79F9 /* device_hfsplus_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mountain.png; sourceTree = "<group>"; };
B43E407814EE869A00CD79F9 /* device_hfsraid_mountain_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain_o.png; sourceTree = "<group>"; };
B43E407914EE869C00CD79F9 /* device_hfsraid_mountain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mountain.png; sourceTree = "<group>"; };
B43E407614EE869700CD79F9 /* device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o.png; sourceTree = "<group>"; };
B43E407714EE869800CD79F9 /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = "<group>"; };
B43E407814EE869A00CD79F9 /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = "<group>"; };
B43E407914EE869C00CD79F9 /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = "<group>"; };
B4189A3414BFC26400ED5B0B /* ati.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ati.c; path = ATiGraphicsEnabler/ati.c; sourceTree = "<group>"; };
B4189A3514BFC26400ED5B0B /* ati.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ati.h; path = ATiGraphicsEnabler/ati.h; sourceTree = "<group>"; };
B4189A3614BFC26400ED5B0B /* ATiGraphicsEnabler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ATiGraphicsEnabler.c; path = ATiGraphicsEnabler/ATiGraphicsEnabler.c; sourceTree = "<group>"; };
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 */,
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 */,
branches/ErmaC/Modules/i386/libsaio/aml_generator.c
291291
292292
293293
294
294
295295
296
296
297297
298298
299
299
300300
301301
302302
......
411411
412412
413413
414
414
415415
416416
417417
418
418
419419
420
421
420
421
422422
423
423
424424
425
426
425
426
427427
428428
429429
430430
431
432
431
432
433433
434434
435435
{
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)
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;
}
branches/ErmaC/Modules/i386/boot2/gui.c
118118
119119
120120
121
122
121
122
123123
124124
125125
......
131131
132132
133133
134
135
134
135
136136
137137
138138
......
372372
373373
374374
375
376
375
376
377377
378378
379379
......
385385
386386
387387
388
389
388
389
390390
391391
392392
{.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},
{.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},
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);
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);

Archive Download the corresponding diff file

Revision: 1826