Chameleon

Chameleon Commit Details

Date:2012-06-07 21:50:15 (11 years 10 months ago)
Author:ErmaC
Commit:1993
Parents: 1992
Message:* Updated NVIDIA DevID (Added new card), added more SubdevID * Merge PS2RestartFix patch from Trunk(r1992) * Package: -Update Czech. -Update Italian (typo)
Changes:
M/branches/ErmaC/Trunk/package/po/it.po
M/branches/ErmaC/Trunk/i386/libsaio/disk.c
M/branches/ErmaC/Trunk/i386/libsaio/nvidia.c
M/branches/ErmaC/Trunk/i386/boot2/boot.h
M/branches/ErmaC/Trunk/i386/libsaio/ati.c
M/branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.c
M/branches/ErmaC/Trunk/i386/libsaio/ati.h

File differences

branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.c
677677
678678
679679
680
680681
681682
682683
683684
684685
686
687
688
689
685690
686691
687692
......
737742
738743
739744
740
741
742
743
744
745
746
747
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
748768
749769
750770
␉struct acpi_2_fadt *fadt_mod;␊
␉bool fadt_rev2_needed = false;␊
␉bool fix_restart;␊
␉bool fix_restart_ps2;␊
␉const char * value;␊
␊
␉// Restart Fix␊
␉if (Platform.CPU.Vendor == 0x756E6547) {␉/* Intel */␊
␉␉fix_restart = true;␊
␉␉fix_restart_ps2 = false;␊
␉␉if ( getBoolForKey(kPS2RestartFix, &fix_restart_ps2, &bootInfo->chameleonConfig) && fix_restart_ps2)␊
␉␉␉fix_restart = true;␊
␉␉else␊
␉␉getBoolForKey(kRestartFix, &fix_restart, &bootInfo->chameleonConfig);␊
␉} else {␊
␉␉verbose ("Not an Intel platform: Restart Fix not applied !!!\n");␊
␉// Patch FADT to fix restart␊
␉if (fix_restart)␊
␉{␊
␉␉fadt_mod->Flags|= 0x400;␊
␉␉fadt_mod->Reset_SpaceID␉␉= 0x01; // System I/O␊
␉␉fadt_mod->Reset_BitWidth␉= 0x08; // 1 byte␊
␉␉fadt_mod->Reset_BitOffset␉= 0x00; // Offset 0␊
␉␉fadt_mod->Reset_AccessWidth␉= 0x01; // Byte access␊
␉␉fadt_mod->Reset_Address␉␉= 0x0cf9; // Address of the register␊
␉␉fadt_mod->Reset_Value␉␉= 0x06; // Value to write to reset the system␊
␉␉verbose("FADT: Restart Fix applied !\n");␊
␉␉if (fix_restart_ps2)␊
␉␉{␊
␉␉␉fadt_mod->Flags|= 0x400;␊
␉␉␉fadt_mod->Reset_SpaceID␉␉= 0x01; // System I/O␊
␉␉␉fadt_mod->Reset_BitWidth␉= 0x08; // 1 byte␊
␉␉␉fadt_mod->Reset_BitOffset␉= 0x00; // Offset 0␊
␉␉␉fadt_mod->Reset_AccessWidth␉= 0x01; // Byte access␊
␉␉␉fadt_mod->Reset_Address␉␉= 0x64; // Address of the register␊
␉␉␉fadt_mod->Reset_Value␉␉= 0xfe; // Value to write to reset the system␊
␉␉␉msglog("FADT: PS2 Restart Fix applied!\n");␊
␉␉}␊
␉␉else␊
␉␉{␊
␉␉␉fadt_mod->Flags|= 0x400;␊
␉␉␉fadt_mod->Reset_SpaceID␉␉= 0x01; // System I/O␊
␉␉␉fadt_mod->Reset_BitWidth␉= 0x08; // 1 byte␊
␉␉␉fadt_mod->Reset_BitOffset␉= 0x00; // Offset 0␊
␉␉␉fadt_mod->Reset_AccessWidth␉= 0x01; // Byte access␊
␉␉␉fadt_mod->Reset_Address␉␉= 0x0cf9; // Address of the register␊
␉␉␉fadt_mod->Reset_Value␉␉= 0x06; // Value to write to reset the system␊
␉␉␉verbose("FADT: Restart Fix applied !\n");␊
␉␉}␊
␊
␉}␊
␊
␉// Patch DSDT Address if we have loaded DSDT.aml␊
branches/ErmaC/Trunk/i386/libsaio/nvidia.c
340340
341341
342342
343
343344
344345
345346
......
433434
434435
435436
437
438
436439
437440
438441
......
513516
514517
515518
519
516520
517521
518522
......
540544
541545
542546
547
543548
544549
545550
......
568573
569574
570575
576
571577
578
572579
573580
574581
......
595602
596603
597604
605
606
607
608
609
610
611
612
613
598614
599615
600616
......
654670
655671
656672
673
674
657675
676
658677
659678
660679
......
672691
673692
674693
694
675695
676696
677697
......
729749
730750
731751
752
753
754
755
756
757
758
732759
733760
734761
......
797824
798825
799826
827
828
829
800830
801831
802832
......
809839
810840
811841
842
812843
813844
814845
......
817848
818849
819850
851
820852
821853
822854
......
842874
843875
844876
877
878
879
880
881
845882
846
847
848
849883
850884
851885
......
855889
856890
857891
892
858893
859894
860895
......
18351870
18361871
18371872
1873
18381874
18391875
18401876
......
18481884
18491885
18501886
1887
18511888
18521889
18531890
␉{ 0x10DE0407,␉0x106B00A4,␉"Apple GeForce 8600M GT" },␊
␉// 0410 - 041F␊
␉// 0420 - 042F␊
␉{ 0x10DE0426,␉0x10338897,␉"NEC GeForce 8400M GT" },␊
␉// 0430 - 043F␊
␉// 0440 - 044F␊
␉// 0450 - 045F␊
␉{ 0x10DE0640,␉0x14621290,␉"MSi GeForge 9500 GT" },␊
␉{ 0x10DE0640,␉0x14621291,␉"MSi GeForge 9500 GT" },␊
␉{ 0x10DE0640,␉0x16423796,␉"Bitland GeForge 9500 GT" },␊
␉{ 0x10DE0648,␉0x1043900F,␉"Asus GeForge 9600M GS" },␊
␉{ 0x10DE0649,␉0x10439013,␉"Asus GeForge 9600M GT" },␊
␉// 0650 - 065F␊
␉// 0660 - 066F␊
␉// 0670 - 067F␊
␉{ 0x10DE06E8,␉0x19614605,␉"ESS GeForce 9200M GE" },␊
␉{ 0x10DE06E8,␉0x19615584,␉"ESS GeForce 9200M GE" },␊
␉{ 0x10DE06E8,␉0x1B0A000E,␉"Pegatron GeForce 9200M GE" },␊
␉{ 0x10DE06E9,␉0x10430510,␉"Asus GeForce 9300M GS" },␊
␉// 06F0 - 06FF␊
␉// 0700 - 070F␊
␉// 0710 - 071F␊
␉// 0870 - 087F␊
␉{ 0x10DE0876,␉0x103C3651,␉"HP ION" },␊
␉{ 0x10DE0876,␉0x10438402,␉"Asus ION" },␊
␉{ 0x10DE087D,␉0x17AA301D,␉"Lenovo ION" },␊
␉// 0880 - 088F␊
␉// 0890 - 089F␊
␉// 08A0 - 08AF␊
␉// 0A10 - 0A1F␊
␉// 0A20 - 0A2F␊
␉{ 0x10DE0A20,␉0x10438311,␉"Asus GeForce GT 220" },␊
␉{ 0x10DE0A28,␉0x1B0A903B,␉"Pegatron GeForce GT 230" },␊
␉// 0A30 - 0A3F␊
␉{ 0x10DE0A34,␉0x16423928,␉"Bitland GeForce GT 240M" },␊
␉// 0A40 - 0A4F␊
␉// 0A50 - 0A5F␊
␉// 0A60 - 0A6F␊
␉{ 0x10DE0A6C,␉0x1028040B,␉"Dell NVS 3100M" },␊
␉{ 0x10DE0A6C,␉0x17AA2142,␉"Lenovo NVS 3100M" },␊
␉// 0A70 - 0A7F␊
␉{ 0x10DE0A70,␉0x10438458,␉"Asus GeForce 310M" },␊
␉{ 0x10DE0A70,␉0x10438459,␉"Asus GeForce 310M" },␊
␉{ 0x10DE0A70,␉0x17AA3605,␉"Lenovo ION" },␊
␉{ 0x10DE0A73,␉0x17AA3607,␉"Lenovo ION" },␊
␉{ 0x10DE0A73,␉0x17AA3610,␉"Lenovo ION" },␊
␉{ 0x10DE0A74,␉0x16423940,␉"Bitland GeForce G210M" },␊
␉{ 0x10DE0A74,␉0x1B0A903A,␉"Pegatron GeForce G210" },␊
␉{ 0x10DE0A75,␉0x10DE0798,␉"nVidia GeForce 310M" },␊
␉{ 0x10DE0A75,␉0x17AA3605,␉"Lenovo ION" },␊
␉// 0A80 - 0A8F␊
␉// 0A90 - 0A9F␊
␉// 0AA0 - 0AAF␊
␉{ 0x10DE0CA3,␉0x19DA1144,␉"Zotac GeForce GT 240" },␊
␉{ 0x10DE0CA3,␉0x19DA2130,␉"Zotac GeForce GT 240" },␊
␉{ 0x10DE0CA3,␉0x19DA2134,␉"Zotac GeForce GT 240" },␊
␉{ 0x10DE0CA9,␉0x16423942,␉"Bitland GeForce GTS 250M" },␊
␉{ 0x10DE0CAF,␉0x10DE0782,␉"nVidia GeForce GT 335M" },␊
␉// 0CB0 - 0CBF␊
␉{ 0x10DE0CB0,␉0x10DE080D,␉"nVidia GeForce GTS 350M" },␊
␉// 0CC0 - 0CCF␊
␉// 0CD0 - 0CDF␊
␉// 0CE0 - 0CEF␊
␉// 0DA0 - 0DAF␊
␉// 0DB0 - 0DBF␊
␉// 0DC0 - 0DCF␊
␉{ 0x10DE0DC0,␉0x174B1178,␉"PC Partner GeForce GT 440" },␊
␉{ 0x10DE0DD1,␉0x102802A2,␉"Dell GeForce GTX 460M" },␊
␉{ 0x10DE0DD1,␉0x1028048F,␉"Dell GeForce GTX 460M" },␊
␉{ 0x10DE0DD1,␉0x10280490,␉"Dell GeForce GTX 460M" },␊
␉{ 0x10DE0DE9,␉0x103C181D,␉"HP GeForce GT 630M" },␊
␉{ 0x10DE0DE9,␉0x103C1837,␉"HP GeForce GT 630M" },␊
␉// 0DF0 - 0DFF␊
␉{ 0x10DE0DF0,␉0x1B0A9077,␉"Pegatron GeForce GT 425M" },␊
␉{ 0x10DE0DF0,␉0x1B0A909A,␉"Pegatron GeForce GT 425M" },␊
␉{ 0x10DE0DF2,␉0x174B5162,␉"PC Partner GeForce GT 435M" },␊
␉{ 0x10DE0DF4,␉0x1043849E,␉"Asus GeForce GT 540M" },␊
␉{ 0x10DE0DF4,␉0x18490DF4,␉"ASRock GeForce GT 540M" },␊
␉{ 0x10DE0DF5,␉0x10280511,␉"Dell GeForce GT 525M" },␊
␉{ 0x10DE0DF5,␉0x10280521,␉"Dell GeForce GT 525M" },␊
␉// 0E00 - 0E0F␊
␉// 0E10 - 0E1F␊
␉// 0E20 - 0E2F␊
␉{ 0x10DE1040,␉0x1ACC5214,␉"Point of View GeForce GT 520" },␊
␉{ 0x10DE1040,␉0x1ACC522C,␉"Point of View GeForce GT 520" },␊
␉{ 0x10DE1040,␉0x1B0A90AA,␉"Pegatron GeForce GT 520" },␊
␉{ 0x10DE1042,␉0x14622595,␉"MSi GeForce 510" },␊
␉{ 0x10DE1042,␉0x14622596,␉"MSi GeForce 510" },␊
␉{ 0x10DE1050,␉0x10250593,␉"Acer GeForce GT 520M" },␊
␉{ 0x10DE1054,␉0x10280511,␉"Dell GeForce 410M" },␊
␉{ 0x10DE1054,␉0x10CF1656,␉"Fujitsu GeForce 410M" },␊
␉{ 0x10DE1054,␉0x10CF1657,␉"Fujitsu GeForce 410M" },␊
␉// 1070 - 107F␊
␉// 1080 - 108F␊
␉{ 0x10DE1081,␉0x10DE087E,␉"nVidia GeForce GTX 570" },␊
␉{ 0x10DE1084,␉0x16423A96,␉"Bitland GeForce GTX 560" },␊
␉{ 0x10DE1086,␉0x10DE0871,␉"Inno3D GeForce GTX 570" },␊
␉{ 0x10DE1087,␉0x104383D6,␉"Asus ENGTX560Ti448 DCII" },␊
␉{ 0x10DE1087,␉0x19DA2207,␉"Zotac GeForce GTX 560 Ti-448" },␊
␉{ 0x10DE1091,␉0x10DE088E,␉"nVidia Tesla X2090" },␊
␉{ 0x10DE1091,␉0x10DE0891,␉"nVidia Tesla X2090" },␊
␉{ 0x10DE1094,␉0x10DE0888,␉"nVidia Tesla M2075" },␊
␉{ 0x10DE109B,␉0x10DE0918,␉"nVidia Quadro 7000" },␊
␉// 10A0 - 10AF␊
␉// 10B0 - 10BF␊
␉// 10C0 - 10CF␊
␉{ 0x10DE1180,␉0x19DA1255,␉"Zotac GTX 680" },␊
␉{ 0x10DE1180,␉0x38422680,␉"EVGA GTX 680" },␊
␉{ 0x10DE1180,␉0x38422682,␉"EVGA GTX 680 SC" },␊
␉{ 0x10DE1180,␉0x10DE097A,␉"nVidia GeForce GTX 680" },␊
␉{ 0x10DE1180,␉0x15691189,␉"Palit GTX 680 JetStream" },␊
␉{ 0x10DE1180,␉0x19DA1255,␉"Zotac GTX 680" },␊
␉{ 0x10DE1188,␉0x10DE095B,␉"nVidia GeForce GTX 690" },␊
␉{ 0x10DE1188,␉0x38422690,␉"EVGA GeForce GTX 690" },␊
␉{ 0x10DE1189,␉0x10438405,␉"Asus GTX 670 Direct CU II TOP" },␊
␉{ 0x10DE1180,␉0x10DE097A,␉"nVidia GTX 670" },␊
␉{ 0x10DE1180,␉0x15691189,␉"Palit GTX 670 JetStream" },␊
␉{ 0x10DE1180,␉0x19DA1255,␉"Zotac GTX 670" },␊
␉{ 0x10DE1189,␉0x38422672,␉"EVGA GTX 670" },␊
␉// 1190 - 119F␊
␉// 11A0 - 11AF␊
␉// 11E0 - 11EF␊
␉// 11F0 - 11FF␊
␉// 1200 - 120F␊
␉{ 0x10DE1206,␉0x10DE0958,␉"nVidia GeForce GTX 555" },␊
␉{ 0x10DE1210,␉0x10431487,␉"Asus GeForce GTX 570M" },␊
␉{ 0x10DE1210,␉0x10432104,␉"Asus GeForce GTX 570M" },␊
␉{ 0x10DE1210,␉0x146210BD,␉"MSi GeForce GTX 570M" },␊
␉{ 0x10DE1203,␉NV_SUB_IDS,␉"GeForce GTX 460 SE v2" },␊
␉{ 0x10DE1205,␉NV_SUB_IDS,␉"GeForce GTX 460 v2" },␊
␉{ 0x10DE1206,␉NV_SUB_IDS,␉"GeForce GTX 555" },␊
␉{ 0x10DE1207,␉NV_SUB_IDS,␉"GeForce GT 645" },␊
␉{ 0x10DE1208,␉NV_SUB_IDS,␉"GeForce GTX 560 SE" },␊
␉{ 0x10DE1210,␉NV_SUB_IDS,␉"GeForce GTX 570M" },␊
␉{ 0x10DE1211,␉NV_SUB_IDS,␉"GeForce GTX 580M" },␊
␉{ 0x10DE1246,␉NV_SUB_IDS,␉"GeForce GTX 550M" },␊
␉{ 0x10DE1247,␉NV_SUB_IDS,␉"GeForce GT 635M" },␊
␉{ 0x10DE1248,␉NV_SUB_IDS,␉"GeForce GTX 555M" },␊
␉{ 0x10DE1249,␉NV_SUB_IDS,␉"GeForce GTS 450M" }, // no M?␊
␉{ 0x10DE124B,␉NV_SUB_IDS,␉"GeForce GT 640" },␊
␉{ 0x10DE124D,␉NV_SUB_IDS,␉"GeForce GTX 555M" },␊
␉// { 0x10DE1250,␉NV_SUB_IDS,␉"GF116-INT" },␊
branches/ErmaC/Trunk/i386/libsaio/ati.c
8787
8888
8989
90
90
9191
9292
9393
......
983983
984984
985985
986
986
987987
988988
989989
......
16051605
16061606
16071607
1608
1608
1609
16091610
16101611
16111612
......
16491650
16501651
16511652
1652
1653
1654
16531655
16541656
16551657
␉{"Flicker",␉␉3},␊
␉{"Galago",␉␉2},␊
␉{"Gliff",␉␉3},␊
␉{"Hoolock",␉␉3},␊
␉{"Hoolock",␉␉1},␊
␉{"Hypoprion",␉␉2},␊
␉{"Iago",␉␉2},␊
␉{"Kakapo",␉␉3},␊
␉{ 0x796C,␉0x00000000, CHIP_FAMILY_RS740,␉␉"ATI Radeon IGP ", kNull␉␉␉},␊
␉{ 0x796D,␉0x00000000, CHIP_FAMILY_RS740,␉␉"ATI Radeon IGP ", kNull␉␉␉},␊
␉{ 0x796E,␉0x00000000, CHIP_FAMILY_RS740,␉␉"ATI Radeon IGP ", kNull␉␉␉},␊
␉{ 0x796F,␉0x00000000, CHIP_FAMILY_RS740,␉␉"ATI Radeon HD ", kNull␉␉␉},␊
␉{ 0x796F,␉0x00000000, CHIP_FAMILY_RS740,␉␉"ATI Radeon IGP ", kNull␉␉␉},␊
␊
␉/* standard/default models */␊
␊
␊
void get_vram_size(void)␊
{␊
␉chip_family_t chip_family = card->info->chip_family;␊
//␉chip_family_t chip_family = card->info->chip_family;␊
ati_chip_family_t chip_family = card->info->chip_family;␊
␉␊
␉card->vram_size = 0;␊
␊
bool read_disabled_vbios(void)␊
{␊
␉bool ret = false;␊
␉chip_family_t chip_family = card->info->chip_family;␊
//␉chip_family_t chip_family = card->info->chip_family;␊
ati_chip_family_t chip_family = card->info->chip_family;␊
␉␊
␉if (chip_family >= CHIP_FAMILY_RV770)␊
␉{␊
branches/ErmaC/Trunk/i386/libsaio/ati.h
121121
122122
123123
124
124
125125
126126
127127
......
183183
184184
185185
186
186
187187
188188
189189
//␉CHIP_FAMILY_LOMBOK,␊
//␉CHIP_FAMILY_NEWZEALAND,␊
␉CHIP_FAMILY_LAST␊
} chip_family_t;␊
} ati_chip_family_t;␊
␊
typedef struct {␊
␉const char␉␉*name;␊
typedef struct {␊
␉uint16_t␉␉␉␉device_id;␊
␉uint32_t␉␉␉␉subsys_id;␊
␉chip_family_t␉␉␉chip_family;␊
␉ati_chip_family_t␉␉chip_family;␊
␉const char␉␉␉␉*model_name;␊
␉config_name_t␉␉␉cfg_name;␊
} radeon_card_info_t;␊
branches/ErmaC/Trunk/i386/libsaio/disk.c
304304
305305
306306
307
307
308308
309309
310310
␉␉sec = secno % di.di.params.phys_spt;␊
␊
␉␉if (cache_valid && (biosdev == xbiosdev) && (cyl == xcyl) &&␊
␉␉␉(head == xhead) && ((unsigned int)sec < (xsec + xnsecs)))␊
␉␉␉(head == xhead) && ((unsigned int)sec >= xsec) && ((unsigned int)sec < (xsec + xnsecs)))␊
␉␉{␊
␉␉␉// this sector is in trackbuf cache␊
␉␉␉biosbuf = trackbuf + (BPS * (sec - xsec));␊
branches/ErmaC/Trunk/i386/boot2/boot.h
105105
106106
107107
108
109
110
108111
109112
110113
/* Duvel300: added this */␊
#define kRestartFix␉␉"RestartFix"␉␉/* acpi_patcher.c */␊
␊
/* Slice: added this */␊
#define kPS2RestartFix␉␉"PS2RestartFix"␉␉/* acpi_patcher.c */␊
␊
/* Signal64: added this key */␊
#define kLegacyOff␉␉"USBLegacyOff"␉␉/* usb.c */␊
␊
branches/ErmaC/Trunk/package/po/it.po
204204
205205
206206
207
207
208208
209209
210210
#: Resources/templates/Localizable.strings:4␊
#, no-wrap␊
msgid "Chameleon Bootloader Package"␊
msgstr "Installazione di Chameleon"␊
msgstr "Chameleon"␊
␊
#. type: "ERROR_BOOTVOL"␊
#: Resources/templates/Localizable.strings:9␊

Archive Download the corresponding diff file

Revision: 1993