Chameleon

Chameleon Commit Details

Date:2011-09-05 22:55:14 (12 years 7 months ago)
Author:Azimutz
Commit:1509
Parents: 1508
Message:Sync these two with trunk (r1508).
Changes:
M/branches/azimutz/trunkAutoResolution/i386/libsaio/ati.c
M/branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/gui.c
M/branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c
M/branches/azimutz/trunkAutoResolution
M/branches/azimutz/trunkAutoResolution/i386/boot2/gui.c
M/branches/azimutz/trunkGraphicsEnablerModules

File differences

branches/azimutz/trunkAutoResolution/i386/libsaio/ati.c
498498
499499
500500
501
502501
502
503
503504
504505
505506
......
560561
561562
562563
563
564
564
565565
566
566567
568
569
567570
568571
569572
......
656659
657660
658661
659
662
660663
661664
662665
␉{ 0x68B8,␉0x22881787, CHIP_FAMILY_JUNIPER,␉"ATI Radeon HD 5770",␉␉␉␉kVervet␉␉},␊
␉␊
␉{ 0x68C0,␉0x1594103C, CHIP_FAMILY_REDWOOD,␉"AMD Radeon HD 6570M",␉␉␉␉kNull␉␉},␊
␉{ 0x68C0,␉0x392717AA, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5730",␉␉kBaboon␉␉},␊
␉␊
␉{ 0x68C0,␉0x392717AA, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5730",␉␉kNull␉␉},␊
␉␊
␉{ 0x68C1,␉0x033E1025, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5650",␉␉kNull␉␉},␊
␉␊
␉{ 0x68C8,␉0x2306103C, CHIP_FAMILY_REDWOOD,␉"ATI FirePro V4800 (FireGL)",␉␉kNull␉␉},␊
␉{ 0x6740,␉0x1657103C, 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,␉0x05131025, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6650M",␉␉␉␉kNull␉␉},␉␊
␉{ 0x6741,␉0x1646103C, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6750M",␉␉␉␉kNull␉␉},␊
␉{ 0x6741,␉0x9080104D, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6630M",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6741,␉0x9080104D, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6630M",␉␉␉␉kNull,␉␉},␊
␉␊
␉{ 0x6759,␉0xE193174B, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6570",␉␉␉␉kNull␉␉},␊
␉␊
␉{ 0x6760,␉0x1CB21043, CHIP_FAMILY_RV730,␉␉"AMD Radeon HD 6470M",␉␉␉␉kNull␉␉},␊
␉{ 0x673E,␉0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6790 Series",␉␉kNull␉␉},␊
␉␊
␉{ 0x6740,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6700M Series",␉␉kNull␉␉},␊
␉{ 0x6741,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6600M/6700M Series", kNull␉␉},␊
␉{ 0x6741,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6600/6700M Series",␉kNull␉␉},␊
␉␊
␉{ 0x6758,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670 Series",␉␉kNull␉␉},␊
␉{ 0x6759,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6500 Series",␉␉kNull␉␉},␊
branches/azimutz/trunkAutoResolution/i386/boot2/gui.c
852852
853853
854854
855
856
855
856
857857
858858
859859
......
913913
914914
915915
916
916
917917
918
919918
920919
921920
......
928927
929928
930929
930
931931
932932
933933
void drawDeviceList (int start, int end, int selection)␊
{␊
␉int␉␉␉i;␊
␉bool␉␉shoWinfo = true; //Azi:showinfo␊
␉extern bool showBootBanner; //␊
␉bool␉␉shoWinfo = false;␊
␉extern bool showBootBanner;␊
␉position_t␉p, p_prev, p_next;␊
␊
␉//uint8_t␉maxDevices = MIN( gui.maxdevices, menucount );␊
␉␉␉␊
␉␉␉getBoolForKey(kShowInfoKey, &shoWinfo, &bootInfo->chameleonConfig);␊
␉␉␉␊
␉␉␉if (shoWinfo && showBootBanner) // no boot banner, no showinfo.␊
␉␉␉if (shoWinfo && showBootBanner)␊
␉␉␉{␊
␉␉␉␉// keep formatted with spaces instead of tabs␊
␉␉␉␉gui.debug.cursor = pos( 10, 100);␊
␉␉␉␉dprintf( &gui.screen, "label: %s\n", param->label );␊
␉␉␉␉dprintf( &gui.screen, "biosdev: 0x%x\n", param->biosdev );␊
␉␉␉␉dprintf( &gui.screen, "name: %s\n", param->name );␊
␉␉␉␉dprintf( &gui.screen, "type_name: %s\n", param->type_name );␊
␉␉␉␉dprintf( &gui.screen, "modtime: %d\n", param->modTime );␊
//␉␉␉␉// res␊
␉␉␉␉dprintf( &gui.screen, "width: %d\n", gui.screen.width );␊
␉␉␉␉dprintf( &gui.screen, "height: %d\n", gui.screen.height );␊
␉␉␉␉dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr ); //Azi: reminder␊␊
branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/gui.c
831831
832832
833833
834
835
834
835
836836
837837
838838
......
892892
893893
894894
895
895
896896
897
898897
899898
900899
......
907906
908907
909908
909
910910
911911
912912
void drawDeviceList (int start, int end, int selection)␊
{␊
␉int␉␉␉i;␊
␉bool␉␉shoWinfo = true; //Azi:showinfo␊
␉extern bool showBootBanner; //␊
␉bool␉␉shoWinfo = false;␊
␉extern bool showBootBanner;␊
␉position_t␉p, p_prev, p_next;␊
␊
␉//uint8_t␉maxDevices = MIN( gui.maxdevices, menucount );␊
␉␉␉␊
␉␉␉getBoolForKey(kShowInfoKey, &shoWinfo, &bootInfo->chameleonConfig);␊
␉␉␉␊
␉␉␉if (shoWinfo && showBootBanner) // no boot banner, no showinfo.␊
␉␉␉if (shoWinfo && showBootBanner)␊
␉␉␉{␊
␉␉␉␉// keep formatted with spaces instead of tabs␊
␉␉␉␉gui.debug.cursor = pos( 10, 100);␊
␉␉␉␉dprintf( &gui.screen, "label: %s\n", param->label );␊
␉␉␉␉dprintf( &gui.screen, "biosdev: 0x%x\n", param->biosdev );␊
␉␉␉␉dprintf( &gui.screen, "name: %s\n", param->name );␊
␉␉␉␉dprintf( &gui.screen, "type_name: %s\n", param->type_name );␊
␉␉␉␉dprintf( &gui.screen, "modtime: %d\n", param->modTime );␊
//␉␉␉␉// res␊
␉␉␉␉dprintf( &gui.screen, "width: %d\n", gui.screen.width );␊
␉␉␉␉dprintf( &gui.screen, "height: %d\n", gui.screen.height );␊
//␉␉␉␉dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr ); //Azi: reminder␊
branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c
506506
507507
508508
509
509
510510
511511
512512
......
573573
574574
575575
576
577
576578
577579
578580
......
665667
666668
667669
668
670
669671
670672
671673
␉␊
␉{ 0x68C0,␉0x1594103C, CHIP_FAMILY_REDWOOD,␉"AMD Radeon HD 6570M",␉␉␉␉kNull␉␉, 0 }, // issue #91␊
␉␊
␉{ 0x68C0,␉0x392717AA, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5730",␉␉kBaboon␉␉, 0 }, // BB␊
␉{ 0x68C0,␉0x392717AA, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5730",␉␉kNull␉␉, 0 }, // BB␊
␉//Azi: from Slice { 0x100268C0,␉ "ATI Radeon 5670 Series", "Galago"}␊
␉// http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1695482␊
␉{ 0x68C1,␉0x033E1025, CHIP_FAMILY_REDWOOD,␉"ATI Mobility Radeon HD 5650",␉␉kNull␉␉, 0 },␊
␉␊
␉{ 0x6741,␉0x1646103C, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6750M",␉␉␉␉kNull␉␉, 0 }, // issue 88␊
␉␊
␉{ 0x6741,␉0x9080104D,␉CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6630M",␉␉␉␉kNull, , 0 },␊
␉␊
␉{ 0x6759,␉0xE193174B, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6570",␉␉␉␉kNull␉␉, 0 },␊
␉␊
␉{ 0x6760,␉0x1CB21043, CHIP_FAMILY_RV730,␉␉"AMD Radeon HD 6470M",␉␉␉␉kNull␉␉, 0 },␊
␉{ 0x673E,␉0x00000000, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6790 Series",␉␉kNull␉␉, 0 },␊
␉␊
␉{ 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 },␊
␉{ 0x6741,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6600/6700M Series",␉kNull␉␉, 0 },␊
␉␊
␉{ 0x6758,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6670 Series",␉␉kNull␉␉, 0 },␊
␉{ 0x6759,␉0x00000000, CHIP_FAMILY_TURKS,␉␉"AMD Radeon HD 6500 Series",␉␉kNull␉␉, 0 },␊␊

Archive Download the corresponding diff file

Revision: 1509