Chameleon

Chameleon Commit Details

Date:2014-01-29 02:14:13 (5 years 10 months ago)
Author:ErmaC
Commit:2359
Parents: 2358
Message:merge from ErmaC branch the NvidiaGeneric changes update BootHelp and update pkg choice flags (the choice are not translated yet: so empty field)
Changes:
M/trunk/doc/BootHelp.txt
M/trunk/package/OptionalSettings/Video.txt
M/trunk/i386/libsaio/nvidia.c
M/trunk/package/OptionalSettings/General.txt

File differences

trunk/i386/libsaio/nvidia.c
7777
7878
7979
80
8081
8182
8283
......
16491650
16501651
16511652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
16521665
16531666
16541667
1655
1668
16561669
16571670
16581671
......
16611674
16621675
16631676
1664
1677
16651678
16661679
16671680
#define WRITE_LE_SHORT(data) (((data) << 8 & 0xff00) | ((data) >> 8 & 0x00ff ))
#define WRITE_LE_INT(data) (WRITE_LE_SHORT(data) << 16 | WRITE_LE_SHORT(data >> 16))
static bool showGeneric = false;
char generic_name[128];
extern uint32_t devices_number;
}
}
//ErmaC added selector for Chameleon "old" style in System Profiler
if (getBoolForKey(kNvidiaGeneric, &showGeneric, &bootInfo->chameleonConfig)) {
verbose("\tNvidiaGeneric = Yes\n");
for (i = 1; i < (sizeof(nvidia_card_generic) / sizeof(nvidia_card_generic[0])); i++) {
if (nvidia_card_generic[i].device == device_id) {
return nvidia_card_generic[i].name;
}
}
return nvidia_card_generic[0].name;
}
// Then check the exceptions table
if (subsys_id) {
for (i = 0; i < (sizeof(nvidia_card_exceptions) / sizeof(nvidia_card_exceptions[0])); i++) {
if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id)) {
if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id)){
return nvidia_card_exceptions[i].name;
break;
}
// At last try the generic names
for (i = 1; i < (sizeof(nvidia_card_generic) / sizeof(nvidia_card_generic[0])); i++) {
if (nvidia_card_generic[i].device == device_id) {
if (nvidia_card_generic[i].device == device_id) {
if (subsys_id) {
for (j = 0; j < (sizeof(nvidia_card_vendors) / sizeof(nvidia_card_vendors[0])); j++) {
if (nvidia_card_vendors[j].device == (subsys_id & 0xffff0000)) {
trunk/package/OptionalSettings/Video.txt
3434
3535
3636
37
Bool@SkipAtiGfx:SkipAtiGfx=Yes
Bool@EnableBacklight:EnableBacklight=Yes
Bool@EnableDualLink:EnableDualLink=Yes
Bool@NvidiaGeneric:NvidiaGeneric=Yes
trunk/package/OptionalSettings/General.txt
3737
3838
3939
40
Bool@UseMemDetect:UseMemDetect=No
Bool@UseKernelCache:UseKernelCache=Yes
Bool@Wake:Wake=Yes
Bool@PrivateData:PrivateData=No
trunk/doc/BootHelp.txt
8888
8989
9090
91
92
9193
9294
93
95
9496
95
97
9698
97
99
98100
99101
100102
101103
102104
103105
104
105
106
106
107
108
107109
108110
109111
......
135137
136138
137139
140
141
138142
139143
140144
SkipNvidiaGfx=Yes|No Skip the Automatic device-properties generation for Nvidia cards.
SkipAtiGfx=Yes|No Skip the Automatic device-properties generation for Ati cards.
NvidiaGeneric =Yes|No Use the classic Nvidia name for the SystemProfiler (disabled by default).
AtiConfig=<cardcfg> Use a different card config, e.g. AtiConfig=Megalodon.
AtiPorts=<value> Specify the number of ports, e.g. AtiPorts=2.
UseAtiROM=Yes|No Use an alternate Ati ROM image
UseAtiROM=Yes|No Use an alternate Ati ROM image
(default path: /Extra/<vendorid>_<devid>_<subsysid>.rom)
UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image
UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image
(default path: /Extra/<vendorid>_<devid>.rom)
VBIOS=Yes|No Inject VBIOS to device-properties.
VBIOS=Yes|No Inject VBIOS to device-properties.
display_0=<value> Inject alternate value of display-cfg into NVDA,Display-A@0 (HEX).
display_1=<value> Inject alternate value of display-cfg into NVDA,Display-B@1 (HEX).
IntelCapriFB=<value> For Intel HD 4xxx, range 0-11.
IntelAzulFB=<value> For Intel HD 5xxx/IRIS, range 0-15.
InjectIntel-ig=<value> Inject alternate value into AAPL,ig-platform-id (HEX).
EnableBacklight=Yes Enable Back light option for NVIDIA and ATI
EnableDualLink=Yes Enable DualLink option for NVIDIA and ATI
EnableHDMIAudio=Yes Inject HDMI audio for NVIDIA and ATI.
EnableBacklight=Yes Enable Back light option for NVIDIA and ATI
EnableDualLink=Yes Enable DualLink option for NVIDIA and ATI
EnableHDMIAudio=Yes Inject HDMI audio for NVIDIA and ATI.
EthernetBuiltIn=Yes|No Automatic "built-in"=YES device-properties generation
for ethernet interfaces.
EnableC3State=Yes Enable specific Processor power state, C3.
EnableC4State=Yes Enable specific Processor power state, C4.
PrivateData=No Show masked data (serial number) in bdmesg log (enbaled by default).
ForceFullMemInfo=Yes Force SMBIOS Table 17 to be 27 bytes long (disabled by default).
SMBIOS=<file> Use an alternate SMBIOS.plist file

Archive Download the corresponding diff file

Revision: 2359