Index: branches/ErmaC/Trunk/i386/libsaio/smbios_getters.h =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/smbios_getters.h (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/smbios_getters.h (revision 1928) @@ -33,6 +33,7 @@ extern bool getSMBOemProcessorBusSpeed(returnType *value); extern bool getSMBOemProcessorType(returnType *value); extern bool getSMBMemoryDeviceMemoryType(returnType *value); +extern bool getSMBMemoryDeviceMemoryErrorHandle(returnType *value); extern bool getSMBMemoryDeviceMemorySpeed(returnType *value); extern bool getSMBMemoryDeviceManufacturer(returnType *value); extern bool getSMBMemoryDeviceSerialNumber(returnType *value); Index: branches/ErmaC/Trunk/i386/libsaio/console.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/console.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/console.c (revision 1928) @@ -91,7 +91,7 @@ msgbuf = malloc(BOOTER_LOG_SIZE); bzero(msgbuf, BOOTER_LOG_SIZE); cursor = msgbuf; - msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]"); + msglog("%s\n", "ErmaC (Trunk) r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]"); } void msglog(const char * fmt, ...) Index: branches/ErmaC/Trunk/i386/libsaio/nvidia.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/nvidia.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/nvidia.c (revision 1928) @@ -1331,7 +1331,8 @@ { int i; - for (i = 1; i < (sizeof(NVKnownChipsets) / sizeof(NVKnownChipsets[0])); i++) { + for (i = 1; i < (sizeof(NVKnownChipsets) / sizeof(NVKnownChipsets[0])); i++) + { if (NVKnownChipsets[i].device == id) { return NVKnownChipsets[i].name; @@ -1503,9 +1504,10 @@ videoRam = mem_detect(regs, nvCardType, nvda_dev); model = get_nvidia_model((nvda_dev->vendor_id << 16) | nvda_dev->device_id); - verbose("nVidia %s %dMB NV%02x [%04x:%04x] :: %s device number: %d\n", + verbose("nVidia %s %dMB NV%02x [%04x:%04x] (subsys [%04x:%04x]) :: %s device number: %d\n", model, (uint32_t)(videoRam / 1024 / 1024), (REG32(0) >> 20) & 0x1ff, nvda_dev->vendor_id, nvda_dev->device_id, + nvda_dev->subsys_id.subsys.vendor_id, nvda_dev->subsys_id.subsys.device_id, devicepath, devices_number); rom = malloc(NVIDIA_ROM_SIZE); Index: branches/ErmaC/Trunk/i386/libsaio/ati.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1928) @@ -378,7 +378,7 @@ { 0x94C3, 0x37161642, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0xE370174B, CHIP_FAMILY_RV610, "ATI Radeon HD 2400 PRO", kNull }, { 0x94C3, 0xE400174B, CHIP_FAMILY_RV610, "ATI 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 }, @@ -448,7 +448,7 @@ { 0x9553, 0xFFA01179, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 5145", kNull }, { 0x9553, 0xFFA21179, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4500", kNull }, { 0x9553, 0xFFC01179, CHIP_FAMILY_RV710, "ATI Mobility Radeon HD 4500", kNull }, - + { 0x9555, 0x29241682, CHIP_FAMILY_RV710, "ATI Radeon HD 4550", kNull }, { 0x9555, 0x24651682, CHIP_FAMILY_RV710, "ATI Radeon HD4300/HD4500", kNull }, { 0x9555, 0x3711174B, CHIP_FAMILY_RV710, "ATI Radeon HD4300/HD4500", kNull }, @@ -639,7 +639,7 @@ { 0x68D8, 0xE151174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kEulemur }, { 0x68D8, 0xE155174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kNull }, { 0x68D8, 0xE166174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kUakari }, - + // { 0x68D9, 0x03CE1043, CHIP_FAMILY_REDWOOD, "ATI Radeon HD ????", kNull }, { 0x68D9, 0x22401462, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5570", kNull }, { 0x68D9, 0x3000148C, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 6510", kNull }, @@ -772,7 +772,7 @@ { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x03AE1043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x03C61043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes }, + { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes }, // ?? kDuckweed ?? { 0x6738, 0x20101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x21FA1458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, @@ -1171,6 +1171,14 @@ { 0x9714, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4290 Series", kNull }, { 0x9715, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 4250 Series", kNull }, + { 0x9723, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 5450 Series", kNull }, + + { 0x9802, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 6310 Series", kNull }, + { 0x9803, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 6310 Series", kNull }, + { 0x9804, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 6310 Series", kNull }, + { 0x9805, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 6250 Series", kNull }, + { 0x9806, 0x00000000, CHIP_FAMILY_RS880, "ATI Radeon HD 6320 Series", kNull }, + /* Evergreen */ { 0x688D, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD FireStream 9350 Series", kUakari }, Index: branches/ErmaC/Trunk/i386/libsaio/cpu.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/cpu.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/cpu.c (revision 1928) @@ -359,10 +359,10 @@ if ( tscFrequency < 1000 )//TEST { tscFrequency = timeRDTSC() * 20;//measure_tsc_frequency(); - DBG("cpu freq timeRDTSC = 0x%016llx\n", tscFrequency); + // DBG("cpu freq timeRDTSC = 0x%016llx\n", tscFrequency); } else{ - DBG("cpu freq timeRDTSC = 0x%016llxn", timeRDTSC() * 20); + // DBG("cpu freq timeRDTSC = 0x%016llxn", timeRDTSC() * 20); } fsbFrequency = 0; cpuFrequency = 0; Index: branches/ErmaC/Trunk/i386/libsaio/smbios.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/smbios.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/smbios.c (revision 1928) @@ -246,6 +246,8 @@ {kSMBTypeMemoryDevice, kSMBString, getFieldOffset(SMBMemoryDevice, assetTag), NULL, NULL, NULL}, + {kSMBTypeMemoryDevice, kSMBWord, getFieldOffset(SMBMemoryDevice, errorHandle), NULL, getSMBMemoryDeviceMemoryErrorHandle, NULL}, + {kSMBTypeMemoryDevice, kSMBString, getFieldOffset(SMBMemoryDevice, partNumber), kSMBMemoryDevicePartNumberKey, getSMBMemoryDevicePartNumber, NULL}, Index: branches/ErmaC/Trunk/i386/libsaio/smbios_decode.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/smbios_decode.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/smbios_decode.c (revision 1928) @@ -165,6 +165,7 @@ if (minorVersion < 3 || structHeader->header.length < 27) return; DBG("\tmemorySpeed: %dMHz\n", structHeader->memorySpeed); + DBG("\terrorHandle: %x\n", structHeader->errorHandle); DBG("\tmanufacturer: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->manufacturer)); DBG("\tserialNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->serialNumber)); DBG("\tassetTag: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->assetTag)); Index: branches/ErmaC/Trunk/i386/libsaio/smbios_getters.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/smbios_getters.c (revision 1927) +++ branches/ErmaC/Trunk/i386/libsaio/smbios_getters.c (revision 1928) @@ -230,6 +230,12 @@ // return true; } +bool getSMBMemoryDeviceMemoryErrorHandle(returnType *value) +{ + value->word = 0xFFFF; + return true; +} + bool getSMBMemoryDeviceMemorySpeed(returnType *value) { static int idx = -1; Index: branches/ErmaC/Trunk/i386/boot2/prompt.c =================================================================== --- branches/ErmaC/Trunk/i386/boot2/prompt.c (revision 1927) +++ branches/ErmaC/Trunk/i386/boot2/prompt.c (revision 1928) @@ -28,7 +28,7 @@ #include -char bootBanner[] = "\nDarwin/x86 boot v" I386BOOT_VERSION " - Chameleon v" I386BOOT_CHAMELEONVERSION " ErmaC (Trunk) r" I386BOOT_CHAMELEONREVISION "\n" +char bootBanner[] = "\nDarwin/x86 boot v" I386BOOT_VERSION " - ErmaC (Trunk) r" I386BOOT_CHAMELEONREVISION "\n" "Build date: " I386BOOT_BUILDDATE "\n" "%dMB memory\n"; Index: branches/ErmaC/Trunk/package/po/pt-PT.po =================================================================== --- branches/ErmaC/Trunk/package/po/pt-PT.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/pt-PT.po (revision 1928) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-06 22:38+0000\n" +"POT-Creation-Date: 2012-04-30 04:13+0200\n" "PO-Revision-Date: 2012-03-15 20:34-0000\n" "Last-Translator: ErmaC\n" "Language-Team: pt-PT \n" Index: branches/ErmaC/Trunk/package/po/cs.po =================================================================== --- branches/ErmaC/Trunk/package/po/cs.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/cs.po (revision 1928) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.1svn-r1870\n" "POT-Creation-Date: 2012-03-06 22:38+0000\n" -"PO-Revision-Date: 2012-04-18 09:55+0200\n" +"PO-Revision-Date: 2012-04-28 21:53+0200\n" "Last-Translator: martin63 \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -939,7 +939,7 @@ #: Resources/templates/Localizable.strings:215 #, no-wrap msgid "Use the keyboard layout for a German Mac keyboard" -msgstr "" +msgstr "Použití rozložení klávesnice pro nÄ›meckou klávesnici Mac" #. type: "mac-es_title" #: Resources/templates/Localizable.strings:217 @@ -951,7 +951,7 @@ #: Resources/templates/Localizable.strings:218 #, no-wrap msgid "Use the keyboard layout for a Spanish Mac keyboard" -msgstr "" +msgstr "Použití rozložení klávesnice pro Å¡panÄ›lskou klávesnici Mac" #. type: "mac-fr_title" #: Resources/templates/Localizable.strings:220 @@ -963,7 +963,7 @@ #: Resources/templates/Localizable.strings:221 #, no-wrap msgid "Use the keyboard layout for a French Mac keyboard" -msgstr "" +msgstr "Použití rozložení klávesnice pro francouzskou klávesnici Mac" #. type: "mac-it_title" #: Resources/templates/Localizable.strings:223 @@ -975,7 +975,7 @@ #: Resources/templates/Localizable.strings:224 #, no-wrap msgid "Use the keyboard layout for an Italian Mac keyboard" -msgstr "" +msgstr "Použití rozložení klávesnice pro italskou klávesnici Mac" #. type: "mac-se_title" #: Resources/templates/Localizable.strings:226 @@ -987,7 +987,7 @@ #: Resources/templates/Localizable.strings:227 #, no-wrap msgid "Use the keyboard layout for a Swedish Mac keyboard" -msgstr "" +msgstr "Použití rozložení klávesnice pro Å¡védskou klávesnici Mac" #. type: "pc-fr_title" #: Resources/templates/Localizable.strings:229 @@ -999,7 +999,7 @@ #: Resources/templates/Localizable.strings:230 #, no-wrap msgid "Use the keyboard layout for a French PC keyboard" -msgstr "" +msgstr "Použití rozložení klávesnice pro francouzskou klávesnici Mac" #. type: "Embed_title" #: Resources/templates/Localizable.strings:236 Index: branches/ErmaC/Trunk/package/po/hu.po =================================================================== --- branches/ErmaC/Trunk/package/po/hu.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/hu.po (revision 1928) @@ -1066,7 +1066,7 @@ #: Resources/templates/Localizable.strings:267 #, no-wrap msgid "A selection of options that deal with power management and speedstep." -msgstr "\"Beállítások az energiagazdálkodáshoz és a sebesség-lépcsőkhöz." +msgstr "Beállítások az energiagazdálkodáshoz és a sebesség-lépcsőkhöz." #. type: "Resolution_description" #: Resources/templates/Localizable.strings:271 Index: branches/ErmaC/Trunk/package/po/pt-BR.po =================================================================== --- branches/ErmaC/Trunk/package/po/pt-BR.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/pt-BR.po (revision 1928) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-06 22:38+0000\n" +"POT-Creation-Date: 2012-04-30 04:13+0200\n" "PO-Revision-Date: 2012-03-15 20:45-0000\n" "Last-Translator: ErmaC\n" "Language-Team: pt-BR \n" Index: branches/ErmaC/Trunk/package/po/sr.po =================================================================== --- branches/ErmaC/Trunk/package/po/sr.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/sr.po (revision 1928) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-06 22:38+0000\n" +"POT-Creation-Date: 2012-04-30 04:13+0200\n" "PO-Revision-Date: 2012-03-15 20:22-0000\n" "Last-Translator: ErmaC\n" "Language-Team: sr \n" Index: branches/ErmaC/Trunk/package/po/zh_TW.po =================================================================== --- branches/ErmaC/Trunk/package/po/zh_TW.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/zh_TW.po (revision 1928) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-06 22:38+0000\n" +"POT-Creation-Date: 2012-04-30 04:13+0200\n" "PO-Revision-Date: 2012-04-11 04:21+0200\n" "Last-Translator: crazybirdy \n" "Language-Team: zh_TW \n" Index: branches/ErmaC/Trunk/package/po/zh_CN.po =================================================================== --- branches/ErmaC/Trunk/package/po/zh_CN.po (revision 1927) +++ branches/ErmaC/Trunk/package/po/zh_CN.po (revision 1928) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-06 22:38+0000\n" +"POT-Creation-Date: 2012-04-30 04:13+0200\n" "PO-Revision-Date: 2012-04-11 04:34+0200\n" "Last-Translator: crazybirdy \n" "Language-Team: zh_CN \n"