Index: branches/ErmaC/i386/libsaio/asm.s =================================================================== --- branches/ErmaC/i386/libsaio/asm.s (revision 1548) +++ branches/ErmaC/i386/libsaio/asm.s (revision 1549) @@ -339,7 +339,7 @@ jmp _halt // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// disableIRQs() - Azi: DHP +// disableIRQs() // http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1677779 // // Port of original patch by: CPARM (who basically did this in boot.c) Thanks! Index: branches/ErmaC/i386/libsaio/ati.c =================================================================== --- branches/ErmaC/i386/libsaio/ati.c (revision 1548) +++ branches/ErmaC/i386/libsaio/ati.c (revision 1549) @@ -314,9 +314,6 @@ { 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 }, @@ -398,8 +395,6 @@ { 0x9589, 0x30001462, CHIP_FAMILY_RV630, "ATI Radeon HD 3610", kNull }, - { 0x9589, 0x30001642, 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 }, @@ -480,7 +475,8 @@ { 0x689C, 0x30201682, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5970", kUakari }, - { 0x68A1, 0x144D103C, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800", 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 }, @@ -504,6 +500,7 @@ { 0x68C0, 0x392717AA, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5730", kNull }, { 0x68C1, 0x033E1025, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kNull }, + { 0x68C1, 0x9071104D, CHIP_FAMILY_REDWOOD, "ATI Mobility Radeon HD 5650", kEulemur }, { 0x68C8, 0x2306103C, CHIP_FAMILY_REDWOOD, "ATI FirePro V4800 (FireGL)", kNull }, @@ -554,19 +551,19 @@ { 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull }, - { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 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, 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, 0x31031682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 0x6738, 0x31041682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0xE178174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 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 }, + { 0x6738, 0x20101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 0x6738, 0x23051787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6739, 0x67391002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, @@ -574,14 +571,14 @@ { 0x6739, 0x24411462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, - { 0x6739, 0xE177174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, + { 0x6739, 0xE177174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 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 }, { 0x6758, 0x67581002, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670", kBulrushes }, @@ -594,11 +591,14 @@ { 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull }, + { 0x6760, 0x04CC1028, CHIP_FAMILY_RV730, "AMD Radeon HD 6490M", kNull }, { 0x6760, 0x1CB21043, CHIP_FAMILY_RV730, "AMD Radeon HD 6470M", kNull }, + { 0x6760, 0x1656103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull }, // ErmaC no tested + { 0x6779, 0x64501092, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, - { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, /* standard/default models */ { 0x9400, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull }, @@ -688,15 +688,15 @@ { 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", kBulrushes }, + { 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kNull }, { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6500 Series", kNull }, { 0x6760, 0x00000000, CHIP_FAMILY_RV730, "AMD Radeon HD 6470M", kNull }, { 0x6770, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400 Series", kNull }, - { 0x6779, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450 Series", kBulrushes }, + { 0x6779, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450 Series", kNull }, { 0x0000, 0x00000000, CHIP_FAMILY_UNKNOW, NULL, kNull } }; @@ -1353,7 +1353,7 @@ // if none, if (!card->cfg_name) { - // use the device fb key on radeon_cards, to retrive the default name from card_configs. + // use cfg_name on radeon_cards, to retrive the default name from card_configs, card->cfg_name = card_configs[card->info->cfg_name].name; // and leave ports alone! // card->ports = card_configs[card->info->cfg_name].ports; @@ -1377,7 +1377,7 @@ } else// if (card->cfg_name > 0) // do we want 0 ports if fb is kNull or mistyped ? { - // else, match fb name with card_configs list and retrive default nr of ports. + // else, match cfg_name with card_configs list and retrive default nr of ports. for (i = 0; i < kCfgEnd; i++) if (strcmp(card->cfg_name, card_configs[i].name) == 0) card->ports = card_configs[i].ports; // default Index: branches/ErmaC/i386/boot2/resume.c =================================================================== --- branches/ErmaC/i386/boot2/resume.c (revision 1548) +++ branches/ErmaC/i386/boot2/resume.c (revision 1549) @@ -139,8 +139,7 @@ mem_base = getmemorylimit() - allocSize;//TODO: lower this printf("mem_base %x\n", mem_base); - // Rek : hibernate fix - if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000)) + if (((long long)mem_base + allocSize) < (1024 * bootInfo->extmem + 0x100000)) { printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n"); getchar(); Index: branches/ErmaC/package/Scripts/Resolutions/1280x768x32/postinstall =================================================================== --- branches/ErmaC/package/Scripts/Resolutions/1280x768x32/postinstall (revision 0) +++ branches/ErmaC/package/Scripts/Resolutions/1280x768x32/postinstall (revision 1549) @@ -0,0 +1,34 @@ +#!/usr/bin/python +# Script to add Graphics_Mode for Chameleon boot loaders + +import sys +import os +import shutil + +vol = str(sys.argv[3]) +boot = "/Extra/org.chameleon.Boot.plist" +plist = vol + boot +if not os.path.exists(plist): + shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist) + +infile = open(plist, "r") +# check if Graphics_Mode has been written or not +Graphics_ModeCheck = False + +body = "" + +for line in infile: + # if we finish the tags and haven't written Graphics_Mode Yet + if "" in line and Graphics_ModeCheck == False: + line = " Graphics Mode\n" + line += " 1280x768x32\n" + line += "\n" + Graphics_ModeCheck = True + + body += line + +infile.close() + +outfile = open(plist, "w") +outfile.write(body) +outfile.close() Property changes on: branches/ErmaC/package/Scripts/Resolutions/1280x768x32/postinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/ErmaC/package/Scripts/Keymaps/postinstall.in =================================================================== --- branches/ErmaC/package/Scripts/Keymaps/postinstall.in (revision 1548) +++ branches/ErmaC/package/Scripts/Keymaps/postinstall.in (revision 1549) @@ -1,34 +0,0 @@ -#!/usr/bin/python -# Script to add Graphics_Mode for Chameleon boot loaders - -import sys -import os -import shutil - -vol = str(sys.argv[3]) -boot = "/Extra/org.chameleon.Boot.plist" -plist = vol + boot -if not os.path.exists(plist): - shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist) - -infile = open(plist, "r") -# check if Graphics_Mode has been written or not -KeyLayoutCheck = False - -body = "" - -for line in infile: - # if we finish the tags and haven't written KeyLayout Yet - if "" in line and KeyLayoutCheck == False: - line = " KeyLayout\n" - line += " @@KEYMAP@@\n" - line += "\n" - KeyLayoutCheck = True - - body += line - -infile.close() - -outfile = open(plist, "w") -outfile.write(body) -outfile.close() Index: branches/ErmaC/package/Scripts/Keymaps/postinstall =================================================================== --- branches/ErmaC/package/Scripts/Keymaps/postinstall (revision 0) +++ branches/ErmaC/package/Scripts/Keymaps/postinstall (revision 1549) @@ -0,0 +1,34 @@ +#!/usr/bin/python +# Script to add KeyLayout for Chameleon boot loaders + +import sys +import os +import shutil + +vol = str(sys.argv[3]) +boot = "/Extra/org.chameleon.Boot.plist" +plist = vol + boot +if not os.path.exists(plist): + shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist) + +infile = open(plist, "r") +# check if Graphics_Mode has been written or not +KeyLayoutCheck = False + +body = "" + +for line in infile: + # if we finish the tags and haven't written KeyLayout Yet + if "" in line and KeyLayoutCheck == False: + line = " KeyLayout\n" + line += " @@KEYMAP@@\n" + line += "\n" + KeyLayoutCheck = True + + body += line + +infile.close() + +outfile = open(plist, "w") +outfile.write(body) +outfile.close() Property changes on: branches/ErmaC/package/Scripts/Keymaps/postinstall ___________________________________________________________________ Added: svn:executable + * Index: branches/ErmaC/package/Resources/he.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/id.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/el.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/ar.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/en.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/es.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/fr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/mk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf (revision 1548) +++ branches/ErmaC/package/Resources/mk.lproj/Welcome.rtfd/TXT.rtf (revision 1549) @@ -29,6 +29,8 @@ \b\fs26 \cf0 Packages credits to : %PKGDEV% \b0\fs30 \ \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural -\cf0 \\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\fs26 \cf0 Copyright \'a9 2011} +\fs26 \cf0 Copyright \'a9 2011 +\b \cf3 \u1087 \u1088 \u1077 \u1074 \u1077 \u1076 \u1077 \u1085 \u1080 \u1086 \u1076 \u1089 \u1090 \u1088 \u1072 \u1085 \u1072 \u1085 \u1072 : kn6600} Index: branches/ErmaC/package/Resources/nl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/pl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/hr-HR.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/zh.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/sr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/ru.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf =================================================================== --- branches/ErmaC/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf (revision 1548) +++ branches/ErmaC/package/Resources/ru.lproj/Welcome.rtfd/TXT.rtf (revision 1549) @@ -32,4 +32,5 @@ \cf0 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\fs26 \cf0 Copyright \'a9 2011} +\fs26 \cf0 Copyright \'a9 2011 +\b \cf3 \u1087 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 : mozodojo} Index: branches/ErmaC/package/Resources/de.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/ErmaC/package/Resources/bg.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream