Chameleon

Chameleon Commit Details

Date:2012-04-30 05:38:01 (7 years 9 months ago)
Author:ErmaC
Commit:1928
Parents: 1927
Message:- Merge patch by Geoff Seeley http://forge.voodooprojects.org/p/chameleon/issues/59/ - Some improvements for nVidia (This still a WORK IN PROGRESS). - Add IDs for Ati. - Removed (commented) some DBG (cpu.c/.h). Package: - Correct a doble quotes into hu.po file. - Update cs.po file.
Changes:
M/branches/ErmaC/Trunk/package/po/zh_TW.po
M/branches/ErmaC/Trunk/i386/libsaio/cpu.c
M/branches/ErmaC/Trunk/i386/libsaio/smbios_getters.c
M/branches/ErmaC/Trunk/package/po/zh_CN.po
M/branches/ErmaC/Trunk/i386/libsaio/smbios.c
M/branches/ErmaC/Trunk/i386/libsaio/smbios_getters.h
M/branches/ErmaC/Trunk/package/po/pt-PT.po
M/branches/ErmaC/Trunk/i386/libsaio/smbios_decode.c
M/branches/ErmaC/Trunk/package/po/cs.po
M/branches/ErmaC/Trunk/i386/libsaio/console.c
M/branches/ErmaC/Trunk/package/po/hu.po
M/branches/ErmaC/Trunk/i386/libsaio/nvidia.c
M/branches/ErmaC/Trunk/i386/libsaio/ati.c
M/branches/ErmaC/Trunk/package/po/pt-BR.po
M/branches/ErmaC/Trunk/package/po/sr.po
M/branches/ErmaC/Trunk/i386/boot2/prompt.c

File differences

branches/ErmaC/Trunk/i386/libsaio/smbios_getters.h
3333
3434
3535
36
3637
3738
3839
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);
branches/ErmaC/Trunk/i386/libsaio/console.c
9191
9292
9393
94
94
9595
9696
9797
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, ...)
branches/ErmaC/Trunk/i386/libsaio/nvidia.c
13311331
13321332
13331333
1334
1334
1335
13351336
13361337
13371338
......
15031504
15041505
15051506
1506
1507
15071508
15081509
1510
15091511
15101512
15111513
{
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;
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);
branches/ErmaC/Trunk/i386/libsaio/ati.c
378378
379379
380380
381
381
382382
383383
384384
......
448448
449449
450450
451
451
452452
453453
454454
......
639639
640640
641641
642
642
643643
644644
645645
......
772772
773773
774774
775
775
776776
777777
778778
......
11711171
11721172
11731173
1174
1175
1176
1177
1178
1179
1180
1181
11741182
11751183
11761184
{ 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},
{ 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},
{ 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},
{ 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},
{ 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},
branches/ErmaC/Trunk/i386/libsaio/cpu.c
359359
360360
361361
362
362
363363
364364
365
365
366366
367367
368368
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;
branches/ErmaC/Trunk/i386/libsaio/smbios.c
246246
247247
248248
249
250
249251
250252
251253
{kSMBTypeMemoryDevice,kSMBString,getFieldOffset(SMBMemoryDevice, assetTag),NULL,NULL,NULL},
{kSMBTypeMemoryDevice,kSMBWord,getFieldOffset(SMBMemoryDevice, errorHandle), NULL, getSMBMemoryDeviceMemoryErrorHandle, NULL},
{kSMBTypeMemoryDevice,kSMBString,getFieldOffset(SMBMemoryDevice, partNumber),kSMBMemoryDevicePartNumberKey,
getSMBMemoryDevicePartNumber,NULL},
branches/ErmaC/Trunk/i386/libsaio/smbios_decode.c
165165
166166
167167
168
168169
169170
170171
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));
branches/ErmaC/Trunk/i386/libsaio/smbios_getters.c
230230
231231
232232
233
234
235
236
237
238
233239
234240
235241
//return true;
}
bool getSMBMemoryDeviceMemoryErrorHandle(returnType *value)
{
value->word = 0xFFFF;
return true;
}
bool getSMBMemoryDeviceMemorySpeed(returnType *value)
{
static int idx = -1;
branches/ErmaC/Trunk/i386/boot2/prompt.c
2828
2929
3030
31
31
3232
3333
3434
#include <vers.h>
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";
branches/ErmaC/Trunk/package/po/pt-PT.po
77
88
99
10
10
1111
1212
1313
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 <pt-PT@li.org>\n"
branches/ErmaC/Trunk/package/po/cs.po
77
88
99
10
10
1111
1212
1313
......
939939
940940
941941
942
942
943943
944944
945945
......
951951
952952
953953
954
954
955955
956956
957957
......
963963
964964
965965
966
966
967967
968968
969969
......
975975
976976
977977
978
978
979979
980980
981981
......
987987
988988
989989
990
990
991991
992992
993993
......
999999
10001000
10011001
1002
1002
10031003
10041004
10051005
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 <martin.badin@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: cs\n"
#: 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
#: 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
#: 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
#: 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
#: 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
#: 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
branches/ErmaC/Trunk/package/po/hu.po
10661066
10671067
10681068
1069
1069
10701070
10711071
10721072
#: 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
branches/ErmaC/Trunk/package/po/pt-BR.po
77
88
99
10
10
1111
1212
1313
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 <pt-BR@li.org>\n"
branches/ErmaC/Trunk/package/po/sr.po
77
88
99
10
10
1111
1212
1313
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 <sr@li.org>\n"
branches/ErmaC/Trunk/package/po/zh_TW.po
77
88
99
10
10
1111
1212
1313
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 <crazybirdy@ms96.url.com.tw>\n"
"Language-Team: zh_TW <zh_TW@li.org>\n"
branches/ErmaC/Trunk/package/po/zh_CN.po
77
88
99
10
10
1111
1212
1313
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 <crazybirdy@ms96.url.com.tw>\n"
"Language-Team: zh_CN <zh_CN@li.org>\n"

Archive Download the corresponding diff file

Revision: 1928