Chameleon Commit Details - 2356 - Chameleon open source boot loader project.

Date:

2014-01-29 01:56:02 (10 years 2 months ago)

Author:

ErmaC

Commit:

2356

Parents:

2355

Message:

add new feature for Nvidia GraphicsEnabler to show generic name instead of SubVendor+DeviceName: place the key flag into Extra/org.chameleon.Boot.plist NvidiaGeneric=Yes (default to No)

Changes:

M	/branches/ErmaC/Enoch/doc/BootHelp.txt
M	/branches/ErmaC/Enoch/i386/libsaio/nvidia.c

File differences

-77
78 78
79 79
80
80 81
81 82
82 83
... ...
1640 1641
1641 1642
1642 1643
1643 
1644 1644
1645 1645
1646 1646
... ...
1651 1651
1652 1652
1653 1653
1654 
1655 
1654
1655
1656
1657
1658
1659
1660
1661
1662
1656 1663
1657 1664
1658 1665
+#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;␊
␊

static char *get_nvidia_model(uint32_t device_id, uint32_t subsys_id)␊
{␊
␉int i, j;␊
␉bool showGeneric =  false;␊
␊
␉// First check in the plist, (for e.g this can override any hardcoded devices)␊
␉cardList_t * nvcard = FindCardWithIds(device_id, subsys_id);␊

␉}␊
␊
␉//ErmaC added selector for Chameleon "old" style in System Profiler␊
␉if ((getBoolForKey(kNvidiaGeneric, &showGeneric, &bootInfo->chameleonConfig) && showGeneric) == true) {␊
␉␉DBG("- TEST - NOT YET IMPLEMENTED.\n");␊
␉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␊
 ...
 ...
 #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;␊
 ␊
 static char *get_nvidia_model(uint32_t device_id, uint32_t subsys_id)␊
 {␊
 ␉int i, j;␊
-␉bool showGeneric =  false;␊
 ␊
 ␉// First check in the plist, (for e.g this can override any hardcoded devices)␊
 ␉cardList_t * nvcard = FindCardWithIds(device_id, subsys_id);␊
 ␉}␊
 ␊
 ␉//ErmaC added selector for Chameleon "old" style in System Profiler␊
-␉if ((getBoolForKey(kNvidiaGeneric, &showGeneric, &bootInfo->chameleonConfig) && showGeneric) == true) {␊
-␉␉DBG("- TEST - NOT YET IMPLEMENTED.\n");␊
+␉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␊

-88
89 89
90 90
91
92
91 93
92 94
93 95
+    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 old style name card for Nvidia into 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␊
     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 old style name card for Nvidia into 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␊

Download the corresponding diff file