Chameleon

Chameleon Commit Details

Date:2015-03-15 22:42:35 (9 years 1 month ago)
Author:ErmaC
Commit:2638
Parents: 2637
Message:Typo and data for future version of OSX 10.11
Changes:
M/trunk/i386/boot2/drivers.c
M/trunk/i386/libsaio/acpi_patcher.c
M/trunk/i386/boot2/boot.c
M/trunk/i386/boot2/gui.c
M/trunk/i386/libsaio/bootstruct.c
M/trunk/i386/libsaio/disk.c

File differences

trunk/i386/libsaio/bootstruct.c
128128
129129
130130
131
131
132132
133133
134134
␉}␊
␉else␊
␉{␊
␉␉// for 10.7 10.8 10.9 10.10␊
␉␉// for 10.7 10.8 10.9 10.10 10.11␊
␉␉void *oldAddr = bootArgs;␊
␉␉bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args));␊
␉␉bcopy(oldAddr, bootArgs, sizeof(boot_args));␊
trunk/i386/libsaio/acpi_patcher.c
330330
331331
332332
333
334
333
334
335335
336336
337337
338
339
338
339
340340
341
341
342342
343343
344344
␊
␉}␊
␊
␉// Patch DSDT Address if we have loaded DSDT.aml␊
␉if(new_dsdt)␊
␉// Patch DSDT address if we have loaded DSDT.aml␊
␉if (new_dsdt)␊
␉{␊
␉␉DBG("DSDT: Old @%x,%x, ",fadt_mod->DSDT,fadt_mod->X_DSDT);␊
␊
␉␉fadt_mod->DSDT=(uint32_t)new_dsdt;␊
␉␉if ((uint32_t)(&(fadt_mod->X_DSDT))-(uint32_t)fadt_mod+8<=fadt_mod->Length)␊
␉␉fadt_mod->DSDT = (uint32_t)new_dsdt;␊
␉␉if ((uint32_t)(&(fadt_mod->X_DSDT)) - (uint32_t)fadt_mod + 8<=fadt_mod->Length)␊
␉␉{␊
␉␉␉fadt_mod->X_DSDT=(uint32_t)new_dsdt;␊
␉␉␉fadt_mod->X_DSDT = (uint32_t)new_dsdt;␊
␉␉}␊
␊
␉␉DBG("New @%x,%x\n",fadt_mod->DSDT,fadt_mod->X_DSDT);␊
trunk/i386/libsaio/disk.c
17731773
17741774
17751775
1776
1776
17771777
17781778
17791779
......
17931793
17941794
17951795
1796
1796
17971797
1798
1799
17981800
17991801
18001802
␉␉␉}␊
␉␉}␊
␊
// Mountain Lion ?␊
//␉␉if ( MOUNTAIN_LION ){}␊
␊
␉␉if ( MAVERICKS )␊
␉␉{␊
␉␉␉}␊
␉␉}␊
␊
// Yosemite ?␊
//␉␉if ( YOSEMITE ){}␊
␊
//␉␉if ( GALA ){}␊
␊
␉}␊
␊
␉if (valid)␊
trunk/i386/boot2/drivers.c
253253
254254
255255
256
256
257257
258258
259259
␉␉␉}␊
␉␉␉else␊
␉␉␉{␊
␉␉␉␉if ( MAVERICKS || YOSEMITE ) // issue 352␊
␉␉␉␉if ( MAVERICKS || YOSEMITE ) // ( MAVERICKS || YOSEMITE || GALA ) // issue 352␊
␉␉␉␉{␊
␉␉␉␉␉strlcpy(gExtensionsSpec, dirSpec, 4087); /* 4096 - sizeof("Library/") */␊
␉␉␉␉␉strcat(gExtensionsSpec, "Library/");␊
trunk/i386/boot2/boot.c
317317
318318
319319
320
320
321321
322322
323323
......
767767
768768
769769
770
770
771771
772772
773773
␉␉else␊
␉␉{␊
␉␉␉// Lion, Mountain Lion, Mavericks and Yosemite prelink kernel cache file␊
␉␉␉// for 10.7 10.8 10.9 10.10␊
␉␉␉// for 10.7 10.8 10.9 10.10 10.11␊
␉␉␉snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kDefaultCachePathSnow);␊
␉␉␉verbose("Kernel Cache file path (Mac OS X 10.7 and newer): %s\n", kernelCacheFile);␊
␊
␉␉␉// bootFile must start with a / if it not start with a device name␊
␉␉␉if (!bootFileWithDevice && (bootInfo->bootFile)[0] != '/')␊
␉␉␉{␊
␉␉␉␉if ( !YOSEMITE ) // Is not Yosemite 10.10␊
␉␉␉␉if ( !YOSEMITE ) // ( !YOSEMITE || !GALA ) Is not Yosemite 10.10 or Gala 10.11␊
␉␉␉␉{␊
␉␉␉␉␉snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading /␊
␉␉␉␉}␊
trunk/i386/boot2/gui.c
5454
5555
5656
57
58
5759
5860
5961
......
7173
7274
7375
76
77
7478
7579
7680
......
144148
145149
146150
151
152
147153
148154
149155
......
161167
162168
163169
170
171
164172
165173
166174
......
386394
387395
388396
397
398
389399
390400
391401
......
403413
404414
405415
416
417
406418
407419
408420
␉iDeviceGeneric_o,␊
␉iDeviceHFS,␊
␉iDeviceHFS_o,␊
//␉iDeviceHFS_gala,␊
//␉iDeviceHFS_gala_o,␊
␉iDeviceHFS_yos,␊
␉iDeviceHFS_yos_o,␊
␉iDeviceHFS_mav,␊
␊
␉iDeviceHFSRAID,␊
␉iDeviceHFSRAID_o,␊
//␉iDeviceHFSRAID_gala,␊
//␉iDeviceHFSRAID_gala_o,␊
␉iDeviceHFSRAID_yos,␊
␉iDeviceHFSRAID_yos_o,␊
␉iDeviceHFSRAID_mav,␊
␉{.name = "device_generic_o", .image = NULL},␊
␉{.name = "device_hfsplus", .image = NULL},␊
␉{.name = "device_hfsplus_o", .image = NULL},␊
//␉{.name = "device_hfsplus_gala", .image = NULL},␊
//␉{.name = "device_hfsplus_gala_o", .image = NULL},␊
␉{.name = "device_hfsplus_yos", .image = NULL},␊
␉{.name = "device_hfsplus_yos_o", .image = NULL},␊
␉{.name = "device_hfsplus_mav", .image = NULL},␊
␊
␉{.name = "device_hfsraid", .image = NULL},␊
␉{.name = "device_hfsraid_o", .image = NULL},␊
//␉{.name = "device_hfsraid_gala", .image = NULL},␊
//␉{.name = "device_hfsraid_gala_o", .image = NULL},␊
␉{.name = "device_hfsraid_yos", .image = NULL},␊
␉{.name = "device_hfsraid_yos_o", .image = NULL},␊
␉{.name = "device_hfsraid_mav", .image = NULL},␊
␉LOADPNG(device_generic_o, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus, iDeviceGeneric);␊
␉LOADPNG(device_hfsplus_o, iDeviceHFS);␊
//␉LOADPNG(device_hfsplus_gala, iDeviceHFS);␊
//␉LOADPNG(device_hfsplus_gala_o, iDeviceHFS_gala);␊
␉LOADPNG(device_hfsplus_yos, iDeviceHFS);␊
␉LOADPNG(device_hfsplus_yos_o, iDeviceHFS_yos);␊
␉LOADPNG(device_hfsplus_mav, iDeviceHFS);␊
␊
␉LOADPNG(device_hfsraid, iDeviceHFS);␊
␉LOADPNG(device_hfsraid_o, iDeviceHFSRAID);␊
//␉LOADPNG(device_hfsraid_gala, iDeviceHFSRAID);␊
//␉LOADPNG(device_hfsraid_gala_o, iDeviceHFSRAID_gala);␊
␉LOADPNG(device_hfsraid_yos, iDeviceHFSRAID);␊
␉LOADPNG(device_hfsraid_yos_o, iDeviceHFSRAID_yos);␊
␉LOADPNG(device_hfsraid_mav, iDeviceHFSRAID);␊

Archive Download the corresponding diff file

Revision: 2638