343.22343.22

3 files changed, 34 insertions, 62 deletions

diff --git a/misc.c b/misc.c
index 3885598..849f1db 100644
--- a/misc.c
+++ b/misc.c
@@ -2499,11 +2499,17 @@ int check_selinux(Options *op)
 int run_nvidia_xconfig(Options *op, int restore)
 {
     int ret, bRet = TRUE;
-    char *data = NULL, *cmd, *args;
+    char *data = NULL, *cmd = NULL, *args, *nvidia_xconfig;
+
+    nvidia_xconfig = find_system_util("nvidia-xconfig");
+
+    if (nvidia_xconfig == NULL) {
+        goto done;
+    }
 
     args = restore ? " --restore-original-backup" : "";
     
-    cmd = nvstrcat(find_system_util("nvidia-xconfig"), args, NULL);
+    cmd = nvstrcat(nvidia_xconfig, args, NULL);
     
     ret = run_command(op, cmd, &data, FALSE, 0, TRUE);
     
@@ -2511,9 +2517,12 @@ int run_nvidia_xconfig(Options *op, int restore)
         ui_error(op, "Failed to run `%s`:\n%s", cmd, data);
         bRet = FALSE;
     }
-    
+
+done:
+
     nvfree(cmd);
     nvfree(data);
+    nvfree(nvidia_xconfig);
 
     return bRet;
     
diff --git a/nvLegacy.h b/nvLegacy.h
index c409a87..53d67ea 100644
--- a/nvLegacy.h
+++ b/nvLegacy.h
@@ -88,15 +88,12 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x00F4,   4,      "GeForce 6600 LE" },
     { 0x00F5,   4,      "GeForce 7800 GS" },
     { 0x00F6,   4,      "GeForce 6800 GS" },
-    { 0x00F8,   4,      "Quadro FX 3400" },
-    { 0x00F8,   4,      "Quadro FX 4000" },
+    { 0x00F8,   4,      "Quadro FX 3400/Quadro FX 4000" },
     { 0x00F9,   4,      "GeForce 6800 Ultra" },
     { 0x00FA,   3,      "GeForce PCX 5750" },
     { 0x00FB,   3,      "GeForce PCX 5900" },
-    { 0x00FC,   3,      "Quadro FX 330" },
-    { 0x00FC,   3,      "GeForce PCX 5300" },
-    { 0x00FD,   3,      "Quadro FX 330" },
-    { 0x00FD,   3,      "Quadro NVS 280 PCI-E" },
+    { 0x00FC,   3,      "Quadro FX 330/GeForce PCX 5300" },
+    { 0x00FD,   3,      "Quadro FX 330/Quadro NVS 280 PCI-E" },
     { 0x00FE,   3,      "Quadro FX 1300" },
     { 0x0100,   1,      "GeForce 256" },
     { 0x0101,   1,      "GeForce DDR" },
@@ -324,12 +321,7 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x05E2,   5,      "GeForce GTX 260" },
     { 0x05E3,   5,      "GeForce GTX 285" },
     { 0x05E6,   5,      "GeForce GTX 275" },
-    { 0x05E7,   5,      "Tesla C1060" },
-    { 0x05E7,   5,      "Tesla T10 Processor" },
-    { 0x05E7,   5,      "Tesla T10 Processor" },
-    { 0x05E7,   5,      "Tesla M1060" },
-    { 0x05E7,   5,      "Tesla M1060" },
-    { 0x05E7,   5,      "Tesla M1060" },
+    { 0x05E7,   5,      "Tesla C1060/Tesla M1060/Tesla T10 Processor" },
     { 0x05EA,   5,      "GeForce GTX 260" },
     { 0x05EB,   5,      "GeForce GTX 295" },
     { 0x05ED,   5,      "Quadroplex 2200 D2" },
@@ -347,8 +339,7 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x0606,   5,      "GeForce 8800 GS" },
     { 0x0607,   5,      "GeForce GTS 240" },
     { 0x0608,   5,      "GeForce 9800M GTX" },
-    { 0x0609,   5,      "GeForce 8800M GTS" },
-    { 0x0609,   5,      "GeForce 8800 GS" },
+    { 0x0609,   5,      "GeForce 8800M GTS/GeForce 8800 GS" },
     { 0x060A,   5,      "GeForce GTX 280M" },
     { 0x060B,   5,      "GeForce 9800M GT" },
     { 0x060C,   5,      "GeForce 8800M GTX" },
@@ -380,8 +371,7 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x062B,   5,      "GeForce 9800M GS" },
     { 0x062C,   5,      "GeForce 9800M GTS" },
     { 0x062D,   5,      "GeForce 9600 GT" },
-    { 0x062E,   5,      "GeForce 9600 GT" },
-    { 0x062E,   5,      "GeForce GT 130" },
+    { 0x062E,   5,      "GeForce 9600 GT/GeForce GT 130" },
     { 0x0630,   5,      "GeForce 9700 S" },
     { 0x0631,   5,      "GeForce GTS 160M" },
     { 0x0632,   5,      "GeForce GTS 150M" },
@@ -397,18 +387,14 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x0646,   5,      "GeForce GT 120" },
     { 0x0647,   5,      "GeForce 9600M GT" },
     { 0x0648,   5,      "GeForce 9600M GS" },
-    { 0x0649,   5,      "GeForce 9600M GT" },
-    { 0x0649,   5,      "GeForce GT 220M" },
+    { 0x0649,   5,      "GeForce 9600M GT/GeForce GT 220M" },
     { 0x064A,   5,      "GeForce 9700M GT" },
     { 0x064B,   5,      "GeForce 9500M G" },
     { 0x064C,   5,      "GeForce 9650M GT" },
     { 0x0651,   5,      "GeForce G 110M" },
-    { 0x0652,   5,      "GeForce GT 130M" },
-    { 0x0652,   5,      "GeForce GT 240M LE" },
+    { 0x0652,   5,      "GeForce GT 130M/GeForce GT 240M LE" },
     { 0x0653,   5,      "GeForce GT 120M" },
-    { 0x0654,   5,      "GeForce GT 220M" },
-    { 0x0654,   5,      "GeForce GT 320M" },
-    { 0x0654,   5,      "GeForce GT 320M" },
+    { 0x0654,   5,      "GeForce GT 220M/GeForce GT 320M" },
     { 0x0655,   5,      "GeForce GT 120" },
     { 0x0656,   5,      "GeForce GT 120" },
     { 0x0658,   5,      "Quadro FX 380" },
@@ -424,8 +410,7 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x06E5,   5,      "GeForce 9300M GS" },
     { 0x06E6,   5,      "GeForce G100" },
     { 0x06E7,   5,      "GeForce 9300 SE" },
-    { 0x06E8,   5,      "GeForce 9200M GS" },
-    { 0x06E8,   5,      "GeForce 9200M GE" },
+    { 0x06E8,   5,      "GeForce 9200M GS/GeForce 9200M GE" },
     { 0x06E9,   5,      "GeForce 9300M GS" },
     { 0x06EA,   5,      "Quadro NVS 150M" },
     { 0x06EB,   5,      "Quadro NVS 160M" },
@@ -433,13 +418,11 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x06EF,   5,      "GeForce G 103M" },
     { 0x06F1,   5,      "GeForce G105M" },
     { 0x06F8,   5,      "Quadro NVS 420" },
-    { 0x06F9,   5,      "Quadro FX 370 LP" },
-    { 0x06F9,   5,      "Quadro FX 370 Low Profile" },
+    { 0x06F9,   5,      "Quadro FX 370 LP/Quadro FX 370 Low Profile" },
     { 0x06FA,   5,      "Quadro NVS 450" },
     { 0x06FB,   5,      "Quadro FX 370M" },
     { 0x06FD,   5,      "Quadro NVS 295" },
-    { 0x06FF,   5,      "HICx16 + Graphics" },
-    { 0x06FF,   5,      "HICx8 + Graphics" },
+    { 0x06FF,   5,      "HICx16 + Graphics/HICx8 + Graphics" },
     { 0x07E0,   4,      "GeForce 7150 / nForce 630i" },
     { 0x07E1,   4,      "GeForce 7100 / nForce 630i" },
     { 0x07E2,   4,      "GeForce 7050 / nForce 630i" },
@@ -463,8 +446,7 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x0863,   5,      "GeForce 9400M" },
     { 0x0864,   5,      "GeForce 9300" },
     { 0x0865,   5,      "ION" },
-    { 0x0866,   5,      "GeForce 9400M G" },
-    { 0x0866,   5,      "GeForce 9400M" },
+    { 0x0866,   5,      "GeForce 9400M G/GeForce 9400M" },
     { 0x0867,   5,      "GeForce 9400" },
     { 0x0868,   5,      "nForce 760i SLI" },
     { 0x0869,   5,      "GeForce 9400" },
@@ -475,10 +457,8 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x086F,   5,      "GeForce 8200M G" },
     { 0x0870,   5,      "GeForce 9400M" },
     { 0x0871,   5,      "GeForce 9200" },
-    { 0x0872,   5,      "GeForce G102M" },
-    { 0x0872,   5,      "GeForce G205M" },
-    { 0x0873,   5,      "GeForce G102M" },
-    { 0x0873,   5,      "GeForce G205M" },
+    { 0x0872,   5,      "GeForce G102M/GeForce G205M" },
+    { 0x0873,   5,      "GeForce G102M/GeForce G205M" },
     { 0x0874,   5,      "ION" },
     { 0x0876,   5,      "ION" },
     { 0x087A,   5,      "GeForce 9400" },
@@ -517,34 +497,17 @@ static const LEGACY_INFO LegacyList[] = {
     { 0x0A69,   5,      "GeForce G105M" },
     { 0x0A6A,   5,      "NVS 2100M" },
     { 0x0A6C,   5,      "NVS 3100M" },
-    { 0x0A6E,   5,      "GeForce 305M" },
-    { 0x0A6E,   5,      "Second Generation ION" },
+    { 0x0A6E,   5,      "GeForce 305M/Second Generation ION" },
     { 0x0A6F,   5,      "Second Generation ION" },
-    { 0x0A70,   5,      "GeForce 310M" },
-    { 0x0A70,   5,      "Second Generation ION" },
-    { 0x0A70,   5,      "Second Generation ION" },
+    { 0x0A70,   5,      "GeForce 310M/Second Generation ION" },
     { 0x0A71,   5,      "GeForce 305M" },
     { 0x0A72,   5,      "GeForce 310M" },
-    { 0x0A73,   5,      "GeForce 305M" },
-    { 0x0A73,   5,      "Second Generation ION" },
-    { 0x0A73,   5,      "Second Generation ION" },
-    { 0x0A74,   5,      "GeForce G210M" },
-    { 0x0A74,   5,      "GeForce G210" },
-    { 0x0A75,   5,      "GeForce 310M" },
-    { 0x0A75,   5,      "Second Generation ION" },
+    { 0x0A73,   5,      "GeForce 305M/Second Generation ION" },
+    { 0x0A74,   5,      "GeForce G210M/GeForce G210" },
+    { 0x0A75,   5,      "GeForce 310M/Second Generation ION" },
     { 0x0A76,   5,      "Second Generation ION" },
     { 0x0A78,   5,      "Quadro FX 380 LP" },
-    { 0x0A7A,   5,      "GeForce 315M" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405M" },
-    { 0x0A7A,   5,      "GeForce 405M" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405" },
-    { 0x0A7A,   5,      "GeForce 405" },
+    { 0x0A7A,   5,      "GeForce 315M/GeForce 405/GeForce 405M" },
     { 0x0A7C,   5,      "Quadro FX 380M" },
     { 0x0CA0,   5,      "GeForce GT 330" },
     { 0x0CA2,   5,      "GeForce GT 320" },
diff --git a/version.mk b/version.mk
index 043e890..66ba96f 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 343.13
+NVIDIA_VERSION = 343.22