Chameleon Commit Details - 1251 - Chameleon open source boot loader project.

Date:

2011-08-01 05:13:00 (12 years 9 months ago)

Author:

Azimutz

Commit:

1251

Parents:

1250

Message:

Sync with trunk (r1248).

Changes:

C	/trunk/i386/boot0/boot0hfs.s → /branches/azimutz/trunkAutoResolution/i386/boot0/boot0hfs.s
C	/trunk/package/Resources/Russian.lproj → /branches/azimutz/trunkAutoResolution/package/Resources/Russian.lproj
C	/trunk/i386/boot0/boot0md.s → /branches/azimutz/trunkAutoResolution/i386/boot0/boot0md.s
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/cpu.h
M	/branches/azimutz/trunkAutoResolution/i386/boot0/Makefile
M	/branches/azimutz/trunkAutoResolution/CREDITS
M	/branches/azimutz/trunkAutoResolution/doc/BootHelp.txt
M	/branches/azimutz/trunkAutoResolution
M	/branches/azimutz/trunkAutoResolution/i386/boot0/boot0.s
M	/branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
M	/branches/azimutz/trunkAutoResolution/BLOCKERS
M	/branches/azimutz/trunkAutoResolution/package/buildpkg.sh
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/nvidia.c
M	/branches/azimutz/trunkAutoResolution/i386/boot2/boot.h
M	/branches/azimutz/trunkAutoResolution/CHANGES
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/ati.c
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/stringTable.c
M	/branches/azimutz/trunkAutoResolution/i386/boot2/drivers.c
M	/branches/azimutz/trunkAutoResolution/Makefile
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/acpi_patcher.c
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/cpu.c
M	/branches/azimutz/trunkAutoResolution/i386/boot0/Cconfig
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/platform.h

File differences

-152
153 153
154 154
155
155 156
156 157
157 158
... ...
184 185
185 186
186 187
188
189
190
187 191
188 192
189 193
... ...
204 208
205 209
206 210
207 
211
208 212
209 213
210 
211 
214
215
212 216
217
218
219
220
221
222
223
213 224
214 225
215 226
... ...
236 247
237 248
238 249
250
239 251
240 
241 
242 
252
253
254
255
243 256
244 257
245 258
... ...
254 267
255 268
256 269
257 
258 
259 
260 
261 
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
262 323
263 
264 
265 
266 
267 
268 
269 
270 
271 
272 
273 
274 
275 
276 
277 
278 
279 
280 
281 
282 
283 
284 
285 
286 
287 
288 
289 
290 
291 
292 
293 
294 
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
295 366
296 367
297 368
+␊
uint8_t␉acpi_cpu_count = 0;␊
char* acpi_cpu_name[32];␊
uint32_t acpi_cpu_p_blk = 0;␊
␊
void get_acpi_cpu_names(unsigned char* dsdt, uint32_t length)␊
{␊

␉␉␉␉acpi_cpu_name[acpi_cpu_count] = malloc(4);␊
␉␉␉␉memcpy(acpi_cpu_name[acpi_cpu_count], dsdt+offset, 4);␊
␉␉␉␉i = offset + 5;␊
                ␊
                if (acpi_cpu_count == 0)␊
                    acpi_cpu_p_blk = dsdt[i] | (dsdt[i+1] << 8);␊
␉␉␉␉␊
␉␉␉␉verbose("Found ACPI CPU: %c%c%c%c\n", acpi_cpu_name[acpi_cpu_count][0], acpi_cpu_name[acpi_cpu_count][1], acpi_cpu_name[acpi_cpu_count][2], acpi_cpu_name[acpi_cpu_count][3]);␊
␉␉␉␉␊

␉␉0x31, 0x03, 0x10, 0x20 ␉␉␉␉␉␉␉/* 1.._␉␉*/␊
␉};␊
␉␊
␉char cstate_resource_template[] = ␊
␉char resource_template_register_fixedhw[] = ␊
␉{␊
␉␉0x11, 0x14, 0x0A, 0x11, 0x82, 0x0C, 0x00, 0x7F, ␊
␉␉0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, ␊
␉␉0x00, 0x00, 0x00, 0x79, 0x00␊
␉␉0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ␊
␉␉0x00, 0x00, 0x01, 0x79, 0x00␊
␉};␊
    ␊
    char resource_template_register_systemio[] = ␊
␉{␊
␉␉0x11, 0x14, 0x0A, 0x11, 0x82, 0x0C, 0x00, 0x01,␊
        0x08, 0x00, 0x00, 0x15, 0x04, 0x00, 0x00, 0x00,␊
        0x00, 0x00, 0x00, 0x79, 0x00, ␉␊
    };␊
␊
␉if (Platform.CPU.Vendor != 0x756E6547) {␊
␉␉verbose ("Not an Intel platform: C-States will not be generated !!!\n");␊

␉␉bool c2_enabled = false;␊
␉␉bool c3_enabled = false;␊
␉␉bool c4_enabled = false;␊
        bool cst_using_sustemio = false;␊
␉␉␊
␉␉getBoolForKey(kEnableC2States, &c2_enabled, &bootInfo->chameleonConfig);␊
␉␉getBoolForKey(kEnableC3States, &c3_enabled, &bootInfo->chameleonConfig);␊
␉␉getBoolForKey(kEnableC4States, &c4_enabled, &bootInfo->chameleonConfig);␊
␉␉getBoolForKey(kEnableC2State, &c2_enabled, &bootInfo->chameleonConfig);␊
␉␉getBoolForKey(kEnableC3State, &c3_enabled, &bootInfo->chameleonConfig);␊
␉␉getBoolForKey(kEnableC4State, &c4_enabled, &bootInfo->chameleonConfig);␊
        getBoolForKey(kCSTUsingSystemIO, &cst_using_sustemio, &bootInfo->chameleonConfig);␊
␉␉␊
␉␉c2_enabled = c2_enabled | (fadt->C2_Latency < 100);␊
␉␉c3_enabled = c3_enabled | (fadt->C3_Latency < 1000);␊

␉␉␉␉␉␉aml_add_byte(pack, cstates_count);␊
␉␉␊
␉␉␉␉␉␉struct aml_chunk* tmpl = aml_add_package(pack);␊
␉␉␉␉␉␉␉cstate_resource_template[11] = 0x00; // C1␊
␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x01); // C1␊
␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x01); // Latency␊
␉␉␉␉␉␉␉aml_add_word(tmpl, 0x03e8); // Power␊
                            if (cst_using_sustemio) ␊
                            {   ␊
                                // C1␊
                                resource_template_register_fixedhw[8] = 0x00; ␊
                                resource_template_register_fixedhw[9] = 0x00; ␊
                                resource_template_register_fixedhw[18] = 0x00; ␊
                                aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
                                aml_add_byte(tmpl, 0x01); // C1␊
                                aml_add_word(tmpl, 0x0001); // Latency␊
                                aml_add_dword(tmpl, 0x000003e8); // Power␊
                                ␊
                                uint8_t p_blk_lo, p_blk_hi;␊
                                ␊
                                if (c2_enabled) // C2␊
                                {    ␊
                                    p_blk_lo = acpi_cpu_p_blk + 4;␊
                                    p_blk_hi = (acpi_cpu_p_blk + 4) >> 8;␊
                                    ␊
                                    tmpl = aml_add_package(pack);␊
                                    resource_template_register_systemio[11] = p_blk_lo; // C2␊
                                    resource_template_register_systemio[12] = p_blk_hi; // C2␊
                                    aml_add_buffer(tmpl, resource_template_register_systemio, sizeof(resource_template_register_systemio));␊
                                    aml_add_byte(tmpl, 0x02); // C2␊
                                    aml_add_word(tmpl, 0x0040); // Latency␊
                                    aml_add_dword(tmpl, 0x000001f4); // Power␊
                                }␊
                                                                ␊
                                if (c4_enabled) // C4␊
                                {␊
                                    p_blk_lo = acpi_cpu_p_blk + 5;␊
                                    p_blk_hi = (acpi_cpu_p_blk + 5) >> 8;␊
                                    ␊
                                    tmpl = aml_add_package(pack);␊
                                    resource_template_register_systemio[11] = p_blk_lo; // C4␊
                                    resource_template_register_systemio[12] = p_blk_hi; // C4␊
                                    aml_add_buffer(tmpl, resource_template_register_systemio, sizeof(resource_template_register_systemio));␊
                                    aml_add_byte(tmpl, 0x04); // C4␊
                                    aml_add_word(tmpl, 0x0080); // Latency␊
                                    aml_add_dword(tmpl, 0x000000C8); // Power␊
                                }␊
                                else if (c3_enabled) // C3␊
                                {␊
                                    p_blk_lo = acpi_cpu_p_blk + 5;␊
                                    p_blk_hi = (acpi_cpu_p_blk + 5) >> 8;␊
                                    ␊
                                    tmpl = aml_add_package(pack);␊
                                    resource_template_register_systemio[11] = p_blk_lo; // C3␊
                                    resource_template_register_systemio[12] = p_blk_hi; // C3␊
                                    aml_add_buffer(tmpl, resource_template_register_systemio, sizeof(resource_template_register_systemio));␊
                                    aml_add_byte(tmpl, 0x03);           // C3␊
                                    aml_add_word(tmpl, 0x0060);         // Latency␊
                                    aml_add_dword(tmpl, 0x0000015e);    // Power␊
                                }␊
␊
␉␉␉␉␉␉// C2␊
␉␉␉␉␉␉if (c2_enabled) ␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉tmpl = aml_add_package(pack);␊
␉␉␉␉␉␉␉␉cstate_resource_template[11] = 0x10; // C2␊
␉␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
␉␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x02); // C2␊
␉␉␉␉␉␉␉␉aml_add_byte(tmpl, fadt->C2_Latency);␊
␉␉␉␉␉␉␉␉aml_add_word(tmpl, 0x01f4); // Power␊
␉␉␉␉␉␉}␊
␉␉␉␉␉␉// C4␊
␉␉␉␉␉␉if (c4_enabled) ␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉tmpl = aml_add_package(pack);␊
␉␉␉␉␉␉␉cstate_resource_template[11] = 0x30; // C4␊
␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x04); // C4␊
␉␉␉␉␉␉␉aml_add_word(tmpl, fadt->C3_Latency / 2); // TODO: right latency for C4␊
␉␉␉␉␉␉␉aml_add_byte(tmpl, 0xfa); // Power␊
␉␉␉␉␉␉}␊
␉␉␉␉␉␉else␊
␉␉␉␉␉␉// C3␊
␉␉␉␉␉␉if (c3_enabled) ␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉tmpl = aml_add_package(pack);␊
␉␉␉␉␉␉␉cstate_resource_template[11] = 0x20; // C3␊
␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x03); // C3␊
␉␉␉␉␉␉␉aml_add_word(tmpl, fadt->C3_Latency);␊
␉␉␉␉␉␉␉aml_add_word(tmpl, 0x015e); // Power␊
␉␉␉␉␉␉}␊
␉␉␉␉␉␉␊
                            }␊
                            else ␊
                            {␊
                                // C1␊
                                resource_template_register_fixedhw[11] = 0x00; // C1␊
                                aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
                                aml_add_byte(tmpl, 0x01);           // C1␊
                                aml_add_word(tmpl, 0x0001);         // Latency␊
                                aml_add_dword(tmpl, 0x000003e8);    // Power␊
                                ␊
                                resource_template_register_fixedhw[18] = 0x03;␊
                                ␊
                                if (c2_enabled) // C2␊
                                {␊
                                    tmpl = aml_add_package(pack);␊
                                    resource_template_register_fixedhw[11] = 0x10; // C2␊
                                    aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
                                    aml_add_byte(tmpl, 0x02);           // C2␊
                                    aml_add_word(tmpl, 0x0040);         // Latency␊
                                    aml_add_dword(tmpl, 0x000001f4);    // Power␊
                                }␊
                                ␊
                                if (c4_enabled) // C4␊
                                {␊
                                    tmpl = aml_add_package(pack);␊
                                    resource_template_register_fixedhw[11] = 0x30; // C4␊
                                    aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
                                    aml_add_byte(tmpl, 0x04);           // C4␊
                                    aml_add_word(tmpl, 0x0080);         // Latency␊
                                    aml_add_dword(tmpl, 0x000000C8);    // Power␊
                                }␊
                                else if (c3_enabled) ␊
                                {␊
                                    tmpl = aml_add_package(pack);␊
                                    resource_template_register_fixedhw[11] = 0x20; // C3␊
                                    aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
                                    aml_add_byte(tmpl, 0x03);           // C3␊
                                    aml_add_word(tmpl, 0x0060);         // Latency␊
                                    aml_add_dword(tmpl, 0x0000015e);    // Power␊
                                }␊
                            }␊
␉␉␉␉␉␉␉␉␉␉␉␉␉␊
␉␉␉␊
␉␉␉// Aliaces␊
␉␉␉int i;␊
 ...
 ...
 ...
 ...
 ␊
 uint8_t␉acpi_cpu_count = 0;␊
 char* acpi_cpu_name[32];␊
+uint32_t acpi_cpu_p_blk = 0;␊
 ␊
 void get_acpi_cpu_names(unsigned char* dsdt, uint32_t length)␊
 {␊
 ␉␉␉␉acpi_cpu_name[acpi_cpu_count] = malloc(4);␊
 ␉␉␉␉memcpy(acpi_cpu_name[acpi_cpu_count], dsdt+offset, 4);␊
 ␉␉␉␉i = offset + 5;␊
+                ␊
+                if (acpi_cpu_count == 0)␊
+                    acpi_cpu_p_blk = dsdt[i] | (dsdt[i+1] << 8);␊
 ␉␉␉␉␊
 ␉␉␉␉verbose("Found ACPI CPU: %c%c%c%c\n", acpi_cpu_name[acpi_cpu_count][0], acpi_cpu_name[acpi_cpu_count][1], acpi_cpu_name[acpi_cpu_count][2], acpi_cpu_name[acpi_cpu_count][3]);␊
 ␉␉␉␉␊
 ␉␉0x31, 0x03, 0x10, 0x20 ␉␉␉␉␉␉␉/* 1.._␉␉*/␊
 ␉};␊
 ␉␊
-␉char cstate_resource_template[] = ␊
+␉char resource_template_register_fixedhw[] = ␊
 ␉{␊
 ␉␉0x11, 0x14, 0x0A, 0x11, 0x82, 0x0C, 0x00, 0x7F, ␊
-␉␉0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, ␊
-␉␉0x00, 0x00, 0x00, 0x79, 0x00␊
+␉␉0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ␊
+␉␉0x00, 0x00, 0x01, 0x79, 0x00␊
 ␉};␊
+    ␊
+    char resource_template_register_systemio[] = ␊
+␉{␊
+␉␉0x11, 0x14, 0x0A, 0x11, 0x82, 0x0C, 0x00, 0x01,␊
+x08, 0x00, 0x00, 0x15, 0x04, 0x00, 0x00, 0x00,␊
+x00, 0x00, 0x00, 0x79, 0x00, ␉␊
+    };␊
 ␊
 ␉if (Platform.CPU.Vendor != 0x756E6547) {␊
 ␉␉verbose ("Not an Intel platform: C-States will not be generated !!!\n");␊
 ␉␉bool c2_enabled = false;␊
 ␉␉bool c3_enabled = false;␊
 ␉␉bool c4_enabled = false;␊
+        bool cst_using_sustemio = false;␊
 ␉␉␊
-␉␉getBoolForKey(kEnableC2States, &c2_enabled, &bootInfo->chameleonConfig);␊
-␉␉getBoolForKey(kEnableC3States, &c3_enabled, &bootInfo->chameleonConfig);␊
-␉␉getBoolForKey(kEnableC4States, &c4_enabled, &bootInfo->chameleonConfig);␊
+␉␉getBoolForKey(kEnableC2State, &c2_enabled, &bootInfo->chameleonConfig);␊
+␉␉getBoolForKey(kEnableC3State, &c3_enabled, &bootInfo->chameleonConfig);␊
+␉␉getBoolForKey(kEnableC4State, &c4_enabled, &bootInfo->chameleonConfig);␊
+        getBoolForKey(kCSTUsingSystemIO, &cst_using_sustemio, &bootInfo->chameleonConfig);␊
 ␉␉␊
 ␉␉c2_enabled = c2_enabled | (fadt->C2_Latency < 100);␊
 ␉␉c3_enabled = c3_enabled | (fadt->C3_Latency < 1000);␊
 ␉␉␉␉␉␉aml_add_byte(pack, cstates_count);␊
 ␉␉␊
 ␉␉␉␉␉␉struct aml_chunk* tmpl = aml_add_package(pack);␊
-␉␉␉␉␉␉␉cstate_resource_template[11] = 0x00; // C1␊
-␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
-␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x01); // C1␊
-␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x01); // Latency␊
-␉␉␉␉␉␉␉aml_add_word(tmpl, 0x03e8); // Power␊
+                            if (cst_using_sustemio) ␊
+                            {   ␊
+                                // C1␊
+                                resource_template_register_fixedhw[8] = 0x00; ␊
+                                resource_template_register_fixedhw[9] = 0x00; ␊
+                                resource_template_register_fixedhw[18] = 0x00; ␊
+                                aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
+                                aml_add_byte(tmpl, 0x01); // C1␊
+                                aml_add_word(tmpl, 0x0001); // Latency␊
+                                aml_add_dword(tmpl, 0x000003e8); // Power␊
+                                ␊
+                                uint8_t p_blk_lo, p_blk_hi;␊
+                                ␊
+                                if (c2_enabled) // C2␊
+                                {    ␊
+                                    p_blk_lo = acpi_cpu_p_blk + 4;␊
+                                    p_blk_hi = (acpi_cpu_p_blk + 4) >> 8;␊
+                                    ␊
+                                    tmpl = aml_add_package(pack);␊
+                                    resource_template_register_systemio[11] = p_blk_lo; // C2␊
+                                    resource_template_register_systemio[12] = p_blk_hi; // C2␊
+                                    aml_add_buffer(tmpl, resource_template_register_systemio, sizeof(resource_template_register_systemio));␊
+                                    aml_add_byte(tmpl, 0x02); // C2␊
+                                    aml_add_word(tmpl, 0x0040); // Latency␊
+                                    aml_add_dword(tmpl, 0x000001f4); // Power␊
+                                }␊
+                                                                ␊
+                                if (c4_enabled) // C4␊
+                                {␊
+                                    p_blk_lo = acpi_cpu_p_blk + 5;␊
+                                    p_blk_hi = (acpi_cpu_p_blk + 5) >> 8;␊
+                                    ␊
+                                    tmpl = aml_add_package(pack);␊
+                                    resource_template_register_systemio[11] = p_blk_lo; // C4␊
+                                    resource_template_register_systemio[12] = p_blk_hi; // C4␊
+                                    aml_add_buffer(tmpl, resource_template_register_systemio, sizeof(resource_template_register_systemio));␊
+                                    aml_add_byte(tmpl, 0x04); // C4␊
+                                    aml_add_word(tmpl, 0x0080); // Latency␊
+                                    aml_add_dword(tmpl, 0x000000C8); // Power␊
+                                }␊
+                                else if (c3_enabled) // C3␊
+                                {␊
+                                    p_blk_lo = acpi_cpu_p_blk + 5;␊
+                                    p_blk_hi = (acpi_cpu_p_blk + 5) >> 8;␊
+                                    ␊
+                                    tmpl = aml_add_package(pack);␊
+                                    resource_template_register_systemio[11] = p_blk_lo; // C3␊
+                                    resource_template_register_systemio[12] = p_blk_hi; // C3␊
+                                    aml_add_buffer(tmpl, resource_template_register_systemio, sizeof(resource_template_register_systemio));␊
+                                    aml_add_byte(tmpl, 0x03);           // C3␊
+                                    aml_add_word(tmpl, 0x0060);         // Latency␊
+                                    aml_add_dword(tmpl, 0x0000015e);    // Power␊
+                                }␊
 ␊
-␉␉␉␉␉␉// C2␊
-␉␉␉␉␉␉if (c2_enabled) ␊
-␉␉␉␉␉␉{␊
-␉␉␉␉␉␉␉tmpl = aml_add_package(pack);␊
-␉␉␉␉␉␉␉␉cstate_resource_template[11] = 0x10; // C2␊
-␉␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
-␉␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x02); // C2␊
-␉␉␉␉␉␉␉␉aml_add_byte(tmpl, fadt->C2_Latency);␊
-␉␉␉␉␉␉␉␉aml_add_word(tmpl, 0x01f4); // Power␊
-␉␉␉␉␉␉}␊
-␉␉␉␉␉␉// C4␊
-␉␉␉␉␉␉if (c4_enabled) ␊
-␉␉␉␉␉␉{␊
-␉␉␉␉␉␉␉tmpl = aml_add_package(pack);␊
-␉␉␉␉␉␉␉cstate_resource_template[11] = 0x30; // C4␊
-␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
-␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x04); // C4␊
-␉␉␉␉␉␉␉aml_add_word(tmpl, fadt->C3_Latency / 2); // TODO: right latency for C4␊
-␉␉␉␉␉␉␉aml_add_byte(tmpl, 0xfa); // Power␊
-␉␉␉␉␉␉}␊
-␉␉␉␉␉␉else␊
-␉␉␉␉␉␉// C3␊
-␉␉␉␉␉␉if (c3_enabled) ␊
-␉␉␉␉␉␉{␊
-␉␉␉␉␉␉␉tmpl = aml_add_package(pack);␊
-␉␉␉␉␉␉␉cstate_resource_template[11] = 0x20; // C3␊
-␉␉␉␉␉␉␉aml_add_buffer(tmpl, cstate_resource_template, sizeof(cstate_resource_template));␊
-␉␉␉␉␉␉␉aml_add_byte(tmpl, 0x03); // C3␊
-␉␉␉␉␉␉␉aml_add_word(tmpl, fadt->C3_Latency);␊
-␉␉␉␉␉␉␉aml_add_word(tmpl, 0x015e); // Power␊
-␉␉␉␉␉␉}␊
-␉␉␉␉␉␉␊
+                            }␊
+                            else ␊
+                            {␊
+                                // C1␊
+                                resource_template_register_fixedhw[11] = 0x00; // C1␊
+                                aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
+                                aml_add_byte(tmpl, 0x01);           // C1␊
+                                aml_add_word(tmpl, 0x0001);         // Latency␊
+                                aml_add_dword(tmpl, 0x000003e8);    // Power␊
+                                ␊
+                                resource_template_register_fixedhw[18] = 0x03;␊
+                                ␊
+                                if (c2_enabled) // C2␊
+                                {␊
+                                    tmpl = aml_add_package(pack);␊
+                                    resource_template_register_fixedhw[11] = 0x10; // C2␊
+                                    aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
+                                    aml_add_byte(tmpl, 0x02);           // C2␊
+                                    aml_add_word(tmpl, 0x0040);         // Latency␊
+                                    aml_add_dword(tmpl, 0x000001f4);    // Power␊
+                                }␊
+                                ␊
+                                if (c4_enabled) // C4␊
+                                {␊
+                                    tmpl = aml_add_package(pack);␊
+                                    resource_template_register_fixedhw[11] = 0x30; // C4␊
+                                    aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
+                                    aml_add_byte(tmpl, 0x04);           // C4␊
+                                    aml_add_word(tmpl, 0x0080);         // Latency␊
+                                    aml_add_dword(tmpl, 0x000000C8);    // Power␊
+                                }␊
+                                else if (c3_enabled) ␊
+                                {␊
+                                    tmpl = aml_add_package(pack);␊
+                                    resource_template_register_fixedhw[11] = 0x20; // C3␊
+                                    aml_add_buffer(tmpl, resource_template_register_fixedhw, sizeof(resource_template_register_fixedhw));␊
+                                    aml_add_byte(tmpl, 0x03);           // C3␊
+                                    aml_add_word(tmpl, 0x0060);         // Latency␊
+                                    aml_add_dword(tmpl, 0x0000015e);    // Power␊
+                                }␊
+                            }␊
+␉␉␉␉␉␉␉␉␉␉␉␉␉␊
 ␉␉␉␊
 ␉␉␉// Aliaces␊
 ␉␉␉int i;␊

-13
14 14
15 15
16
17
18
19
16 20
17 21
18 22
19 23
20 24
21 25
22 
23 
24 
26
27
28
29
30
25 31
26 32
27 33
+extern void scan_platform(void);␊
extern void dumpPhysAddr(const char * title, void * a, int len);␊
␊
/* CPUID Vendor */␊
#define CPUID_VENDOR_INTEL      0x756E6547␊
#define CPUID_VENDOR_AMD        0x68747541␊
␊
/* CPUID index into cpuid_raw */␊
#define CPUID_0␉␉␉␉0␊
#define CPUID_1␉␉␉␉1␊
#define CPUID_2␉␉␉␉2␊
#define CPUID_3␉␉␉␉3␊
#define CPUID_4␉␉␉␉4␊
#define CPUID_80␉␉␉5␊
#define CPUID_81␉␉␉6␊
#define CPUID_MAX␉␉␉7␊
#define CPUID_6␉␉␉␉5␊
#define CPUID_80␉␉␉6␊
#define CPUID_81␉␉␉7␊
#define CPUID_88␉␉␉8␊
#define CPUID_MAX␉␉␉9␊
␊
#define CPU_MODEL_YONAH␉␉␉0x0E␉␉␉// Sossaman, Yonah␊
#define CPU_MODEL_MEROM␉␉␉0x0F␉␉␉// Allendale, Conroe, Kentsfield, Woodcrest, Clovertown, Tigerton, Merom␊
 extern void scan_platform(void);␊
 extern void dumpPhysAddr(const char * title, void * a, int len);␊
 ␊
+/* CPUID Vendor */␊
+#define CPUID_VENDOR_INTEL      0x756E6547␊
+#define CPUID_VENDOR_AMD        0x68747541␊
+␊
 /* CPUID index into cpuid_raw */␊
 #define CPUID_0␉␉␉␉0␊
 #define CPUID_1␉␉␉␉1␊
 #define CPUID_2␉␉␉␉2␊
 #define CPUID_3␉␉␉␉3␊
 #define CPUID_4␉␉␉␉4␊
-#define CPUID_80␉␉␉5␊
-#define CPUID_81␉␉␉6␊
-#define CPUID_MAX␉␉␉7␊
+#define CPUID_6␉␉␉␉5␊
+#define CPUID_80␉␉␉6␊
+#define CPUID_81␉␉␉7␊
+#define CPUID_88␉␉␉8␊
+#define CPUID_MAX␉␉␉9␊
 ␊
 #define CPU_MODEL_YONAH␉␉␉0x0E␉␉␉// Sossaman, Yonah␊
 #define CPU_MODEL_MEROM␉␉␉0x0F␉␉␉// Allendale, Conroe, Kentsfield, Woodcrest, Clovertown, Tigerton, Merom␊

-10
11 11
12 12
13 
13
14 14
15 15
16 16
17 17
18 18
19 
19
20 20
21 21
22 22
... ...
28 28
29 29
30 30
31
32
33
31 34
32 35
33 36
+␊
extern void scan_cpu(PlatformInfo_t *);␊
␊
#define bit(n)␉␉␉(1UL << (n))␊
#define bit(n)␉␉␉(1ULL << (n))␊
#define bitmask(h,l)␉␉((bit(h)|(bit(h)-1)) & ~(bit(l)-1))␊
#define bitfield(x,h,l)␉␉(((x) & bitmask(h,l)) >> l)␊
␊
#define CPU_STRING_UNKNOWN␉␉"Unknown CPU Type"␊
␊
#define␉MSR_IA32_PERF_STATUS␉0x198␊
#define␉MSR_IA32_PERF_STATUS␉0x00000198␊
#define MSR_IA32_PERF_CONTROL␉0x199␊
#define MSR_IA32_EXT_CONFIG␉␉0x00EE␊
#define MSR_FLEX_RATIO␉␉␉0x194␊

#define K8_FIDVID_STATUS␉␉0xC0010042␊
#define K10_COFVID_STATUS␉␉0xC0010071␊
␊
#define MSR_AMD_MPERF           0x000000E7␊
#define MSR_AMD_APERF           0x000000E8␊
␊
#define DEFAULT_FSB␉␉100000          /* for now, hardcoding 100MHz for old CPUs */␊
␊
// DFE: This constant comes from older xnu:␊
 ...
 ␊
 extern void scan_cpu(PlatformInfo_t *);␊
 ␊
-#define bit(n)␉␉␉(1UL << (n))␊
+#define bit(n)␉␉␉(1ULL << (n))␊
 #define bitmask(h,l)␉␉((bit(h)|(bit(h)-1)) & ~(bit(l)-1))␊
 #define bitfield(x,h,l)␉␉(((x) & bitmask(h,l)) >> l)␊
 ␊
 #define CPU_STRING_UNKNOWN␉␉"Unknown CPU Type"␊
 ␊
-#define␉MSR_IA32_PERF_STATUS␉0x198␊
+#define␉MSR_IA32_PERF_STATUS␉0x00000198␊
 #define MSR_IA32_PERF_CONTROL␉0x199␊
 #define MSR_IA32_EXT_CONFIG␉␉0x00EE␊
 #define MSR_FLEX_RATIO␉␉␉0x194␊
 #define K8_FIDVID_STATUS␉␉0xC0010042␊
 #define K10_COFVID_STATUS␉␉0xC0010071␊
 ␊
+#define MSR_AMD_MPERF           0x000000E7␊
+#define MSR_AMD_APERF           0x000000E8␊
+␊
 #define DEFAULT_FSB␉␉100000          /* for now, hardcoding 100MHz for old CPUs */␊
 ␊
 // DFE: This constant comes from older xnu:␊

-503
504 504
505 505
506 
506
507 507
508 508
509 509
... ...
646 646
647 647
648 648
649
649 650
650 
651 651
652 652
653
653 654
654 
655 655
656 656
657 657
+␊
      // NOTE: Values are defined by apple as being in com.apple.Boot.plist␊
      //        kHelperRootUUIDKey, kKernelArchKey, kMKextCacheKey, kKernelCacheKey, kKernelNameKey, kKernelFlagsKey␊
      if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, "mach_kernel") == 0))␊
      if (ret && (strcmp(key, kKernelNameKey) == 0) && (overrideSize == 0))␊
        override = false;␊
␊
      if (ret && (strcmp(key, kKernelFlagsKey) == 0) && (overrideSize == 0))␊

{␊
␉char *dirspec[] = {␊
␉␉"rd(0,0)/Extra/org.chameleon.Boot.plist",␊
␉␉"/Extra/org.chameleon.Boot.plist",␊
␉␉"bt(0,0)/Extra/org.chameleon.Boot.plist",␊
␉␉"/Extra/org.chameleon.Boot.plist",␊
␉␉␊
␉␉"rd(0,0)/Extra/com.apple.Boot.plist",   /* DEPRECIATED */␊
␉␉"/Extra/com.apple.Boot.plist",           /* DEPRECIATED */␊
␉␉"bt(0,0)/Extra/com.apple.Boot.plist",   /* DEPRECIATED */␊
␉␉"/Extra/com.apple.Boot.plist"           /* DEPRECIATED */␊
␉};␊
␊
␉int i, fd, count, ret=-1;␊
 ...
 ␊
       // NOTE: Values are defined by apple as being in com.apple.Boot.plist␊
       //        kHelperRootUUIDKey, kKernelArchKey, kMKextCacheKey, kKernelCacheKey, kKernelNameKey, kKernelFlagsKey␊
-      if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, "mach_kernel") == 0))␊
+      if (ret && (strcmp(key, kKernelNameKey) == 0) && (overrideSize == 0))␊
         override = false;␊
 ␊
       if (ret && (strcmp(key, kKernelFlagsKey) == 0) && (overrideSize == 0))␊
 {␊
 ␉char *dirspec[] = {␊
 ␉␉"rd(0,0)/Extra/org.chameleon.Boot.plist",␊
+␉␉"/Extra/org.chameleon.Boot.plist",␊
 ␉␉"bt(0,0)/Extra/org.chameleon.Boot.plist",␊
-␉␉"/Extra/org.chameleon.Boot.plist",␊
 ␉␉␊
 ␉␉"rd(0,0)/Extra/com.apple.Boot.plist",   /* DEPRECIATED */␊
+␉␉"/Extra/com.apple.Boot.plist",           /* DEPRECIATED */␊
 ␉␉"bt(0,0)/Extra/com.apple.Boot.plist",   /* DEPRECIATED */␊
-␉␉"/Extra/com.apple.Boot.plist"           /* DEPRECIATED */␊
 ␉};␊
 ␊
 ␉int i, fd, count, ret=-1;␊

-315
316 316
317 317
318 
319 
320 
321 
322 
323 
324 
325 318
326 319
327 320
328 321
329 322
330 
331 
332 323
333 324
334 325
335 
336 
337 
338 
339 
340 
341 
342 326
343 327
344 328
345 329
346 330
347 
348 331
349 332
350 333
+    jne␉    .Pass2␊
␊
.Pass1:␊
%if CONFIG_BOOT0_HFSFIRST␊
    cmp␉    BYTE [si + part.type], kPartTypeHFS␉␉; In pass 1 we're going to find a HFS+ partition␊
                                                    ; equipped with boot1h in its boot record␊
                                                    ; regardless if it's active or not.␊
    jne     .continue␊
  ␉mov␉␉dh, 1                ␉␉␉␉␉; Argument for loadBootSector to check HFS+ partition signature.␊
%else␊
    cmp     BYTE [si + part.bootid], kPartActive␉; In pass 1 we are walking on the standard path␊
                                                    ; by trying to hop on the active partition.␊
    jne     .continue␊
    xor␉  ␉dh, dh               ␉␉␉␉␉; Argument for loadBootSector to skip HFS+ partition␊
␉␉␉␉␉␉␉␉␉␉␉        ; signature check.␊
%endif␊
␊
    jmp     .tryToBoot␊
␊
.Pass2:    ␊
%if CONFIG_BOOT0_HFSFIRST␊
    cmp     BYTE [si + part.bootid], kPartActive␉; In pass 2 we are walking on the standard path␊
                                                    ; by trying to hop on the active partition.␊
    jne     .continue␊
    xor␉␉dh, dh               ␉␉␉␉␉; Argument for loadBootSector to skip HFS+ partition␊
␉␉␉␉␉␉␉␉␉␉␉        ; signature check.␊
%else␊
    cmp␉    BYTE [si + part.type], kPartTypeHFS␉␉; In pass 2 we're going to find a HFS+ partition␊
                                                    ; equipped with boot1h in its boot record␊
                                                    ; regardless if it's active or not.␊
    jne     .continue␊
  ␉mov ␉dh, 1                ␉␉␉␉␉; Argument for loadBootSector to check HFS+ partition signature.␊
%endif␊
␊
    DebugChar('*')␊
␊
     jne␉    .Pass2␊
 ␊
 .Pass1:␊
-%if CONFIG_BOOT0_HFSFIRST␊
-    cmp␉    BYTE [si + part.type], kPartTypeHFS␉␉; In pass 1 we're going to find a HFS+ partition␊
-                                                    ; equipped with boot1h in its boot record␊
-                                                    ; regardless if it's active or not.␊
-    jne     .continue␊
-  ␉mov␉␉dh, 1                ␉␉␉␉␉; Argument for loadBootSector to check HFS+ partition signature.␊
-%else␊
     cmp     BYTE [si + part.bootid], kPartActive␉; In pass 1 we are walking on the standard path␊
                                                     ; by trying to hop on the active partition.␊
     jne     .continue␊
     xor␉  ␉dh, dh               ␉␉␉␉␉; Argument for loadBootSector to skip HFS+ partition␊
 ␉␉␉␉␉␉␉␉␉␉␉        ; signature check.␊
-%endif␊
-␊
     jmp     .tryToBoot␊
 ␊
 .Pass2:    ␊
-%if CONFIG_BOOT0_HFSFIRST␊
-    cmp     BYTE [si + part.bootid], kPartActive␉; In pass 2 we are walking on the standard path␊
-                                                    ; by trying to hop on the active partition.␊
-    jne     .continue␊
-    xor␉␉dh, dh               ␉␉␉␉␉; Argument for loadBootSector to skip HFS+ partition␊
-␉␉␉␉␉␉␉␉␉␉␉        ; signature check.␊
-%else␊
     cmp␉    BYTE [si + part.type], kPartTypeHFS␉␉; In pass 2 we're going to find a HFS+ partition␊
                                                     ; equipped with boot1h in its boot record␊
                                                     ; regardless if it's active or not.␊
     jne     .continue␊
   ␉mov ␉dh, 1                ␉␉␉␉␉; Argument for loadBootSector to check HFS+ partition signature.␊
-%endif␊
 ␊
     DebugChar('*')␊
 ␊

-
2 
3 
4 
5 
6 
7 
8 1
9 2
10 3
+config BOOT0_HFSFIRST␊
␉bool "boot0 HFS prefered"␊
␉default y␊
␉help␊
␉  Say Y here if you want boot0 to attempt to boot the first␊
␉  hfs partition found, instead of the active partition.␊
␊
config BOOT0_DEBUG␊
␉bool "boot0 debug support"␊
␉default n␊
-config BOOT0_HFSFIRST␊
-␉bool "boot0 HFS prefered"␊
-␉default y␊
-␉help␊
-␉  Say Y here if you want boot0 to attempt to boot the first␊
-␉  hfs partition found, instead of the active partition.␊
-␊
 config BOOT0_DEBUG␊
 ␉bool "boot0 debug support"␊
 ␉default n␊

-13
14 14
15 15
16 
16
17 17
18 18
19 19
+DIRS_NEEDED = $(SYMROOT)␊
␊
␊
OBJECTS  = boot0 chain0␊
OBJECTS  = boot0 boot0hfs boot0md chain0␊
OBJECTS := $(addprefix $(SYMROOT)/, $(OBJECTS))␊
␊
all: $(DIRS_NEEDED) $(OBJECTS)␊
 DIRS_NEEDED = $(SYMROOT)␊
 ␊
 ␊
-OBJECTS  = boot0 chain0␊
+OBJECTS  = boot0 boot0hfs boot0md chain0␊
 OBJECTS := $(addprefix $(SYMROOT)/, $(OBJECTS))␊
 ␊
 all: $(DIRS_NEEDED) $(OBJECTS)␊

-746
747 747
748 748
749 
750 
749
750
751
752
751 753
752 
754
753 755
754 756
755 757
756 
757 758
758 759
759 760
+  ␊
    if (length == -1) return -1;␊
␊
#if 0   /** remove this check. **/   ␊
    if (strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)␊
    ␊
    if (!(gBootMode & kBootModeSafe) &&␊
        XMLGetProperty(moduleDict, kPropOSBundleRequired) && ␊
        strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)␊
    {␊
        // Don't load Safe Boot kexts. NOTE: -x should be check too.␊
        // Don't load Safe Boot kexts if -x not specified.␊
        XMLFreeTag(moduleDict);␊
        return -2;␊
    }␊
#endif ␊
␊
    tmpModule = malloc(sizeof(Module));␊
    if (tmpModule == 0)␊
   ␊
     if (length == -1) return -1;␊
 ␊
-#if 0   /** remove this check. **/   ␊
-    if (strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)␊
+    ␊
+    if (!(gBootMode & kBootModeSafe) &&␊
+        XMLGetProperty(moduleDict, kPropOSBundleRequired) && ␊
+        strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)␊
     {␊
-        // Don't load Safe Boot kexts. NOTE: -x should be check too.␊
+        // Don't load Safe Boot kexts if -x not specified.␊
         XMLFreeTag(moduleDict);␊
         return -2;␊
     }␊
-#endif ␊
 ␊
     tmpModule = malloc(sizeof(Module));␊
     if (tmpModule == 0)␊

-520
521 521
522 522
523
523 524
524 525
525 526
526 527
527 528
528 529
529 
530
530 531
531 532
532 533
533 534
534 535
535 
536 
537 
536
538 537
539 538
540 539
... ...
573 572
574 573
575 574
575
576 576
577
577 578
578 579
579 580
... ...
695 696
696 697
697 698
698 
699
699 700
700 
701
701 702
702 
703
703 704
704 
705 
706 
707 
708 
709 
710 
705
706
707
711 708
712 709
713 710
714 
715 
711
712
713
714
715
716
717
716 718
717 
718 719
719 
720
720 721
721 722
722 723
723 
724
725
724 726
725 727
726 
728
729
727 730
728 731
729 732
730 733
731 734
732 735
733 
736
737
734 738
735 739
736 740
737 
741
742
738 743
739 744
740 745
+␉␉} else {␊
␉␉␉archCpuType = CPU_TYPE_I386;␊
␉␉}␊
␉␉␊
␉␉if (getValueForKey(karch, &val, &len, &bootInfo->chameleonConfig)) {␊
␉␉␉if (strncmp(val, "i386", 4) == 0) {␊
␉␉␉␉archCpuType = CPU_TYPE_I386;␊
␉␉␉}␊
␉␉}␊
        ␊
        if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {␊
        ␉if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {␊
␉␉␉if (strncmp(val, "i386", 4) == 0) {␊
␉␉␉␉archCpuType = CPU_TYPE_I386;␊
␉␉␉}␊
␉␉}␊
␊
        //archCpuType = CPU_TYPE_I386;␊
        ␊
␉␉// Notify moduals that we are attempting to boot␊
␉␉// Notify modules that we are attempting to boot␊
␉␉execute_hook("PreBoot", NULL, NULL, NULL, NULL);␊
␊
␉␉if (!getBoolForKey (kWake, &tryresume, &bootInfo->chameleonConfig)) {␊

␉␉␉␉break;␊
␉␉␉␊
␉␉␉if (!forceresume && ((sleeptime+3)<bvr->modTime)) {␊
#if DEBUG    ␊
␉␉␉␉printf ("Hibernate image is too old by %d seconds. Use ForceWake=y to override\n",bvr->modTime-sleeptime);␊
#endif                ␊
␉␉␉␉break;␊
␉␉␉}␊
␉␉␉␉␊

␉␉␉␉␊
␉␉␉␉verbose("Kernel cache did not load %s\n ", bootFile);␊
            }␊
␉␉␉␊
            ␊
            bootFile = bootInfo->bootFile;␊
␊
            ␊
            // Try to load kernel image from alternate locations on boot helper partitions.␊
            sprintf(bootFileSpec, "com.apple.boot.P/%s", bootFile);␊
            sprintf(bootFileSpec, "com.apple.boot.P%s", bootFile);␊
            ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
  ␉  ␉    if (ret == -1)␊
  ␉  ␉    {␊
              sprintf(bootFileSpec, "com.apple.boot.R/%s", bootFile);␊
              ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
              if (ret == -1)␊
              {␊
                sprintf(bootFileSpec, "com.apple.boot.S/%s", bootFile);␊
            if (ret == -1)␊
            {␊
                sprintf(bootFileSpec, "com.apple.boot.R%s", bootFile);␊
                ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
                if (ret == -1)␊
                {␊
                  // No alternate location found, using the original kernel image path.␊
                  strcpy(bootFileSpec, bootFile);␊
                    sprintf(bootFileSpec, "com.apple.boot.S%s", bootFile);␊
                    ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
                    if (ret == -1)␊
                    {␊
                        // No alternate location found, using the original kernel image path.␊
                        strcpy(bootFileSpec, bootFile);␊
                    }␊
                }␊
              }␊
            }␊
            ␉␉␉␊
␉␉␉␉␉␉␊
            if (checkOSVersion("10.7"))␊
            {␊
                //Lion, dont load kernel if haz cache␊
                if (!trycache) {␊
                if (!trycache) ␊
                {␊
            ␉␉verbose("Loading kernel %s\n", bootFileSpec);␊
            ␉␉ret = LoadThinFatFile(bootFileSpec, &binary);␊
            ␉␉if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) {␊
            ␉␉if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) ␊
                    {␊
              ␉␉␉archCpuType = CPU_TYPE_I386;␊
              ␉␉␉ret = LoadThinFatFile(bootFileSpec, &binary);␉␉␉␉␊
            ␉␉}␊
␉␉        } ␊
␉␉␉␉else ret = 1;␊
            } ␊
␉␉␉else {␊
␉␉␉else ␊
            {␊
                //Snow Leopard or older␊
                verbose("Loading kernel %s\n", bootFileSpec);␊
                ret = LoadThinFatFile(bootFileSpec, &binary);␊
                if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) {␊
                if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) ␊
                {␊
                    archCpuType = CPU_TYPE_I386;␊
                    ret = LoadThinFatFile(bootFileSpec, &binary);␉␉␉␉␊
                }␊
 ...
 ...
 ␉␉} else {␊
 ␉␉␉archCpuType = CPU_TYPE_I386;␊
 ␉␉}␊
+␉␉␊
 ␉␉if (getValueForKey(karch, &val, &len, &bootInfo->chameleonConfig)) {␊
 ␉␉␉if (strncmp(val, "i386", 4) == 0) {␊
 ␉␉␉␉archCpuType = CPU_TYPE_I386;␊
 ␉␉␉}␊
 ␉␉}␊
         ␊
-        if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {␊
+        ␉if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {␊
 ␉␉␉if (strncmp(val, "i386", 4) == 0) {␊
 ␉␉␉␉archCpuType = CPU_TYPE_I386;␊
 ␉␉␉}␊
 ␉␉}␊
 ␊
-        //archCpuType = CPU_TYPE_I386;␊
-        ␊
-␉␉// Notify moduals that we are attempting to boot␊
+␉␉// Notify modules that we are attempting to boot␊
 ␉␉execute_hook("PreBoot", NULL, NULL, NULL, NULL);␊
 ␊
 ␉␉if (!getBoolForKey (kWake, &tryresume, &bootInfo->chameleonConfig)) {␊
 ␉␉␉␉break;␊
 ␉␉␉␊
 ␉␉␉if (!forceresume && ((sleeptime+3)<bvr->modTime)) {␊
+#if DEBUG    ␊
 ␉␉␉␉printf ("Hibernate image is too old by %d seconds. Use ForceWake=y to override\n",bvr->modTime-sleeptime);␊
+#endif                ␊
 ␉␉␉␉break;␊
 ␉␉␉}␊
 ␉␉␉␉␊
 ␉␉␉␉␊
 ␉␉␉␉verbose("Kernel cache did not load %s\n ", bootFile);␊
             }␊
-␉␉␉␊
+            ␊
             bootFile = bootInfo->bootFile;␊
-␊
+            ␊
             // Try to load kernel image from alternate locations on boot helper partitions.␊
-            sprintf(bootFileSpec, "com.apple.boot.P/%s", bootFile);␊
+            sprintf(bootFileSpec, "com.apple.boot.P%s", bootFile);␊
             ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
-  ␉  ␉    if (ret == -1)␊
-  ␉  ␉    {␊
-              sprintf(bootFileSpec, "com.apple.boot.R/%s", bootFile);␊
-              ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
-              if (ret == -1)␊
-              {␊
-                sprintf(bootFileSpec, "com.apple.boot.S/%s", bootFile);␊
+            if (ret == -1)␊
+            {␊
+                sprintf(bootFileSpec, "com.apple.boot.R%s", bootFile);␊
                 ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
                 if (ret == -1)␊
                 {␊
-                  // No alternate location found, using the original kernel image path.␊
-                  strcpy(bootFileSpec, bootFile);␊
+                    sprintf(bootFileSpec, "com.apple.boot.S%s", bootFile);␊
+                    ret = GetFileInfo(NULL, bootFileSpec, &flags, &time); ␊
+                    if (ret == -1)␊
+                    {␊
+                        // No alternate location found, using the original kernel image path.␊
+                        strcpy(bootFileSpec, bootFile);␊
+                    }␊
                 }␊
-              }␊
             }␊
-            ␉␉␉␊
+␉␉␉␉␉␉␊
             if (checkOSVersion("10.7"))␊
             {␊
                 //Lion, dont load kernel if haz cache␊
-                if (!trycache) {␊
+                if (!trycache) ␊
+                {␊
             ␉␉verbose("Loading kernel %s\n", bootFileSpec);␊
             ␉␉ret = LoadThinFatFile(bootFileSpec, &binary);␊
-            ␉␉if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) {␊
+            ␉␉if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) ␊
+                    {␊
               ␉␉␉archCpuType = CPU_TYPE_I386;␊
               ␉␉␉ret = LoadThinFatFile(bootFileSpec, &binary);␉␉␉␉␊
             ␉␉}␊
 ␉␉        } ␊
 ␉␉␉␉else ret = 1;␊
             } ␊
-␉␉␉else {␊
+␉␉␉else ␊
+            {␊
                 //Snow Leopard or older␊
                 verbose("Loading kernel %s\n", bootFileSpec);␊
                 ret = LoadThinFatFile(bootFileSpec, &binary);␊
-                if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) {␊
+                if (ret <= 0 && archCpuType == CPU_TYPE_X86_64) ␊
+                {␊
                     archCpuType = CPU_TYPE_I386;␊
                     ret = LoadThinFatFile(bootFileSpec, &binary);␉␉␉␉␊
                 }␊

-80
81 81
82 82
83 
84 
85 
83
84
85
86
86 87
87 88
88 89
... ...
107 108
108 109
109 110
111
110 112
111 113
112 114
+#define kRestartFix␉␉␉"RestartFix"␉␉/* acpi_patcher.c */␊
#define kGeneratePStates␉"GeneratePStates"␉/* acpi_patcher.c */␊
#define kGenerateCStates␉"GenerateCStates"␉/* acpi_patcher.c */␊
#define kEnableC2States␉␉"EnableC2State"␉␉/* acpi_patcher.c */␊
#define kEnableC3States␉␉"EnableC3State"␉␉/* acpi_patcher.c */␊
#define kEnableC4States␉␉"EnableC4State"␉␉/* acpi_patcher.c */␊
#define kCSTUsingSystemIO␉"CSTUsingSystemIO"␉/* acpi_patcher.c */␊
#define kEnableC2State␉␉"EnableC2State"␉␉/* acpi_patcher.c */␊
#define kEnableC3State␉␉"EnableC3State"␉␉/* acpi_patcher.c */␊
#define kEnableC4State␉␉"EnableC4State"␉␉/* acpi_patcher.c */␊
␊
#define kWake␉␉␉␉"Wake"␉␉␉␉/* boot.c */␊
#define kForceWake␉␉␉"ForceWake"␉␉␉/* boot.c */␊

␊
#define kUseAtiROM␉␉␉"UseAtiROM"␉␉␉/* ati.c */␊
#define kAtiConfig␉␉␉"AtiConfig"␉␉␉/* ati.c */␊
#define kAtiPorts␉␉␉"AtiPorts"␉␉␉/* ati.c */␊
#define kATYbinimage␉␉"ATYbinimage"␉␉/* ati.c */␊
␊
#define kUseNvidiaROM␉␉"UseNvidiaROM"␉␉/* nvidia.c */␊
 ...
 #define kRestartFix␉␉␉"RestartFix"␉␉/* acpi_patcher.c */␊
 #define kGeneratePStates␉"GeneratePStates"␉/* acpi_patcher.c */␊
 #define kGenerateCStates␉"GenerateCStates"␉/* acpi_patcher.c */␊
-#define kEnableC2States␉␉"EnableC2State"␉␉/* acpi_patcher.c */␊
-#define kEnableC3States␉␉"EnableC3State"␉␉/* acpi_patcher.c */␊
-#define kEnableC4States␉␉"EnableC4State"␉␉/* acpi_patcher.c */␊
+#define kCSTUsingSystemIO␉"CSTUsingSystemIO"␉/* acpi_patcher.c */␊
+#define kEnableC2State␉␉"EnableC2State"␉␉/* acpi_patcher.c */␊
+#define kEnableC3State␉␉"EnableC3State"␉␉/* acpi_patcher.c */␊
+#define kEnableC4State␉␉"EnableC4State"␉␉/* acpi_patcher.c */␊
 ␊
 #define kWake␉␉␉␉"Wake"␉␉␉␉/* boot.c */␊
 #define kForceWake␉␉␉"ForceWake"␉␉␉/* boot.c */␊
 ␊
 #define kUseAtiROM␉␉␉"UseAtiROM"␉␉␉/* ati.c */␊
 #define kAtiConfig␉␉␉"AtiConfig"␉␉␉/* ati.c */␊
+#define kAtiPorts␉␉␉"AtiPorts"␉␉␉/* ati.c */␊
 #define kATYbinimage␉␉"ATYbinimage"␉␉/* ati.c */␊
 ␊
 #define kUseNvidiaROM␉␉"UseNvidiaROM"␉␉/* nvidia.c */␊

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">␊
<html>␊
<head>␊
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">␊
  <meta http-equiv="Content-Style-Type" content="text/css">␊
  <title></title>␊
  <style type="text/css">␊
    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 11.0px Lucida Grande;}␊
  </style>␊
</head>␊
<body>␊
<p class="p1">Chameleon квинтэссенцией технологий развитых для загрузки OSX,␊
<br />Он основан на проекте Apple's boot-132 <br /> и дополнен следующими функциями:</p>␊
<br /> ␊
<p class="p1">Новые возможности Chameleon 2.0</p>␊
<br>␊
<p class="p1">   - Эмуляция EFI.</p>␊
<p class="p1">   - Замена таблиц ACPI на более подходящие.</p>␊
<p class="p1">   - Исправления таблиц DMI на нужные.</p>␊
<p class="p1">   - Присвоение свойств встроенным устройствам, необходимых для запуска.</p>␊
<p class="p1">   - Запуск технологии энергосбережения.</p>␊
<br>␊
<p class="p1">   - Настраиваемый внешний вид.</p>␊
<p class="p1">   - Распознавание разных схем разделов диска.</p>␊
<p class="p1">   - Возможность установки на HDD, DVD и на USB.</p>␊
<p class="p1">   - другие технологии Apple.</p>␊
<br />  ␊
<p class="p1">Для детальной информации смотрите на сайте : <a href="http://www.applelife.ru">http://www.applelife.ru</a></p>␊
</body>␊
</html>␊
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">␊
+<html>␊
+<head>␊
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">␊
+  <meta http-equiv="Content-Style-Type" content="text/css">␊
+  <title></title>␊
+  <style type="text/css">␊
+    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 11.0px Lucida Grande;}␊
+  </style>␊
+</head>␊
+<body>␊
+<p class="p1">Chameleon квинтэссенцией технологий развитых для загрузки OSX,␊
+<br />Он основан на проекте Apple's boot-132 <br /> и дополнен следующими функциями:</p>␊
+<br /> ␊
+<p class="p1">Новые возможности Chameleon 2.0</p>␊
+<br>␊
+<p class="p1">   - Эмуляция EFI.</p>␊
+<p class="p1">   - Замена таблиц ACPI на более подходящие.</p>␊
+<p class="p1">   - Исправления таблиц DMI на нужные.</p>␊
+<p class="p1">   - Присвоение свойств встроенным устройствам, необходимых для запуска.</p>␊
+<p class="p1">   - Запуск технологии энергосбережения.</p>␊
+<br>␊
+<p class="p1">   - Настраиваемый внешний вид.</p>␊
+<p class="p1">   - Распознавание разных схем разделов диска.</p>␊
+<p class="p1">   - Возможность установки на HDD, DVD и на USB.</p>␊
+<p class="p1">   - другие технологии Apple.</p>␊
+<br />  ␊
+<p class="p1">Для детальной информации смотрите на сайте : <a href="http://www.applelife.ru">http://www.applelife.ru</a></p>␊
+</body>␊
+</html>␊

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360␊
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}␊
{\colortbl;\red255\green255\blue255;\red65\green78\blue255;}␊
\margl1440\margr1440\vieww11660\viewh12980\viewkind0␊
\pard\ri0\qc␊
␊
\f0\b\fs72 \cf0 Chameleon␊
\fs50 \␊
␊
\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%␊
\fs50 \␊
\␊
\cf2 %CHAMELEONSTAGE%␊
\fs26 \cf0 \␊
\pard\ri0\ql\qnatural␊
\cf0 \␊
\␊
\␊
Developers:  zef,  Turbo, dfe, netkas, mackerintel, fassl, Kabyl, kaitek, iNDi,  asereBLN, mozodojo, meklort, AzimutZ, Slice\␊
\␊
\␊
Thanks to : JrCs, mercurysquad, munky, rekursor,  cosmolt, kalyway, Krazubu, THeKiNG, XyZ, blackosx, DHP,  cparm\␊
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
␊
\b0\fs30 \cf0 \␊
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
␊
\fs26 \cf0 Copyright \'a9 2011}
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360␊
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}␊
+{\colortbl;\red255\green255\blue255;\red65\green78\blue255;}␊
+\margl1440\margr1440\vieww11660\viewh12980\viewkind0␊
+\pard\ri0\qc␊
+␊
+\f0\b\fs72 \cf0 Chameleon␊
+\fs50 \␊
+␊
+\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%␊
+\fs50 \␊
+\␊
+\cf2 %CHAMELEONSTAGE%␊
+\fs26 \cf0 \␊
+\pard\ri0\ql\qnatural␊
+\cf0 \␊
+\␊
+\␊
+Developers:  zef,  Turbo, dfe, netkas, mackerintel, fassl, Kabyl, kaitek, iNDi,  asereBLN, mozodojo, meklort, AzimutZ, Slice\␊
+\␊
+\␊
+Thanks to : JrCs, mercurysquad, munky, rekursor,  cosmolt, kalyway, Krazubu, THeKiNG, XyZ, blackosx, DHP,  cparm\␊
+\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
+␊
+\b0\fs30 \cf0 \␊
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
+␊
+\fs26 \cf0 Copyright \'a9 2011}

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360␊
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}␊
{\colortbl;\red255\green255\blue255;\red65\green78\blue255;\red255\green0\blue0;}␊
\margl1440\margr1440\vieww11660\viewh12980\viewkind0␊
\pard\ri0\qc␊
␊
\f0\b\fs72 \cf0 Chameleon␊
\fs50 \␊
␊
\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%␊
\fs50 \␊
\␊
\cf2 %CHAMELEONSTAGE%\cf0 \␊
\pard\ri0\ql\qnatural␊
␊
\fs26 \cf0 \␊
\pard\ri0\qc␊
␊
\fs50 \cf3 \uc0\u1059 \u1089 \u1090 \u1072 \u1085 \u1086 \u1074 \u1082 \u1072  \u1074 \u1099 \u1087 \u1086 \u1083 \u1085 \u1077 \u1085 \u1072 !␊
\b0\fs26 \cf0 \␊
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
␊
\fs18 \cf0 \␊
{\field{\*\fldinst{HYPERLINK "http://chameleon.osx86.hu/"}}{\fldrslt ␊
\fs26 http://www.applelife.ru/topic/23967-%d0%bd%d0%be%d0%b2%d1%8b%d0%b9-%d1%85%d0%b0%d0%bc%d0%b5%d0%bb%d0%b5%d0%be%d0%bd/}}␊
\fs26 \␊
{\field{\*\fldinst{HYPERLINK "http://forum.voodooprojects.org/index.php"}}{\fldrslt http://forum.voodooprojects.org/index.php}}␊
\b \␊
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
␊
\b0\fs30 \cf0 \␊
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
␊
\fs26 \cf0 Copyright \'a9 2011}
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360␊
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}␊
+{\colortbl;\red255\green255\blue255;\red65\green78\blue255;\red255\green0\blue0;}␊
+\margl1440\margr1440\vieww11660\viewh12980\viewkind0␊
+\pard\ri0\qc␊
+␊
+\f0\b\fs72 \cf0 Chameleon␊
+\fs50 \␊
+␊
+\fs26 v%CHAMELEONVERSION% r%CHAMELEONREVISION%␊
+\fs50 \␊
+\␊
+\cf2 %CHAMELEONSTAGE%\cf0 \␊
+\pard\ri0\ql\qnatural␊
+␊
+\fs26 \cf0 \␊
+\pard\ri0\qc␊
+␊
+\fs50 \cf3 \uc0\u1059 \u1089 \u1090 \u1072 \u1085 \u1086 \u1074 \u1082 \u1072  \u1074 \u1099 \u1087 \u1086 \u1083 \u1085 \u1077 \u1085 \u1072 !␊
+\b0\fs26 \cf0 \␊
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
+␊
+\fs18 \cf0 \␊
+{\field{\*\fldinst{HYPERLINK "http://chameleon.osx86.hu/"}}{\fldrslt ␊
+\fs26 http://www.applelife.ru/topic/23967-%d0%bd%d0%be%d0%b2%d1%8b%d0%b9-%d1%85%d0%b0%d0%bc%d0%b5%d0%bb%d0%b5%d0%be%d0%bd/}}␊
+\fs26 \␊
+{\field{\*\fldinst{HYPERLINK "http://forum.voodooprojects.org/index.php"}}{\fldrslt http://forum.voodooprojects.org/index.php}}␊
+\b \␊
+\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
+␊
+\b0\fs30 \cf0 \␊
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
+␊
+\fs26 \cf0 Copyright \'a9 2011}

-
2
3
4
5
6
7
8
9
10
11
12
13
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360␊
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}␊
{\colortbl;\red255\green255\blue255;}␊
\vieww22060\viewh14020\viewkind0␊
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
␊
\f0\b\fs20 \cf0 \uc0\u1056 \u1091 \u1089 \u1089 \u1082 \u1080 \u1081 \␊
\␊
\uc0\u1051 \u1080 \u1094 \u1077 \u1085 \u1079 \u1080 \u1103  \u1085 \u1072  \u1061 \u1072 \u1084 \u1077 \u1083 \u1077 \u1086 \u1085  \u1087 \u1086 \u1076 \u1088 \u1072 \u1079 \u1091 \u1084 \u1077 \u1074 \u1072 \u1077 \u1090 , \u1095 \u1090 \u1086  \u1085 \u1080 \u1082 \u1090 \u1086  \u1085 \u1080  \u1079 \u1072  \u1095 \u1090 \u1086  \␊
\uc0\u1085 \u1077  \u1086 \u1090 \u1074 \u1077 \u1095 \u1072 \u1077 \u1090 . \u1048 \u1089 \u1087 \u1086 \u1083 \u1100 \u1079 \u1091 \u1081 \u1090 \u1077  \u1085 \u1072  \u1089 \u1074 \u1086 \u1081  \u1089 \u1090 \u1088 \u1072 \u1093  \u1080  \u1088 \u1080 \u1089 \u1082 .\␊
␊
\b0 \␊
Rev. 18/07/2011}
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360␊
+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}␊
+{\colortbl;\red255\green255\blue255;}␊
+\vieww22060\viewh14020\viewkind0␊
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural␊
+␊
+\f0\b\fs20 \cf0 \uc0\u1056 \u1091 \u1089 \u1089 \u1082 \u1080 \u1081 \␊
+\␊
+\uc0\u1051 \u1080 \u1094 \u1077 \u1085 \u1079 \u1080 \u1103  \u1085 \u1072  \u1061 \u1072 \u1084 \u1077 \u1083 \u1077 \u1086 \u1085  \u1087 \u1086 \u1076 \u1088 \u1072 \u1079 \u1091 \u1084 \u1077 \u1074 \u1072 \u1077 \u1090 , \u1095 \u1090 \u1086  \u1085 \u1080 \u1082 \u1090 \u1086  \u1085 \u1080  \u1079 \u1072  \u1095 \u1090 \u1086  \␊
+\uc0\u1085 \u1077  \u1086 \u1090 \u1074 \u1077 \u1095 \u1072 \u1077 \u1090 . \u1048 \u1089 \u1087 \u1086 \u1083 \u1100 \u1079 \u1091 \u1081 \u1090 \u1077  \u1085 \u1072  \u1089 \u1074 \u1086 \u1081  \u1089 \u1090 \u1088 \u1072 \u1093  \u1080  \u1088 \u1080 \u1089 \u1082 .\␊
+␊
+\b0 \␊
+Rev. 18/07/2011}

-48
49 49
50 50
51 
51
52 52
53 53
54 54
... ...
88 88
89 89
90 90
91 
91
92 92
93 93
94 94
+␉cp -f ${1%/*}/i386/cdboot ${1}/Core/Root/usr/standalone/i386␊
␉cp -f ${1%/*}/i386/chain0 ${1}/Core/Root/usr/standalone/i386␊
␉fixperms "${1}/Core/Root/"␊
␉cp -f ${pkgroot}/fdisk ${1}/Core/Root/usr/sbin␊
␉cp -f ${pkgroot}/fdisk440 ${1}/Core/Root/usr/sbin/fdisk␊
␉local coresize=$( du -hkc "${1}/Core/Root" | tail -n1 | awk {'print $1'} )␊
␉buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\""␊
␊

␉␉mkdir -p "${1}/${options[$i]##*/}/Root"␊
␉␉mkdir -p "${1}/${options[$i]##*/}/Scripts"␊
␉␉␊
␉␉ditto --noextattr --noqtn "${options[$i]}/postinstall" "${1}/${options[$i]##*/}/Scripts/postinstall"␊
␉␉ditto --noextattr --noqtn "${options[$i]}/postinstall.sh" "${1}/${options[$i]##*/}/Scripts/postinstall.sh"␊
␉␉␊
␉␉buildpackage "${1}/${options[$i]##*/}" "/" "" "start_selected=\"false\""␊
␉done␊
 ...
 ␉cp -f ${1%/*}/i386/cdboot ${1}/Core/Root/usr/standalone/i386␊
 ␉cp -f ${1%/*}/i386/chain0 ${1}/Core/Root/usr/standalone/i386␊
 ␉fixperms "${1}/Core/Root/"␊
-␉cp -f ${pkgroot}/fdisk ${1}/Core/Root/usr/sbin␊
+␉cp -f ${pkgroot}/fdisk440 ${1}/Core/Root/usr/sbin/fdisk␊
 ␉local coresize=$( du -hkc "${1}/Core/Root" | tail -n1 | awk {'print $1'} )␊
 ␉buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\""␊
 ␊
 ␉␉mkdir -p "${1}/${options[$i]##*/}/Root"␊
 ␉␉mkdir -p "${1}/${options[$i]##*/}/Scripts"␊
 ␉␉␊
-␉␉ditto --noextattr --noqtn "${options[$i]}/postinstall" "${1}/${options[$i]##*/}/Scripts/postinstall"␊
+␉␉ditto --noextattr --noqtn "${options[$i]}/postinstall.sh" "${1}/${options[$i]##*/}/Scripts/postinstall.sh"␊
 ␉␉␊
 ␉␉buildpackage "${1}/${options[$i]##*/}" "/" "" "start_selected=\"false\""␊
 ␉done␊

-
2 1
3 2
4 3
5 4
6 5
7 6
8 
9 7
10 8
11 9
10
11
12
13
+ Memory Allocation Error on boot1 loading /boot: http://forge.voodooprojects.org/p/chameleon/issues/101/ ␊
 Nvidia GT 540M && 310M : can't find rom to patch : http://forge.voodooprojects.org/p/chameleon/issues/99/␊
      ** This is also http://forge.voodooprojects.org/p/chameleon/issues/48/␊
      ** GT 440 --> http://forge.voodooprojects.org/p/chameleon/issues/98/␊
 Extra Kext Loading dependency error: http://forge.voodooprojects.org/p/chameleon/issues/94/␊
 AMD reported issues in cpu.c http://forge.voodooprojects.org/p/chameleon/issues/92/␊
 Make Package: http://forge.voodooprojects.org/p/chameleon/issues/82/␊
 SMBus : http://forge.voodooprojects.org/p/chameleon/issues/10/␊
␊
=== Done ===␊
 Multi Booting: http://forge.voodooprojects.org/p/chameleon/issues/62/␊
 Memory Allocation Error on boot1 loading /boot: http://forge.voodooprojects.org/p/chameleon/issues/101/ ␊
␊
== Closed == ␊
 SMBus : http://forge.voodooprojects.org/p/chameleon/issues/10/␊
- Memory Allocation Error on boot1 loading /boot: http://forge.voodooprojects.org/p/chameleon/issues/101/ ␊
  Nvidia GT 540M && 310M : can't find rom to patch : http://forge.voodooprojects.org/p/chameleon/issues/99/␊
       ** This is also http://forge.voodooprojects.org/p/chameleon/issues/48/␊
       ** GT 440 --> http://forge.voodooprojects.org/p/chameleon/issues/98/␊
  Extra Kext Loading dependency error: http://forge.voodooprojects.org/p/chameleon/issues/94/␊
  AMD reported issues in cpu.c http://forge.voodooprojects.org/p/chameleon/issues/92/␊
  Make Package: http://forge.voodooprojects.org/p/chameleon/issues/82/␊
- SMBus : http://forge.voodooprojects.org/p/chameleon/issues/10/␊
 ␊
 === Done ===␊
  Multi Booting: http://forge.voodooprojects.org/p/chameleon/issues/62/␊
+ Memory Allocation Error on boot1 loading /boot: http://forge.voodooprojects.org/p/chameleon/issues/101/ ␊
+␊
+== Closed == ␊
+ SMBus : http://forge.voodooprojects.org/p/chameleon/issues/10/␊

-72
73 73
74 74
75 
75
76
76 77
77 78
78 79
+                            ignore /E/E and /S/L/E/Extensions.mkext.␊
␊
  GraphicsEnabler=Yes|No  Automatic device-properties generation for gfx cards.␊
    AtiConfig=<cardcfg>   Use a different card config␊
    AtiConfig=<cardcfg>   Use a different card config, e.g. AtiConfig=Megalodon.␊
    AtiPorts=<value>      Specify the number of ports, e.g. AtiPorts=2.␊
    UseAtiROM=Yes|No      Use an alternate Ati ROM image␊
                            (path: /Extra/<vendorid>_<devid>_<subsysid>.rom)␊
    UseNvidiaROM=Yes|No   Use an alternate Nvidia ROM image␊
                             ignore /E/E and /S/L/E/Extensions.mkext.␊
 ␊
   GraphicsEnabler=Yes|No  Automatic device-properties generation for gfx cards.␊
-    AtiConfig=<cardcfg>   Use a different card config␊
+    AtiConfig=<cardcfg>   Use a different card config, e.g. AtiConfig=Megalodon.␊
+    AtiPorts=<value>      Specify the number of ports, e.g. AtiPorts=2.␊
     UseAtiROM=Yes|No      Use an alternate Ati ROM image␊
                             (path: /Extra/<vendorid>_<devid>_<subsysid>.rom)␊
     UseNvidiaROM=Yes|No   Use an alternate Nvidia ROM image␊

-
2
3
4
5
1 6
2 7
3 8
+- Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved␊
  to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a␊
  requirement on laptops that can only use 2 ports at the same time.␊
  Thanks to Akbar for testing and AniV also for the tip:␊
    http://forum.voodooprojects.org/index.php/topic,1959.msg10402.html#msg10402␊
- Added NVidia ION AHCI controllers dev id to AHCIPortInjector kext.␊
  Forgot to mention source on the commit: http://forum.voodooprojects.org/index.php/topic,1170.0.html␊
- Renamed com.apple.Boot.plist to org.chameleon.Boot.plist.␊
+- Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved␊
+  to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a␊
+  requirement on laptops that can only use 2 ports at the same time.␊
+  Thanks to Akbar for testing and AniV also for the tip:␊
+    http://forum.voodooprojects.org/index.php/topic,1959.msg10402.html#msg10402␊
 - Added NVidia ION AHCI controllers dev id to AHCIPortInjector kext.␊
   Forgot to mention source on the commit: http://forum.voodooprojects.org/index.php/topic,1170.0.html␊
 - Renamed com.apple.Boot.plist to org.chameleon.Boot.plist.␊

Download the corresponding diff file