Index: branches/iFabio/Chameleon/i386/libsaio/nvidia.c
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/nvidia.c	(revision 332)
+++ branches/iFabio/Chameleon/i386/libsaio/nvidia.c	(revision 333)
@@ -19,8 +19,8 @@
 /*
  * Alternatively you can choose to comply with APSL
  */
-
-
+ 
+ 
 /*
  * DCB-Table parsing is based on software (nouveau driver) originally distributed under following license:
  *
@@ -115,6 +115,11 @@
 	{ 0x10DE0048, "GeForce 6800 XT" },
 	{ 0x10DE004D, "Quadro FX 3400" },
 	{ 0x10DE004E, "Quadro FX 4000" },
+	// 0050 - 005F
+	// 0060 - 006F	
+	// 0070 - 007F	
+	// 0080 - 008F	
+	// 0090 - 009F	
 	{ 0x10DE0090, "GeForce 7800 GTX" },
 	{ 0x10DE0091, "GeForce 7800 GTX" },
 	{ 0x10DE0092, "GeForce 7800 GT" },
@@ -123,6 +128,9 @@
 	{ 0x10DE0098, "GeForce Go 7800" },
 	{ 0x10DE0099, "GeForce Go 7800 GTX" },
 	{ 0x10DE009D, "Quadro FX 4500" },
+	// 00A0 - 00AF	
+	// 00B0 - 00BF	
+	// 00C0 - 00CF	
 	{ 0x10DE00C0, "GeForce 6800 GS" },
 	{ 0x10DE00C1, "GeForce 6800" },
 	{ 0x10DE00C2, "GeForce 6800 LE" },
@@ -132,6 +140,9 @@
 	{ 0x10DE00CC, "Quadro FX Go1400" },
 	{ 0x10DE00CD, "Quadro FX 3450/4000 SDI" },
 	{ 0x10DE00CE, "Quadro FX 1400" },
+	// 00D0 - 00DF	
+	// 00E0 - 00EF	
+	// 00F0 - 00FF	
 	{ 0x10DE00F1, "GeForce 6600 GT" },
 	{ 0x10DE00F2, "GeForce 6600" },
 	{ 0x10DE00F3, "GeForce 6200" },
@@ -140,6 +151,11 @@
 	{ 0x10DE00F6, "GeForce 6800 GS/XT" },
 	{ 0x10DE00F8, "Quadro FX 3400/4400" },
 	{ 0x10DE00F9, "GeForce 6800 Series GPU" },
+	// 0100 - 010F	
+	// 0110 - 011F	
+	// 0120 - 012F	
+	// 0130 - 013F	
+	// 0140 - 014F	
 	{ 0x10DE0140, "GeForce 6600 GT" },
 	{ 0x10DE0141, "GeForce 6600" },
 	{ 0x10DE0142, "GeForce 6600 LE" },
@@ -155,6 +171,8 @@
 	{ 0x10DE014D, "Quadro FX 550" },
 	{ 0x10DE014E, "Quadro FX 540" },
 	{ 0x10DE014F, "GeForce 6200" },
+	// 0150 - 015F	
+	// 0160 - 016F	
 	{ 0x10DE0160, "GeForce 6500" },
 	{ 0x10DE0161, "GeForce 6200 TurboCache(TM)" },
 	{ 0x10DE0162, "GeForce 6200SE TurboCache(TM)" },
@@ -166,12 +184,19 @@
 	{ 0x10DE0168, "GeForce Go 6400" },
 	{ 0x10DE0169, "GeForce 6250" },
 	{ 0x10DE016A, "GeForce 7100 GS" },
+	// 0170 - 017F	
+	// 0180 - 018F	
+	// 0190 - 019F		
 	{ 0x10DE0191, "GeForce 8800 GTX" },
 	{ 0x10DE0193, "GeForce 8800 GTS" },
 	{ 0x10DE0194, "GeForce 8800 Ultra" },
 	{ 0x10DE0197, "Tesla C870" },
 	{ 0x10DE019D, "Quadro FX 5600" },
 	{ 0x10DE019E, "Quadro FX 4600" },
+	// 01A0 - 01AF	
+	// 01B0 - 01BF	
+	// 01C0 - 01CF	
+	// 01D0 - 01DF		
 	{ 0x10DE01D0, "GeForce 7350 LE" },
 	{ 0x10DE01D1, "GeForce 7300 LE" },
 	{ 0x10DE01D2, "GeForce 7550 LE" },
@@ -186,18 +211,30 @@
 	{ 0x10DE01DD, "GeForce 7500 LE" },
 	{ 0x10DE01DE, "Quadro FX 350" },
 	{ 0x10DE01DF, "GeForce 7300 GS" },
+	// 01E0 - 01EF	
+	// 01F0 - 01FF
+	// 0200 - 020F	
+	// 0210 - 021F	
 	{ 0x10DE0211, "GeForce 6800" },
 	{ 0x10DE0212, "GeForce 6800 LE" },
 	{ 0x10DE0215, "GeForce 6800 GT" },
 	{ 0x10DE0218, "GeForce 6800 XT" },
+	// 0220 - 022F	
 	{ 0x10DE0221, "GeForce 6200" },
 	{ 0x10DE0222, "GeForce 6200 A-LE" },
+	// 0230 - 023F	
+	// 0240 - 024F	
 	{ 0x10DE0240, "GeForce 6150" },
 	{ 0x10DE0241, "GeForce 6150 LE" },
 	{ 0x10DE0242, "GeForce 6100" },
 	{ 0x10DE0244, "GeForce Go 6150" },
 	{ 0x10DE0245, "Quadro NVS 210S / GeForce 6150LE" },
 	{ 0x10DE0247, "GeForce Go 6100" },
+	// 0250 - 025F	
+	// 0260 - 026F	
+	// 0270 - 027F	
+	// 0280 - 028F		
+	// 0290 - 029F	
 	{ 0x10DE0290, "GeForce 7900 GTX" },
 	{ 0x10DE0291, "GeForce 7900 GT/GTO" },
 	{ 0x10DE0292, "GeForce 7900 GS" },
@@ -212,21 +249,30 @@
 	{ 0x10DE029D, "Quadro FX 3500" },
 	{ 0x10DE029E, "Quadro FX 1500" },
 	{ 0x10DE029F, "Quadro FX 4500 X2" },
+	// 02A0 - 02AF	
+	// 02B0 - 02BF	
+	// 02C0 - 02CF	
+	// 02D0 - 02DF		
+	// 02E0 - 02EF		
 	{ 0x10DE02E0, "GeForce 7600 GT" },
 	{ 0x10DE02E1, "GeForce 7600 GS" },
 	{ 0x10DE02E2, "GeForce 7300 GT" },
 	{ 0x10DE02E3, "GeForce 7900 GS" },
 	{ 0x10DE02E4, "GeForce 7950 GT" },
+	// 02F0 - 02FF		
+	// 0300 - 030F		
 	{ 0x10DE0301, "GeForce FX 5800 Ultra" },
 	{ 0x10DE0302, "GeForce FX 5800" },
 	{ 0x10DE0308, "Quadro FX 2000" },
 	{ 0x10DE0309, "Quadro FX 1000" },
+	// 0310 - 031F		
 	{ 0x10DE0311, "GeForce FX 5600 Ultra" },
 	{ 0x10DE0312, "GeForce FX 5600" },
 	{ 0x10DE0314, "GeForce FX 5600XT" },
 	{ 0x10DE031A, "GeForce FX Go5600" },
 	{ 0x10DE031B, "GeForce FX Go5650" },
 	{ 0x10DE031C, "Quadro FX Go700" },
+	// 0320 - 032F		
 	{ 0x10DE0324, "GeForce FX Go5200" },
 	{ 0x10DE0325, "GeForce FX Go5250" },
 	{ 0x10DE0326, "GeForce FX 5500" },
@@ -235,6 +281,7 @@
 	{ 0x10DE032B, "Quadro FX 500/600 PCI" },
 	{ 0x10DE032C, "GeForce FX Go53xx Series" },
 	{ 0x10DE032D, "GeForce FX Go5100" },
+	// 0330 - 033F
 	{ 0x10DE0330, "GeForce FX 5900 Ultra" },
 	{ 0x10DE0331, "GeForce FX 5900" },
 	{ 0x10DE0332, "GeForce FX 5900XT" },
@@ -242,6 +289,7 @@
 	{ 0x10DE0334, "GeForce FX 5900ZT" },
 	{ 0x10DE0338, "Quadro FX 3000" },
 	{ 0x10DE033F, "Quadro FX 700" },
+	// 0340 - 034F
 	{ 0x10DE0341, "GeForce FX 5700 Ultra" },
 	{ 0x10DE0342, "GeForce FX 5700" },
 	{ 0x10DE0343, "GeForce FX 5700LE" },
@@ -250,7 +298,12 @@
 	{ 0x10DE0348, "GeForce FX Go5700" },
 	{ 0x10DE034C, "Quadro FX Go1000" },
 	{ 0x10DE034E, "Quadro FX 1100" },
+	// 0350 - 035F	
+	// 0360 - 036F	
+	// 0370 - 037F	
+	// 0380 - 038F			
 	{ 0x10DE038B, "GeForce 7650 GS" },
+	// 0390 - 039F
 	{ 0x10DE0390, "GeForce 7650 GS" },
 	{ 0x10DE0391, "GeForce 7600 GT" },
 	{ 0x10DE0392, "GeForce 7600 GS" },
@@ -264,11 +317,18 @@
 	{ 0x10DE039B, "GeForce Go 7900 SE" },
 	{ 0x10DE039C, "Quadro FX 550M" },
 	{ 0x10DE039E, "Quadro FX 560" },
+	// 03A0 - 03AF	
+	// 03B0 - 03BF	
+	// 03C0 - 03CF	
+	// 03D0 - 03DF			
 	{ 0x10DE03D0, "GeForce 6150SE nForce 430" },
 	{ 0x10DE03D1, "GeForce 6100 nForce 405" },
 	{ 0x10DE03D2, "GeForce 6100 nForce 400" },
 	{ 0x10DE03D5, "GeForce 6100 nForce 420" },
 	{ 0x10DE03D6, "GeForce 7025 / nForce 630a" },
+	// 03E0 - 03EF
+	// 03F0 - 03FF
+	// 0400 - 040F		
 	{ 0x10DE0400, "GeForce 8600 GTS" },
 	{ 0x10DE0401, "GeForce 8600 GT" },
 	{ 0x10DE0402, "GeForce 8600 GT" },
@@ -285,7 +345,9 @@
 	{ 0x10DE040D, "Quadro FX 1600M" },
 	{ 0x10DE040E, "Quadro FX 570" },
 	{ 0x10DE040F, "Quadro FX 1700" },
+	// 0410 - 041F	
 	{ 0x10DE0410, "GeForce GT 330" },
+	// 0420 - 042F	
 	{ 0x10DE0420, "GeForce 8400 SE" },
 	{ 0x10DE0421, "GeForce 8500 GT" },
 	{ 0x10DE0422, "GeForce 8400 GS" },
@@ -302,9 +364,37 @@
 	{ 0x10DE042D, "Quadro FX 360M" },
 	{ 0x10DE042E, "GeForce 9300M G" },
 	{ 0x10DE042F, "Quadro NVS 290" },
+	// 0430 - 043F
+	// 0440 - 044F
+	// 0450 - 045F
+	// 0460 - 046F
+	// 0470 - 047F
+	// 0480 - 048F
+	// 0490 - 049F
+	// 04A0 - 04AF
+	// 04B0 - 04BF
+	// 04C0 - 04CF
+	// 04D0 - 04DF
+	// 04E0 - 04EF
+	// 04F0 - 04FF
+	// 0500 - 050F	
+	// 0510 - 051F	
+	// 0520 - 052F	
+	// 0530 - 053F	
 	{ 0x10DE053A, "GeForce 7050 PV / nForce 630a" },
 	{ 0x10DE053B, "GeForce 7050 PV / nForce 630a" },
 	{ 0x10DE053E, "GeForce 7025 / nForce 630a" },
+	// 0540 - 054F
+	// 0550 - 055F
+	// 0560 - 056F
+	// 0570 - 057F
+	// 0580 - 058F
+	// 0590 - 059F
+	// 05A0 - 05AF
+	// 05B0 - 05BF
+	// 05C0 - 05CF
+	// 05D0 - 05DF
+	// 05E0 - 05EF	
 	{ 0x10DE05E0, "GeForce GTX 295" },
 	{ 0x10DE05E1, "GeForce GTX 280" },
 	{ 0x10DE05E2, "GeForce GTX 260" },
@@ -313,11 +403,13 @@
 	{ 0x10DE05EA, "GeForce GTX 260" },
 	{ 0x10DE05EB, "GeForce GTX 295" },
 	{ 0x10DE05ED, "Quadroplex 2200 D2" },
+	// 05F0 - 05FF		
 	{ 0x10DE05F8, "Quadroplex 2200 S4" },
 	{ 0x10DE05F9, "Quadro CX" },
 	{ 0x10DE05FD, "Quadro FX 5800" },
 	{ 0x10DE05FE, "Quadro FX 4800" },
 	{ 0x10DE05FF, "Quadro FX 3800" },
+	// 0600 - 060F	
 	{ 0x10DE0600, "GeForce 8800 GTS 512" },
 	{ 0x10DE0601, "GeForce 9800 GT" },
 	{ 0x10DE0602, "GeForce 8800 GT" },
@@ -333,6 +425,7 @@
 	{ 0x10DE060C, "GeForce 8800M GTX" },
 	{ 0x10DE060D, "GeForce 8800 GS" },
 	{ 0x10DE060F, "GeForce GTX 285M" },
+	// 0610 - 061F	
 	{ 0x10DE0610, "GeForce 9600 GSO" },
 	{ 0x10DE0611, "GeForce 8800 GT" },
 	{ 0x10DE0612, "GeForce 9800 GTX" },
@@ -347,6 +440,7 @@
 	{ 0x10DE061C, "Quadro FX 3600M" },
 	{ 0x10DE061D, "Quadro FX 2800M" },
 	{ 0x10DE061F, "Quadro FX 3800M" },
+	// 0620 - 062F	
 	{ 0x10DE0622, "GeForce 9600 GT" },
 	{ 0x10DE0623, "GeForce 9600 GS" },
 	{ 0x10DE0625, "GeForce 9600 GSO 512"},
@@ -357,12 +451,14 @@
 	{ 0x10DE062C, "GeForce 9800M GTS" },
 	{ 0x10DE062D, "GeForce 9600 GT" },
 	{ 0x10DE062E, "GeForce 9600 GT" },
+	// 0630 - 063F	
 	{ 0x10DE0631, "GeForce GTS 160M" },
 	{ 0x10DE0632, "GeForce GTS 150M" },
 	{ 0x10DE0635, "GeForce 9600 GSO" },
 	{ 0x10DE0637, "GeForce 9600 GT" },
 	{ 0x10DE0638, "Quadro FX 1800" },
 	{ 0x10DE063A, "Quadro FX 2700M" },
+	// 0640 - 064F	
 	{ 0x10DE0640, "GeForce 9500 GT" },
 	{ 0x10DE0641, "GeForce 9400 GT" },
 	{ 0x10DE0642, "GeForce 8400 GS" },
@@ -376,6 +472,7 @@
 	{ 0x10DE064A, "GeForce 9700M GT" },
 	{ 0x10DE064B, "GeForce 9500M G" },
 	{ 0x10DE064C, "GeForce 9650M GT" },
+	// 0650 - 065F		
 	{ 0x10DE0651, "GeForce G 110M" },
 	{ 0x10DE0652, "GeForce GT 130M" },
 	{ 0x10DE0653, "GeForce GT 120M" },
@@ -387,13 +484,21 @@
 	{ 0x10DE065B, "GeForce 9400 GT" },
 	{ 0x10DE065C, "Quadro FX 770M" },
 	{ 0x10DE065F, "GeForce G210" },
+	// 0660 - 066F
+	// 0670 - 067F
+	// 0680 - 068F
+	// 0690 - 069F
+	// 06A0 - 06AF
+	// 06B0 - 06BF
+	// 06C0 - 06CF
 	{ 0x10DE06C0, "GeForce GTX 480" },
 	{ 0x10DE06C3, "GeForce GTX D12U" },
 	{ 0x10DE06C4, "GeForce GTX 465" },
 	{ 0x10DE06CA, "GeForce GTX 480M" },
 	{ 0x10DE06CD, "GeForce GTX 470" },
-	{ 0x10DE06D1, "Tesla C2050" },
-	{ 0x10DE06D1, "Tesla C2070" },
+	// 06D0 - 06DF
+	{ 0x10DE06D1, "Tesla C2050" },	// TODO: sub-device id: 0x0771
+	{ 0x10DE06D1, "Tesla C2070" },	// TODO: sub-device id: 0x0772
 	{ 0x10DE06D2, "Tesla M2070" },
 	{ 0x10DE06D8, "Quadro 6000" },
 	{ 0x10DE06D9, "Quadro 5000" },
@@ -402,9 +507,11 @@
 	{ 0x10DE06DE, "Tesla M2050" },
 	{ 0x10DE06DE, "Tesla M2070" },
 	{ 0x10DE06DD, "Quadro 4000" },
-	{ 0x10DE06DE, "Tesla M2050" },
-	{ 0x10DE06DE, "Tesla M2070" },
+	{ 0x10DE06DE, "Tesla M2050" },	// TODO: sub-device id: 0x0846
+	{ 0x10DE06DE, "Tesla M2070" },	// TODO: sub-device id: ?	
 	{ 0x10DE06DF, "Tesla M2070-Q" },
+	// 0x10DE06DE also applies to misc S2050, X2070, M2050, M2070
+	// 06E0 - 06EF	
 	{ 0x10DE06E0, "GeForce 9300 GE" },
 	{ 0x10DE06E1, "GeForce 9300 GS" },
 	{ 0x10DE06E2, "GeForce 8400" },
@@ -419,16 +526,38 @@
 	{ 0x10DE06EB, "Quadro NVS 160M" },
 	{ 0x10DE06EC, "GeForce G 105M" },
 	{ 0x10DE06EF, "GeForce G 103M" },
+	// 06F0 - 06FF	
 	{ 0x10DE06F8, "Quadro NVS 420" },
 	{ 0x10DE06F9, "Quadro FX 370 LP" },
 	{ 0x10DE06FA, "Quadro NVS 450" },
 	{ 0x10DE06FB, "Quadro FX 370M" },
 	{ 0x10DE06FD, "Quadro NVS 295" },
+	// 0700 - 070F
+	// 0710 - 071F
+	// 0720 - 072F
+	// 0730 - 073F
+	// 0740 - 074F
+	// 0750 - 075F
+	// 0760 - 076F
+	// 0770 - 077F
+	// 0780 - 078F
+	// 0790 - 079F
+	// 07A0 - 07AF
+	// 07B0 - 07BF
+	// 07C0 - 07CF
+	// 07D0 - 07DF	
+	// 07E0 - 07EF		
 	{ 0x10DE07E0, "GeForce 7150 / nForce 630i" },
 	{ 0x10DE07E1, "GeForce 7100 / nForce 630i" },
 	{ 0x10DE07E2, "GeForce 7050 / nForce 630i" },
 	{ 0x10DE07E3, "GeForce 7050 / nForce 610i" },
 	{ 0x10DE07E5, "GeForce 7050 / nForce 620i" },
+	// 07F0 - 07FF	
+	// 0800 - 080F
+	// 0810 - 081F
+	// 0820 - 082F
+	// 0830 - 083F
+	// 0840 - 084F
 	{ 0x10DE0844, "GeForce 9100M G" },
 	{ 0x10DE0845, "GeForce 8200M G" },
 	{ 0x10DE0846, "GeForce 9200" },
@@ -440,6 +569,8 @@
 	{ 0x10DE084C, "nForce 980a/780a SLI" },
 	{ 0x10DE084D, "nForce 750a SLI" },
 	{ 0x10DE084F, "GeForce 8100 / nForce 720a" },
+	// 0850 - 085F
+	// 0860 - 086F	
 	{ 0x10DE0860, "GeForce 9400" },
 	{ 0x10DE0861, "GeForce 9400" },
 	{ 0x10DE0862, "GeForce 9400M G" },
@@ -454,6 +585,7 @@
 	{ 0x10DE086D, "GeForce 9200" },
 	{ 0x10DE086E, "GeForce 9100M G" },
 	{ 0x10DE086F, "GeForce 8200M G" },
+	// 0870 - 087F	
 	{ 0x10DE0870, "GeForce 9400M" },
 	{ 0x10DE0871, "GeForce 9200" },
 	{ 0x10DE0872, "GeForce G102M" },
@@ -464,6 +596,33 @@
 	{ 0x10DE087D, "ION 9400M" },
 	{ 0x10DE087E, "ION LE" },
 	{ 0x10DE087F, "ION LE" },
+	// 0880 - 088F
+	// 0890 - 089F
+	// 08A0 - 08AF
+	// 08B0 - 08BF
+	// 08C0 - 08CF
+	// 08D0 - 08DF	
+	// 08E0 - 08EF			
+	// 08F0 - 08FF
+	// 0900 - 090F
+	// 0910 - 091F
+	// 0920 - 092F
+	// 0930 - 093F
+	// 0940 - 094F
+	// 0950 - 095F
+	// 0960 - 096F
+	// 0970 - 097F
+	// 0980 - 098F
+	// 0990 - 099F
+	// 09A0 - 09AF
+	// 09B0 - 09BF
+	// 09C0 - 09CF
+	// 09D0 - 09DF	
+	// 09E0 - 09EF
+	// 09F0 - 09FF
+	// 0A00 - 0A0F
+	// 0A10 - 0A1F
+	// 0A20 - 0A2F
 	{ 0x10DE0A20, "GeForce GT220" },
 	{ 0x10DE0A22, "GeForce 315" },
 	{ 0x10DE0A23, "GeForce 210" },
@@ -472,10 +631,14 @@
 	{ 0x10DE0A2A, "GeForce GT 230M" },
 	{ 0x10DE0A2B, "GeForce GT 330M" },
 	{ 0x10DE0A2C, "NVS 5100M" },
-	{ 0x10DE0A2D, "GeForce GT 320M" },
+	{ 0x10DE0A2D, "GeForce GT 320M" },	
+	// 0A30 - 0A3F	
 	{ 0x10DE0A34, "GeForce GT 240M" },
 	{ 0x10DE0A35, "GeForce GT 325M" },
 	{ 0x10DE0A3C, "Quadro FX 880M" },
+	// 0A40 - 0A4F
+	// 0A50 - 0A5F
+	// 0A60 - 0A6F
 	{ 0x10DE0A60, "GeForce G210" },
 	{ 0x10DE0A62, "GeForce 205" },
 	{ 0x10DE0A63, "GeForce 310" },
@@ -488,7 +651,8 @@
 	{ 0x10DE0A6A, "NVS 2100M" },
 	{ 0x10DE0A6C, "NVS 3100M" },
 	{ 0x10DE0A6E, "GeForce 305M" },
-	{ 0x10DE0A6F, "ION" },
+	{ 0x10DE0A6F, "ION" },	
+	// 0A70 - 0A7F
 	{ 0x10DE0A70, "GeForce 310M" },
 	{ 0x10DE0A71, "GeForce 305M" },
 	{ 0x10DE0A72, "GeForce 310M" },
@@ -497,6 +661,41 @@
 	{ 0x10DE0A75, "GeForce G310M" },
 	{ 0x10DE0A78, "Quadro FX 380 LP" },
 	{ 0x10DE0A7C, "Quadro FX 380M" },
+	// 0A80 - 0A8F
+	// 0A90 - 0A9F
+	// 0AA0 - 0AAF
+	// 0AB0 - 0ABF
+	// 0AC0 - 0ACF
+	// 0AD0 - 0ADF	
+	// 0AE0 - 0AEF
+	// 0AF0 - 0AFF
+	// 0B00 - 0B0F
+	// 0B10 - 0B1F
+	// 0B20 - 0B2F
+	// 0B30 - 0B3F
+	// 0B40 - 0B4F
+	// 0B50 - 0B5F
+	// 0B60 - 0B6F
+	// 0B70 - 0B7F
+	// 0B80 - 0B8F
+	// 0B90 - 0B9F
+	// 0BA0 - 0BAF
+	// 0BB0 - 0BBF
+	// 0BC0 - 0BCF
+	// 0BD0 - 0BDF	
+	// 0BE0 - 0BEF
+	// 0BF0 - 0BFF
+	// 0C00 - 0C0F
+	// 0C10 - 0C1F
+	// 0C20 - 0C2F
+	// 0C30 - 0C3F
+	// 0C40 - 0C4F
+	// 0C50 - 0C5F
+	// 0C60 - 0C6F
+	// 0C70 - 0C7F
+	// 0C80 - 0C8F
+	// 0C90 - 0C9F
+	// 0CA0 - 0CAF
 	{ 0x10DE0CA0, "GeForce GT 330 " },
 	{ 0x10DE0CA2, "GeForce GT 320" },
 	{ 0x10DE0CA3, "GeForce GT 240" },
@@ -506,9 +705,27 @@
 	{ 0x10DE0CA9, "GeForce GTS 250M" },
 	{ 0x10DE0CAC, "GeForce 315" },
 	{ 0x10DE0CAF, "GeForce GT 335M" },
+	// 0CB0 - 0CBF	
 	{ 0x10DE0CB0, "GeForce GTS 350M" },
 	{ 0x10DE0CB1, "GeForce GTS 360M" },
 	{ 0x10DE0CBC, "Quadro FX 1800M" },
+	// 0CC0 - 0CCF
+	// 0CD0 - 0CDF	
+	// 0CE0 - 0CEF
+	// 0CF0 - 0CFF
+	// 0D00 - 0D0F
+	// 0D10 - 0D1F
+	// 0D20 - 0D2F
+	// 0D30 - 0D3F
+	// 0D40 - 0D4F
+	// 0D50 - 0D5F
+	// 0D60 - 0D6F
+	// 0D70 - 0D7F
+	// 0D80 - 0D8F
+	// 0D90 - 0D9F
+	// 0DA0 - 0DAF	
+	// 0DB0 - 0DBF
+	// 0DC0 - 0DCF
 	{ 0x10DE0DC0, "GeForce GT 440" },
 	{ 0x10DE0DC1, "D12-P1-35" },
 	{ 0x10DE0DC2, "D12-P1-35" },
@@ -516,6 +733,7 @@
 	{ 0x10DE0DC5, "GeForce GTS 450" },
 	{ 0x10DE0DC6, "GeForce GTS 450" },
 	{ 0x10DE0DCA, "GF10x" },
+	// 0DD0 - 0DDF	
 	{ 0x10DE0DCD, "GeForce GT 555M" },
 	{ 0x10DE0DCE, "GeForce GT 555M" },
 	{ 0x10DE0DD1, "GeForce GTX 460M" },
@@ -526,6 +744,7 @@
 	{ 0x10DE0DDA, "Quadro 2000M" },
 	{ 0x10DE0DDE, "GF106-ES" },
 	{ 0x10DE0DDF, "GF106-INT" },
+	// 0DE0 - 0DEF	
 	{ 0x10DE0DE0, "GeForce GT 440" },
 	{ 0x10DE0DE1, "GeForce GT 430" },
 	{ 0x10DE0DE2, "GeForce GT 420" },
@@ -534,6 +753,7 @@
 	{ 0x10DE0DEC, "GeForce GT 525M" },
 	{ 0x10DE0DED, "GeForce GT 520M" },
 	{ 0x10DE0DEE, "GeForce GT 415M" },
+	// 0DF0 - 0DFF	
 	{ 0x10DE0DF0, "GeForce GT 425M" },
 	{ 0x10DE0DF1, "GeForce GT 420M" },
 	{ 0x10DE0DF2, "GeForce GT 435M" },
@@ -546,11 +766,15 @@
 	{ 0x10DE0DFA, "Quadro 1000M" },
 	{ 0x10DE0DFE, "GF108 ES" },
 	{ 0x10DE0DFF, "GF108 INT" },
+	// 0E00 - 0E0F
+	// 0E10 - 0E1F
+	// 0E20 - 0E2F
 	{ 0x10DE0E21, "D12U-25" },
 	{ 0x10DE0E22, "GeForce GTX 460" },
 	{ 0x10DE0E23, "GeForce GTX 460 SE" },
 	{ 0x10DE0E24, "GeForce GTX 460" },
 	{ 0x10DE0E25, "D12U-50" },
+	// 0E30 - 0E3F	
 	{ 0x10DE0E30, "GeForce GTX 470M" },
 	{ 0x10DE0E31, "GeForce GTX 485M" },
 	{ 0x10DE0E38, "GF104GL" },
@@ -558,7 +782,45 @@
 	{ 0x10DE0E3B, "Quadro 4000M" },
 	{ 0x10DE0E3E, "GF104-ES" },
 	{ 0x10DE0E3F, "GF104-INT" },
+	// 0E40 - 0E4F	
+	// 0E50 - 0E5F
+	// 0E60 - 0E6F
+	// 0E70 - 0E7F
+	// 0E80 - 0E8F
+	// 0E90 - 0E9F
+	// 0EA0 - 0EAF
+	// 0EB0 - 0EBF
+	// 0EC0 - 0ECF
+	// 0ED0 - 0EDF	
+	// 0EE0 - 0EEF
+	// 0EF0 - 0EFF
+	// 0F00 - 0F0F
+	// 0F10 - 0F1F
+	// 0F20 - 0F2F
+	// 0F30 - 0F3F
+	// 0F40 - 0F4F
+	// 0F50 - 0F5F
+	// 0F60 - 0F6F
+	// 0F70 - 0F7F
+	// 0F80 - 0F8F
+	// 0F90 - 0F9F
+	// 0FA0 - 0FAF
+	// 0FB0 - 0FBF
+	// 0FC0 - 0FCF
+	// 0FD0 - 0FDF
+	// 0FE0 - 0FEF
+	// 0FF0 - 0FFF
+	// 1000 - 100F
+	// 1010 - 101F
+	// 1020 - 102F
+	// 1030 - 103F
+	// 1040 - 104F
+	{ 0x10DE1040, "GeForce GT 520" },	
+	// 1050 - 105F
 	{ 0x10DE1050, "GeForce GT 520M" },
+	// 1060 - 106F
+	// 1070 - 107F
+	// 1080 - 108F
 	{ 0x10DE1054, "GeForce GT 410M" },
 	{ 0x10DE1056, "NVS 4200M" },
 	{ 0x10DE1057, "NVS 4200M" },
@@ -569,9 +831,14 @@
 	{ 0x10DE1083, "D13U" },
 	{ 0x10DE1086, "GeForce GTX 570" },
 	{ 0x10DE1088, "GeForce GTX 590" },
+	// 1090 - 109F	
 	{ 0x10DE1098, "D13U" },
 	{ 0x10DE109A, "Quadro 5010M / N12E-Q5" },
+	// 10A0 - 10AF
+	// 10B0 - 10BF
+	// 10C0 - 10CF
 	{ 0x10DE10C3, "GeForce 8400 GS" },
+	// 1200 - 
 	{ 0x10DE1200, "GeForce GTX 560 Ti" },
 	{ 0x10DE1244, "GeForce GTX 550 Ti" },
 	{ 0x10DE1245, "GeForce GTS 450" },
Index: branches/iFabio/Chameleon/i386/libsaio/ati.c
===================================================================
--- branches/iFabio/Chameleon/i386/libsaio/ati.c	(revision 332)
+++ branches/iFabio/Chameleon/i386/libsaio/ati.c	(revision 333)
@@ -364,12 +364,12 @@
 	//Azi: most of the 9598 are rv630, according to http://developer.amd.com/gpu_assets/ATI_Device_IDs_xxx_xx.txt
 	{ 0x9598,	0xB3831002, CHIP_FAMILY_RV635,		"ATI All-in-Wonder HD",				kNull		},
 	{ 0x9598,	0x30011043, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
-	{ 0x9598,	0x30001043, CHIP_FAMILY_RV635,		"HD3730",							kNull		},
+	{ 0x9598,	0x30001043, CHIP_FAMILY_RV635,		"HD3730",					kNull		},
 	{ 0x9598,	0x3000148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",				kNull		},
 	{ 0x9598,	0x3031148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
 	{ 0x9598,	0x3001148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
-	{ 0x9598,	0x30011545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 Pro",		kNull		},
-	{ 0x9598,	0x30001545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 XT",		kNull		},
+	{ 0x9598,	0x30011545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 Pro",			kNull		},
+	{ 0x9598,	0x30001545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 XT",			kNull		},
 	{ 0x9598,	0x4570174B, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
 	{ 0x9598,	0x4580174B, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
 	{ 0x9598,	0x4610174B, CHIP_FAMILY_RV635,		"ATI Radeon HD 4610",				kNull		},
@@ -411,7 +411,7 @@
 	{ 0x6899,	0x22901787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
 	{ 0x6899,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
 	
-	{ 0x689C,	0x03521043, CHIP_FAMILY_HEMLOCK,	"ASUS ARES",						kUakari		},
+	{ 0x689C,	0x03521043, CHIP_FAMILY_HEMLOCK,	"ASUS ARES",					kUakari		},
 	{ 0x689C,	0x039E1043, CHIP_FAMILY_HEMLOCK,	"ASUS EAH5870 Series",				kUakari		},
 	{ 0x689C,	0x30201682, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",				kUakari		},
 	
@@ -437,19 +437,20 @@
 	{ 0x68DA,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
 	{ 0x68DA,	0x5630174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
 	
+	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
+	{ 0x68E0,	0x1433103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
 	{ 0x68E0,	0x04561028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
+	{ 0x68F9,	0x20091787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
+	{ 0x68F9,	0x22911787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
 	{ 0x68F9,	0x301317AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x301117AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
+	{ 0x68F9,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
+	{ 0x68F9,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x301217AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
-	{ 0x68F9,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x30021787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
-	{ 0x68F9,	0x30011787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",				kNull		},
-	{ 0x68F9,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
 	{ 0x68F9,	0x5490174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
 	{ 0x68F9,	0x5530174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",				kNull		},
-	{ 0x68F9,	0x20091787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x22911787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
+	{ 0x68F9,	0x30011787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",				kNull		},
 	
 	/* Northen Islands */
 	{ 0x6718,	0x0B001002,	CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		},
Index: branches/iFabio/Chameleon/i386/boot2/boot.c
===================================================================
--- branches/iFabio/Chameleon/i386/boot2/boot.c	(revision 332)
+++ branches/iFabio/Chameleon/i386/boot2/boot.c	(revision 333)
@@ -440,7 +440,6 @@
 			}
 		}
 
-        //archCpuType = CPU_TYPE_I386;
         
 		// Notify moduals that we are attempting to boot
 		execute_hook("PreBoot", NULL, NULL, NULL, NULL);
@@ -481,7 +480,9 @@
 				break;
 			
 			if (!forceresume && ((sleeptime+3)<bvr->modTime)) {
+#if DEBUG    
 				printf ("Hibernate image is too old by %d seconds. Use ForceWake=y to override\n",bvr->modTime-sleeptime);
+#endif                
 				break;
 			}
 
@@ -603,7 +604,7 @@
 				
 				verbose("Kernel cache did not load %s\n ", bootFile);
             }
-			
+
             bootFile = bootInfo->bootFile;
 
             // Try to load kernel image from alternate locations on boot helper partitions.
Index: branches/iFabio/Chameleon/package/slimpkg.sh
===================================================================
--- branches/iFabio/Chameleon/package/slimpkg.sh	(revision 332)
+++ branches/iFabio/Chameleon/package/slimpkg.sh	(revision 333)
@@ -10,7 +10,7 @@
 
 COL_BLACK="\x1b[30;01m"
 COL_RED="\x1b[31;01m"
-COL_GREEN="\x1b[32;01m" #COL_GREEN="\x1b[32;01m"
+COL_GREEN="\x1b[32;01m"
 COL_YELLOW="\x1b[33;01m"
 COL_MAGENTA="\x1b[35;01m"
 COL_CYAN="\x1b[36;01m"
@@ -58,12 +58,17 @@
 # build core package
 	echo "================= Core ================="
 	((xmlindent++))
-	packagesidentity="org.chameleon"
+	packagesidentity="org.chameleon.core"
 	mkdir -p ${1}/Core/Root/usr/sbin
 	mkdir -p ${1}/Core/Root/usr/local/bin
 	mkdir -p ${1}/Core/Root/usr/standalone/i386
-	mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
-	cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
+    if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
+        echo "Found Module :)"
+        mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
+        cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
+    else
+        echo "No found module into dir module"
+    fi
 	cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386
@@ -108,23 +113,27 @@
 	# End build reset choice package 
 
 	# build Modules package
-		echo "================= Modules ================="
-		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Module\">"
-		choices[$((choicescount++))]="<choice\n\tid=\"Module\"\n\ttitle=\"Module_title\"\n\tdescription=\"Module_description\"\n>\n</choice>\n"
-		((xmlindent++))
-		packagesidentity="org.chameleon.module"
-		modules=($( find "${pkgroot}/Scripts/Modules" -type d -depth 1 -not -name '.svn' ))
-		for (( i = 0 ; i < ${#modules[@]} ; i++ )) 
-		do
-			mkdir -p "${1}/${modules[$i]##*/}/Root"
-			mkdir -p "${1}/${modules[$i]##*/}/Scripts"
-			ditto --noextattr --noqtn "${modules[$i]}/postinstall" "${1}/${modules[$i]##*/}/Scripts/postinstall"
-			echo "	[BUILD] ${modules[$i]##*/} "
-			buildpackage "${1}/${modules[$i]##*/}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1
-			rm -R -f "${1}/${i##*/}"
-		done
-		((xmlindent--))
-		outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+            echo "================= Modules ================="
+        if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
+            outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Module\">"
+            choices[$((choicescount++))]="<choice\n\tid=\"Module\"\n\ttitle=\"Module_title\"\n\tdescription=\"Module_description\"\n>\n</choice>\n"
+            ((xmlindent++))
+            packagesidentity="org.chameleon.module"
+            modules=($( find "${pkgroot}/Scripts/Modules" -type d -depth 1 -not -name '.svn' ))
+            for (( i = 0 ; i < ${#modules[@]} ; i++ )) 
+            do
+                mkdir -p "${1}/${modules[$i]##*/}/Root"
+                mkdir -p "${1}/${modules[$i]##*/}/Scripts"
+                ditto --noextattr --noqtn "${modules[$i]}/postinstall" "${1}/${modules[$i]##*/}/Scripts/postinstall"
+                echo "	[BUILD] ${modules[$i]##*/} "
+                buildpackage "${1}/${modules[$i]##*/}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1
+                rm -R -f "${1}/${i##*/}"
+            done
+            ((xmlindent--))
+            outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+        else
+            echo "      -= no module/s to include =-"
+        fi
 	# End build Modules packages
 
 	((xmlindent--))
@@ -141,9 +150,11 @@
 	outline[$((outlinecount++))]="${indent[$xmlindent]}</choices-outline>"
 
 # build meta package
+
 	makedistribution "${1}" "${2}" "${3}" "${4}" "${5}"
 
 # clean up 
+
 	rm -R -f "${1}"
 
 }
@@ -258,8 +269,8 @@
 	perl -i -p -e "s/%CHAMELEONREVISION%/${revision}/g" `find "${1}/${packagename}/Resources" -type f`
 
 #  Adding Developer and credits
-    perl -i -p -e "s/%DEVELOP%/${develop}/g" `find "${1}/${packagename}/Resources" -type f`
-    perl -i -p -e "s/%CREDITS%/${credits}/g" `find "${1}/${packagename}/Resources" -type f`
+	perl -i -p -e "s/%DEVELOP%/${develop}/g" `find "${1}/${packagename}/Resources" -type f`
+	perl -i -p -e "s/%CREDITS%/${credits}/g" `find "${1}/${packagename}/Resources" -type f`
 #
 
 	stage=${stage/RC/Release Candidate }
Index: branches/iFabio/Chameleon/package/buildpkg.sh
===================================================================
--- branches/iFabio/Chameleon/package/buildpkg.sh	(revision 332)
+++ branches/iFabio/Chameleon/package/buildpkg.sh	(revision 333)
@@ -29,7 +29,7 @@
 
 develop=" Crazor, Dense, fassl, fxtentacle, iNDi, JrCs, Kabyl, kaitek, mackerintel, mercurysquad, munky, Slice, meklort, mozodojo, rekursor, Turbo, cparm, valv & zef "
 
-credits=" andyvand, asereBLN, Azimut, bumby, cosmo1t, dfe, Galaxy, kalyway, Krazubu, MasterChief, netkas, sckevyn, smith@@, THeKiNG, blackosx, .: ErmaC :., scrax, DutchHockeyPro & Andy"
+credits=" andyvand, asereBLN, Azimut, bumby, cosmo1t, dfe, Galaxy, kalyway, Krazubu, MasterChief, netkas, sckevyn, smith@@, THeKiNG, blackosx, ErmaC , scrax, DutchHockeyPro & Andy"
 
 # =================
 
@@ -62,8 +62,13 @@
 	mkdir -p ${1}/Core/Root/usr/sbin
 	mkdir -p ${1}/Core/Root/usr/local/bin
 	mkdir -p ${1}/Core/Root/usr/standalone/i386
-	mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
-	cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
+    if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
+        echo "Found Module :)"
+        mkdir -p ${1}/Core/Root/usr/standalone/i386/modules
+        cp -R ${1%/*}/i386/modules ${1}/Core/Root/usr/standalone/i386
+    else
+        echo "No found module into dir module"
+    fi
 	cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot0md ${1}/Core/Root/usr/standalone/i386
@@ -110,23 +115,27 @@
 	# End build reset choice package 
 
 	# build Modules package
-		echo "================= Modules ================="
-		outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Module\">"
-		choices[$((choicescount++))]="<choice\n\tid=\"Module\"\n\ttitle=\"Module_title\"\n\tdescription=\"Module_description\"\n>\n</choice>\n"
-		((xmlindent++))
-		packagesidentity="org.chameleon.module"
-		modules=($( find "${pkgroot}/Scripts/Modules" -type d -depth 1 -not -name '.svn' ))
-		for (( i = 0 ; i < ${#modules[@]} ; i++ )) 
-		do
-			mkdir -p "${1}/${modules[$i]##*/}/Root"
-			mkdir -p "${1}/${modules[$i]##*/}/Scripts"
-			ditto --noextattr --noqtn "${modules[$i]}/postinstall" "${1}/${modules[$i]##*/}/Scripts/postinstall"
-			echo "	[BUILD] ${modules[$i]##*/} "
-			buildpackage "${1}/${modules[$i]##*/}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1
-			rm -R -f "${1}/${i##*/}"
-		done
-		((xmlindent--))
-		outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+            echo "================= Modules ================="
+        if [ "$(ls -A ${1%/*}/i386/modules)" ]; then
+            outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Module\">"
+            choices[$((choicescount++))]="<choice\n\tid=\"Module\"\n\ttitle=\"Module_title\"\n\tdescription=\"Module_description\"\n>\n</choice>\n"
+            ((xmlindent++))
+            packagesidentity="org.chameleon.module"
+            modules=($( find "${pkgroot}/Scripts/Modules" -type d -depth 1 -not -name '.svn' ))
+            for (( i = 0 ; i < ${#modules[@]} ; i++ )) 
+            do
+                mkdir -p "${1}/${modules[$i]##*/}/Root"
+                mkdir -p "${1}/${modules[$i]##*/}/Scripts"
+                ditto --noextattr --noqtn "${modules[$i]}/postinstall" "${1}/${modules[$i]##*/}/Scripts/postinstall"
+                echo "	[BUILD] ${modules[$i]##*/} "
+                buildpackage "${1}/${modules[$i]##*/}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1
+                rm -R -f "${1}/${i##*/}"
+            done
+            ((xmlindent--))
+            outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+        else
+            echo "      -= no module/s to include =-"
+        fi
 	# End build Modules packages
 
 	((xmlindent--))