Index: branches/ErmaC/Trunk/i386/libsaio/nvidia.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/nvidia.c (revision 1835) +++ branches/ErmaC/Trunk/i386/libsaio/nvidia.c (revision 1836) @@ -79,17 +79,33 @@ const char *nvidia_device_type_0[] = { "@0,device_type", "display" }; const char *nvidia_device_type_1[] = { "@1,device_type", "display" }; const char *nvidia_device_type[] = { "device_type", "NVDA,Parent" }; +/* + TODO: http://forge.voodooprojects.org/p/chameleon/issues/193/ + const char *nvidia_device_type[] = { "device_type", "NVDA,Child" }; + */ const char *nvidia_name_0[] = { "@0,name", "NVDA,Display-A" }; const char *nvidia_name_1[] = { "@1,name", "NVDA,Display-B" }; const char *nvidia_slot_name[] = { "AAPL,slot-name", "Slot-1" }; +// uint8_t display_cfg_0[] = {0x03, 0x01, 0x03, 0x00}; +// uint8_t display_cfg_1[] = {0xff, 0xff, 0x00, 0x01}; +// uint8_t connector_type_1[] = {0x00, 0x08, 0x00, 0x00}; + static uint8_t default_NVCAP[]= { 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00 }; +static uint8_t default_NVPM[]= { + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + #define NVCAP_LEN ( sizeof(default_NVCAP) / sizeof(uint8_t) ) +#define NVPM_LEN ( sizeof(default_NVPM) / sizeof(uint8_t) ) static uint8_t default_dcfg_0[] = {0xff, 0xff, 0xff, 0xff}; static uint8_t default_dcfg_1[] = {0xff, 0xff, 0xff, 0xff}; @@ -400,7 +416,7 @@ { 0x10DE05E2, "GeForce GTX 260" }, { 0x10DE05E3, "GeForce GTX 285" }, { 0x10DE05E6, "GeForce GTX 275" }, - { 0x10DE05E7, "Tesla C1060" }, // ErmaC + { 0x10DE05E7, "Tesla C1060" }, { 0x10DE05EA, "GeForce GTX 260" }, { 0x10DE05EB, "GeForce GTX 295" }, { 0x10DE05ED, "Quadroplex 2200 D2" }, @@ -440,10 +456,10 @@ { 0x10DE061B, "Quadro VX 200" }, { 0x10DE061C, "Quadro FX 3600M" }, { 0x10DE061D, "Quadro FX 2800M" }, - { 0x10DE061E, "Quadro FX 3700M" }, // ErmaC + { 0x10DE061E, "Quadro FX 3700M" }, { 0x10DE061F, "Quadro FX 3800M" }, // 0620 - 062F - { 0x10DE0621, "GeForce GT 230" }, // ErmaC + { 0x10DE0621, "GeForce GT 230" }, { 0x10DE0622, "GeForce 9600 GT" }, { 0x10DE0623, "GeForce 9600 GS" }, { 0x10DE0625, "GeForce 9600 GSO 512"}, @@ -451,7 +467,7 @@ { 0x10DE0627, "GeForce GT 140" }, { 0x10DE0628, "GeForce 9800M GTS" }, { 0x10DE062A, "GeForce 9700M GTS" }, - { 0x10DE062B, "GeForce 9800M GS" }, // ErmaC + { 0x10DE062B, "GeForce 9800M GS" }, { 0x10DE062C, "GeForce 9800M GTS" }, { 0x10DE062D, "GeForce 9600 GT" }, { 0x10DE062E, "GeForce 9600 GT" }, @@ -481,7 +497,7 @@ { 0x10DE0652, "GeForce GT 130M" }, { 0x10DE0653, "GeForce GT 120M" }, { 0x10DE0654, "GeForce GT 220M" }, - { 0x10DE0655, "GeForce GT 120" }, // ErmaC + { 0x10DE0655, "GeForce GT 120" }, { 0x10DE0656, "GeForce 9650 S" }, { 0x10DE0658, "Quadro FX 380" }, { 0x10DE0659, "Quadro FX 580" }, @@ -512,7 +528,7 @@ { 0x10DE06DD, "Quadro 4000" }, { 0x10DE06DE, "Tesla M2050" }, // TODO: sub-device id: 0x0846 { 0x10DE06DE, "Tesla M2070" }, // TODO: sub-device id: ? - { 0x10DE06DF, "Tesla M2070-Q" }, // ErmaC + { 0x10DE06DF, "Tesla M2070-Q" }, // 0x10DE06DE also applies to misc S2050, X2070, M2050, M2070 // 06E0 - 06EF { 0x10DE06E0, "GeForce 9300 GE" }, @@ -530,13 +546,13 @@ { 0x10DE06EC, "GeForce G 105M" }, { 0x10DE06EF, "GeForce G 103M" }, // 06F0 - 06FF - { 0x10DE06F1, "GeForce G105M" }, // ErmaC + { 0x10DE06F1, "GeForce G105M" }, { 0x10DE06F8, "Quadro NVS 420" }, { 0x10DE06F9, "Quadro FX 370 LP" }, { 0x10DE06FA, "Quadro NVS 450" }, { 0x10DE06FB, "Quadro FX 370M" }, { 0x10DE06FD, "Quadro NVS 295" }, - { 0x10DE06FF, "HICx16 + Graphics" }, // ErmaC + { 0x10DE06FF, "HICx16 + Graphics" }, // 0700 - 070F // 0710 - 071F // 0720 - 072F @@ -563,7 +579,7 @@ // 0820 - 082F // 0830 - 083F // 0840 - 084F - { 0x10DE0840, "GeForce 8200M" }, // ErmaC + { 0x10DE0840, "GeForce 8200M" }, { 0x10DE0844, "GeForce 9100M G" }, { 0x10DE0845, "GeForce 8200M G" }, { 0x10DE0846, "GeForce 9200" }, @@ -586,7 +602,7 @@ { 0x10DE0866, "GeForce 9400M G" }, { 0x10DE0867, "GeForce 9400" }, { 0x10DE0868, "nForce 760i SLI" }, - { 0x10DE0869, "GeForce 9400" }, // ErmaC + { 0x10DE0869, "GeForce 9400" }, { 0x10DE086A, "GeForce 9400" }, { 0x10DE086C, "GeForce 9300 / nForce 730i" }, { 0x10DE086D, "GeForce 9200" }, @@ -606,8 +622,8 @@ // 0880 - 088F // 0890 - 089F // 08A0 - 08AF - { 0x10DE08A0, "GeForce 320M" }, // ErmaC - { 0x10DE08A4, "GeForce 320M" }, // ErmaC + { 0x10DE08A0, "GeForce 320M" }, + { 0x10DE08A4, "GeForce 320M" }, // 08B0 - 08BF // 08C0 - 08CF // 08D0 - 08DF @@ -635,8 +651,8 @@ { 0x10DE0A20, "GeForce GT220" }, { 0x10DE0A22, "GeForce 315" }, { 0x10DE0A23, "GeForce 210" }, - { 0x10DE0A26, "GeForce 405" }, // ErmaC - { 0x10DE0A27, "GeForce 405" }, // ErmaC + { 0x10DE0A26, "GeForce 405" }, + { 0x10DE0A27, "GeForce 405" }, { 0x10DE0A28, "GeForce GT 230M" }, { 0x10DE0A29, "GeForce GT 330M" }, { 0x10DE0A2A, "GeForce GT 230M" }, @@ -646,7 +662,7 @@ // 0A30 - 0A3F { 0x10DE0A34, "GeForce GT 240M" }, { 0x10DE0A35, "GeForce GT 325M" }, - { 0x10DE0A38, "Quadro 400" }, // ErmaC + { 0x10DE0A38, "Quadro 400" }, { 0x10DE0A3C, "Quadro FX 880M" }, // 0A40 - 0A4F // 0A50 - 0A5F @@ -671,9 +687,9 @@ { 0x10DE0A73, "GeForce 305M" }, { 0x10DE0A74, "GeForce G210M" }, { 0x10DE0A75, "GeForce G310M" }, - { 0x10DE0A76, "ION" }, // ErmaC + { 0x10DE0A76, "ION" }, { 0x10DE0A78, "Quadro FX 380 LP" }, - { 0x10DE0A7A, "GeForce 315M" }, // ErmaC + { 0x10DE0A7A, "GeForce 315M" }, { 0x10DE0A7C, "Quadro FX 380M" }, // 0A80 - 0A8F // 0A90 - 0A9F @@ -714,11 +730,11 @@ { 0x10DE0CA2, "GeForce GT 320" }, { 0x10DE0CA3, "GeForce GT 240" }, { 0x10DE0CA4, "GeForce GT 340" }, - { 0x10DE0CA5, "GeForce GT 220" }, // ErmaC + { 0x10DE0CA5, "GeForce GT 220" }, { 0x10DE0CA7, "GeForce GT 330" }, { 0x10DE0CA8, "GeForce GTS 260M" }, { 0x10DE0CA9, "GeForce GTS 250M" }, - { 0x10DE0CAC, "GeForce GT 220" }, // ErmaC + { 0x10DE0CAC, "GeForce GT 220" }, { 0x10DE0CAF, "GeForce GT 335M" }, // 0CB0 - 0CBF { 0x10DE0CB0, "GeForce GTS 350M" }, @@ -748,15 +764,15 @@ { 0x10DE0DC5, "GeForce GTS 450" }, { 0x10DE0DC6, "GeForce GTS 450" }, { 0x10DE0DCA, "GF10x" }, - { 0x10DE0DCD, "GeForce GT 555M" }, // ErmaC - { 0x10DE0DCE, "GeForce GT 555M" }, // ErmaC + { 0x10DE0DCD, "GeForce GT 555M" }, + { 0x10DE0DCE, "GeForce GT 555M" }, // 0DD0 - 0DDF { 0x10DE0DD1, "GeForce GTX 460M" }, { 0x10DE0DD2, "GeForce GT 445M" }, { 0x10DE0DD3, "GeForce GT 435M" }, - { 0x10DE0DD6, "GeForce GT 550M" }, // ErmaC + { 0x10DE0DD6, "GeForce GT 550M" }, { 0x10DE0DD8, "Quadro 2000" }, - { 0x10DE0DDA, "Quadro 2000M" }, // ErmaC + { 0x10DE0DDA, "Quadro 2000M" }, { 0x10DE0DDE, "GF106-ES" }, { 0x10DE0DDF, "GF106-INT" }, // 0DE0 - 0DEF @@ -765,20 +781,20 @@ { 0x10DE0DE2, "GeForce GT 420" }, { 0x10DE0DE5, "GeForce GT 530" }, { 0x10DE0DEB, "GeForce GT 555M" }, - { 0x10DE0DEC, "GeForce GT 525M" }, // ErmaC - { 0x10DE0DED, "GeForce GT 520M" }, // ErmaC + { 0x10DE0DEC, "GeForce GT 525M" }, + { 0x10DE0DED, "GeForce GT 520M" }, { 0x10DE0DEE, "GeForce GT 415M" }, // 0DF0 - 0DFF { 0x10DE0DF0, "GeForce GT 425M" }, { 0x10DE0DF1, "GeForce GT 420M" }, { 0x10DE0DF2, "GeForce GT 435M" }, { 0x10DE0DF3, "GeForce GT 420M" }, - { 0x10DE0DF4, "GeForce GT 540M" }, // ErmaC - { 0x10DE0DF5, "GeForce GT 525M" }, // ErmaC - { 0x10DE0DF6, "GeForce GT 550M" }, // ErmaC - { 0x10DE0DF7, "GeForce GT 520M" }, // ErmaC + { 0x10DE0DF4, "GeForce GT 540M" }, + { 0x10DE0DF5, "GeForce GT 525M" }, + { 0x10DE0DF6, "GeForce GT 550M" }, + { 0x10DE0DF7, "GeForce GT 520M" }, { 0x10DE0DF8, "Quadro 600" }, - { 0x10DE0DFA, "Quadro 1000M" }, // ErmaC + { 0x10DE0DFA, "Quadro 1000M" }, { 0x10DE0DFE, "GF108 ES" }, { 0x10DE0DFF, "GF108 INT" }, // 0E00 - 0E0F @@ -791,10 +807,10 @@ { 0x10DE0E25, "D12U-50" }, // 0E30 - 0E3F { 0x10DE0E30, "GeForce GTX 470M" }, - { 0x10DE0E31, "GeForce GTX 485M" }, // ErmaC + { 0x10DE0E31, "GeForce GTX 485M" }, { 0x10DE0E38, "GF104GL" }, - { 0x10DE0E3A, "Quadro 3000M" }, // ErmaC - { 0x10DE0E3B, "Quadro 4000M" }, // ErmaC + { 0x10DE0E3A, "Quadro 3000M" }, + { 0x10DE0E3B, "Quadro 4000M" }, { 0x10DE0E3E, "GF104-ES" }, { 0x10DE0E3F, "GF104-INT" }, // 0E40 - 0E4F @@ -833,45 +849,45 @@ { 0x10DE1040, "GeForce GT 520" }, // 1050 - 105F { 0x10DE1050, "GeForce GT 520M" }, - { 0x10DE1051, "GeForce GT 520MX" }, // ErmaC - { 0x10DE1054, "GeForce GT 410M" }, // ErmaC - { 0x10DE1056, "NVS 4200M" }, // ErmaC - { 0x10DE1057, "NVS 4200M" }, // ErmaC + { 0x10DE1051, "GeForce GT 520MX" }, + { 0x10DE1054, "GeForce GT 410M" }, + { 0x10DE1056, "NVS 4200M" }, + { 0x10DE1057, "NVS 4200M" }, // 1060 - 106F // 1070 - 107F - { 0x10DE107F, "NVIDIA GF119-ES" }, // ErmaC + { 0x10DE107F, "NVIDIA GF119-ES" }, // 1080 - 108F { 0x10DE1080, "GeForce GTX 580" }, { 0x10DE1081, "GeForce GTX 570" }, { 0x10DE1082, "GeForce GTX 560 Ti" }, { 0x10DE1083, "D13U" }, - { 0x10DE1084, "GeForce GTX 560" }, // ErmaC - { 0x10DE1086, "GeForce GTX 570" }, // ErmaC - { 0x10DE1087, "GeForce GTX 560 Ti-448" }, // ErmaC + { 0x10DE1084, "GeForce GTX 560" }, + { 0x10DE1086, "GeForce GTX 570" }, + { 0x10DE1087, "GeForce GTX 560 Ti-448" }, { 0x10DE1088, "GeForce GTX 590" }, - { 0x10DE1089, "GeForce GTX 580" }, // ErmaC - { 0x10DE108B, "GeForce GTX 590" }, // ErmaC + { 0x10DE1089, "GeForce GTX 580" }, + { 0x10DE108B, "GeForce GTX 590" }, // 1090 - 109F - { 0x10DE1091, "Tesla M2090" }, // ErmaC + { 0x10DE1091, "Tesla M2090" }, { 0x10DE1098, "D13U" }, - { 0x10DE109A, "Quadro 5010M" }, // ErmaC - { 0x10DE109B, "Quadro 7000" }, // ErmaC + { 0x10DE109A, "Quadro 5010M" }, + { 0x10DE109B, "Quadro 7000" }, // 10A0 - 10AF // 10B0 - 10BF // 10C0 - 10CF - { 0x10DE10C0, "GeForce 9300 GS" }, // ErmaC + { 0x10DE10C0, "GeForce 9300 GS" }, { 0x10DE10C3, "GeForce 8400 GS" }, - { 0x10DE10C5, "GeForce 405" }, // ErmaC + { 0x10DE10C5, "GeForce 405" }, // 10D0 - 10DF - { 0x10DE10D8, "NVS 300" }, // ErmaC + { 0x10DE10D8, "NVS 300" }, // 1200 - { 0x10DE1200, "GeForce GTX 560 Ti" }, - { 0x10DE1201, "GeForce GTX 560" }, // ErmaC - { 0x10DE1241, "GeForce GT 545" }, // ErmaC - { 0x10DE1243, "GeForce GT 545" }, // ErmaC + { 0x10DE1201, "GeForce GTX 560" }, + { 0x10DE1241, "GeForce GT 545" }, + { 0x10DE1243, "GeForce GT 545" }, { 0x10DE1244, "GeForce GTX 550 Ti" }, { 0x10DE1245, "GeForce GTS 450" }, - { 0x10DE1251, "GeForce GTX 560M" }, // ErmaC + { 0x10DE1251, "GeForce GTX 560M" }, }; static uint16_t swap16(uint16_t x) @@ -1253,10 +1269,11 @@ vram_size *= REG32(NVC0_MEM_CTRLR_COUNT); } - // Workaround for 9600M GT, GT 420/430/440 & GT 525M + // Workaround for 9600M GT, GT 210/420/430/440 & GT 525M switch (nvda_dev->device_id) { case 0x0649: vram_size = 512*1024*1024; break; // 9600M GT + case 0x0A65: vram_size = 1024*1024*1024; break; // GT 210 case 0x0DE0: vram_size = 1024*1024*1024; break; // GT 440 case 0x0DE1: vram_size = 1024*1024*1024; break; // GT 430 case 0x0DE2: vram_size = 1024*1024*1024; break; // GT 420 @@ -1511,6 +1528,10 @@ devprop_add_value(device, "VRAM,totalsize", (uint8_t*)&videoRam, 4); devprop_add_value(device, "model", (uint8_t*)model, strlen(model) + 1); devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, strlen(biosVersion) + 1); + // devprop_add_value(device, "@1,connector-type", connector_type_1, 4); // fixme + // devprop_add_value(device, "@0,display-cfg", display_cfg_0, 4); + // devprop_add_value(device, "@1,display-cfg", display_cfg_1, 4); + devprop_add_value(device, "NVPM", default_NVPM, NVPM_LEN); devprop_add_value(device, "@0,display-cfg", default_dcfg_0, DCFG0_LEN); devprop_add_value(device, "@1,display-cfg", default_dcfg_1, DCFG1_LEN); Index: branches/ErmaC/Trunk/i386/libsaio/ati.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1835) +++ branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1836) @@ -233,8 +233,8 @@ { 0x9400, 0x25521002, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull }, { 0x9400, 0x30001002, CHIP_FAMILY_R600, "ATI Radeon HD 2900 PRO", kNull }, - { 0x9440, 0x0851174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot }, // ErmaC - { 0x9440, 0x114A174B, CHIP_FAMILY_RV770, "Sapphire Radeon HD4870 Vapor-X", kCardinal }, // ErmaC + { 0x9440, 0x0851174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot }, + { 0x9440, 0x114A174B, CHIP_FAMILY_RV770, "Sapphire Radeon HD4870 Vapor-X", kCardinal }, { 0x9440, 0x24401682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot }, { 0x9440, 0x24411682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot }, { 0x9440, 0x24441682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot }, @@ -243,26 +243,17 @@ { 0x9441, 0x24401682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870 X2", kMotmot }, { 0x9442, 0x080110B0, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot }, - { 0x9442, 0x24701682, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot }, { 0x9442, 0x24711682, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot }, - { 0x9442, 0xE104174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot }, { 0x944A, 0x30001043, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x30001458, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x30001462, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x30001545, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x30001682, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x3000174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x30001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944A, 0x300017AF, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, { 0x944C, 0x24801682, CHIP_FAMILY_RV770, "ATI Radeon HD 4830", kMotmot }, @@ -270,148 +261,111 @@ { 0x944E, 0x3260174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 Series", kMotmot }, { 0x944E, 0x3261174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 series", kMotmot }, - { 0x944E, 0x30001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4730 Series", kMotmot }, { 0x944E, 0x30101787, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 Series", kMotmot }, { 0x944E, 0x31001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4820", kMotmot }, { 0x9480, 0x3628103C, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff }, - { 0x9480, 0x9035104D, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff }, - + { 0x9490, 0x4710174B, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull }, - { 0x9490, 0x20031787, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kFlicker }, { 0x9490, 0x30501787, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull }, - { 0x9490, 0x300017AF, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull }, { 0x9498, 0x21CF1458, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kNull }, - { 0x9498, 0x24511682, CHIP_FAMILY_RV730, "ATI Radeon HD 4650", kNull }, { 0x9498, 0x24521682, CHIP_FAMILY_RV730, "ATI Radeon HD 4650", kNull }, { 0x9498, 0x24541682, CHIP_FAMILY_RV730, "ATI Radeon HD 4650", kNull }, { 0x9498, 0x29331682, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kNull }, { 0x9498, 0x29341682, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kNull }, - { 0x9498, 0x30501787, CHIP_FAMILY_RV730, "ATI Radeon HD 4700", kNull }, { 0x9498, 0x31001787, CHIP_FAMILY_RV730, "ATI Radeon HD 4720", kNull }, { 0x94B3, 0x0D001002, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker }, - { 0x94B3, 0x29001682, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker }, - { 0x94B3, 0x1170174B, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker }, { 0x94C1, 0x0D021002, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull }, { 0x94C1, 0x10021002, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Pro", kNull }, - { 0x94C1, 0x0D021028, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull }, - { 0x94C1, 0x21741458, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull }, - { 0x94C1, 0x10331462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull }, { 0x94C1, 0x10401462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull }, { 0x94C1, 0x11101462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull }, { 0x94C3, 0x03421002, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, - { 0x94C3, 0x30001025, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull }, - { 0x94C3, 0x03021028, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0x04021028, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, - { 0x94C3, 0x216A1458, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0x21721458, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0x30001458, CHIP_FAMILY_RV610, "ATI Radeon HD 3410", kNull }, - { 0x94C3, 0x10321462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0x10411462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull }, { 0x94C3, 0x11041462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull }, { 0x94C3, 0x11051462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull }, { 0x94C3, 0x30001462, CHIP_FAMILY_RV610, "ATI Radeon HD 3410", kNull }, - { 0x94C3, 0x2247148C, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 LE", kNull }, { 0x94C3, 0x3000148C, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull }, - { 0x94C3, 0x30001642, CHIP_FAMILY_RV610, "ATI Radeon HD 3410", kNull }, { 0x94C3, 0x37161642, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, - { 0x94C3, 0x3000174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull }, { 0x94C3, 0xE370174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0xE400174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, - { 0x94C3, 0x203817AF, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull }, - { 0x94C3, 0x22471787, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 LE", kNull }, { 0x94C3, 0x30001787, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull }, - { 0x94C3, 0x01011A93, CHIP_FAMILY_RV610, "Qimonda Radeon HD 2400 PRO", kNull }, { 0x9501, 0x25421002, CHIP_FAMILY_RV670, "ATI Radeon HD 3870", kNull }, { 0x9501, 0x30001002, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull }, - { 0x9501, 0x3000174B, CHIP_FAMILY_RV670, "Sapphire Radeon HD 3690", kNull }, { 0x9501, 0x4750174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull }, - { 0x9501, 0x30001787, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull }, { 0x9505, 0x25421002, CHIP_FAMILY_RV670, "ATI Radeon HD 3850", kNull }, { 0x9505, 0x30001002, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull }, - { 0x9505, 0x30011043, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull }, - { 0x9505, 0x3000148C, CHIP_FAMILY_RV670, "ATI Radeon HD 3850", kNull }, { 0x9505, 0x3001148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull }, { 0x9505, 0x3002148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull }, { 0x9505, 0x3003148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull }, { 0x9505, 0x3004148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull }, - { 0x9505, 0x3000174B, CHIP_FAMILY_RV670, "Sapphire Radeon HD 3690", kNull }, { 0x9505, 0x3001174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull }, { 0x9505, 0x3010174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull }, { 0x9505, 0x4730174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull }, - { 0x9505, 0x30001787, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull }, { 0x9505, 0x301017AF, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull }, { 0x9540, 0x4590174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4590", kNull }, - { 0x9540, 0x30501787, CHIP_FAMILY_RV710, "ATI Radeon HD 4590", kNull }, - { 0x954F, 0x16131462, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull }, // ErmaC - { 0x954F, 0x20081787, CHIP_FAMILY_RV710, "ATI Radeon HD 4350", kNull }, // ErmaC + { 0x954F, 0x16131462, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull }, + { 0x954F, 0x20081787, CHIP_FAMILY_RV710, "ATI Radeon HD 4350", kNull }, { 0x954F, 0x29201682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull }, { 0x954F, 0x29211682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull }, { 0x954F, 0x30901682, CHIP_FAMILY_RV710, "XFX Radeon HD 4570", kNull }, - { 0x954F, 0x30501787, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull }, { 0x954F, 0x31001787, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull }, - { 0x954F, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull }, + { 0x954F, 0x301017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull }, { 0x954F, 0x4450174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull }, { 0x954F, 0x4570174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD 4570", kNull }, { 0x954F, 0xE990174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD 4350", kNull }, - { 0x954F, 0x301017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull }, - { 0x9552, 0x04341028, CHIP_FAMILY_RV710, "ATI Mobility Radeon 4330", kShrike }, - { 0x9552, 0x308B103C, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4300 Series", kShrike }, - { 0x9552, 0x3000148C, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull }, - { 0x9552, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull }, - { 0x9552, 0x30001787, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull }, - { 0x9552, 0x300017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull }, { 0x9553, 0x18751043, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4570", kShrike }, { 0x9553, 0x1B321043, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4570", kShrike }, { 0x9581, 0x95811002, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, - { 0x9581, 0x3000148C, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, { 0x9583, 0x3000148C, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, @@ -419,43 +373,32 @@ { 0x9588, 0x01021A93, CHIP_FAMILY_RV630, "Qimonda Radeon HD 2600 XT", kNull }, { 0x9589, 0x30001462, CHIP_FAMILY_RV630, "ATI Radeon HD 3610", kNull }, - { 0x9589, 0x0E41174B, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, - { 0x9589, 0x30001787, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, - { 0x9589, 0x01001A93, CHIP_FAMILY_RV630, "Qimonda Radeon HD 2600 PRO", kNull }, { 0x9591, 0x2303148C, CHIP_FAMILY_RV635, "ATI Radeon HD 3600 Series", kNull }, { 0x9598, 0xB3831002, CHIP_FAMILY_RV635, "ATI All-in-Wonder HD", kNull }, - { 0x9598, 0x30001043, CHIP_FAMILY_RV635, "ATI Radeon HD 3730", kNull }, { 0x9598, 0x30011043, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull }, - { 0x9598, 0x3000148C, CHIP_FAMILY_RV635, "ATI Radeon HD 3730", kNull }, { 0x9598, 0x3001148C, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull }, { 0x9598, 0x3031148C, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull }, - { 0x9598, 0x30001545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 XT", kNull }, { 0x9598, 0x30011545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 Pro", kNull }, - { 0x9598, 0x3000174B, CHIP_FAMILY_RV635, "Sapphire Radeon HD 3730", kNull }, { 0x9598, 0x3001174B, CHIP_FAMILY_RV635, "Sapphire Radeon HD 3750", kNull }, { 0x9598, 0x4570174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull }, { 0x9598, 0x4580174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull }, { 0x9598, 0x4610174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4610", kNull }, - { 0x9598, 0x300117AF, CHIP_FAMILY_RV635, "ATI Radeon HD 3750", kNull }, { 0x9598, 0x301017AF, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull }, { 0x9598, 0x301117AF, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull }, - { 0x9598, 0x30501787, CHIP_FAMILY_RV635, "ATI Radeon HD 4610", kNull }, { 0x95C0, 0x3000148C, CHIP_FAMILY_RV620, "ATI Radeon HD 3550", kNull }, - { 0x95C0, 0xE3901745, CHIP_FAMILY_RV620, "ATI Radeon HD 3550", kNull }, - { 0x95C0, 0x3000174B, CHIP_FAMILY_RV620, "Sapphire Radeon HD 3550", kNull }, { 0x95C0, 0x3002174B, CHIP_FAMILY_RV620, "ATI Radeon HD 3570", kNull }, { 0x95C0, 0x3020174B, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull }, @@ -466,34 +409,23 @@ { 0x95C5, 0x3003148C, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull }, { 0x95C5, 0x3032148C, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull }, { 0x95C5, 0x3033148C, CHIP_FAMILY_RV620, "ATI Radeon HD 4230", kNull }, - { 0x95C5, 0x3010174B, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull }, { 0x95C5, 0x4250174B, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull }, - { 0x95C5, 0x30501787, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull }, - { 0x95C5, 0x301017AF, CHIP_FAMILY_RV620, "ATI Radeon HD 4230", kNull }, - { 0x95C5, 0x01041A93, CHIP_FAMILY_RV620, "Qimonda Radeon HD 3450", kNull }, { 0x95C5, 0x01051A93, CHIP_FAMILY_RV620, "Qimonda Radeon HD 3450", kNull }, /* Evergreen */ { 0x6898, 0x0B001002, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kZonalis }, - { 0x6898, 0x032E1043, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kUakari }, - { 0x6898, 0x00D0106B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kLangur }, - { 0x6898, 0xE140174B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kUakari }, - { 0x6898, 0x29611682, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kUakari }, { 0x6899, 0x21E41458, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari }, - { 0x6899, 0xE140174B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari }, - { 0x6899, 0xE174174B, CHIP_FAMILY_CYPRESS, "ATI Sapphire Radeon HD 5850", kUakari }, - { 0x6899, 0x200A1787, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari }, { 0x6899, 0x22901787, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari }, @@ -502,59 +434,51 @@ { 0x689C, 0x30201682, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5970", kUakari }, - { 0x68A0, 0x043A1028, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5870", kNomascus }, // ErmaC + { 0x68A0, 0x043A1028, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5870", kNomascus }, { 0x68A1, 0x144D103C, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5850", kNomascus }, { 0x68A1, 0x1522103C, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5850", kHoolock }, { 0x68A8, 0x050E1025, CHIP_FAMILY_CYPRESS, "AMD Radeon HD 6850M", kUakari }, - { 0x68BA, 0x174B1482, CHIP_FAMILY_JUNIPER, "ATI Sapphire Radeon HD 6770", kVervet }, // ErmaC - { 0x68B8, 0x00CF106B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock }, - { 0x68B8, 0x21D71458, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, - { 0x68B8, 0x21F61458, CHIP_FAMILY_JUNIPER, "GigaByte HD5770 R577SL-1GD", kVervet }, // ErmaC - + { 0x68B8, 0x21F61458, CHIP_FAMILY_JUNIPER, "GigaByte HD5770 R577SL-1GD", kVervet }, { 0x68B8, 0x29901682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, { 0x68B8, 0x29911682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, - { 0x68B8, 0x1482174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, - { 0x68B8, 0xE144174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock }, // ErmaC + { 0x68B8, 0xE144174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock }, { 0x68B8, 0xE147174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, - - { 0x68B8, 0x200A1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, // ErmaC + { 0x68B8, 0x200A1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, { 0x68B8, 0x200B1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, { 0x68B8, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, - { 0x68BE, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5750", kVervet }, // ErmaC + { 0x68BA, 0x174B1482, CHIP_FAMILY_JUNIPER, "ATI Sapphire Radeon HD 6770", kVervet }, + { 0x68BA, 0x31501682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, + { 0x68BE, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5750", kVervet }, + { 0x68BF, 0x220E1458, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6750", kVervet }, - { 0x68BF, 0x31401682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6750", kVervet }, // ErmaC + { 0x68BF, 0x31401682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6750", kVervet }, { 0x68C0, 0x1594103C, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M", kNull }, - { 0x68C0, 0x392717AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull }, + { 0x68C0, 0x395217AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull }, - { 0x68C0, 0x395217AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull }, // ErmaC - - { 0x68C1, 0x02051025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x02961025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x030A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x033D1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x03471025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x03561025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x03581025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x035A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x035C1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x03641025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x03791025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x037E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - { 0x68C1, 0x03821025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, // ErmaC - + { 0x68C1, 0x02051025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x02961025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x030A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x033D1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kNull }, - + { 0x68C1, 0x03471025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x03561025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x03581025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x035A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x035C1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x03641025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x03791025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x037E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, + { 0x68C1, 0x03821025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull }, { 0x68C1, 0x9071104D, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kEulemur }, { 0x68C8, 0x2306103C, CHIP_FAMILY_REDWOOD, "ATI FirePro V4800 (FireGL)", kNull }, @@ -562,195 +486,186 @@ { 0x68D8, 0x03561043, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon }, { 0x68D8, 0x21D91458, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon }, - { 0x68D8, 0x5690174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5690", kNull }, { 0x68D8, 0x5730174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull }, - { 0x68D8, 0xE151174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kEulemur }, - + { 0x68D8, 0xE151174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kEulemur }, { 0x68D8, 0x30001787, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull }, - { 0x68D8, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull }, { 0x68D8, 0x301117AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5690", kNull }, { 0x68D9, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, { 0x68DA, 0x5630174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, - { 0x68DA, 0x30001787, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, - { 0x68DA, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, { 0x68E0, 0x04561028, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur }, - { 0x68E0, 0x1433103C, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur }, { 0x68E1, 0x1426103C, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5430M", kEulemur }, - { 0x68F9, 0x010E1002, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, // ErmaC + { 0x68E4, 0x1426103C, CHIP_FAMILY_CEDAR, "AMD Radeon HD 6370M", kNull }, + { 0x68E4, 0x397917AA, CHIP_FAMILY_CEDAR, "AMD Radeon HD 6370M", kNull }, - { 0x68F9, 0x03741043, CHIP_FAMILY_CEDAR, "ASUS EAH5450", kEulemur }, // ErmaC - + { 0x68F9, 0x010E1002, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, + { 0x68F9, 0x03741043, CHIP_FAMILY_CEDAR, "ASUS EAH5450", kEulemur }, { 0x68F9, 0x5470174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull }, { 0x68F9, 0x5490174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5490", kNull }, { 0x68F9, 0x5530174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5530", kNull }, - { 0x68F9, 0x20091787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, { 0x68F9, 0x22911787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, - { 0x68F9, 0x23401462, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, // ErmaC + { 0x68F9, 0x23401462, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, { 0x68F9, 0x30001787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull }, { 0x68F9, 0x30011787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5530", kNull }, { 0x68F9, 0x30021787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5490", kNull }, - { 0x68F9, 0x301117AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull }, { 0x68F9, 0x301217AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5490", kNull }, { 0x68F9, 0x301317AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull }, + { 0x68F9, 0xE145174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, + { 0x68F9, 0xE153174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, - { 0x68F9, 0xE145174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, // ErmaC - { 0x68F9, 0xE153174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, // ErmaC - /* Northen Islands */ { 0x6718, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull }, { 0x6718, 0x67181002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull }, { 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull }, - { 0x6719, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, // ErmaC - { 0x6719, 0x186B174B, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, // ErmaC - { 0x6719, 0x20101787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, // ErmaC + { 0x6719, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, + { 0x6719, 0x186B174B, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, + { 0x6719, 0x20101787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, + { 0x6719, 0x21FD1458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, - { 0x671D, 0x10020B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, // ErmaC - { 0x671D, 0x10021B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, // ErmaC - { 0x671D, 0x16823160, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, // ErmaC + { 0x671D, 0x10020B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, + { 0x671D, 0x10021B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, + { 0x671D, 0x16823160, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, - { 0x6720, 0x04901028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kNull }, // ErmaC - { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea }, // ErmaC + { 0x6720, 0x04901028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea }, + { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea }, { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes }, // ErmaC + { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes }, { 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x67381002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x21FA1458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x31031682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x31041682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x31071682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, // ErmaC - { 0x6738, 0x31081682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, // ErmaC ?? kJuncus ?? - + { 0x6738, 0x31071682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 0x6738, 0x31081682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, // ?? kJuncus ?? { 0x6738, 0xE178174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x20101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x23051787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6739, 0xAA881002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, - { 0x6739, 0x03B41043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, // ErmaC - { 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kBulrushes }, // ErmaC + { 0x6739, 0x03B41043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, + { 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kBulrushes }, { 0x6739, 0x24411462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, - { 0x6739, 0x31101682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, + { 0x6739, 0x31101682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0x67391002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0xE177174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, - { 0x6740, 0x1D121043, CHIP_FAMILY_TURKS, "AMD Radeon HD 6730M", kNull }, // ErmaC + { 0x6740, 0x1D121043, CHIP_FAMILY_TURKS, "AMD Radeon HD 6730M", kNull }, + { 0x6740, 0x1631103C, CHIP_FAMILY_TURKS, "AMD FirePro M5950", kNull }, { 0x6740, 0x1657103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull }, { 0x6740, 0x165A103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull }, - { 0x6740, 0x3388103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull }, // ErmaC + { 0x6740, 0x3388103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull }, { 0x6741, 0x050E1025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, { 0x6741, 0x05131025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull }, - { 0x6741, 0x1646103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6750M", kNull }, + { 0x6741, 0x1688103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 7690M", kNull }, + { 0x6741, 0x358D103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M/6650M/6750M", kNull }, + { 0x6741, 0x9080104D, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M", kNull }, - { 0x6741, 0x1688103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 7690M", kNull }, // ErmaC - - { 0x6741, 0x358D103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M/6650M/6750M", kNull }, // ErmaC - - { 0x6741, 0x9080104D, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M", kNull }, - - { 0x6758, 0x67581002, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, - + { 0x6758, 0x00121028, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, { 0x6758, 0x22051458, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, - - { 0x6758, 0xE194174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, - { 0x6758, 0x31811682, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, { 0x6758, 0x31831682, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, - + { 0x6758, 0x67581002, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, { 0x6758, 0xE1941746, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, + { 0x6758, 0xE194174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, - { 0x6759, 0x20121787, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kPithecia }, // ErmaC + { 0x6759, 0x20121787, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kPithecia }, { 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull }, - { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull }, + { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, - { 0x6760, 0x11790003, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, // ErmaC + { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, + { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull }, { 0x6760, 0x165A103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, - { 0x6760, 0x167D103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, // ErmaC - + { 0x6760, 0x167D103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, { 0x6760, 0x1CB21043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, { 0x6779, 0x64501092, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, - { 0x6779, 0xE180174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kPithecia }, // ErmaC + { 0x6779, 0xE180174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kPithecia }, /* standard/default models */ { 0x9400, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull }, { 0x9405, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 GT", kNull }, - { 0x9440, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, + { 0x9440, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, { 0x9441, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4870 X2", kMotmot }, - { 0x9442, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, + { 0x9442, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, { 0x9443, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4850 X2", kMotmot }, - { 0x944C, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x944E, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4700 Series", kMotmot }, + { 0x944A, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, + { 0x944C, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, + { 0x944E, 0x00000000, CHIP_FAMILY_RV740, "ATI Radeon HD 4700 Series", kMotmot }, { 0x9450, 0x00000000, CHIP_FAMILY_RV770, "AMD FireStream 9270", kMotmot }, { 0x9452, 0x00000000, CHIP_FAMILY_RV770, "AMD FireStream 9250", kMotmot }, - { 0x9460, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x9462, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot }, + { 0x9460, 0x00000000, CHIP_FAMILY_RV790, "ATI Radeon HD 4800 Series", kMotmot }, + { 0x9462, 0x00000000, CHIP_FAMILY_RV790, "ATI Radeon HD 4800 Series", kMotmot }, - { 0x9490, 0x00000000, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kFlicker }, - { 0x9498, 0x00000000, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kFlicker }, + { 0x9480, 0x00000000, CHIP_FAMILY_RV730, "ATI Mobility Radeon HD 4650 Series", kGliff }, + { 0x9490, 0x00000000, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kFlicker }, + { 0x9498, 0x00000000, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kFlicker }, + { 0x94B3, 0x00000000, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker }, - { 0x94B4, 0x00000000, CHIP_FAMILY_RV740, "ATI Radeon HD 4700 Series", kFlicker }, + { 0x94B4, 0x00000000, CHIP_FAMILY_RV740, "ATI Radeon HD 4700 Series", kFlicker }, { 0x94B5, 0x00000000, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker }, - { 0x94C1, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago }, - { 0x94C3, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago }, + { 0x94C1, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago }, + { 0x94C3, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago }, { 0x94C7, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2350", kIago }, - { 0x94CC, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago }, + { 0x94CC, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago }, - { 0x9501, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3800 Series", kMegalodon }, - { 0x9505, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3800 Series", kMegalodon }, - { 0x9507, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3830", kMegalodon }, - { 0x950F, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3870 X2", kMegalodon }, + { 0x9501, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3800 Series", kMegalodon }, + { 0x9505, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3800 Series", kMegalodon }, + { 0x9507, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3830", kMegalodon }, + { 0x950F, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3870 X2", kMegalodon }, - { 0x9513, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3850 X2", kMegalodon }, - { 0x9519, 0x00000000, CHIP_FAMILY_RV670, "AMD FireStream 9170", kMegalodon }, + { 0x9513, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3850 X2", kMegalodon }, + { 0x9519, 0x00000000, CHIP_FAMILY_RV630, "AMD FireStream 9170", kMegalodon }, { 0x9540, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull }, - { 0x954F, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull }, + { 0x954F, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull }, + { 0x9552, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kShrike }, { 0x9553, 0x00000000, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4500/5100 Series", kShrike }, - { 0x9588, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 XT", kLamna }, - { 0x9589, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 PRO", kLamna }, - { 0x958A, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 X2 Series", kLamna }, + { 0x9581, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, + { 0x9583, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull }, - { 0x9598, 0x00000000, CHIP_FAMILY_RV635, "ATI Radeon HD 3600 Series", kMegalodon }, + { 0x9588, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 XT", kNull }, + { 0x9589, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3610 Series", kNull }, + { 0x958A, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 X2 Series", kLamna }, - { 0x95C0, 0x00000000, CHIP_FAMILY_RV620, "ATI Radeon HD 3400 Series", kIago }, - { 0x95C5, 0x00000000, CHIP_FAMILY_RV620, "ATI Radeon HD 3400 Series", kIago }, + { 0x9591, 0x00000000, CHIP_FAMILY_RV635, "ATI Radeon HD 3600 Series", kNull }, + { 0x9598, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kMegalodon }, + { 0x95C0, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 3400 Series", kIago }, + { 0x95C5, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 3400 Series", kIago }, + /* IGP */ - { 0x9610, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon HD 3200 Graphics", kNull }, + { 0x9610, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon HD 3200 Graphics", kNull }, { 0x9611, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon 3100 Graphics", kNull }, - { 0x9614, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon HD 3300 Graphics", kNull }, - { 0x9616, 0x00000000, CHIP_FAMILY_RS780, "AMD 760G", kNull }, + { 0x9614, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon HD 3300 Graphics", kNull }, + { 0x9616, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon 3000 Graphics", kNull }, { 0x9710, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4200", kNull }, - { 0x9715, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4250", kNull }, { 0x9714, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4290", kNull }, + { 0x9715, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4250", kNull }, /* Evergreen */ { 0x688D, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD FireStream 9350", kUakari }, @@ -760,20 +675,27 @@ { 0x689C, 0x00000000, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5900 Series", kUakari }, { 0x689E, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari }, - { 0x68A0, 0x00000000, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5800 Series", kNomascus }, // ErmaC - { 0x68A1, 0x00000000, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5800 Series", kNull }, // ErmaC - { 0x68B0, 0x00000000, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5800 Series", kNull }, // ErmaC + { 0x68A0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus }, // CHIP_FAMILY_BROADWAY ?? + { 0x68A1, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus }, // CHIP_FAMILY_BROADWAY ?? + { 0x68A8, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD Mobility Radeon HD 6800 Series", kUakari }, + { 0x68B0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNull }, // CHIP_FAMILY_BROADWAY ?? { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet }, { 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5600 Series", kVervet }, - { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6770 Series", kVervet }, + { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6700 Series", kVervet }, { 0x68BE, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet }, + { 0x68BF, 0x00000000, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6700 Series", kVervet }, + { 0x68C0, 0x00000000, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M/5700 Series", kNull }, + { 0x68C1, 0x00000000, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6500M/5600/5700 Series", kNull }, + { 0x68D8, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5600 Series", kBaboon }, - { 0x68D9, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500 Series", kBaboon }, + { 0x68D9, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500/5600 Series", kBaboon }, { 0x68DA, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500 Series", kBaboon }, - { 0x68E4, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 6370M Series", kNull }, + { 0x68E0, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur }, + { 0x68E1, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur }, + { 0x68E4, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 6300M Series", kNull }, { 0x68F9, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5400 Series", kNull }, @@ -781,9 +703,10 @@ { 0x6718, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970 Series", kNull }, { 0x6719, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950 Series", kGibba }, - { 0x671D, 0x00000000, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6900 Series", kNull }, // ErmaC - { 0x671F, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6900 Series", kNull }, // ErmaC + { 0x671D, 0x00000000, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6900 Series", kNull }, + { 0x671F, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6900 Series", kNull }, + { 0x6720, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6900M Series", kNull }, { 0x6738, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870 Series", kDuckweed }, @@ -793,12 +716,14 @@ { 0x6740, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6700M Series", kNull }, { 0x6741, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600M/6700M Series", kNull }, + { 0x6750, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600A Series", kNull }, + { 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kBulrushes }, - { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6500 Series", kNull }, + { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570/7570 Series", kNull }, { 0x6760, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400M Series", kNull }, { 0x6761, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6430M Series", kNull }, - + { 0x6770, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400 Series", kNull }, { 0x6779, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450 Series", kBulrushes }, Index: branches/ErmaC/Trunk/package/OptionalSettings/KernelFlags.txt =================================================================== --- branches/ErmaC/Trunk/package/OptionalSettings/KernelFlags.txt (revision 1835) +++ branches/ErmaC/Trunk/package/OptionalSettings/KernelFlags.txt (revision 1836) @@ -29,4 +29,5 @@ List@Singleusermode:Kernel Flags=-s List@Ignorecaches:Kernel Flags=-f List@Npci:Kernel Flags=npci=0x2000 +List@Npci3:Kernel Flags=npci=0x3000 List@Darkwake:Kernel Flags=darkwake=0 Index: branches/ErmaC/Trunk/package/Resources/ja.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/he.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/fi.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/bs.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/fr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/nl.lproj/Description.html =================================================================== --- branches/ErmaC/Trunk/package/Resources/nl.lproj/Description.html (revision 1835) +++ branches/ErmaC/Trunk/package/Resources/nl.lproj/Description.html (revision 1836) @@ -15,23 +15,23 @@ -

Chameleon is een combinatie van verschillende boot loader componenten. Het is gebaseerd op de fake EFI implementatie van David Elliott die toegevoegd is aan Apple's boot-123 project.

+

Chameleon is een combinatie van verschillende bootloader componenten. Het is gebaseerd op de fake EFI implementatie van David Elliott die toegevoegd is aan Apple's boot-123 project.


Nieuwe functies in Chameleon 2.0.


-

- Volledig aanpasbare GUI, zodat de Darwin Bootloader een mooier uiterlijk krijgt.

-

- Het booten van retail DVD's door direct een ramdisk image te laden zonder hulp van extra programma's.

+

- Volledig aanpasbare GUI, zodat de Darwin Bootloader een ander uiterlijk krijgt.

+

- Het booten van retail DVD's door direct een image te laden zonder hulp van externe programma's.

- Slaapstand. Geniet van het hervatten van Mac OS X met een preview image.

-

- Het negeren van het SMBIOS zodat de standaard SMBIOS waarden aangepast kunnen worden.

-

- Het negeren van de DSDT zodat er een aangepaste verbeterde DSDT kan worden gebruikt om bepaalde problemen op te lossen.

-

- Device Property Injection via device-properties string.

+

- Het passeren van de SMBIOS zodat de standaard SMBIOS waarden aangepast kunnen worden.

+

- Het passeren van de DSDT zodat er een aangepaste verbeterde DSDT kan worden gebruikt om bepaalde problemen op te lossen.

+

- Device Property Injectie via device-properties string.

- Hybride boot0 / boot1h voor MBR en GPT gepartitioneerde schijven.

-

- automatische FSB detectie code, zelfs voor recente AMD processoren.

+

- Automatische FSB detectie code, zelfs voor recente AMD processors.

- Apple Software RAID ondersteuning.

-

- Nvidia & ATI/AMD graphische kaart autodetectie.

+

- Nvidia & ATI/AMD grafische kaart autodetectie.

- Module ondersteuning

- Geheugen detectie overgenomen van memtest86: http://www.memtest.org

-

- Automatisch P-State's & C-State's aangemaakt voor automatisch stroombeheer.

+

- Automatisch P-State's & C-State's aangemaakt voor zelf aangestuurd stroombeheer.

- Bericht logboek.


De code is vrijgegeven onder versie 2 van de Gnu Public License.

Index: branches/ErmaC/Trunk/package/Resources/nl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/Trunk/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1835) +++ branches/ErmaC/Trunk/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1836) @@ -11,8 +11,8 @@ \cf2 @LOG_FILENAME@\cf3 is geschreven\ naar de root van de door u gekozen partitie.\ \ -\cf0 Alstublieft \cf4 lees het\cf0 document om te zien of de installatie\ -goed verlopen is en bewaar het als registratie.\ +\cf0 Alstublieft \cf4 raadpleeg\cf0 het document om te zien of\ +de installatie goed verlopen is en bewaar het ter naslag.\ \cf4 \ \ \ Index: branches/ErmaC/Trunk/package/Resources/hr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/pl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/th.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/no.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/hu.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/vi.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/ro.lproj/Description.html =================================================================== --- branches/ErmaC/Trunk/package/Resources/ro.lproj/Description.html (revision 1835) +++ branches/ErmaC/Trunk/package/Resources/ro.lproj/Description.html (revision 1836) @@ -15,26 +15,26 @@ -

Chameleon is a boot loader built using a combination of components which evolved from the development of David Elliott's fake EFI implementation added to Apple's boot-132 project.

+

Chameleon este un bootloader cu elemente combinate, derivat din implementarea fake EFI a lui David Elliott si proiectul Apple's boot-132.


-

Chameleon v2 is extended with many features. For example:

+

Chameleon v2 ofera un numar de facilitati, cum ar fi:


-

- Fully customizable GUI to bring some color to the Darwin Bootloader.

-

- Load a ramdisk to directly boot retail DVDs without additional programs.

-

- Hibernation. Enjoy resuming your Mac OS X with a preview image.

-

- SMBIOS override to modify the factory SMBIOS values.

-

- DSDT override to use a modified fixed DSDT which can solve several issues.

-

- Device Property Injection via device-properties string.

-

- hybrid boot0 / boot1h for MBR and GPT partitioned disks.

-

- Automatic FSB detection code even for recent AMD CPUs.

-

- Apple Software RAID support.

-

- Nvidia & ATI/AMD Graphics Card Enabler.

-

- Module support

-

- Memory detection adapted from memtest86: http://www.memtest.org

-

- Automatic P-State & C-State generation for native power management.

-

- Message logging.

+

- Interfata grafica complet modificabila dupa preferintele userului.

+

- RamDisk pentru boot cu versiuni retail Mac OS X.

+

- Hibernare folosind imaginea de hibernare.

+

- SMBIOS modificabil pentru a extinde compatibilitatea cu diferite computere.

+

- DSDT modificabil, oferind avantajul de a corecta posibilele incompatibilitati hardware.

+

- Injectare de proprietati pentru diferite hardware-uri.

+

- boot0 / boot1h hibrid, pentru partiti MBR precum si GPT.

+

- FSB detectabil automat, chiar si pentru procesoare AMD noi.

+

- Suport nativ RAID in OS X.

+

- Activare mod video pentru nVidia si ATI/AMD.

+

- Suport pentru module

+

- Detectare automata a memoriei bazata pe memtest86: http://www.memtest.org

+

- Generare automata P-states si C-states pentru management al energiei.

+

- Logare mesaje.


-

The code is released under version 2 of the Gnu Public License.

+

Acest cod este acoperit de versiunea 2 a Gnu Public License.

http://forge.voodooprojects.org/p/chameleon


FAQ's: http://forum.voodooprojects.org/index.php/topic,754.0.html

Index: branches/ErmaC/Trunk/package/Resources/ro.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/Trunk/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf (revision 1835) +++ branches/ErmaC/Trunk/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf (revision 1836) @@ -17,18 +17,18 @@ \fs28 \cf0 \ \pard\ri0\qc -\cf2 Do not install to an Apple Macintosh computer\ +\cf2 Nu instalati acest software pe un computer Apple Macintosh\ \pard\ri0\qc \cf0 \ \pard\ri0\ql\qnatural -\fs24 \cf0 Developers : +\fs24 \cf0 Developeri : \fs20 %DEVELOP% \fs24 \ \fs18 \ -\fs24 Thanks to : +\fs24 Multumiri : \fs20 %CREDITS% \fs24 \ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -36,7 +36,7 @@ \b0\fs18 \cf0 \ \pard\ri0\ql\qnatural -\b\fs24 \cf0 Package : +\b\fs24 \cf0 Pachet : \fs20 %PKGDEV% \b0\fs30 \ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -44,10 +44,10 @@ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 -\b \cf3 Translated by : ???\ +\b \cf3 Tradus de : RvXtm\ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc -\b\fs20 \cf4 This package was builded by: %WHOBUILD%} +\b\fs20 \cf4 Pachet compilat de: %WHOBUILD%} Index: branches/ErmaC/Trunk/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/Trunk/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf (revision 1835) +++ branches/ErmaC/Trunk/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf (revision 1836) @@ -7,12 +7,12 @@ \f0\b\fs28 \cf0 \ \ -The scripts have completed and a file\ - named \cf2 @LOG_FILENAME@\cf3 has been\ -written to the root of your chosen partition.\ +Scripturiile au fost executate iar un fisier\ + numit \cf2 @LOG_FILENAME@\cf3 a fost salvat in\ +directorul principal al partitiei selectate.\ \ -\cf0 Please \cf4 read it\cf0 to find out if the installation was\ -successful and keep it for a record of what was done.\ +\cf0 Va rugam \cf4 sa il cititi\cf0 pentru a afla daca instalarea a fost\ +facuta cu succes si pentru a tine evidenta modificariilor facute.\ \cf4 \ \ \ @@ -26,4 +26,4 @@ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc -\b \cf6 This package was builded by: %WHOBUILD%} +\b \cf6 Pachet compilat de: %WHOBUILD%} Index: branches/ErmaC/Trunk/package/Resources/ca.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/tr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/ru.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/id.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/el.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/en.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/ar.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/cs.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/es.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/mk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/ko.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/it.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/sk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/ms.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/uk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/sr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/da.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/sv.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/bg.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/Resources/de.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Trunk/package/buildpkg.sh =================================================================== --- branches/ErmaC/Trunk/package/buildpkg.sh (revision 1835) +++ branches/ErmaC/Trunk/package/buildpkg.sh (revision 1836) @@ -60,7 +60,7 @@ declare -r CHAMELEON_CREDITS=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS) declare -r CHAMELEON_PKGDEV=$(awk "NR==14{print;exit}" ${PKGROOT}/../CREDITS) declare -r CHAMELEON_CPRYEAR=$(awk "NR==18{print;exit}" ${PKGROOT}/../CREDITS) -if [[ $(whoami | awk '{print $1}' | cut -d ":" -f3) == "cmorton" ]];then +if [[ $(whoami | awk '{print $1}' | cut -d ":" -f3) == "admin" ]];then declare -r CHAMELEON_WHOBUILD="VoodooLabs BuildBot" else declare -r CHAMELEON_WHOBUILD=$(whoami | awk '{print $1}' | cut -d ":" -f3) Index: branches/ErmaC/Trunk/Make.rules =================================================================== --- branches/ErmaC/Trunk/Make.rules (revision 1835) +++ branches/ErmaC/Trunk/Make.rules (revision 1836) @@ -10,7 +10,7 @@ endif AS = as LD = ld -CC = cc +CC = gcc CPP = g++ PAX = /bin/pax NASM = $(shell which nasm) -p $(SRCROOT)/autoconf.inc Index: branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1835) +++ branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj (revision 1836) @@ -744,7 +744,7 @@ A354B634149514DE00D81AA5 /* MountESP.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = MountESP.sh; sourceTree = ""; }; A354B635149514DE00D81AA5 /* patch */ = {isa = PBXFileReference; lastKnownFileType = file; path = patch; sourceTree = ""; }; A354B636149514DE00D81AA5 /* SetActivePartition.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = SetActivePartition.sh; sourceTree = ""; }; - A354B637149514DE00D81AA5 /* UnMountEFIvolumes.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = UnMountEFIvolumes.sh; sourceTree = ""; }; + A354B637149514DE00D81AA5 /* UnMountEFIvolumes.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Scripts.templates/UnMount/UnMountEFIvolumes.sh; sourceTree = ""; }; A354B638149514DE00D81AA5 /* WriteChameleonStage0.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = WriteChameleonStage0.sh; sourceTree = ""; }; A354B639149514DE00D81AA5 /* WriteChameleonStage1.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = WriteChameleonStage1.sh; sourceTree = ""; }; A354B63A149514DE00D81AA5 /* WriteChameleonStage2.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = WriteChameleonStage2.sh; sourceTree = ""; }; @@ -1299,10 +1299,6 @@ B4189A2214BFBF5600ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; B4189A2314BFBF7200ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; B4189A2414BFBFD100ED5B0B /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; - B43E407614EE869700CD79F9 /* device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o.png; sourceTree = ""; }; - B43E407714EE869800CD79F9 /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = ""; }; - B43E407814EE869A00CD79F9 /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = ""; }; - B43E407914EE869C00CD79F9 /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = ""; }; B4189A3414BFC26400ED5B0B /* ati.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ati.c; path = ATiGraphicsEnabler/ati.c; sourceTree = ""; }; B4189A3514BFC26400ED5B0B /* ati.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ati.h; path = ATiGraphicsEnabler/ati.h; sourceTree = ""; }; B4189A3614BFC26400ED5B0B /* ATiGraphicsEnabler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ATiGraphicsEnabler.c; path = ATiGraphicsEnabler/ATiGraphicsEnabler.c; sourceTree = ""; }; @@ -1328,6 +1324,10 @@ B4189A5214BFC2F700ED5B0B /* NVIDIAGraphicsEnabler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NVIDIAGraphicsEnabler.c; path = NVIDIAGraphicsEnabler/NVIDIAGraphicsEnabler.c; sourceTree = ""; }; B4189A5314BFC2F700ED5B0B /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Readme.txt; path = NVIDIAGraphicsEnabler/Readme.txt; sourceTree = ""; }; B4189A5714BFC39700ED5B0B /* GraphicsEnablerModules.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GraphicsEnablerModules.txt; sourceTree = ""; }; + B43E407614EE869700CD79F9 /* device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o.png; sourceTree = ""; }; + B43E407714EE869800CD79F9 /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = ""; }; + B43E407814EE869A00CD79F9 /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = ""; }; + B43E407914EE869C00CD79F9 /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = ""; }; B442B8C514BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ar; path = ar.lproj/License.rtf; sourceTree = ""; }; B442B8C614BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = ar; path = ar.lproj/Conclusion.rtfd; sourceTree = ""; }; B442B8C714BE6C7A00EEF9D4 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ar; path = ar.lproj/Description.html; sourceTree = ""; }; @@ -1506,6 +1506,7 @@ B4AABE5C14C3B8D70055ECD1 /* InstallTheme */, 364E0DE314BCFB7A00F55E58 /* Post */, 364E0DE514BCFB7A00F55E58 /* Pre */, + B49B8D2614FC6E87000327FF /* UnMount */, ); name = Scripts.templates; sourceTree = ""; @@ -2672,7 +2673,6 @@ A354B634149514DE00D81AA5 /* MountESP.sh */, A354B635149514DE00D81AA5 /* patch */, A354B636149514DE00D81AA5 /* SetActivePartition.sh */, - A354B637149514DE00D81AA5 /* UnMountEFIvolumes.sh */, A354B638149514DE00D81AA5 /* WriteChameleonStage0.sh */, A354B639149514DE00D81AA5 /* WriteChameleonStage1.sh */, A354B63A149514DE00D81AA5 /* WriteChameleonStage2.sh */, @@ -3593,6 +3593,14 @@ name = lxdialog; sourceTree = ""; }; + B49B8D2614FC6E87000327FF /* UnMount */ = { + isa = PBXGroup; + children = ( + A354B637149514DE00D81AA5 /* UnMountEFIvolumes.sh */, + ); + name = UnMount; + sourceTree = ""; + }; B4AABE5814C3B8B90055ECD1 /* AddOption */ = { isa = PBXGroup; children = ( Index: branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c =================================================================== --- branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c (revision 1835) +++ branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c (revision 1836) @@ -86,17 +86,33 @@ const char *nvidia_device_type_0[] = { "@0,device_type", "display" }; const char *nvidia_device_type_1[] = { "@1,device_type", "display" }; const char *nvidia_device_type[] = { "device_type", "NVDA,Parent" }; +/* + TODO: http://forge.voodooprojects.org/p/chameleon/issues/193/ + const char *nvidia_device_type[] = { "device_type", "NVDA,Child" }; + */ const char *nvidia_name_0[] = { "@0,name", "NVDA,Display-A" }; const char *nvidia_name_1[] = { "@1,name", "NVDA,Display-B" }; const char *nvidia_slot_name[] = { "AAPL,slot-name", "Slot-1" }; +// uint8_t display_cfg_0[] = {0x03, 0x01, 0x03, 0x00}; +// uint8_t display_cfg_1[] = {0xff, 0xff, 0x00, 0x01}; +// uint8_t connector_type_1[] = {0x00, 0x08, 0x00, 0x00}; + static uint8_t default_NVCAP[]= { 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00 }; +static uint8_t default_NVPM[]= { + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + #define NVCAP_LEN ( sizeof(default_NVCAP) / sizeof(uint8_t) ) +#define NVPM_LEN ( sizeof(default_NVPM) / sizeof(uint8_t) ) static uint8_t default_dcfg_0[] = {0xff, 0xff, 0xff, 0xff}; static uint8_t default_dcfg_1[] = {0xff, 0xff, 0xff, 0xff}; @@ -407,7 +423,7 @@ { 0x10DE05E2, "GeForce GTX 260" }, { 0x10DE05E3, "GeForce GTX 285" }, { 0x10DE05E6, "GeForce GTX 275" }, - { 0x10DE05E7, "Tesla C1060" }, // ErmaC + { 0x10DE05E7, "Tesla C1060" }, { 0x10DE05EA, "GeForce GTX 260" }, { 0x10DE05EB, "GeForce GTX 295" }, { 0x10DE05ED, "Quadroplex 2200 D2" }, @@ -447,10 +463,10 @@ { 0x10DE061B, "Quadro VX 200" }, { 0x10DE061C, "Quadro FX 3600M" }, { 0x10DE061D, "Quadro FX 2800M" }, - { 0x10DE061E, "Quadro FX 3700M" }, // ErmaC + { 0x10DE061E, "Quadro FX 3700M" }, { 0x10DE061F, "Quadro FX 3800M" }, // 0620 - 062F - { 0x10DE0621, "GeForce GT 230" }, // ErmaC + { 0x10DE0621, "GeForce GT 230" }, { 0x10DE0622, "GeForce 9600 GT" }, { 0x10DE0623, "GeForce 9600 GS" }, { 0x10DE0625, "GeForce 9600 GSO 512"}, @@ -458,7 +474,7 @@ { 0x10DE0627, "GeForce GT 140" }, { 0x10DE0628, "GeForce 9800M GTS" }, { 0x10DE062A, "GeForce 9700M GTS" }, - { 0x10DE062B, "GeForce 9800M GS" }, // ErmaC + { 0x10DE062B, "GeForce 9800M GS" }, { 0x10DE062C, "GeForce 9800M GTS" }, { 0x10DE062D, "GeForce 9600 GT" }, { 0x10DE062E, "GeForce 9600 GT" }, @@ -488,7 +504,7 @@ { 0x10DE0652, "GeForce GT 130M" }, { 0x10DE0653, "GeForce GT 120M" }, { 0x10DE0654, "GeForce GT 220M" }, - { 0x10DE0655, "GeForce GT 120" }, // ErmaC + { 0x10DE0655, "GeForce GT 120" }, { 0x10DE0656, "GeForce 9650 S" }, { 0x10DE0658, "Quadro FX 380" }, { 0x10DE0659, "Quadro FX 580" }, @@ -519,7 +535,7 @@ { 0x10DE06DD, "Quadro 4000" }, { 0x10DE06DE, "Tesla M2050" }, // TODO: sub-device id: 0x0846 { 0x10DE06DE, "Tesla M2070" }, // TODO: sub-device id: ? - { 0x10DE06DF, "Tesla M2070-Q" }, // ErmaC + { 0x10DE06DF, "Tesla M2070-Q" }, // 0x10DE06DE also applies to misc S2050, X2070, M2050, M2070 // 06E0 - 06EF { 0x10DE06E0, "GeForce 9300 GE" }, @@ -537,13 +553,13 @@ { 0x10DE06EC, "GeForce G 105M" }, { 0x10DE06EF, "GeForce G 103M" }, // 06F0 - 06FF - { 0x10DE06F1, "GeForce G105M" }, // ErmaC + { 0x10DE06F1, "GeForce G105M" }, { 0x10DE06F8, "Quadro NVS 420" }, { 0x10DE06F9, "Quadro FX 370 LP" }, { 0x10DE06FA, "Quadro NVS 450" }, { 0x10DE06FB, "Quadro FX 370M" }, { 0x10DE06FD, "Quadro NVS 295" }, - { 0x10DE06FF, "HICx16 + Graphics" }, // ErmaC + { 0x10DE06FF, "HICx16 + Graphics" }, // 0700 - 070F // 0710 - 071F // 0720 - 072F @@ -570,7 +586,7 @@ // 0820 - 082F // 0830 - 083F // 0840 - 084F - { 0x10DE0840, "GeForce 8200M" }, // ErmaC + { 0x10DE0840, "GeForce 8200M" }, { 0x10DE0844, "GeForce 9100M G" }, { 0x10DE0845, "GeForce 8200M G" }, { 0x10DE0846, "GeForce 9200" }, @@ -593,7 +609,7 @@ { 0x10DE0866, "GeForce 9400M G" }, { 0x10DE0867, "GeForce 9400" }, { 0x10DE0868, "nForce 760i SLI" }, - { 0x10DE0869, "GeForce 9400" }, // ErmaC + { 0x10DE0869, "GeForce 9400" }, { 0x10DE086A, "GeForce 9400" }, { 0x10DE086C, "GeForce 9300 / nForce 730i" }, { 0x10DE086D, "GeForce 9200" }, @@ -613,8 +629,8 @@ // 0880 - 088F // 0890 - 089F // 08A0 - 08AF - { 0x10DE08A0, "GeForce 320M" }, // ErmaC - { 0x10DE08A4, "GeForce 320M" }, // ErmaC + { 0x10DE08A0, "GeForce 320M" }, + { 0x10DE08A4, "GeForce 320M" }, // 08B0 - 08BF // 08C0 - 08CF // 08D0 - 08DF @@ -642,8 +658,8 @@ { 0x10DE0A20, "GeForce GT220" }, { 0x10DE0A22, "GeForce 315" }, { 0x10DE0A23, "GeForce 210" }, - { 0x10DE0A26, "GeForce 405" }, // ErmaC - { 0x10DE0A27, "GeForce 405" }, // ErmaC + { 0x10DE0A26, "GeForce 405" }, + { 0x10DE0A27, "GeForce 405" }, { 0x10DE0A28, "GeForce GT 230M" }, { 0x10DE0A29, "GeForce GT 330M" }, { 0x10DE0A2A, "GeForce GT 230M" }, @@ -653,7 +669,7 @@ // 0A30 - 0A3F { 0x10DE0A34, "GeForce GT 240M" }, { 0x10DE0A35, "GeForce GT 325M" }, - { 0x10DE0A38, "Quadro 400" }, // ErmaC + { 0x10DE0A38, "Quadro 400" }, { 0x10DE0A3C, "Quadro FX 880M" }, // 0A40 - 0A4F // 0A50 - 0A5F @@ -678,9 +694,9 @@ { 0x10DE0A73, "GeForce 305M" }, { 0x10DE0A74, "GeForce G210M" }, { 0x10DE0A75, "GeForce G310M" }, - { 0x10DE0A76, "ION" }, // ErmaC + { 0x10DE0A76, "ION" }, { 0x10DE0A78, "Quadro FX 380 LP" }, - { 0x10DE0A7A, "GeForce 315M" }, // ErmaC + { 0x10DE0A7A, "GeForce 315M" }, { 0x10DE0A7C, "Quadro FX 380M" }, // 0A80 - 0A8F // 0A90 - 0A9F @@ -721,11 +737,11 @@ { 0x10DE0CA2, "GeForce GT 320" }, { 0x10DE0CA3, "GeForce GT 240" }, { 0x10DE0CA4, "GeForce GT 340" }, - { 0x10DE0CA5, "GeForce GT 220" }, // ErmaC + { 0x10DE0CA5, "GeForce GT 220" }, { 0x10DE0CA7, "GeForce GT 330" }, { 0x10DE0CA8, "GeForce GTS 260M" }, { 0x10DE0CA9, "GeForce GTS 250M" }, - { 0x10DE0CAC, "GeForce GT 220" }, // ErmaC + { 0x10DE0CAC, "GeForce GT 220" }, { 0x10DE0CAF, "GeForce GT 335M" }, // 0CB0 - 0CBF { 0x10DE0CB0, "GeForce GTS 350M" }, @@ -755,15 +771,15 @@ { 0x10DE0DC5, "GeForce GTS 450" }, { 0x10DE0DC6, "GeForce GTS 450" }, { 0x10DE0DCA, "GF10x" }, - { 0x10DE0DCD, "GeForce GT 555M" }, // ErmaC - { 0x10DE0DCE, "GeForce GT 555M" }, // ErmaC + { 0x10DE0DCD, "GeForce GT 555M" }, + { 0x10DE0DCE, "GeForce GT 555M" }, // 0DD0 - 0DDF { 0x10DE0DD1, "GeForce GTX 460M" }, { 0x10DE0DD2, "GeForce GT 445M" }, { 0x10DE0DD3, "GeForce GT 435M" }, - { 0x10DE0DD6, "GeForce GT 550M" }, // ErmaC + { 0x10DE0DD6, "GeForce GT 550M" }, { 0x10DE0DD8, "Quadro 2000" }, - { 0x10DE0DDA, "Quadro 2000M" }, // ErmaC + { 0x10DE0DDA, "Quadro 2000M" }, { 0x10DE0DDE, "GF106-ES" }, { 0x10DE0DDF, "GF106-INT" }, // 0DE0 - 0DEF @@ -772,20 +788,20 @@ { 0x10DE0DE2, "GeForce GT 420" }, { 0x10DE0DE5, "GeForce GT 530" }, { 0x10DE0DEB, "GeForce GT 555M" }, - { 0x10DE0DEC, "GeForce GT 525M" }, // ErmaC - { 0x10DE0DED, "GeForce GT 520M" }, // ErmaC + { 0x10DE0DEC, "GeForce GT 525M" }, + { 0x10DE0DED, "GeForce GT 520M" }, { 0x10DE0DEE, "GeForce GT 415M" }, // 0DF0 - 0DFF { 0x10DE0DF0, "GeForce GT 425M" }, { 0x10DE0DF1, "GeForce GT 420M" }, { 0x10DE0DF2, "GeForce GT 435M" }, { 0x10DE0DF3, "GeForce GT 420M" }, - { 0x10DE0DF4, "GeForce GT 540M" }, // ErmaC - { 0x10DE0DF5, "GeForce GT 525M" }, // ErmaC - { 0x10DE0DF6, "GeForce GT 550M" }, // ErmaC - { 0x10DE0DF7, "GeForce GT 520M" }, // ErmaC + { 0x10DE0DF4, "GeForce GT 540M" }, + { 0x10DE0DF5, "GeForce GT 525M" }, + { 0x10DE0DF6, "GeForce GT 550M" }, + { 0x10DE0DF7, "GeForce GT 520M" }, { 0x10DE0DF8, "Quadro 600" }, - { 0x10DE0DFA, "Quadro 1000M" }, // ErmaC + { 0x10DE0DFA, "Quadro 1000M" }, { 0x10DE0DFE, "GF108 ES" }, { 0x10DE0DFF, "GF108 INT" }, // 0E00 - 0E0F @@ -798,10 +814,10 @@ { 0x10DE0E25, "D12U-50" }, // 0E30 - 0E3F { 0x10DE0E30, "GeForce GTX 470M" }, - { 0x10DE0E31, "GeForce GTX 485M" }, // ErmaC + { 0x10DE0E31, "GeForce GTX 485M" }, { 0x10DE0E38, "GF104GL" }, - { 0x10DE0E3A, "Quadro 3000M" }, // ErmaC - { 0x10DE0E3B, "Quadro 4000M" }, // ErmaC + { 0x10DE0E3A, "Quadro 3000M" }, + { 0x10DE0E3B, "Quadro 4000M" }, { 0x10DE0E3E, "GF104-ES" }, { 0x10DE0E3F, "GF104-INT" }, // 0E40 - 0E4F @@ -840,44 +856,45 @@ { 0x10DE1040, "GeForce GT 520" }, // 1050 - 105F { 0x10DE1050, "GeForce GT 520M" }, - { 0x10DE1054, "GeForce GT 410M" }, // ErmaC - { 0x10DE1056, "NVS 4200M" }, // ErmaC - { 0x10DE1057, "NVS 4200M" }, // ErmaC + { 0x10DE1051, "GeForce GT 520MX" }, + { 0x10DE1054, "GeForce GT 410M" }, + { 0x10DE1056, "NVS 4200M" }, + { 0x10DE1057, "NVS 4200M" }, // 1060 - 106F // 1070 - 107F - { 0x10DE107F, "NVIDIA GF119-ES" }, // ErmaC + { 0x10DE107F, "NVIDIA GF119-ES" }, // 1080 - 108F { 0x10DE1080, "GeForce GTX 580" }, { 0x10DE1081, "GeForce GTX 570" }, { 0x10DE1082, "GeForce GTX 560 Ti" }, { 0x10DE1083, "D13U" }, - { 0x10DE1084, "GeForce GTX 560" }, // ErmaC - { 0x10DE1086, "GeForce GTX 570" }, // ErmaC - { 0x10DE1087, "GeForce GTX 560 Ti-448" }, // ErmaC + { 0x10DE1084, "GeForce GTX 560" }, + { 0x10DE1086, "GeForce GTX 570" }, + { 0x10DE1087, "GeForce GTX 560 Ti-448" }, { 0x10DE1088, "GeForce GTX 590" }, - { 0x10DE1089, "GeForce GTX 580" }, // ErmaC - { 0x10DE108B, "GeForce GTX 590" }, // ErmaC + { 0x10DE1089, "GeForce GTX 580" }, + { 0x10DE108B, "GeForce GTX 590" }, // 1090 - 109F - { 0x10DE1091, "Tesla M2090" }, // ErmaC + { 0x10DE1091, "Tesla M2090" }, { 0x10DE1098, "D13U" }, - { 0x10DE109A, "Quadro 5010M" }, // ErmaC - { 0x10DE109B, "Quadro 7000" }, // ErmaC + { 0x10DE109A, "Quadro 5010M" }, + { 0x10DE109B, "Quadro 7000" }, // 10A0 - 10AF // 10B0 - 10BF // 10C0 - 10CF - { 0x10DE10C0, "GeForce 9300 GS" }, // ErmaC + { 0x10DE10C0, "GeForce 9300 GS" }, { 0x10DE10C3, "GeForce 8400 GS" }, - { 0x10DE10C5, "GeForce 405" }, // ErmaC + { 0x10DE10C5, "GeForce 405" }, // 10D0 - 10DF - { 0x10DE10D8, "NVS 300" }, // ErmaC + { 0x10DE10D8, "NVS 300" }, // 1200 - { 0x10DE1200, "GeForce GTX 560 Ti" }, - { 0x10DE1201, "GeForce GTX 560" }, // ErmaC - { 0x10DE1241, "GeForce GT 545" }, // ErmaC - { 0x10DE1243, "GeForce GT 545" }, // ErmaC + { 0x10DE1201, "GeForce GTX 560" }, + { 0x10DE1241, "GeForce GT 545" }, + { 0x10DE1243, "GeForce GT 545" }, { 0x10DE1244, "GeForce GTX 550 Ti" }, { 0x10DE1245, "GeForce GTS 450" }, - { 0x10DE1251, "GeForce GTX 560M" }, // ErmaC + { 0x10DE1251, "GeForce GTX 560M" }, }; static uint16_t swap16(uint16_t x) @@ -1259,14 +1276,16 @@ vram_size *= REG32(NVC0_MEM_CTRLR_COUNT); } - // Workaround for 9600M GT, GT 420/430/440 & GT 525M + // Workaround for 9600M GT, GT 210/420/430/440 & GT 525M switch (nvda_dev->device_id) { case 0x0649: vram_size = 512*1024*1024; break; // 9600M GT + case 0x0A65: vram_size = 1024*1024*1024; break; // GT 210 case 0x0DE0: vram_size = 1024*1024*1024; break; // GT 440 case 0x0DE1: vram_size = 1024*1024*1024; break; // GT 430 case 0x0DE2: vram_size = 1024*1024*1024; break; // GT 420 - case 0x0DEC: vram_size = 1024*1024*1024; break; // GT 525M + case 0x0DEC: vram_size = 1024*1024*1024; break; // GT 525M 0DEC + case 0x0DF5: vram_size = 1024*1024*1024; break; // GT 525M 0DF5 default: break; } @@ -1516,6 +1535,10 @@ devprop_add_value(device, "VRAM,totalsize", (uint8_t*)&videoRam, 4); devprop_add_value(device, "model", (uint8_t*)model, strlen(model) + 1); devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, strlen(biosVersion) + 1); + // devprop_add_value(device, "@1,connector-type", connector_type_1, 4); // fixme + // devprop_add_value(device, "@0,display-cfg", display_cfg_0, 4); + // devprop_add_value(device, "@1,display-cfg", display_cfg_1, 4); + devprop_add_value(device, "NVPM", default_NVPM, NVPM_LEN); devprop_add_value(device, "@0,display-cfg", default_dcfg_0, DCFG0_LEN); devprop_add_value(device, "@1,display-cfg", default_dcfg_1, DCFG1_LEN); Index: branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c =================================================================== --- branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c (revision 1835) +++ branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c (revision 1836) @@ -50,8 +50,8 @@ CHIP_FAMILY_RV710, CHIP_FAMILY_RV730, CHIP_FAMILY_RV740, - CHIP_FAMILY_RV772, CHIP_FAMILY_RV770, + CHIP_FAMILY_RV772, CHIP_FAMILY_RV790, /* Evergreen */ CHIP_FAMILY_CEDAR, @@ -240,8 +240,8 @@ { 0x9400, 0x25521002, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull , 0 }, { 0x9400, 0x30001002, CHIP_FAMILY_R600, "ATI Radeon HD 2900 PRO", kNull , 0 }, - { 0x9440, 0x0851174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot , 0 }, // ErmaC - { 0x9440, 0x114A174B, CHIP_FAMILY_RV770, "Sapphire Radeon HD4870 Vapor-X", kCardinal , 0 }, // ErmaC + { 0x9440, 0x0851174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot , 0 }, + { 0x9440, 0x114A174B, CHIP_FAMILY_RV770, "Sapphire Radeon HD4870 Vapor-X", kCardinal , 0 }, { 0x9440, 0x24401682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot , 0 }, { 0x9440, 0x24411682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot , 0 }, { 0x9440, 0x24441682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870", kMotmot , 0 }, @@ -250,26 +250,17 @@ { 0x9441, 0x24401682, CHIP_FAMILY_RV770, "ATI Radeon HD 4870 X2", kMotmot , 0 }, { 0x9442, 0x080110B0, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot , 0 }, - { 0x9442, 0x24701682, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot , 0 }, { 0x9442, 0x24711682, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot , 0 }, - { 0x9442, 0xE104174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4850", kMotmot , 0 }, { 0x944A, 0x30001043, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x30001458, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x30001462, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x30001545, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x30001682, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x3000174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x30001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944A, 0x300017AF, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, { 0x944C, 0x24801682, CHIP_FAMILY_RV770, "ATI Radeon HD 4830", kMotmot , 0 }, @@ -277,148 +268,111 @@ { 0x944E, 0x3260174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 Series", kMotmot , 0 }, { 0x944E, 0x3261174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 series", kMotmot , 0 }, - { 0x944E, 0x30001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4730 Series", kMotmot , 0 }, { 0x944E, 0x30101787, CHIP_FAMILY_RV770, "ATI Radeon HD 4810 Series", kMotmot , 0 }, { 0x944E, 0x31001787, CHIP_FAMILY_RV770, "ATI Radeon HD 4820", kMotmot , 0 }, { 0x9480, 0x3628103C, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff , 0 }, - { 0x9480, 0x9035104D, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff , 0 }, - + { 0x9490, 0x4710174B, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull , 0 }, - { 0x9490, 0x20031787, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kFlicker , 0 }, { 0x9490, 0x30501787, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull , 0 }, - { 0x9490, 0x300017AF, CHIP_FAMILY_RV730, "ATI Radeon HD 4710", kNull , 0 }, { 0x9498, 0x21CF1458, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kNull , 0 }, - { 0x9498, 0x24511682, CHIP_FAMILY_RV730, "ATI Radeon HD 4650", kNull , 0 }, { 0x9498, 0x24521682, CHIP_FAMILY_RV730, "ATI Radeon HD 4650", kNull , 0 }, { 0x9498, 0x24541682, CHIP_FAMILY_RV730, "ATI Radeon HD 4650", kNull , 0 }, { 0x9498, 0x29331682, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kNull , 0 }, { 0x9498, 0x29341682, CHIP_FAMILY_RV730, "ATI Radeon HD 4670", kNull , 0 }, - { 0x9498, 0x30501787, CHIP_FAMILY_RV730, "ATI Radeon HD 4700", kNull , 0 }, { 0x9498, 0x31001787, CHIP_FAMILY_RV730, "ATI Radeon HD 4720", kNull , 0 }, { 0x94B3, 0x0D001002, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker , 0 }, - { 0x94B3, 0x29001682, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker , 0 }, - { 0x94B3, 0x1170174B, CHIP_FAMILY_RV740, "ATI Radeon HD 4770", kFlicker , 0 }, { 0x94C1, 0x0D021002, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull , 0 }, { 0x94C1, 0x10021002, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Pro", kNull , 0 }, - { 0x94C1, 0x0D021028, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull , 0 }, - { 0x94C1, 0x21741458, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull , 0 }, - { 0x94C1, 0x10331462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull , 0 }, { 0x94C1, 0x10401462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull , 0 }, { 0x94C1, 0x11101462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 XT", kNull , 0 }, { 0x94C3, 0x03421002, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, - { 0x94C3, 0x30001025, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull , 0 }, - { 0x94C3, 0x03021028, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, { 0x94C3, 0x04021028, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, - { 0x94C3, 0x216A1458, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, { 0x94C3, 0x21721458, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, { 0x94C3, 0x30001458, CHIP_FAMILY_RV610, "ATI Radeon HD 3410", kNull , 0 }, - { 0x94C3, 0x10321462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, { 0x94C3, 0x10411462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull , 0 }, { 0x94C3, 0x11041462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull , 0 }, { 0x94C3, 0x11051462, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull , 0 }, { 0x94C3, 0x30001462, CHIP_FAMILY_RV610, "ATI Radeon HD 3410", kNull , 0 }, - { 0x94C3, 0x2247148C, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 LE", kNull , 0 }, { 0x94C3, 0x3000148C, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull , 0 }, - { 0x94C3, 0x30001642, CHIP_FAMILY_RV610, "ATI Radeon HD 3410", kNull , 0 }, { 0x94C3, 0x37161642, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, - { 0x94C3, 0x3000174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull , 0 }, { 0x94C3, 0xE370174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, { 0x94C3, 0xE400174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull , 0 }, - { 0x94C3, 0x203817AF, CHIP_FAMILY_RV610, "ATI Radeon HD 2400", kNull , 0 }, - { 0x94C3, 0x22471787, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 LE", kNull , 0 }, { 0x94C3, 0x30001787, CHIP_FAMILY_RV610, "ATI Radeon HD 2350 Series", kNull , 0 }, - { 0x94C3, 0x01011A93, CHIP_FAMILY_RV610, "Qimonda Radeon HD 2400 PRO", kNull , 0 }, { 0x9501, 0x25421002, CHIP_FAMILY_RV670, "ATI Radeon HD 3870", kNull , 0 }, { 0x9501, 0x30001002, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull , 0 }, - { 0x9501, 0x3000174B, CHIP_FAMILY_RV670, "Sapphire Radeon HD 3690", kNull , 0 }, { 0x9501, 0x4750174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull , 0 }, - { 0x9501, 0x30001787, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull , 0 }, { 0x9505, 0x25421002, CHIP_FAMILY_RV670, "ATI Radeon HD 3850", kNull , 0 }, { 0x9505, 0x30001002, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull , 0 }, - { 0x9505, 0x30011043, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull , 0 }, - { 0x9505, 0x3000148C, CHIP_FAMILY_RV670, "ATI Radeon HD 3850", kNull , 0 }, { 0x9505, 0x3001148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull , 0 }, { 0x9505, 0x3002148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull , 0 }, { 0x9505, 0x3003148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull , 0 }, { 0x9505, 0x3004148C, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull , 0 }, - { 0x9505, 0x3000174B, CHIP_FAMILY_RV670, "Sapphire Radeon HD 3690", kNull , 0 }, { 0x9505, 0x3001174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull , 0 }, { 0x9505, 0x3010174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull , 0 }, { 0x9505, 0x4730174B, CHIP_FAMILY_RV670, "ATI Radeon HD 4730", kNull , 0 }, - { 0x9505, 0x30001787, CHIP_FAMILY_RV670, "ATI Radeon HD 3690", kNull , 0 }, { 0x9505, 0x301017AF, CHIP_FAMILY_RV670, "ATI Radeon HD 4750", kNull , 0 }, { 0x9540, 0x4590174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4590", kNull , 0 }, - { 0x9540, 0x30501787, CHIP_FAMILY_RV710, "ATI Radeon HD 4590", kNull , 0 }, - { 0x954F, 0x16131462, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull , 0 }, // ErmaC - { 0x954F, 0x20081787, CHIP_FAMILY_RV710, "ATI Radeon HD 4350", kNull , 0 }, // ErmaC + { 0x954F, 0x16131462, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull , 0 }, + { 0x954F, 0x20081787, CHIP_FAMILY_RV710, "ATI Radeon HD 4350", kNull , 0 }, { 0x954F, 0x29201682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull , 0 }, { 0x954F, 0x29211682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull , 0 }, { 0x954F, 0x30901682, CHIP_FAMILY_RV710, "XFX Radeon HD 4570", kNull , 0 }, - { 0x954F, 0x30501787, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull , 0 }, { 0x954F, 0x31001787, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull , 0 }, - { 0x954F, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4520", kNull , 0 }, + { 0x954F, 0x301017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull , 0 }, { 0x954F, 0x4450174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull , 0 }, { 0x954F, 0x4570174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD 4570", kNull , 0 }, { 0x954F, 0xE990174B, CHIP_FAMILY_RV710, "Sapphire Radeon HD 4350", kNull , 0 }, - { 0x954F, 0x301017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4450", kNull , 0 }, - { 0x9552, 0x04341028, CHIP_FAMILY_RV710, "ATI Mobility Radeon 4330", kShrike , 0 }, - { 0x9552, 0x308B103C, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4300 Series", kShrike , 0 }, - { 0x9552, 0x3000148C, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull , 0 }, - { 0x9552, 0x3000174B, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull , 0 }, - { 0x9552, 0x30001787, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull , 0 }, - { 0x9552, 0x300017AF, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull , 0 }, { 0x9553, 0x18751043, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4570", kShrike , 0 }, { 0x9553, 0x1B321043, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4570", kShrike , 0 }, { 0x9581, 0x95811002, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, - { 0x9581, 0x3000148C, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, { 0x9583, 0x3000148C, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, @@ -426,43 +380,32 @@ { 0x9588, 0x01021A93, CHIP_FAMILY_RV630, "Qimonda Radeon HD 2600 XT", kNull , 0 }, { 0x9589, 0x30001462, CHIP_FAMILY_RV630, "ATI Radeon HD 3610", kNull , 0 }, - { 0x9589, 0x0E41174B, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, - { 0x9589, 0x30001787, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, - { 0x9589, 0x01001A93, CHIP_FAMILY_RV630, "Qimonda Radeon HD 2600 PRO", kNull , 0 }, { 0x9591, 0x2303148C, CHIP_FAMILY_RV635, "ATI Radeon HD 3600 Series", kNull , 0 }, { 0x9598, 0xB3831002, CHIP_FAMILY_RV635, "ATI All-in-Wonder HD", kNull , 0 }, - { 0x9598, 0x30001043, CHIP_FAMILY_RV635, "ATI Radeon HD 3730", kNull , 0 }, { 0x9598, 0x30011043, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull , 0 }, - { 0x9598, 0x3000148C, CHIP_FAMILY_RV635, "ATI Radeon HD 3730", kNull , 0 }, { 0x9598, 0x3001148C, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull , 0 }, { 0x9598, 0x3031148C, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull , 0 }, - { 0x9598, 0x30001545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 XT", kNull , 0 }, { 0x9598, 0x30011545, CHIP_FAMILY_RV635, "VisionTek Radeon HD 2600 Pro", kNull , 0 }, - { 0x9598, 0x3000174B, CHIP_FAMILY_RV635, "Sapphire Radeon HD 3730", kNull , 0 }, { 0x9598, 0x3001174B, CHIP_FAMILY_RV635, "Sapphire Radeon HD 3750", kNull , 0 }, { 0x9598, 0x4570174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull , 0 }, { 0x9598, 0x4580174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull , 0 }, { 0x9598, 0x4610174B, CHIP_FAMILY_RV635, "ATI Radeon HD 4610", kNull , 0 }, - { 0x9598, 0x300117AF, CHIP_FAMILY_RV635, "ATI Radeon HD 3750", kNull , 0 }, { 0x9598, 0x301017AF, CHIP_FAMILY_RV635, "ATI Radeon HD 4570", kNull , 0 }, { 0x9598, 0x301117AF, CHIP_FAMILY_RV635, "ATI Radeon HD 4580", kNull , 0 }, - { 0x9598, 0x30501787, CHIP_FAMILY_RV635, "ATI Radeon HD 4610", kNull , 0 }, { 0x95C0, 0x3000148C, CHIP_FAMILY_RV620, "ATI Radeon HD 3550", kNull , 0 }, - { 0x95C0, 0xE3901745, CHIP_FAMILY_RV620, "ATI Radeon HD 3550", kNull , 0 }, - { 0x95C0, 0x3000174B, CHIP_FAMILY_RV620, "Sapphire Radeon HD 3550", kNull , 0 }, { 0x95C0, 0x3002174B, CHIP_FAMILY_RV620, "ATI Radeon HD 3570", kNull , 0 }, { 0x95C0, 0x3020174B, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull , 0 }, @@ -473,34 +416,23 @@ { 0x95C5, 0x3003148C, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull , 0 }, { 0x95C5, 0x3032148C, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull , 0 }, { 0x95C5, 0x3033148C, CHIP_FAMILY_RV620, "ATI Radeon HD 4230", kNull , 0 }, - { 0x95C5, 0x3010174B, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull , 0 }, { 0x95C5, 0x4250174B, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull , 0 }, - { 0x95C5, 0x30501787, CHIP_FAMILY_RV620, "ATI Radeon HD 4250", kNull , 0 }, - { 0x95C5, 0x301017AF, CHIP_FAMILY_RV620, "ATI Radeon HD 4230", kNull , 0 }, - { 0x95C5, 0x01041A93, CHIP_FAMILY_RV620, "Qimonda Radeon HD 3450", kNull , 0 }, { 0x95C5, 0x01051A93, CHIP_FAMILY_RV620, "Qimonda Radeon HD 3450", kNull , 0 }, /* Evergreen */ { 0x6898, 0x0B001002, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kZonalis , 0 }, - { 0x6898, 0x032E1043, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kUakari , 0 }, - { 0x6898, 0x00D0106B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kLangur , 0 }, - { 0x6898, 0xE140174B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kUakari , 0 }, - { 0x6898, 0x29611682, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5870", kUakari , 0 }, { 0x6899, 0x21E41458, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari , 0 }, - { 0x6899, 0xE140174B, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari , 0 }, - { 0x6899, 0xE174174B, CHIP_FAMILY_CYPRESS, "ATI Sapphire Radeon HD 5850", kUakari , 0 }, - { 0x6899, 0x200A1787, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari , 0 }, { 0x6899, 0x22901787, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5850", kUakari , 0 }, @@ -509,58 +441,51 @@ { 0x689C, 0x30201682, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5970", kUakari , 0 }, - { 0x68A0, 0x043A1028, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5870", kNomascus , 0 }, // ErmaC + { 0x68A0, 0x043A1028, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5870", kNomascus , 0 }, - { 0x68A1, 0x144D103C, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5850", kNomascus , 0 }, + { 0x68A1, 0x144D103C, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5850", kNomascus , 0 }, { 0x68A1, 0x1522103C, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5850", kHoolock , 0 }, { 0x68A8, 0x050E1025, CHIP_FAMILY_CYPRESS, "AMD Radeon HD 6850M", kUakari , 0 }, - { 0x68BA, 0x174B1482, CHIP_FAMILY_JUNIPER, "ATI Sapphire Radeon HD 6770", kVervet , 0 }, // ErmaC - { 0x68B8, 0x00CF106B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock , 0 }, - { 0x68B8, 0x21D71458, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, - { 0x68B8, 0x21F61458, CHIP_FAMILY_JUNIPER, "GigaByte HD5770 R577SL-1GD", kVervet , 0 }, // ErmaC - + { 0x68B8, 0x21F61458, CHIP_FAMILY_JUNIPER, "GigaByte HD5770 R577SL-1GD", kVervet , 0 }, { 0x68B8, 0x29901682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, { 0x68B8, 0x29911682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, - { 0x68B8, 0x1482174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, - { 0x68B8, 0xE144174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock , 0 }, // ErmaC + { 0x68B8, 0xE144174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kHoolock , 0 }, { 0x68B8, 0xE147174B, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, - - { 0x68B8, 0x200A1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, // ErmaC + { 0x68B8, 0x200A1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, { 0x68B8, 0x200B1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, { 0x68B8, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, - { 0x68BE, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5750", kVervet , 0 }, // ErmaC + { 0x68BA, 0x174B1482, CHIP_FAMILY_JUNIPER, "ATI Sapphire Radeon HD 6770", kVervet , 0 }, + { 0x68BA, 0x31501682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, + { 0x68BE, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5750", kVervet , 0 }, + { 0x68BF, 0x220E1458, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6750", kVervet , 0 }, + { 0x68BF, 0x31401682, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6750", kVervet , 0 }, { 0x68C0, 0x1594103C, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M", kNull , 0 }, - { 0x68C0, 0x392717AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull , 0 }, + { 0x68C0, 0x395217AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull , 0 }, - { 0x68C0, 0x395217AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull , 0 }, // ErmaC - - { 0x68C1, 0x02051025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x02961025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x030A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x033D1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x03471025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x03561025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x03581025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x035A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x035C1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x03641025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x03791025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x037E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - { 0x68C1, 0x03821025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, // ErmaC - + { 0x68C1, 0x02051025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x02961025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x030A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x033D1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kNull , 0 }, - + { 0x68C1, 0x03471025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x03561025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x03581025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x035A1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x035C1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x03641025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x03791025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x037E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, + { 0x68C1, 0x03821025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5750", kNull , 0 }, { 0x68C1, 0x9071104D, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kEulemur , 0 }, { 0x68C8, 0x2306103C, CHIP_FAMILY_REDWOOD, "ATI FirePro V4800 (FireGL)", kNull , 0 }, @@ -568,131 +493,118 @@ { 0x68D8, 0x03561043, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon , 0 }, { 0x68D8, 0x21D91458, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon , 0 }, - { 0x68D8, 0x5690174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5690", kNull , 0 }, { 0x68D8, 0x5730174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull , 0 }, { 0x68D8, 0xE151174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kEulemur , 0 }, - { 0x68D8, 0x30001787, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull , 0 }, - { 0x68D8, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull , 0 }, { 0x68D8, 0x301117AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5690", kNull , 0 }, { 0x68D9, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull , 0 }, { 0x68DA, 0x5630174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull , 0 }, - { 0x68DA, 0x30001787, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull , 0 }, - { 0x68DA, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull , 0 }, { 0x68E0, 0x04561028, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur , 0 }, - { 0x68E0, 0x1433103C, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470M", kEulemur , 0 }, { 0x68E1, 0x1426103C, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5430M", kEulemur , 0 }, - { 0x68F9, 0x010E1002, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, // ErmaC + { 0x68E4, 0x1426103C, CHIP_FAMILY_CEDAR, "AMD Radeon HD 6370M", kNull , 0 }, + { 0x68E4, 0x397917AA, CHIP_FAMILY_CEDAR, "AMD Radeon HD 6370M", kNull , 0 }, - { 0x68F9, 0x03741043, CHIP_FAMILY_CEDAR, "ASUS EAH5450", kEulemur , 0 }, // ErmaC - + { 0x68F9, 0x010E1002, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, + { 0x68F9, 0x03741043, CHIP_FAMILY_CEDAR, "ASUS EAH5450", kEulemur , 0 }, { 0x68F9, 0x5470174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull , 0 }, { 0x68F9, 0x5490174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5490", kNull , 0 }, { 0x68F9, 0x5530174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5530", kNull , 0 }, - { 0x68F9, 0x20091787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, { 0x68F9, 0x22911787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, - { 0x68F9, 0x23401462, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, // ErmaC + { 0x68F9, 0x23401462, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, { 0x68F9, 0x30001787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull , 0 }, { 0x68F9, 0x30011787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5530", kNull , 0 }, { 0x68F9, 0x30021787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5490", kNull , 0 }, - { 0x68F9, 0x301117AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull , 0 }, { 0x68F9, 0x301217AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5490", kNull , 0 }, { 0x68F9, 0x301317AF, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5470", kNull , 0 }, + { 0x68F9, 0xE145174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, + { 0x68F9, 0xE153174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, - { 0x68F9, 0xE145174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, // ErmaC - { 0x68F9, 0xE153174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, // ErmaC - /* Northen Islands */ { 0x6718, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, { 0x6718, 0x67181002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, { 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, - { 0x6719, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, // ErmaC - { 0x6719, 0x186B174B, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, // ErmaC - { 0x6719, 0x20101787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, // ErmaC + { 0x6719, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, + { 0x6719, 0x186B174B, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, + { 0x6719, 0x20101787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, + { 0x6719, 0x21FD1458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, - { 0x671D, 0x10020B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, // ErmaC - { 0x671D, 0x10021B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, // ErmaC - { 0x671D, 0x16823160, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, // ErmaC + { 0x671D, 0x10020B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, + { 0x671D, 0x10021B2A, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, + { 0x671D, 0x16823160, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, - { 0x6720, 0x04901028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kNull , 0 }, // ErmaC - { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea , 0 }, // ErmaC + { 0x6720, 0x04901028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea , 0 }, + { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea , 0 }, { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes , 0 }, // ErmaC + { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes , 0 }, { 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x67381002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x21FA1458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x31031682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x31041682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x31071682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, // ErmaC - { 0x6738, 0x31081682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, // ErmaC ?? kJuncus ?? - + { 0x6738, 0x31071682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, + { 0x6738, 0x31081682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, // ?? kJuncus ?? { 0x6738, 0xE178174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x20101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x23051787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6739, 0xAA881002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, - { 0x6739, 0x03B41043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, // ErmaC - { 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kBulrushes , 0 }, // ErmaC + { 0x6739, 0x03B41043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, + { 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kBulrushes , 0 }, { 0x6739, 0x24411462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, - { 0x6739, 0x31101682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, + { 0x6739, 0x31101682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0x67391002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0xE177174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, - { 0x6740, 0x1D121043, CHIP_FAMILY_TURKS, "AMD Radeon HD 6730M", kNull , 0 }, // ErmaC + { 0x6740, 0x1D121043, CHIP_FAMILY_TURKS, "AMD Radeon HD 6730M", kNull , 0 }, + { 0x6740, 0x1631103C, CHIP_FAMILY_TURKS, "AMD FirePro M5950", kNull , 0 }, { 0x6740, 0x1657103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull , 0 }, { 0x6740, 0x165A103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull , 0 }, + { 0x6740, 0x3388103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6770M", kNull , 0 }, { 0x6741, 0x050E1025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull , 0 }, { 0x6741, 0x05131025, CHIP_FAMILY_TURKS, "AMD Radeon HD 6650M", kNull , 0 }, - { 0x6741, 0x1646103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6750M", kNull , 0 }, + { 0x6741, 0x1688103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 7690M", kNull , 0 }, + { 0x6741, 0x358D103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M/6650M/6750M", kNull , 0 }, + { 0x6741, 0x9080104D, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M", kNull , 0 }, - { 0x6741, 0x358D103C, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M/6650M/6750M", kNull , 0 }, // ErmaC - - { 0x6741, 0x9080104D, CHIP_FAMILY_TURKS, "AMD Radeon HD 6630M", kNull , 0 }, - - { 0x6758, 0x67581002, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, - + { 0x6758, 0x00121028, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, { 0x6758, 0x22051458, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, - - { 0x6758, 0xE194174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, - { 0x6758, 0x31811682, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, { 0x6758, 0x31831682, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, - + { 0x6758, 0x67581002, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, { 0x6758, 0xE1941746, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, + { 0x6758, 0xE194174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes , 0 }, + { 0x6759, 0x20121787, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kPithecia , 0 }, { 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull , 0 }, - { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull , 0 }, + { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, - { 0x6760, 0x11790003, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, // ErmaC + { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, + { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull , 0 }, { 0x6760, 0x165A103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, - { 0x6760, 0x167D103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, // ErmaC - + { 0x6760, 0x167D103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, { 0x6760, 0x1CB21043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, { 0x6779, 0x64501092, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0xE180174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kPithecia , 0 }, - { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, - /* standard/default models */ { 0x9400, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull , 0 }, { 0x9405, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 GT", kNull , 0 }, @@ -701,15 +613,18 @@ { 0x9441, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4870 X2", kMotmot , 0 }, { 0x9442, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, { 0x9443, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4850 X2", kMotmot , 0 }, + { 0x944A, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, { 0x944C, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x944E, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4700 Series", kMotmot , 0 }, + { 0x944E, 0x00000000, CHIP_FAMILY_RV740, "ATI Radeon HD 4700 Series", kMotmot , 0 }, { 0x9450, 0x00000000, CHIP_FAMILY_RV770, "AMD FireStream 9270", kMotmot , 0 }, { 0x9452, 0x00000000, CHIP_FAMILY_RV770, "AMD FireStream 9250", kMotmot , 0 }, - { 0x9460, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, - { 0x9462, 0x00000000, CHIP_FAMILY_RV770, "ATI Radeon HD 4800 Series", kMotmot , 0 }, + { 0x9460, 0x00000000, CHIP_FAMILY_RV790, "ATI Radeon HD 4800 Series", kMotmot , 0 }, + { 0x9462, 0x00000000, CHIP_FAMILY_RV790, "ATI Radeon HD 4800 Series", kMotmot , 0 }, + { 0x9480, 0x00000000, CHIP_FAMILY_RV730, "ATI Mobility Radeon HD 4650 Series", kGliff , 0 }, + { 0x9490, 0x00000000, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kFlicker , 0 }, { 0x9498, 0x00000000, CHIP_FAMILY_RV730, "ATI Radeon HD 4600 Series", kFlicker , 0 }, @@ -722,37 +637,42 @@ { 0x94C7, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2350", kIago , 0 }, { 0x94CC, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 Series", kIago , 0 }, - { 0x9501, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3800 Series", kMegalodon , 0 }, - { 0x9505, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3800 Series", kMegalodon , 0 }, - { 0x9507, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3830", kMegalodon , 0 }, - { 0x950F, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3870 X2", kMegalodon , 0 }, + { 0x9501, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3800 Series", kMegalodon , 0 }, + { 0x9505, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3800 Series", kMegalodon , 0 }, + { 0x9507, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3830", kMegalodon , 0 }, + { 0x950F, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3870 X2", kMegalodon , 0 }, - { 0x9513, 0x00000000, CHIP_FAMILY_RV670, "ATI Radeon HD 3850 X2", kMegalodon , 0 }, - { 0x9519, 0x00000000, CHIP_FAMILY_RV670, "AMD FireStream 9170", kMegalodon , 0 }, + { 0x9513, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3850 X2", kMegalodon , 0 }, + { 0x9519, 0x00000000, CHIP_FAMILY_RV630, "AMD FireStream 9170", kMegalodon , 0 }, { 0x9540, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull , 0 }, { 0x954F, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kNull , 0 }, + { 0x9552, 0x00000000, CHIP_FAMILY_RV710, "ATI Radeon HD 4300/4500 Series", kShrike , 0 }, { 0x9553, 0x00000000, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4500/5100 Series", kShrike , 0 }, - { 0x9588, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 XT", kLamna , 0 }, - { 0x9589, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 PRO", kLamna , 0 }, + { 0x9581, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, + { 0x9583, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kNull , 0 }, + + { 0x9588, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 XT", kNull , 0 }, + { 0x9589, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3610 Series", kNull , 0 }, { 0x958A, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 2600 X2 Series", kLamna , 0 }, - { 0x9598, 0x00000000, CHIP_FAMILY_RV635, "ATI Radeon HD 3600 Series", kMegalodon , 0 }, + { 0x9591, 0x00000000, CHIP_FAMILY_RV635, "ATI Radeon HD 3600 Series", kNull , 0 }, + { 0x9598, 0x00000000, CHIP_FAMILY_RV630, "ATI Radeon HD 3600 Series", kMegalodon , 0 }, - { 0x95C0, 0x00000000, CHIP_FAMILY_RV620, "ATI Radeon HD 3400 Series", kIago , 0 }, - { 0x95C5, 0x00000000, CHIP_FAMILY_RV620, "ATI Radeon HD 3400 Series", kIago , 0 }, + { 0x95C0, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 3400 Series", kIago , 0 }, + { 0x95C5, 0x00000000, CHIP_FAMILY_RV610, "ATI Radeon HD 3400 Series", kIago , 0 }, /* IGP */ { 0x9610, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon HD 3200 Graphics", kNull , 0 }, { 0x9611, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon 3100 Graphics", kNull , 0 }, { 0x9614, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon HD 3300 Graphics", kNull , 0 }, - { 0x9616, 0x00000000, CHIP_FAMILY_RS780, "AMD 760G", kNull , 0 }, + { 0x9616, 0x00000000, CHIP_FAMILY_RS780, "ATI Radeon 3000 Graphics", kNull , 0 }, { 0x9710, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4200", kNull , 0 }, - { 0x9715, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4250", kNull , 0 }, { 0x9714, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4290", kNull , 0 }, + { 0x9715, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4250", kNull , 0 }, /* Evergreen */ { 0x688D, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD FireStream 9350", kUakari , 0 }, @@ -762,20 +682,27 @@ { 0x689C, 0x00000000, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5900 Series", kUakari , 0 }, { 0x689E, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari , 0 }, - { 0x68A0, 0x00000000, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5800 Series", kNomascus , 0 }, // ErmaC - { 0x68A1, 0x00000000, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5800 Series", kNull , 0 }, // ErmaC - { 0x68B0, 0x00000000, CHIP_FAMILY_BROADWAY, "ATI Mobility Radeon HD 5800 Series", kNull , 0 }, // ErmaC + { 0x68A0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus , 0 }, // CHIP_FAMILY_BROADWAY ?? + { 0x68A1, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus , 0 }, // CHIP_FAMILY_BROADWAY ?? + { 0x68A8, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD Mobility Radeon HD 6800 Series", kUakari , 0 }, + { 0x68B0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNull , 0 }, // CHIP_FAMILY_BROADWAY ?? { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet , 0 }, { 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5600 Series", kVervet , 0 }, - { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6770 Series", kVervet , 0 }, + { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6700 Series", kVervet , 0 }, { 0x68BE, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet , 0 }, + { 0x68BF, 0x00000000, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6700 Series", kVervet , 0 }, + { 0x68C0, 0x00000000, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6570M/5700 Series", kNull , 0 }, + { 0x68C1, 0x00000000, CHIP_FAMILY_REDWOOD, "AMD Radeon HD 6500M/5600/5700 Series", kNull , 0 }, + { 0x68D8, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5600 Series", kBaboon , 0 }, - { 0x68D9, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500 Series", kBaboon , 0 }, + { 0x68D9, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500/5600 Series", kBaboon , 0 }, { 0x68DA, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500 Series", kBaboon , 0 }, - { 0x68E4, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 6370M Series", kNull , 0 }, + { 0x68E0, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur , 0 }, + { 0x68E1, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur , 0 }, + { 0x68E4, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 6300M Series", kNull , 0 }, { 0x68F9, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5400 Series", kNull , 0 }, @@ -783,9 +710,10 @@ { 0x6718, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970 Series", kNull , 0 }, { 0x6719, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950 Series", kGibba , 0 }, - { 0x671D, 0x00000000, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6900 Series", kNull , 0 }, // ErmaC - { 0x671F, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6900 Series", kNull , 0 }, // ErmaC + { 0x671D, 0x00000000, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6900 Series", kNull , 0 }, + { 0x671F, 0x00000000, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6900 Series", kNull , 0 }, + { 0x6720, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6900M Series", kNull , 0 }, { 0x6738, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870 Series", kDuckweed , 0 }, @@ -795,12 +723,14 @@ { 0x6740, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6700M Series", kNull , 0 }, { 0x6741, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600M/6700M Series", kNull , 0 }, + { 0x6750, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6600A Series", kNull , 0 }, + { 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kBulrushes , 0 }, - { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6500 Series", kNull , 0 }, + { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570/7570 Series", kNull , 0 }, { 0x6760, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400M Series", kNull , 0 }, { 0x6761, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6430M Series", kNull , 0 }, - + { 0x6770, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400 Series", kNull , 0 }, { 0x6779, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450 Series", kBulrushes , 0 }, @@ -1412,7 +1342,8 @@ } } - if (!card->info->device_id || !card->info->cfg_name) + // if (!card->info->device_id || !card->info->cfg_name) + if (!card->info->device_id) { printf("Unsupported card!\n"); return false; Index: branches/ErmaC/Modules/package/Scripts.templates/UnMount/UnMountEFIvolumes.sh =================================================================== --- branches/ErmaC/Modules/package/Scripts.templates/UnMount/UnMountEFIvolumes.sh (revision 0) +++ branches/ErmaC/Modules/package/Scripts.templates/UnMount/UnMountEFIvolumes.sh (revision 1836) @@ -0,0 +1,35 @@ +#!/bin/bash + +echo "===============================================" +echo "Unmount all volumes named EFI" + +# loop through and un-mount ALL mounted 'EFI' system partitions - Thanks kizwan + +# Receives targetVolumeChosenByUser: To write install log to. +# Receives scriptDir: The location of the main script dir. + +if [ "$#" -eq 2 ]; then + targetVolumeChosenByUser="$1" + scriptDir="$2" + # echo "DEBUG: passed argument for targetVolumeChosenByUser = $targetVolumeChosenByUser" + # echo "DEBUG: passed argument for scriptDir = $scriptDir" +else + echo "Error - wrong number of values passed" >&2 + exit 9 +fi + +# Count of 5 exists incase for some reason /Volumes/EFI fails +# be unmounted in which case the loop would run forever. +attempts=1 +while [ "$( df | grep EFI )" ] && [ $attempts -lt 5 ]; do + "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Volume named 'EFI' is mounted..." + "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Unmounting $( df | grep EFI | awk '{print $1}' )" + umount -f $( df | grep EFI | awk '{print $1}' ) + (( attempts++ )) +done +if [ $attempts = 5 ]; then + "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Failed to unmount 'EFI' System Partition." + exit 1 +fi + +exit 0 Property changes on: branches/ErmaC/Modules/package/Scripts.templates/UnMount/UnMountEFIvolumes.sh ___________________________________________________________________ Added: svn:executable + * Index: branches/ErmaC/Modules/package/OptionalSettings/KernelFlags.txt =================================================================== --- branches/ErmaC/Modules/package/OptionalSettings/KernelFlags.txt (revision 1835) +++ branches/ErmaC/Modules/package/OptionalSettings/KernelFlags.txt (revision 1836) @@ -29,4 +29,5 @@ List@Singleusermode:Kernel Flags=-s List@Ignorecaches:Kernel Flags=-f List@Npci:Kernel Flags=npci=0x2000 +List@Npci3:Kernel Flags=npci=0x3000 List@Darkwake:Kernel Flags=darkwake=0 Index: branches/ErmaC/Modules/package/Scripts/Sub/UnMountEFIvolumes.sh =================================================================== --- branches/ErmaC/Modules/package/Scripts/Sub/UnMountEFIvolumes.sh (revision 1835) +++ branches/ErmaC/Modules/package/Scripts/Sub/UnMountEFIvolumes.sh (revision 1836) @@ -1,35 +0,0 @@ -#!/bin/bash - -echo "===============================================" -echo "Unmount all volumes named EFI" - -# loop through and un-mount ALL mounted 'EFI' system partitions - Thanks kizwan - -# Receives targetVolumeChosenByUser: To write install log to. -# Receives scriptDir: The location of the main script dir. - -if [ "$#" -eq 2 ]; then - targetVolumeChosenByUser="$1" - scriptDir="$2" - # echo "DEBUG: passed argument for targetVolumeChosenByUser = $targetVolumeChosenByUser" - # echo "DEBUG: passed argument for scriptDir = $scriptDir" -else - echo "Error - wrong number of values passed" >&2 - exit 9 -fi - -# Count of 5 exists incase for some reason /Volumes/EFI fails -# be unmounted in which case the loop would run forever. -attempts=1 -while [ "$( df | grep EFI )" ] && [ $attempts -lt 5 ]; do - "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Volume named 'EFI' is mounted..." - "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Unmounting $( df | grep EFI | awk '{print $1}' )" - umount -f $( df | grep EFI | awk '{print $1}' ) - (( attempts++ )) -done -if [ $attempts = 5 ]; then - "$scriptDir"InstallLog.sh "${targetVolumeChosenByUser}" "Failed to unmount 'EFI' System Partition." - exit 1 -fi - -exit 0 Index: branches/ErmaC/Modules/package/Resources/ja.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/he.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/fi.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/bs.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/fr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/nl.lproj/Description.html =================================================================== --- branches/ErmaC/Modules/package/Resources/nl.lproj/Description.html (revision 1835) +++ branches/ErmaC/Modules/package/Resources/nl.lproj/Description.html (revision 1836) @@ -15,23 +15,23 @@ -

Chameleon is een combinatie van verschillende boot loader componenten. Het is gebaseerd op de fake EFI implementatie van David Elliott die toegevoegd is aan Apple's boot-123 project.

+

Chameleon is een combinatie van verschillende bootloader componenten. Het is gebaseerd op de fake EFI implementatie van David Elliott die toegevoegd is aan Apple's boot-123 project.


Nieuwe functies in Chameleon 2.0.


-

- Volledig aanpasbare GUI, zodat de Darwin Bootloader een mooier uiterlijk krijgt.

-

- Het booten van retail DVD's door direct een ramdisk image te laden zonder hulp van extra programma's.

+

- Volledig aanpasbare GUI, zodat de Darwin Bootloader een ander uiterlijk krijgt.

+

- Het booten van retail DVD's door direct een image te laden zonder hulp van externe programma's.

- Slaapstand. Geniet van het hervatten van Mac OS X met een preview image.

-

- Het negeren van het SMBIOS zodat de standaard SMBIOS waarden aangepast kunnen worden.

-

- Het negeren van de DSDT zodat er een aangepaste verbeterde DSDT kan worden gebruikt om bepaalde problemen op te lossen.

-

- Device Property Injection via device-properties string.

+

- Het passeren van de SMBIOS zodat de standaard SMBIOS waarden aangepast kunnen worden.

+

- Het passeren van de DSDT zodat er een aangepaste verbeterde DSDT kan worden gebruikt om bepaalde problemen op te lossen.

+

- Device Property Injectie via device-properties string.

- Hybride boot0 / boot1h voor MBR en GPT gepartitioneerde schijven.

-

- automatische FSB detectie code, zelfs voor recente AMD processoren.

+

- Automatische FSB detectie code, zelfs voor recente AMD processors.

- Apple Software RAID ondersteuning.

-

- Nvidia & ATI/AMD graphische kaart autodetectie.

+

- Nvidia & ATI/AMD grafische kaart autodetectie.

- Module ondersteuning

- Geheugen detectie overgenomen van memtest86: http://www.memtest.org

-

- Automatisch P-State's & C-State's aangemaakt voor automatisch stroombeheer.

+

- Automatisch P-State's & C-State's aangemaakt voor zelf aangestuurd stroombeheer.

- Bericht logboek.


De code is vrijgegeven onder versie 2 van de Gnu Public License.

Index: branches/ErmaC/Modules/package/Resources/nl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/Modules/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1835) +++ branches/ErmaC/Modules/package/Resources/nl.lproj/Conclusion.rtfd/TXT.rtf (revision 1836) @@ -11,8 +11,8 @@ \cf2 @LOG_FILENAME@\cf3 is geschreven\ naar de root van de door u gekozen partitie.\ \ -\cf0 Alstublieft \cf4 lees het\cf0 document om te zien of de installatie\ -goed verlopen is en bewaar het als registratie.\ +\cf0 Alstublieft \cf4 raadpleeg\cf0 het document om te zien of\ +de installatie goed verlopen is en bewaar het ter naslag.\ \cf4 \ \ \ Index: branches/ErmaC/Modules/package/Resources/hr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/pl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/th.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/no.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/hu.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/vi.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/ro.lproj/Description.html =================================================================== --- branches/ErmaC/Modules/package/Resources/ro.lproj/Description.html (revision 1835) +++ branches/ErmaC/Modules/package/Resources/ro.lproj/Description.html (revision 1836) @@ -15,26 +15,26 @@ -

Chameleon is a boot loader built using a combination of components which evolved from the development of David Elliott's fake EFI implementation added to Apple's boot-132 project.

+

Chameleon este un bootloader cu elemente combinate, derivat din implementarea fake EFI a lui David Elliott si proiectul Apple's boot-132.


-

Chameleon v2 is extended with many features. For example:

+

Chameleon v2 ofera un numar de facilitati, cum ar fi:


-

- Fully customizable GUI to bring some color to the Darwin Bootloader.

-

- Load a ramdisk to directly boot retail DVDs without additional programs.

-

- Hibernation. Enjoy resuming your Mac OS X with a preview image.

-

- SMBIOS override to modify the factory SMBIOS values.

-

- DSDT override to use a modified fixed DSDT which can solve several issues.

-

- Device Property Injection via device-properties string.

-

- hybrid boot0 / boot1h for MBR and GPT partitioned disks.

-

- Automatic FSB detection code even for recent AMD CPUs.

-

- Apple Software RAID support.

-

- Nvidia & ATI/AMD Graphics Card Enabler.

-

- Module support

-

- Memory detection adapted from memtest86: http://www.memtest.org

-

- Automatic P-State & C-State generation for native power management.

-

- Message logging.

+

- Interfata grafica complet modificabila dupa preferintele userului.

+

- RamDisk pentru boot cu versiuni retail Mac OS X.

+

- Hibernare folosind imaginea de hibernare.

+

- SMBIOS modificabil pentru a extinde compatibilitatea cu diferite computere.

+

- DSDT modificabil, oferind avantajul de a corecta posibilele incompatibilitati hardware.

+

- Injectare de proprietati pentru diferite hardware-uri.

+

- boot0 / boot1h hibrid, pentru partiti MBR precum si GPT.

+

- FSB detectabil automat, chiar si pentru procesoare AMD noi.

+

- Suport nativ RAID in OS X.

+

- Activare mod video pentru nVidia si ATI/AMD.

+

- Suport pentru module

+

- Detectare automata a memoriei bazata pe memtest86: http://www.memtest.org

+

- Generare automata P-states si C-states pentru management al energiei.

+

- Logare mesaje.


-

The code is released under version 2 of the Gnu Public License.

+

Acest cod este acoperit de versiunea 2 a Gnu Public License.

http://forge.voodooprojects.org/p/chameleon


FAQ's: http://forum.voodooprojects.org/index.php/topic,754.0.html

Index: branches/ErmaC/Modules/package/Resources/ro.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/Modules/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf (revision 1835) +++ branches/ErmaC/Modules/package/Resources/ro.lproj/Welcome.rtfd/TXT.rtf (revision 1836) @@ -17,18 +17,18 @@ \fs28 \cf0 \ \pard\ri0\qc -\cf2 Do not install to an Apple Macintosh computer\ +\cf2 Nu instalati acest software pe un computer Apple Macintosh\ \pard\ri0\qc \cf0 \ \pard\ri0\ql\qnatural -\fs24 \cf0 Developers : +\fs24 \cf0 Developeri : \fs20 %DEVELOP% \fs24 \ \fs18 \ -\fs24 Thanks to : +\fs24 Multumiri : \fs20 %CREDITS% \fs24 \ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -36,7 +36,7 @@ \b0\fs18 \cf0 \ \pard\ri0\ql\qnatural -\b\fs24 \cf0 Package : +\b\fs24 \cf0 Pachet : \fs20 %PKGDEV% \b0\fs30 \ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -44,10 +44,10 @@ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \fs20 \cf0 Copyright \'a9 2011-2012 -\b \cf3 Translated by : ???\ +\b \cf3 Tradus de : RvXtm\ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0\fs18 \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc -\b\fs20 \cf4 This package was builded by: %WHOBUILD%} +\b\fs20 \cf4 Pachet compilat de: %WHOBUILD%} Index: branches/ErmaC/Modules/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/Modules/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf (revision 1835) +++ branches/ErmaC/Modules/package/Resources/ro.lproj/Conclusion.rtfd/TXT.rtf (revision 1836) @@ -7,12 +7,12 @@ \f0\b\fs28 \cf0 \ \ -The scripts have completed and a file\ - named \cf2 @LOG_FILENAME@\cf3 has been\ -written to the root of your chosen partition.\ +Scripturiile au fost executate iar un fisier\ + numit \cf2 @LOG_FILENAME@\cf3 a fost salvat in\ +directorul principal al partitiei selectate.\ \ -\cf0 Please \cf4 read it\cf0 to find out if the installation was\ -successful and keep it for a record of what was done.\ +\cf0 Va rugam \cf4 sa il cititi\cf0 pentru a afla daca instalarea a fost\ +facuta cu succes si pentru a tine evidenta modificariilor facute.\ \cf4 \ \ \ @@ -26,4 +26,4 @@ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc -\b \cf6 This package was builded by: %WHOBUILD%} +\b \cf6 Pachet compilat de: %WHOBUILD%} Index: branches/ErmaC/Modules/package/Resources/ca.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/tr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/ru.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/id.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/el.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/en.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/ar.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/cs.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/es.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/mk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/ko.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/it.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/sk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/ms.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/uk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/sr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/da.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/sv.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/bg.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/Resources/de.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/Modules/package/buildpkg.sh =================================================================== --- branches/ErmaC/Modules/package/buildpkg.sh (revision 1835) +++ branches/ErmaC/Modules/package/buildpkg.sh (revision 1836) @@ -64,7 +64,7 @@ declare -r CHAMELEON_CREDITS=$(awk "NR==10{print;exit}" ${PKGROOT}/../CREDITS) declare -r CHAMELEON_PKGDEV=$(awk "NR==14{print;exit}" ${PKGROOT}/../CREDITS) declare -r CHAMELEON_CPRYEAR=$(awk "NR==18{print;exit}" ${PKGROOT}/../CREDITS) -if [[ $(whoami | awk '{print $1}' | cut -d ":" -f3) == "cmorton" ]];then +if [[ $(whoami | awk '{print $1}' | cut -d ":" -f3) == "admin" ]];then declare -r CHAMELEON_WHOBUILD="VoodooLabs BuildBot" else declare -r CHAMELEON_WHOBUILD=$(whoami | awk '{print $1}' | cut -d ":" -f3) @@ -898,8 +898,8 @@ choiceId="Post" mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId} - cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts - + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" InstallerLog + addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" UnMount packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}" @@ -943,7 +943,7 @@ header+="auth=\"root\">\n" header+="\t\n" - rm -R -f "${packagePath}/Temp" + #rm -R -f "${packagePath}/Temp" //blackosx commented out for now [ -d "${packagePath}/Temp" ] || mkdir -m 777 "${packagePath}/Temp" [ -d "${packagePath}/Root" ] && mkbom "${packagePath}/Root" "${packagePath}/Temp/Bom" @@ -956,7 +956,7 @@ header+="\t\n" # Create the Script archive file (cpio format) (cd "${packagePath}/Scripts" && find . -print | cpio -o -z -R 0:0 --format cpio > "${packagePath}/Temp/Scripts") 2>&1 | \ - grep -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages + grep -E '^[0-9]+\s+blocks?$' # to remove cpio stderr messages fi header+="" @@ -964,7 +964,7 @@ # Create the Payload file (cpio format) (cd "${packagePath}/Root" && find . -print | cpio -o -z -R 0:0 --format cpio > "${packagePath}/Temp/Payload") 2>&1 | \ - grep -vE '^[0-9]+\s+blocks?$' # to remove cpio stderr messages + grep -E '^[0-9]+\s+blocks?$' # to remove cpio stderr messages # Create the package (cd "${packagePath}/Temp" && xar -c -f "${packagePath}/../${packageName}.pkg" --compression none .) @@ -972,7 +972,7 @@ # Add the package to the list of build packages pkgrefs[${#pkgrefs[*]}]="\t#${packageName}.pkg" - rm -rf "${packagePath}" + #rm -rf "${packagePath}" //blackosx commented out for now fi } @@ -1046,7 +1046,7 @@ declare -r distributionFilename="${packagename// /}-${CHAMELEON_VERSION}-r${CHAMELEON_REVISION}.pkg" declare -r distributionFilePath="${distributionDestDir}/${distributionFilename}" - rm -f "${distributionDestDir}/${packagename// /}"*.pkg + #rm -f "${distributionDestDir}/${packagename// /}"*.pkg //blackosx commented out for now mkdir -p "${PKG_BUILD_DIR}/${packagename}" @@ -1056,7 +1056,7 @@ pkgdir="${PKG_BUILD_DIR}/${packagename}/${pkg}" # expand individual packages pkgutil --expand "${PKG_BUILD_DIR}/${pkg}" "$pkgdir" - rm -f "${PKG_BUILD_DIR}/${pkg}" + #rm -f "${PKG_BUILD_DIR}/${pkg}" //blackosx commented out for now done # Create the Distribution file @@ -1081,7 +1081,14 @@ ditto --noextattr --noqtn "${PKGROOT}/Resources" "${PKG_BUILD_DIR}/${packagename}/Resources" # CleanUp the directory - find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \; + # this next line should work but it doesn't - not sure why. + #find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \; + + # instead, doing it this way works. + find "${PKG_BUILD_DIR}/${packagename}/Resources" -name ".svn" -type d -o -name ".DS_Store" -type f | while read component + do + rm -rf "${component}" + done # Make substitutions for version, revision, stage, developers, credits, etc.. makeSubstitutions $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f ) Index: branches/ErmaC/Modules/Make.rules =================================================================== --- branches/ErmaC/Modules/Make.rules (revision 1835) +++ branches/ErmaC/Modules/Make.rules (revision 1836) @@ -10,7 +10,7 @@ endif AS = as LD = ld -CC = cc +CC = gcc CPP = g++ PAX = /bin/pax NASM = $(shell which nasm) -p $(SRCROOT)/autoconf.inc