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

Date:

2011-07-20 15:37:37 (12 years 9 months ago)

Author:

Sergey Slice

Commit:

1194

Parents:

1193

Message:

DMI<->MSR priority, I mean that we need no get FSB and CPU speed from MSR if we have good values in DMI

Changes:

M	/branches/slice/trunkM/revision
M	/branches/slice/trunkM/i386/boot2/boot.c
M	/branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3
M	/branches/slice/trunkM/i386/libsaio/pci.c
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/decls.pbxbtree
M	/branches/slice/trunkM/i386/boot2/modules.c
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/imports.pbxbtree
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/cdecls.pbxbtree
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/pbxindex.header
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/symbols0.pbxsymbols
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/refs.pbxbtree
M	/branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser
M	/branches/slice/trunkM/org.chameleon.Boot.plist
M	/branches/slice/trunkM/i386/libsaio/acpi_patcher.c
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/strings.pbxstrings/control
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/files.pbxbtree
M	/branches/slice/trunkM/i386/libsaio/platform.c
M	/branches/slice/trunkM/Chameleon.xcodeproj/project.pbxproj
M	/branches/slice/trunkM/i386/libsaio/cpu.c
M	/branches/slice/trunkM/i386/libsaio/smbios_getters.c
M	/branches/slice/trunkM/i386/libsaio/fake_efi.c
M	/branches/slice/trunkM/i386/libsaio/pci_setup.c
M	/branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/strings.pbxstrings/strings
M	/branches/slice/trunkM/i386/libsaio/smbios.c
M	/branches/slice/trunkM/i386/libsaio/smbios_getters.h

File differences

-216
217 217
218 218
219 
220 219
221 220
222 221
... ...
273 272
274 273
275 274
276 
277 
275
276
278 277
279 278
280 279
281 280
282 281
283 
282
284 283
285 284
286 285
... ...
299 298
300 299
301 300
302 
301
303 302
304 303
305 304
... ...
317 316
318 317
319 318
320 
319
321 320
322 321
323 322
... ...
325 324
326 325
327 326
328 
327
329 328
330 329
331 330
332 
331
333 332
334 333
335 334
336 335
337 336
338 
339 337
340 338
341 339
342 340
343 341
344 
345 
346 
347 
348 342
349 
350 343
351 344
352 
353 
354 
345
346
347
348
349
350
351
352
353
354
355 355
356 356
357 357
... ...
363 363
364 364
365 365
366 
366
367 367
368 
368
369 369
370 370
371 371
372 372
373 
373
374 374
375 375
376 376
... ...
383 383
384 384
385 385
386 
386
387 387
388 
388
389 389
390 390
391 391
392 392
393 
393
394 394
395 395
396 396
... ...
409 409
410 410
411 411
412 
412
413 413
414 
414
415 415
416 416
417 417
... ...
549 549
550 550
551 551
552
552 553
553 
554 
554
555 555
556 556
557 
557
558 558
559 559
560 560
... ...
584 584
585 585
586 586
587 
587
588 588
589 589
590 590
... ...
608 608
609 609
610 610
611 
611
612 612
613 613
614 614
... ...
631 631
632 632
633 633
634 
634
635 635
636 636
637 637
... ...
640 640
641 641
642 642
643 
643
644 644
645 645
646 646
... ...
769 769
770 770
771 771
772 
772
773 773
774 774
775 775
... ...
778 778
779 779
780 780
781 
781
782 782
783 783
784 784
... ...
804 804
805 805
806 806
807 
807
808 808
809 809
810 810
... ...
827 827
828 828
829 829
830 
831 
830
831
832 832
833 833
834 834
835 835
836 
836
837 837
838 838
839 839
840 
840
841 841
842 842
843 843
+␉␉␉␉<string>servicesModulefind</string>␊
␉␉␉␉<string>com.apple.ide.PBXToolbarStopButton</string>␊
␉␉␉␉<string>get-info</string>␊
␉␉␉␉<string>go</string>␊
␉␉␉␉<string>NSToolbarFlexibleSpaceItem</string>␊
␉␉␉␉<string>com.apple.pbx.toolbar.searchfield</string>␊
␉␉␉</array>␊

␉␉␉␉␉␉␉<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>␊
␉␉␉␉␉␉␉<array>␊
␉␉␉␉␉␉␉␉<array>␊
␉␉␉␉␉␉␉␉␉<integer>84</integer>␊
␉␉␉␉␉␉␉␉␉<integer>10</integer>␊
␉␉␉␉␉␉␉␉␉<integer>46</integer>␊
␉␉␉␉␉␉␉␉␉<integer>11</integer>␊
␉␉␉␉␉␉␉␉␉<integer>3</integer>␊
␉␉␉␉␉␉␉␉␉<integer>0</integer>␊
␉␉␉␉␉␉␉␉</array>␊
␉␉␉␉␉␉␉</array>␊
␉␉␉␉␉␉␉<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>␊
␉␉␉␉␉␉␉<string>{{0, 1020}, {186, 600}}</string>␊
␉␉␉␉␉␉␉<string>{{0, 334}, {186, 600}}</string>␊
␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉<key>PBXTopSmartGroupGIDs</key>␊
␉␉␉␉␉␉<array/>␊

␉␉␉␉␉␉␉<real>186</real>␊
␉␉␉␉␉␉</array>␊
␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉<string>134 119 1146 659 0 0 1280 778 </string>␊
␉␉␉␉␉␉<string>294 219 1146 659 0 0 1440 878 </string>␊
␉␉␉␉␉</dict>␊
␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉<string>PBXSmartGroupTreeModule</string>␊

␉␉␉␉␉␉␉␉<key>PBXProjectModuleGUID</key>␊
␉␉␉␉␉␉␉␉<string>1CE0B20306471E060097A5F4</string>␊
␉␉␉␉␉␉␉␉<key>PBXProjectModuleLabel</key>␊
␉␉␉␉␉␉␉␉<string>spd.c</string>␊
␉␉␉␉␉␉␉␉<string>AppleSMBIOS.cpp</string>␊
␉␉␉␉␉␉␉␉<key>PBXSplitModuleInNavigatorKey</key>␊
␉␉␉␉␉␉␉␉<dict>␊
␉␉␉␉␉␉␉␉␉<key>Split0</key>␊

␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleGUID</key>␊
␉␉␉␉␉␉␉␉␉␉<string>1CE0B20406471E060097A5F4</string>␊
␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleLabel</key>␊
␉␉␉␉␉␉␉␉␉␉<string>spd.c</string>␊
␉␉␉␉␉␉␉␉␉␉<string>AppleSMBIOS.cpp</string>␊
␉␉␉␉␉␉␉␉␉␉<key>_historyCapacity</key>␊
␉␉␉␉␉␉␉␉␉␉<integer>0</integer>␊
␉␉␉␉␉␉␉␉␉␉<key>bookmark</key>␊
␉␉␉␉␉␉␉␉␉␉<string>12D15FF513D3652300ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉<string>1208BED813D710A600694228</string>␊
␉␉␉␉␉␉␉␉␉␉<key>history</key>␊
␉␉␉␉␉␉␉␉␉␉<array>␊
␉␉␉␉␉␉␉␉␉␉␉<string>122A5BCA1375C49300795FF0</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>122A5BCB1375C49300795FF0</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12EDC2D91376FCB300937D70</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12B5D34713C064DF003DE4EE</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EB70A13D31D3900E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EB70B13D31D3900E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC26913D3427400E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC27313D3442900E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC27413D3442900E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC2C313D34A8300E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC2D813D34BE800E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC36A13D35A4A00E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>128EC36B13D35A4A00E0DA4B</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FC013D35DFB00ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FC113D35DFB00ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FC213D35DFB00ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FE813D3634F00ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FF213D3652300ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FF313D3652300ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12D15FF413D3652300ABAAF4</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12BFD73713D6E2DD00065808</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>12BFD73813D6E2DD00065808</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1284EEE713D6F35E00A6BE87</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1284EEE913D6F35E00A6BE87</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1284EEF713D6F95000A6BE87</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1284EEF913D6F95000A6BE87</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1284EF1113D6FD4500A6BE87</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1208BED013D70B8900694228</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1208BED513D710A600694228</string>␊
␉␉␉␉␉␉␉␉␉␉␉<string>1208BED613D710A600694228</string>␊
␉␉␉␉␉␉␉␉␉␉</array>␊
␉␉␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉␉␉<key>SplitCount</key>␊

␉␉␉␉␉␉␉<key>GeometryConfiguration</key>␊
␉␉␉␉␉␉␉<dict>␊
␉␉␉␉␉␉␉␉<key>Frame</key>␊
␉␉␉␉␉␉␉␉<string>{{0, 0}, {938, 264}}</string>␊
␉␉␉␉␉␉␉␉<string>{{0, 0}, {938, 432}}</string>␊
␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉␉␉<string>134 119 1146 659 0 0 1280 778 </string>␊
␉␉␉␉␉␉␉␉<string>294 219 1146 659 0 0 1440 878 </string>␊
␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉␉␉<string>PBXNavigatorGroup</string>␊
␉␉␉␉␉␉␉<key>Proportion</key>␊
␉␉␉␉␉␉␉<string>264pt</string>␊
␉␉␉␉␉␉␉<string>432pt</string>␊
␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉<dict>␊
␉␉␉␉␉␉␉<key>ContentConfiguration</key>␊

␉␉␉␉␉␉␉<key>GeometryConfiguration</key>␊
␉␉␉␉␉␉␉<dict>␊
␉␉␉␉␉␉␉␉<key>Frame</key>␊
␉␉␉␉␉␉␉␉<string>{{0, 269}, {938, 349}}</string>␊
␉␉␉␉␉␉␉␉<string>{{0, 437}, {938, 181}}</string>␊
␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉␉␉<string>134 119 1146 659 0 0 1280 778 </string>␊
␉␉␉␉␉␉␉␉<string>294 219 1146 659 0 0 1440 878 </string>␊
␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉␉␉<string>XCDetailModule</string>␊
␉␉␉␉␉␉␉<key>Proportion</key>␊
␉␉␉␉␉␉␉<string>349pt</string>␊
␉␉␉␉␉␉␉<string>181pt</string>␊
␉␉␉␉␉␉</dict>␊
␉␉␉␉␉</array>␊
␉␉␉␉␉<key>Proportion</key>␊

␉␉␉</array>␊
␉␉␉<key>TableOfContents</key>␊
␉␉␉<array>␊
␉␉␉␉<string>12D15FF613D3652300ABAAF4</string>␊
␉␉␉␉<string>1208BED313D70B8900694228</string>␊
␉␉␉␉<string>1CE0B1FE06471DED0097A5F4</string>␊
␉␉␉␉<string>12D15FF713D3652300ABAAF4</string>␊
␉␉␉␉<string>1208BED413D70B8900694228</string>␊
␉␉␉␉<string>1CE0B20306471E060097A5F4</string>␊
␉␉␉␉<string>1CE0B20506471E060097A5F4</string>␊
␉␉␉</array>␊

␉<integer>5</integer>␊
␉<key>WindowOrderList</key>␊
␉<array>␊
␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
␉␉<string>122A5BB81375BA4700795FF0</string>␊
␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
␉␉<string>/Developer/Projects/Chameleons/slice/Musya/Chameleon.xcodeproj</string>␊
␉␉<string>/Users/slice/Projects/Chameleons/chameleon/branches/slice/trunkM/Chameleon.xcodeproj</string>␊
␉</array>␊
␉<key>WindowString</key>␊
␉<string>134 119 1146 659 0 0 1280 778 </string>␊
␉<string>294 219 1146 659 0 0 1440 878 </string>␊
␉<key>WindowToolsV3</key>␊
␉<array>␊
␉␉<dict>␊

␉␉␉␉␉␉␉␉<key>Frame</key>␊
␉␉␉␉␉␉␉␉<string>{{0, 0}, {500, 218}}</string>␊
␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉␉␉<string>91 232 500 500 0 0 1280 778 </string>␊
␉␉␉␉␉␉␉␉<string>110 311 500 500 0 0 1440 878 </string>␊
␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉␉␉<string>PBXNavigatorGroup</string>␊

␉␉␉␉␉␉␉␉<key>Frame</key>␊
␉␉␉␉␉␉␉␉<string>{{0, 223}, {500, 236}}</string>␊
␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉␉␉<string>91 232 500 500 0 0 1280 778 </string>␊
␉␉␉␉␉␉␉␉<string>110 311 500 500 0 0 1440 878 </string>␊
␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉␉␉<string>PBXBuildResultsModule</string>␊

␉␉␉<key>TableOfContents</key>␊
␉␉␉<array>␊
␉␉␉␉<string>122A5BB81375BA4700795FF0</string>␊
␉␉␉␉<string>12D15FF813D3652300ABAAF4</string>␊
␉␉␉␉<string>1208BEC713D70B8600694228</string>␊
␉␉␉␉<string>1CD0528F0623707200166675</string>␊
␉␉␉␉<string>XCMainBuildResultsModuleGUID</string>␊
␉␉␉</array>␊

␉␉␉<key>WindowContentMinSize</key>␊
␉␉␉<string>486 300</string>␊
␉␉␉<key>WindowString</key>␊
␉␉␉<string>91 232 500 500 0 0 1280 778 </string>␊
␉␉␉<string>110 311 500 500 0 0 1440 878 </string>␊
␉␉␉<key>WindowToolGUID</key>␊
␉␉␉<string>122A5BB81375BA4700795FF0</string>␊
␉␉␉<key>WindowToolIsVisible</key>␊

␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleGUID</key>␊
␉␉␉␉␉␉␉␉␉␉<string>1CDD528C0622207200134675</string>␊
␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleLabel</key>␊
␉␉␉␉␉␉␉␉␉␉<string>platform.h</string>␊
␉␉␉␉␉␉␉␉␉␉<string>bootstruct.c</string>␊
␉␉␉␉␉␉␉␉␉␉<key>StatusBarVisibility</key>␊
␉␉␉␉␉␉␉␉␉␉<true/>␊
␉␉␉␉␉␉␉␉␉</dict>␊

␉␉␉␉␉␉␉␉␉␉<key>Frame</key>␊
␉␉␉␉␉␉␉␉␉␉<string>{{0, 0}, {843, 431}}</string>␊
␉␉␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉␉␉␉␉<string>562 87 843 689 0 0 1280 778 </string>␊
␉␉␉␉␉␉␉␉␉␉<string>526 109 843 689 0 0 1440 878 </string>␊
␉␉␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉␉␉␉␉<string>PBXNavigatorGroup</string>␊

␉␉␉␉␉␉␉␉<key>Frame</key>␊
␉␉␉␉␉␉␉␉<string>{{0, 436}, {843, 212}}</string>␊
␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
␉␉␉␉␉␉␉␉<string>562 87 843 689 0 0 1280 778 </string>␊
␉␉␉␉␉␉␉␉<string>526 109 843 689 0 0 1440 878 </string>␊
␉␉␉␉␉␉␉</dict>␊
␉␉␉␉␉␉␉<key>Module</key>␊
␉␉␉␉␉␉␉<string>PBXProjectFindModule</string>␊

␉␉␉<key>TableOfContents</key>␊
␉␉␉<array>␊
␉␉␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
␉␉␉␉<string>12D15FF913D3652300ABAAF4</string>␊
␉␉␉␉<string>12D15FFA13D3652300ABAAF4</string>␊
␉␉␉␉<string>1208BECE13D70B8600694228</string>␊
␉␉␉␉<string>1208BECF13D70B8600694228</string>␊
␉␉␉␉<string>1CDD528C0622207200134675</string>␊
␉␉␉␉<string>1CD0528E0623707200166675</string>␊
␉␉␉</array>␊
␉␉␉<key>WindowString</key>␊
␉␉␉<string>562 87 843 689 0 0 1280 778 </string>␊
␉␉␉<string>526 109 843 689 0 0 1440 878 </string>␊
␉␉␉<key>WindowToolGUID</key>␊
␉␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
␉␉␉<key>WindowToolIsVisible</key>␊
␉␉␉<true/>␊
␉␉␉<false/>␊
␉␉</dict>␊
␉␉<dict>␊
␉␉␉<key>Identifier</key>␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ␉␉␉␉<string>servicesModulefind</string>␊
 ␉␉␉␉<string>com.apple.ide.PBXToolbarStopButton</string>␊
 ␉␉␉␉<string>get-info</string>␊
-␉␉␉␉<string>go</string>␊
 ␉␉␉␉<string>NSToolbarFlexibleSpaceItem</string>␊
 ␉␉␉␉<string>com.apple.pbx.toolbar.searchfield</string>␊
 ␉␉␉</array>␊
 ␉␉␉␉␉␉␉<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>␊
 ␉␉␉␉␉␉␉<array>␊
 ␉␉␉␉␉␉␉␉<array>␊
-␉␉␉␉␉␉␉␉␉<integer>84</integer>␊
-␉␉␉␉␉␉␉␉␉<integer>10</integer>␊
+␉␉␉␉␉␉␉␉␉<integer>46</integer>␊
+␉␉␉␉␉␉␉␉␉<integer>11</integer>␊
 ␉␉␉␉␉␉␉␉␉<integer>3</integer>␊
 ␉␉␉␉␉␉␉␉␉<integer>0</integer>␊
 ␉␉␉␉␉␉␉␉</array>␊
 ␉␉␉␉␉␉␉</array>␊
 ␉␉␉␉␉␉␉<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>␊
-␉␉␉␉␉␉␉<string>{{0, 1020}, {186, 600}}</string>␊
+␉␉␉␉␉␉␉<string>{{0, 334}, {186, 600}}</string>␊
 ␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉<key>PBXTopSmartGroupGIDs</key>␊
 ␉␉␉␉␉␉<array/>␊
 ␉␉␉␉␉␉␉<real>186</real>␊
 ␉␉␉␉␉␉</array>␊
 ␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉<string>134 119 1146 659 0 0 1280 778 </string>␊
+␉␉␉␉␉␉<string>294 219 1146 659 0 0 1440 878 </string>␊
 ␉␉␉␉␉</dict>␊
 ␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉<string>PBXSmartGroupTreeModule</string>␊
 ␉␉␉␉␉␉␉␉<key>PBXProjectModuleGUID</key>␊
 ␉␉␉␉␉␉␉␉<string>1CE0B20306471E060097A5F4</string>␊
 ␉␉␉␉␉␉␉␉<key>PBXProjectModuleLabel</key>␊
-␉␉␉␉␉␉␉␉<string>spd.c</string>␊
+␉␉␉␉␉␉␉␉<string>AppleSMBIOS.cpp</string>␊
 ␉␉␉␉␉␉␉␉<key>PBXSplitModuleInNavigatorKey</key>␊
 ␉␉␉␉␉␉␉␉<dict>␊
 ␉␉␉␉␉␉␉␉␉<key>Split0</key>␊
 ␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleGUID</key>␊
 ␉␉␉␉␉␉␉␉␉␉<string>1CE0B20406471E060097A5F4</string>␊
 ␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleLabel</key>␊
-␉␉␉␉␉␉␉␉␉␉<string>spd.c</string>␊
+␉␉␉␉␉␉␉␉␉␉<string>AppleSMBIOS.cpp</string>␊
 ␉␉␉␉␉␉␉␉␉␉<key>_historyCapacity</key>␊
 ␉␉␉␉␉␉␉␉␉␉<integer>0</integer>␊
 ␉␉␉␉␉␉␉␉␉␉<key>bookmark</key>␊
-␉␉␉␉␉␉␉␉␉␉<string>12D15FF513D3652300ABAAF4</string>␊
+␉␉␉␉␉␉␉␉␉␉<string>1208BED813D710A600694228</string>␊
 ␉␉␉␉␉␉␉␉␉␉<key>history</key>␊
 ␉␉␉␉␉␉␉␉␉␉<array>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>122A5BCA1375C49300795FF0</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>122A5BCB1375C49300795FF0</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>12EDC2D91376FCB300937D70</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>12B5D34713C064DF003DE4EE</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>128EB70A13D31D3900E0DA4B</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>128EB70B13D31D3900E0DA4B</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>128EC26913D3427400E0DA4B</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>128EC27313D3442900E0DA4B</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>128EC27413D3442900E0DA4B</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>128EC2C313D34A8300E0DA4B</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>128EC2D813D34BE800E0DA4B</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>128EC36A13D35A4A00E0DA4B</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>128EC36B13D35A4A00E0DA4B</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>12D15FC013D35DFB00ABAAF4</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>12D15FC113D35DFB00ABAAF4</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>12D15FC213D35DFB00ABAAF4</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉<string>12D15FE813D3634F00ABAAF4</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>12D15FF213D3652300ABAAF4</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>12D15FF313D3652300ABAAF4</string>␊
-␉␉␉␉␉␉␉␉␉␉␉<string>12D15FF413D3652300ABAAF4</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>12BFD73713D6E2DD00065808</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>12BFD73813D6E2DD00065808</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1284EEE713D6F35E00A6BE87</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1284EEE913D6F35E00A6BE87</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1284EEF713D6F95000A6BE87</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1284EEF913D6F95000A6BE87</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1284EF1113D6FD4500A6BE87</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1208BED013D70B8900694228</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1208BED513D710A600694228</string>␊
+␉␉␉␉␉␉␉␉␉␉␉<string>1208BED613D710A600694228</string>␊
 ␉␉␉␉␉␉␉␉␉␉</array>␊
 ␉␉␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉␉␉<key>SplitCount</key>␊
 ␉␉␉␉␉␉␉<key>GeometryConfiguration</key>␊
 ␉␉␉␉␉␉␉<dict>␊
 ␉␉␉␉␉␉␉␉<key>Frame</key>␊
-␉␉␉␉␉␉␉␉<string>{{0, 0}, {938, 264}}</string>␊
+␉␉␉␉␉␉␉␉<string>{{0, 0}, {938, 432}}</string>␊
 ␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉␉␉<string>134 119 1146 659 0 0 1280 778 </string>␊
+␉␉␉␉␉␉␉␉<string>294 219 1146 659 0 0 1440 878 </string>␊
 ␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉␉␉<string>PBXNavigatorGroup</string>␊
 ␉␉␉␉␉␉␉<key>Proportion</key>␊
-␉␉␉␉␉␉␉<string>264pt</string>␊
+␉␉␉␉␉␉␉<string>432pt</string>␊
 ␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉<dict>␊
 ␉␉␉␉␉␉␉<key>ContentConfiguration</key>␊
 ␉␉␉␉␉␉␉<key>GeometryConfiguration</key>␊
 ␉␉␉␉␉␉␉<dict>␊
 ␉␉␉␉␉␉␉␉<key>Frame</key>␊
-␉␉␉␉␉␉␉␉<string>{{0, 269}, {938, 349}}</string>␊
+␉␉␉␉␉␉␉␉<string>{{0, 437}, {938, 181}}</string>␊
 ␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉␉␉<string>134 119 1146 659 0 0 1280 778 </string>␊
+␉␉␉␉␉␉␉␉<string>294 219 1146 659 0 0 1440 878 </string>␊
 ␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉␉␉<string>XCDetailModule</string>␊
 ␉␉␉␉␉␉␉<key>Proportion</key>␊
-␉␉␉␉␉␉␉<string>349pt</string>␊
+␉␉␉␉␉␉␉<string>181pt</string>␊
 ␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉</array>␊
 ␉␉␉␉␉<key>Proportion</key>␊
 ␉␉␉</array>␊
 ␉␉␉<key>TableOfContents</key>␊
 ␉␉␉<array>␊
-␉␉␉␉<string>12D15FF613D3652300ABAAF4</string>␊
+␉␉␉␉<string>1208BED313D70B8900694228</string>␊
 ␉␉␉␉<string>1CE0B1FE06471DED0097A5F4</string>␊
-␉␉␉␉<string>12D15FF713D3652300ABAAF4</string>␊
+␉␉␉␉<string>1208BED413D70B8900694228</string>␊
 ␉␉␉␉<string>1CE0B20306471E060097A5F4</string>␊
 ␉␉␉␉<string>1CE0B20506471E060097A5F4</string>␊
 ␉␉␉</array>␊
 ␉<integer>5</integer>␊
 ␉<key>WindowOrderList</key>␊
 ␉<array>␊
+␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
 ␉␉<string>122A5BB81375BA4700795FF0</string>␊
-␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
-␉␉<string>/Developer/Projects/Chameleons/slice/Musya/Chameleon.xcodeproj</string>␊
+␉␉<string>/Users/slice/Projects/Chameleons/chameleon/branches/slice/trunkM/Chameleon.xcodeproj</string>␊
 ␉</array>␊
 ␉<key>WindowString</key>␊
-␉<string>134 119 1146 659 0 0 1280 778 </string>␊
+␉<string>294 219 1146 659 0 0 1440 878 </string>␊
 ␉<key>WindowToolsV3</key>␊
 ␉<array>␊
 ␉␉<dict>␊
 ␉␉␉␉␉␉␉␉<key>Frame</key>␊
 ␉␉␉␉␉␉␉␉<string>{{0, 0}, {500, 218}}</string>␊
 ␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉␉␉<string>91 232 500 500 0 0 1280 778 </string>␊
+␉␉␉␉␉␉␉␉<string>110 311 500 500 0 0 1440 878 </string>␊
 ␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉␉␉<string>PBXNavigatorGroup</string>␊
 ␉␉␉␉␉␉␉␉<key>Frame</key>␊
 ␉␉␉␉␉␉␉␉<string>{{0, 223}, {500, 236}}</string>␊
 ␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉␉␉<string>91 232 500 500 0 0 1280 778 </string>␊
+␉␉␉␉␉␉␉␉<string>110 311 500 500 0 0 1440 878 </string>␊
 ␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉␉␉<string>PBXBuildResultsModule</string>␊
 ␉␉␉<key>TableOfContents</key>␊
 ␉␉␉<array>␊
 ␉␉␉␉<string>122A5BB81375BA4700795FF0</string>␊
-␉␉␉␉<string>12D15FF813D3652300ABAAF4</string>␊
+␉␉␉␉<string>1208BEC713D70B8600694228</string>␊
 ␉␉␉␉<string>1CD0528F0623707200166675</string>␊
 ␉␉␉␉<string>XCMainBuildResultsModuleGUID</string>␊
 ␉␉␉</array>␊
 ␉␉␉<key>WindowContentMinSize</key>␊
 ␉␉␉<string>486 300</string>␊
 ␉␉␉<key>WindowString</key>␊
-␉␉␉<string>91 232 500 500 0 0 1280 778 </string>␊
+␉␉␉<string>110 311 500 500 0 0 1440 878 </string>␊
 ␉␉␉<key>WindowToolGUID</key>␊
 ␉␉␉<string>122A5BB81375BA4700795FF0</string>␊
 ␉␉␉<key>WindowToolIsVisible</key>␊
 ␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleGUID</key>␊
 ␉␉␉␉␉␉␉␉␉␉<string>1CDD528C0622207200134675</string>␊
 ␉␉␉␉␉␉␉␉␉␉<key>PBXProjectModuleLabel</key>␊
-␉␉␉␉␉␉␉␉␉␉<string>platform.h</string>␊
+␉␉␉␉␉␉␉␉␉␉<string>bootstruct.c</string>␊
 ␉␉␉␉␉␉␉␉␉␉<key>StatusBarVisibility</key>␊
 ␉␉␉␉␉␉␉␉␉␉<true/>␊
 ␉␉␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉␉␉␉<key>Frame</key>␊
 ␉␉␉␉␉␉␉␉␉␉<string>{{0, 0}, {843, 431}}</string>␊
 ␉␉␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉␉␉␉␉<string>562 87 843 689 0 0 1280 778 </string>␊
+␉␉␉␉␉␉␉␉␉␉<string>526 109 843 689 0 0 1440 878 </string>␊
 ␉␉␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉␉␉␉␉<string>PBXNavigatorGroup</string>␊
 ␉␉␉␉␉␉␉␉<key>Frame</key>␊
 ␉␉␉␉␉␉␉␉<string>{{0, 436}, {843, 212}}</string>␊
 ␉␉␉␉␉␉␉␉<key>RubberWindowFrame</key>␊
-␉␉␉␉␉␉␉␉<string>562 87 843 689 0 0 1280 778 </string>␊
+␉␉␉␉␉␉␉␉<string>526 109 843 689 0 0 1440 878 </string>␊
 ␉␉␉␉␉␉␉</dict>␊
 ␉␉␉␉␉␉␉<key>Module</key>␊
 ␉␉␉␉␉␉␉<string>PBXProjectFindModule</string>␊
 ␉␉␉<key>TableOfContents</key>␊
 ␉␉␉<array>␊
 ␉␉␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
-␉␉␉␉<string>12D15FF913D3652300ABAAF4</string>␊
-␉␉␉␉<string>12D15FFA13D3652300ABAAF4</string>␊
+␉␉␉␉<string>1208BECE13D70B8600694228</string>␊
+␉␉␉␉<string>1208BECF13D70B8600694228</string>␊
 ␉␉␉␉<string>1CDD528C0622207200134675</string>␊
 ␉␉␉␉<string>1CD0528E0623707200166675</string>␊
 ␉␉␉</array>␊
 ␉␉␉<key>WindowString</key>␊
-␉␉␉<string>562 87 843 689 0 0 1280 778 </string>␊
+␉␉␉<string>526 109 843 689 0 0 1440 878 </string>␊
 ␉␉␉<key>WindowToolGUID</key>␊
 ␉␉␉<string>1C530D57069F1CE1000CFCEE</string>␊
 ␉␉␉<key>WindowToolIsVisible</key>␊
-␉␉␉<true/>␊
+␉␉␉<false/>␊
 ␉␉</dict>␊
 ␉␉<dict>␊
 ␉␉␉<key>Identifier</key>␊

-37
38 38
39 39
40 
40
41 41
42 42
43 43
44
44 45
45 46
46 47
+extern bool getSMBMemoryDeviceManufacturer(returnType *value);␊
extern bool getSMBMemoryDeviceSerialNumber(returnType *value);␊
extern bool getSMBMemoryDevicePartNumber(returnType *value);␊
extern bool scanDMI(void);␊
//extern bool scanDMI(void);␊
extern SMBStructHeader* FindFirstDmiTableOfType(int type, int minlength);␊
extern SMBStructHeader* FindNextDmiTableOfType(int type, int minlength);␊
extern void getSmbiosProductName();␊
extern void getSmbiosMacModel(void);␊
␊
SMBEntryPoint *getAddressOfSmbiosTable(void);␊
const char * smbiosStringAtIndex(SMBStructHeader* smHeader, int index, int* length);␊
 extern bool getSMBMemoryDeviceManufacturer(returnType *value);␊
 extern bool getSMBMemoryDeviceSerialNumber(returnType *value);␊
 extern bool getSMBMemoryDevicePartNumber(returnType *value);␊
-extern bool scanDMI(void);␊
+//extern bool scanDMI(void);␊
 extern SMBStructHeader* FindFirstDmiTableOfType(int type, int minlength);␊
 extern SMBStructHeader* FindNextDmiTableOfType(int type, int minlength);␊
 extern void getSmbiosProductName();␊
+extern void getSmbiosMacModel(void);␊
 ␊
 SMBEntryPoint *getAddressOfSmbiosTable(void);␊
 const char * smbiosStringAtIndex(SMBStructHeader* smHeader, int index, int* length);␊

-732
733 733
734 734
735 
736 
737 
738 
735
739 736
740 737
741 738
... ...
752 749
753 750
754 751
755 
752
756 753
757 754
758 755
... ...
763 760
764 761
765 762
766 
763
767 764
768 765
769 766
+␉// Determine system type / PM_Model␊
␉if (fadt_mod && Platform->Type) {␊
␉␉fadt_mod->PM_Profile = Platform->Type;␊
␉} else if(fadt)␊
␉␉Platform->Type = fadt->PM_Profile;␊
␉else␊
␉␉Platform->Type = 1;␊
␉} //else do not change anything␊
␉␊
␉//User override default value␊
␉if ( (value=getStringForKey(kSystemType, &bootInfo->chameleonConfig))!=NULL)␊

␉␉␉Platform->Type = (unsigned char) strtoul(value, NULL, 10);␊
␉}␊
␉// Set PM_Profile from System-type if only user wanted this value to be forced␊
␉if (fadt_mod->PM_Profile != Platform->Type) ␊
/*␉if (fadt_mod->PM_Profile != Platform->Type) ␊
␉{␊
␉    if (value) ␊
␉␉{ // user has overriden the SystemType so take care of it in FACP␊

␉    { // PM_Profile has a different value and no override has been set, so reflect the user value to ioregs␊
␉␉␉Platform->Type = fadt_mod->PM_Profile <= 6 ? fadt_mod->PM_Profile : 1;␊
␉    }  ␊
␉}␊
␉} */␊
␉// We now have to write the systemm-type in ioregs: we cannot do it before in setupDeviceTree()␊
␉// because we need to take care of facp original content, if it is correct.␊
␉setupSystemType();␊
 ...
 ...
 ␉// Determine system type / PM_Model␊
 ␉if (fadt_mod && Platform->Type) {␊
 ␉␉fadt_mod->PM_Profile = Platform->Type;␊
-␉} else if(fadt)␊
-␉␉Platform->Type = fadt->PM_Profile;␊
-␉else␊
-␉␉Platform->Type = 1;␊
+␉} //else do not change anything␊
 ␉␊
 ␉//User override default value␊
 ␉if ( (value=getStringForKey(kSystemType, &bootInfo->chameleonConfig))!=NULL)␊
 ␉␉␉Platform->Type = (unsigned char) strtoul(value, NULL, 10);␊
 ␉}␊
 ␉// Set PM_Profile from System-type if only user wanted this value to be forced␊
-␉if (fadt_mod->PM_Profile != Platform->Type) ␊
+/*␉if (fadt_mod->PM_Profile != Platform->Type) ␊
 ␉{␊
 ␉    if (value) ␊
 ␉␉{ // user has overriden the SystemType so take care of it in FACP␊
 ␉    { // PM_Profile has a different value and no override has been set, so reflect the user value to ioregs␊
 ␉␉␉Platform->Type = fadt_mod->PM_Profile <= 6 ? fadt_mod->PM_Profile : 1;␊
 ␉    }  ␊
-␉}␊
+␉} */␊
 ␉// We now have to write the systemm-type in ioregs: we cannot do it before in setupDeviceTree()␊
 ␉// because we need to take care of facp original content, if it is correct.␊
 ␉setupSystemType();␊

-44
45 45
46 46
47 
47
48 48
49 49
50 50
... ...
68 68
69 69
70 70
71
71 72
72 73
73 74
+␉␉bootInfo->memDetect = true;␊
␉/* manually */␊
    getBoolForKey(kUseMemDetect, &bootInfo->memDetect, &bootInfo->chameleonConfig);␊
␊
    ␊
    if (bootInfo->memDetect) {␊
␉␉if (dram_controller_dev != NULL) {␊
␉␉␉scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ...␊

//␉gBootOrder = (void*)BootOrder;␊
␉␊
␉build_pci_dt();␊
␉verbose("1:Platform=%x root_pci=%x\n", gPlatform, gRootPCIDev);␊
␉scan_cpu(Platform);␊
␉//scan_mem(); Rek: called after pci devs init in fake_efi now ...␊
}␊
 ...
 ␉␉bootInfo->memDetect = true;␊
 ␉/* manually */␊
     getBoolForKey(kUseMemDetect, &bootInfo->memDetect, &bootInfo->chameleonConfig);␊
-␊
+    ␊
     if (bootInfo->memDetect) {␊
 ␉␉if (dram_controller_dev != NULL) {␊
 ␉␉␉scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ...␊
 //␉gBootOrder = (void*)BootOrder;␊
 ␉␊
 ␉build_pci_dt();␊
+␉verbose("1:Platform=%x root_pci=%x\n", gPlatform, gRootPCIDev);␊
 ␉scan_cpu(Platform);␊
 ␉//scan_mem(); Rek: called after pci devs init in fake_efi now ...␊
 }␊

-295
296 296
297 297
298 
298
299 299
300 300
301 301
... ...
331 331
332 332
333 333
334 
334
335 335
336 336
337 337
+␉␉␉␉currcoef = bus_ratio_max;␊
␉␉␉} else {␊
␉␉␉␉msr = rdmsr64(MSR_IA32_PERF_STATUS);␊
␉␉␉␉DBG("msr(%d): ia32_perf_stat 0x%08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉DBG("msr(0x%x): ia32_perf_stat 0x%08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉currcoef = (msr >> 8) & 0x1f;␊
␉␉␉␉/* Non-integer bus ratio for the max-multi*/␊
␉␉␉␉maxdiv = (msr >> 46) & 0x01;␊

//Slice ␊
␉␉msr = rdmsr64(MSR_IA32_PLATFORM_ID);␊
␉␉DBG("msr(0x%04x): MSR_IA32_PLATFORM_ID 0x%08x\n", MSR_IA32_PLATFORM_ID, msr & 0xffffffff); //__LINE__ - source line number :)␊
␉␉if (!scanDMI() && msr) {␊
␉␉if (msr) {␊
␉␉␉p->CPU.Mobile = FALSE;␊
␉␉␉switch (p->CPU.Model) {␊
␉␉␉␉case 0x0D:␊
 ...
 ␉␉␉␉currcoef = bus_ratio_max;␊
 ␉␉␉} else {␊
 ␉␉␉␉msr = rdmsr64(MSR_IA32_PERF_STATUS);␊
-␉␉␉␉DBG("msr(%d): ia32_perf_stat 0x%08x\n", __LINE__, msr & 0xffffffff);␊
+␉␉␉␉DBG("msr(0x%x): ia32_perf_stat 0x%08x\n", __LINE__, msr & 0xffffffff);␊
 ␉␉␉␉currcoef = (msr >> 8) & 0x1f;␊
 ␉␉␉␉/* Non-integer bus ratio for the max-multi*/␊
 ␉␉␉␉maxdiv = (msr >> 46) & 0x01;␊
 //Slice ␊
 ␉␉msr = rdmsr64(MSR_IA32_PLATFORM_ID);␊
 ␉␉DBG("msr(0x%04x): MSR_IA32_PLATFORM_ID 0x%08x\n", MSR_IA32_PLATFORM_ID, msr & 0xffffffff); //__LINE__ - source line number :)␊
-␉␉if (!scanDMI() && msr) {␊
+␉␉if (msr) {␊
 ␉␉␉p->CPU.Mobile = FALSE;␊
 ␉␉␉switch (p->CPU.Model) {␊
 ␉␉␉␉case 0x0D:␊

-18
19 19
20 20
21
21 22
22 23
23 24
... ...
668 669
669 670
670 671
671 
672 
673 
674 
675 
676 
677 
678 
679 
672
680 673
681 674
682 675
... ...
743 736
744 737
745 738
746 
739
740
741
747 742
748 743
749 744
... ...
768 763
769 764
770 765
771 
766
772 767
773 768
774 769
+#include "pci.h"␊
#include "sl.h"␊
␊
#define DEBUG 1␊
extern void setup_pci_devs(pci_dt_t *pci_dt);␊
␊
/*␊

    getBoolForKey("GetCPUfromBIOS", &useDMIinfoCPU, &bootInfo->bootConfig);␊
␉if (useDMIinfoCPU) {␊
␉␉scan_cpu_DMI(); //Platform);␊
␉}␊
␉// PM_Model␊
//␉if ((Platform->CPU.Features & CPU_FEATURE_MOBILE)) {␊
␉if ((Platform->CPU.Mobile)) {␊
␉␉Platform->Type = 2;␊
␉} else {␊
␉␉Platform->Type = 1;␊
␉}␊
␉␊
␉}␉␊
}␊
␊
/*␊

␉␉//Slice - remember globals␊
␉Platform = (PlatformInfo_t *)gPlatform;␊
␉root_pci_dev = (pci_dt_t*)gRootPCIDev;␊
␊
#if DEBUG␉␊
␉verbose("2:Platform=%x root_pci=%x\n", Platform, root_pci_dev);␊
#endif␉␊
␉setup_pci_devs(root_pci_dev);␊
␉␊
␉readSMBIOSInfo(getSmbios(SMBIOS_ORIGINAL));␊

␉␊
␉saveOriginalSMBIOS();␉␊
␉getSmbiosProductName();␊
␊
    getSmbiosMacModel();␊
␉setupAcpi();␊
␉//execute_hook("setupEfiConfigurationTable", NULL, NULL, NULL, NULL);␊
␊
 ...
 ...
 ...
 #include "pci.h"␊
 #include "sl.h"␊
 ␊
+#define DEBUG 1␊
 extern void setup_pci_devs(pci_dt_t *pci_dt);␊
 ␊
 /*␊
     getBoolForKey("GetCPUfromBIOS", &useDMIinfoCPU, &bootInfo->bootConfig);␊
 ␉if (useDMIinfoCPU) {␊
 ␉␉scan_cpu_DMI(); //Platform);␊
-␉}␊
-␉// PM_Model␊
-//␉if ((Platform->CPU.Features & CPU_FEATURE_MOBILE)) {␊
-␉if ((Platform->CPU.Mobile)) {␊
-␉␉Platform->Type = 2;␊
-␉} else {␊
-␉␉Platform->Type = 1;␊
-␉}␊
-␉␊
+␉}␉␊
 }␊
 ␊
 /*␊
 ␉␉//Slice - remember globals␊
 ␉Platform = (PlatformInfo_t *)gPlatform;␊
 ␉root_pci_dev = (pci_dt_t*)gRootPCIDev;␊
-␊
+#if DEBUG␉␊
+␉verbose("2:Platform=%x root_pci=%x\n", Platform, root_pci_dev);␊
+#endif␉␊
 ␉setup_pci_devs(root_pci_dev);␊
 ␉␊
 ␉readSMBIOSInfo(getSmbios(SMBIOS_ORIGINAL));␊
 ␉␊
 ␉saveOriginalSMBIOS();␉␊
 ␉getSmbiosProductName();␊
-␊
+    getSmbiosMacModel();␊
 ␉setupAcpi();␊
 ␉//execute_hook("setupEfiConfigurationTable", NULL, NULL, NULL, NULL);␊
 ␊

-449
450 450
451 451
452 
452
453 453
454 454
455 455
+␊
        //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)) {␊
 ␊
         //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)) {␊

-367
368 368
369 369
370 
370
371 371
372 372
373 373
+␉}␊
␉else␊
␉{␊
␉␉verbose("Invalid mach magic 0x%X\n", ((struct mach_header*)binary)->magic);␊
//␉␉verbose("Invalid mach magic 0x%X\n", ((struct mach_header*)binary)->magic);␊
␉␉//getchar();␊
␉␉return NULL;␊
␉}␊
 ␉}␊
 ␉else␊
 ␉{␊
-␉␉verbose("Invalid mach magic 0x%X\n", ((struct mach_header*)binary)->magic);␊
+//␉␉verbose("Invalid mach magic 0x%X\n", ((struct mach_header*)binary)->magic);␊
 ␉␉//getchar();␊
 ␉␉return NULL;␊
 ␉}␊

-14
15 15
16 16
17
18
19
20
17 21
18 22
+␉<string>yes</string>␊
␉<key>Instant Menu</key>␊
␉<string>Yes</string>␊
␉<key>RestartFix</key>␊
␉<string>PS2</string>␊
␉<key>USBFix</key>␊
␉<string>Yes</string>␊
</dict>␊
</plist>␊
 ␉<string>yes</string>␊
 ␉<key>Instant Menu</key>␊
 ␉<string>Yes</string>␊
+␉<key>RestartFix</key>␊
+␉<string>PS2</string>␊
+␉<key>USBFix</key>␊
+␉<string>Yes</string>␊
 </dict>␊
 </plist>␊

Download the corresponding diff file