Index: trunk/i386/libsaio/spd.c
===================================================================
--- trunk/i386/libsaio/spd.c	(revision 971)
+++ trunk/i386/libsaio/spd.c	(revision 972)
@@ -38,24 +38,24 @@
 	"DDR2 SDRAM",   /* 08h  SDRAM DDR 2 */
 	"",				/* 09h  Undefined */
 	"",				/* 0Ah  Undefined */
-	"DDR3 SDRAM"   /* 0Bh  SDRAM DDR 3 */
+	"DDR3 SDRAM"	/* 0Bh  SDRAM DDR 3 */
 };
 
 #define UNKNOWN_MEM_TYPE 2
 static uint8_t spd_mem_to_smbios[] =
 {
-	UNKNOWN_MEM_TYPE,          /* 00h  Undefined */
-	UNKNOWN_MEM_TYPE,          /* 01h  FPM */
-	UNKNOWN_MEM_TYPE,          /* 02h  EDO */
-	UNKNOWN_MEM_TYPE,	   /* 03h  PIPELINE NIBBLE */
-	SMB_MEM_TYPE_SDRAM,        /* 04h  SDRAM */
-	SMB_MEM_TYPE_ROM,	   /* 05h  MULTIPLEXED ROM */
-	SMB_MEM_TYPE_SGRAM,        /* 06h  SGRAM DDR */
-	SMB_MEM_TYPE_DDR,          /* 07h  SDRAM DDR */
-	SMB_MEM_TYPE_DDR2,         /* 08h  SDRAM DDR 2 */
-	UNKNOWN_MEM_TYPE,  	   /* 09h  Undefined */
-	UNKNOWN_MEM_TYPE,	   /* 0Ah  Undefined */
-	SMB_MEM_TYPE_DDR3          /* 0Bh  SDRAM DDR 3 */
+	UNKNOWN_MEM_TYPE,		/* 00h  Undefined */
+	UNKNOWN_MEM_TYPE,		/* 01h  FPM */
+	UNKNOWN_MEM_TYPE,		/* 02h  EDO */
+	UNKNOWN_MEM_TYPE,		/* 03h  PIPELINE NIBBLE */
+	SMB_MEM_TYPE_SDRAM,		/* 04h  SDRAM */
+	SMB_MEM_TYPE_ROM,		/* 05h  MULTIPLEXED ROM */
+	SMB_MEM_TYPE_SGRAM,		/* 06h  SGRAM DDR */
+	SMB_MEM_TYPE_DDR,		/* 07h  SDRAM DDR */
+	SMB_MEM_TYPE_DDR2,		/* 08h  SDRAM DDR 2 */
+	UNKNOWN_MEM_TYPE,		/* 09h  Undefined */
+	UNKNOWN_MEM_TYPE,		/* 0Ah  Undefined */
+	SMB_MEM_TYPE_DDR3		/* 0Bh  SDRAM DDR 3 */
 };
 #define SPD_TO_SMBIOS_SIZE (sizeof(spd_mem_to_smbios)/sizeof(uint8_t))
 
Index: trunk/i386/libsaio/nvidia.c
===================================================================
--- trunk/i386/libsaio/nvidia.c	(revision 971)
+++ trunk/i386/libsaio/nvidia.c	(revision 972)
@@ -95,6 +95,7 @@
 
 static struct nv_chipsets_t NVKnownChipsets[] = {
 	{ 0x00000000, "Unknown" },
+	// 0040 - 004F	
 	{ 0x10DE0040, "GeForce 6800 Ultra" },
 	{ 0x10DE0041, "GeForce 6800" },
 	{ 0x10DE0042, "GeForce 6800 LE" },
@@ -104,7 +105,13 @@
 	{ 0x10DE0046, "GeForce 6800 GT" },
 	{ 0x10DE0047, "GeForce 6800 GS" },
 	{ 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" },
@@ -113,6 +120,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" },
@@ -122,6 +132,22 @@
 	{ 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" },
+	{ 0x10DE00F4, "GeForce 6600 LE" },
+	{ 0x10DE00F5, "GeForce 7800 GS" },
+	{ 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" },
@@ -132,10 +158,13 @@
 	{ 0x10DE0147, "GeForce 6700 XL" },
 	{ 0x10DE0148, "GeForce Go 6600" },
 	{ 0x10DE0149, "GeForce Go 6600 GT" },
+	{ 0x10DE014A, "Quadro NVS 440" },
 	{ 0x10DE014C, "Quadro FX 550" },
 	{ 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)" },
@@ -147,13 +176,23 @@
 	{ 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" },
-	{ 0x10DE01D3, "GeForce 7300 SE" },
+	{ 0x10DE01D2, "GeForce 7550 LE" },
+	{ 0x10DE01D3, "GeForce 7300 SE/7200 GS" },
 	{ 0x10DE01D6, "GeForce Go 7200" },
 	{ 0x10DE01D7, "GeForce Go 7300" },
 	{ 0x10DE01D8, "GeForce Go 7400" },
@@ -164,20 +203,36 @@
 	{ 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" },
+	{ 0x10DE0291, "GeForce 7900 GT/GTO" },
 	{ 0x10DE0292, "GeForce 7900 GS" },
+	{ 0x10DE0293, "GeForce 7950 GX2" },
+	{ 0x10DE0294, "GeForce 7950 GX2" },
+	{ 0x10DE0295, "GeForce 7950 GT" },
 	{ 0x10DE0298, "GeForce Go 7900 GS" },
 	{ 0x10DE0299, "GeForce Go 7900 GTX" },
 	{ 0x10DE029A, "Quadro FX 2500M" },
@@ -186,16 +241,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" },
@@ -204,6 +273,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" },
@@ -211,6 +281,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" },
@@ -219,6 +290,13 @@
 	{ 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" },
 	{ 0x10DE0393, "GeForce 7300 GT" },
@@ -231,12 +309,25 @@
 	{ 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" },
 	{ 0x10DE0403, "GeForce 8600 GS" },
 	{ 0x10DE0404, "GeForce 8400 GS" },
 	{ 0x10DE0405, "GeForce 9500M GS" },
+	{ 0x10DE0406, "GeForce 8300 GS" },
 	{ 0x10DE0407, "GeForce 8600M GT" },
 	{ 0x10DE0408, "GeForce 9650M GS" },
 	{ 0x10DE0409, "GeForce 8700M GT" },
@@ -246,6 +337,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" },
@@ -262,6 +356,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" },
@@ -269,11 +394,18 @@
 	{ 0x10DE05E6, "GeForce GTX 275" },
 	{ 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" },
+	{ 0x10DE0603, "GeForce GT 230" },
 	{ 0x10DE0604, "GeForce 9800 GX2" },
 	{ 0x10DE0605, "GeForce 9800 GT" },
 	{ 0x10DE0606, "GeForce 8800 GS" },
@@ -284,6 +416,8 @@
 	{ 0x10DE060B, "GeForce 9800M GT" },
 	{ 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" },
@@ -291,11 +425,14 @@
 	{ 0x10DE0614, "GeForce 9800 GT" },
 	{ 0x10DE0615, "GeForce GTS 250" },
 	{ 0x10DE0617, "GeForce 9800M GTX" },
-	{ 0x10DE0618, "GeForce GTX 260M" }, 
+	{ 0x10DE0618, "GeForce GTX 260M" },
+	{ 0x10DE0619, "Quadro FX 4700 X2" },
 	{ 0x10DE061A, "Quadro FX 3700" },
+	{ 0x10DE061B, "Quadro VX 200" },
 	{ 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"},
@@ -304,6 +441,16 @@
 	{ 0x10DE0628, "GeForce 9800M GTS" },
 	{ 0x10DE062A, "GeForce 9700M GTS" },
 	{ 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" },
@@ -317,70 +464,257 @@
 	{ 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" },
+	{ 0x10DE0654, "GeForce GT 220M" },
+	{ 0x10DE0656, "GeForce 9650 S" },
 	{ 0x10DE0658, "Quadro FX 380" },
 	{ 0x10DE0659, "Quadro FX 580" },
 	{ 0x10DE065A, "Quadro FX 1700M" },
 	{ 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" },
+	// 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" },
+	{ 0x10DE06DA, "Quadro 5000M" },
+	{ 0x10DE06DC, "Quadro 6000" },
+	{ 0x10DE06DD, "Quadro 4000" },
+	{ 0x10DE06DE, "Tesla M2050" },	// TODO: sub-device id: 0x0846
+	{ 0x10DE06DE, "Tesla M2070" },	// TODO: sub-device id: ?	
+	// 0x10DE06DE also applies to misc S2050, X2070, M2050, M2070
+	// 06E0 - 06EF	
 	{ 0x10DE06E0, "GeForce 9300 GE" },
 	{ 0x10DE06E1, "GeForce 9300 GS" },
+	{ 0x10DE06E2, "GeForce 8400" },
+	{ 0x10DE06E3, "GeForce 8400 SE" },
 	{ 0x10DE06E4, "GeForce 8400 GS" },
 	{ 0x10DE06E5, "GeForce 9300M GS" },
+	{ 0x10DE06E6, "GeForce G100" },
+	{ 0x10DE06E7, "GeForce 9300 SE" },
 	{ 0x10DE06E8, "GeForce 9200M GS" },
 	{ 0x10DE06E9, "GeForce 9300M GS" },
 	{ 0x10DE06EA, "Quadro NVS 150M" },
 	{ 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" },
+	{ 0x10DE0847, "GeForce 9100" },
+	{ 0x10DE0848, "GeForce 8300" },
+	{ 0x10DE0849, "GeForce 8200" },
+	{ 0x10DE084A, "nForce 730a" },
+	{ 0x10DE084B, "GeForce 9200" },
+	{ 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" },
+	{ 0x10DE0863, "GeForce 9400M" },
+	{ 0x10DE0864, "GeForce 9300" },
+	{ 0x10DE0865, "ION" },
+	{ 0x10DE0866, "GeForce 9400M G" },
+	{ 0x10DE0867, "GeForce 9400" },
+	{ 0x10DE0868, "nForce 760i SLI" },
 	{ 0x10DE086A, "GeForce 9400" },
+	{ 0x10DE086C, "GeForce 9300 / nForce 730i" },
+	{ 0x10DE086D, "GeForce 9200" },
+	{ 0x10DE086E, "GeForce 9100M G" },
+	{ 0x10DE086F, "GeForce 8200M G" },
+	// 0870 - 087F	
+	{ 0x10DE0870, "GeForce 9400M" },
+	{ 0x10DE0871, "GeForce 9200" },
+	{ 0x10DE0872, "GeForce G102M" },
+	{ 0x10DE0873, "GeForce G102M" },
 	{ 0x10DE0874, "ION 9300M" },	
-	{ 0x10DE086C, "GeForce 9300/nForce 730i" },
+	{ 0x10DE0876, "ION" },
+	{ 0x10DE087A, "GeForce 9400" },
 	{ 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" },
 	{ 0x10DE0A28, "GeForce GT 230M" },
 	{ 0x10DE0A29, "GeForce GT 330M" },
 	{ 0x10DE0A2A, "GeForce GT 230M" },
+	{ 0x10DE0A2B, "GeForce GT 330M" },
+	{ 0x10DE0A2C, "NVS 5100M" },
+	{ 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" },
+	{ 0x10DE0A64, "ION" },
 	{ 0x10DE0A65, "GeForce 210" },
 	{ 0x10DE0A66, "GeForce 310" },
+	{ 0x10DE0A67, "GeForce 315" },
+	{ 0x10DE0A68, "GeForce G105M" },
+	{ 0x10DE0A69, "GeForce G105M" },
+	{ 0x10DE0A6A, "NVS 2100M" },
+	{ 0x10DE0A6C, "NVS 3100M" },
+	{ 0x10DE0A6E, "GeForce 305M" },
+	{ 0x10DE0A6F, "ION" },	
+	// 0A70 - 0A7F
+	{ 0x10DE0A70, "GeForce 310M" },
+	{ 0x10DE0A71, "GeForce 305M" },
+	{ 0x10DE0A72, "GeForce 310M" },
+	{ 0x10DE0A73, "GeForce 305M" },
 	{ 0x10DE0A74, "GeForce G210M" },
 	{ 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" },
+	{ 0x10DE0CA4, "GeForce GT 340" },
+	{ 0x10DE0CA7, "GeForce GT 330" },
 	{ 0x10DE0CA8, "GeForce GTS 260M" },
 	{ 0x10DE0CA9, "GeForce GTS 250M" },
+	{ 0x10DE0CAC, "GeForce 315" },
+	{ 0x10DE0CAF, "GeForce GT 335M" },
+	// 0CB0 - 0CBF	
+	{ 0x10DE0CB0, "GeForce GTS 350M" },
 	{ 0x10DE0CB1, "GeForce GTS 360M" },
-	{ 0x10DE0CA3, "GeForce GT240" },
-	
-	// 06C0 - 06DFF
-	{ 0x10DE06C0, "GeForce GTX 480" },
-	{ 0x10DE06C3, "GeForce GTX D12U" },
-	{ 0x10DE06C4, "GeForce GTX 465" },
-	{ 0x10DE06CA, "GeForce GTX 480M" },
-	{ 0x10DE06CD, "GeForce GTX 470" },
-	{ 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" },
-	{ 0x10DE06DA, "Quadro 5000M" },
-	{ 0x10DE06DC, "Quadro 6000" },
-	{ 0x10DE06DE, "Tesla M2050" },	// TODO: sub-device id: 0x0846
-	{ 0x10DE06DE, "Tesla M2070" },	// TODO: sub-device id: ?
-	// 0x10DE06DE also applies to misc S2050, X2070, M2050, M2070
-	{ 0x10DE06DD, "Quadro 4000" },
-	
-	// 0DC0 - 0DFF
+	{ 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" },
@@ -388,16 +722,21 @@
 	{ 0x10DE0DC5, "GeForce GTS 450" },
 	{ 0x10DE0DC6, "GeForce GTS 450" },
 	{ 0x10DE0DCA, "GF10x" },
+	// 0DD0 - 0DDF	
 	{ 0x10DE0DD1, "GeForce GTX 460M" },
 	{ 0x10DE0DD2, "GeForce GT 445M" },
 	{ 0x10DE0DD3, "GeForce GT 435M" },
 	{ 0x10DE0DD8, "Quadro 2000" },
 	{ 0x10DE0DDE, "GF106-ES" },
 	{ 0x10DE0DDF, "GF106-INT" },
+	// 0DE0 - 0DEF	
+	{ 0x10DE0DE0, "GeForce GT 440" },
 	{ 0x10DE0DE1, "GeForce GT 430" },
 	{ 0x10DE0DE2, "GeForce GT 420" },
+	{ 0x10DE0DE5, "GeForce GT 530" },
 	{ 0x10DE0DEB, "GeForce GT 555M" },
 	{ 0x10DE0DEE, "GeForce GT 415M" },
+	// 0DF0 - 0DFF	
 	{ 0x10DE0DF0, "GeForce GT 425M" },
 	{ 0x10DE0DF1, "GeForce GT 420M" },
 	{ 0x10DE0DF2, "GeForce GT 435M" },
@@ -405,29 +744,74 @@
 	{ 0x10DE0DF8, "Quadro 600" },
 	{ 0x10DE0DFE, "GF108 ES" },
 	{ 0x10DE0DFF, "GF108 INT" },
-	
-	// 0E20 - 0E3F
+	// 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" },
 	{ 0x10DE0E38, "GF104GL" },
 	{ 0x10DE0E3E, "GF104-ES" },
 	{ 0x10DE0E3F, "GF104-INT" },
-	
-	// 0EE0 - 0EFF: none yet
-	// 0F00 - 0F3F: none yet
-	// 1040 - 107F: none yet
-	
-	// 1080 - 109F
+	// 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
 	{ 0x10DE1080, "GeForce GTX 580" },
-	{ 0x10DE1081, "D13U" },
-	{ 0x10DE1082, "D13U" },
+	{ 0x10DE1081, "GeForce GTX 570" },
+	{ 0x10DE1082, "GeForce GTX 560 Ti" },
 	{ 0x10DE1083, "D13U" },
+	{ 0x10DE1088, "GeForce GTX 590" },
+	// 1090 - 109F	
 	{ 0x10DE1098, "D13U" },
 	{ 0x10DE109A, "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" },	
 };
 
 static uint16_t swap16(uint16_t x)
@@ -744,6 +1128,15 @@
 		vram_size = REG32(NVC0_MEM_CTRLR_RAM_AMOUNT) << 20;
 		vram_size *= REG32(NVC0_MEM_CTRLR_COUNT);
 	}
+
+	// Workaround for GT 420/430 & 9600M GT
+	switch (nvda_dev->device_id)
+	{
+		case 0x0DE1: vram_size = 1024*1024*1024; break; // GT 430
+		case 0x0DE2: vram_size = 1024*1024*1024; break; // GT 420
+		case 0x0649: vram_size = 512*1024*1024; break;  // 9600M GT
+		default: break;
+	}
 	
 	return vram_size;
 }
Index: trunk/i386/libsaio/cpu.c
===================================================================
--- trunk/i386/libsaio/cpu.c	(revision 971)
+++ trunk/i386/libsaio/cpu.c	(revision 972)
@@ -324,8 +324,8 @@
 				}
 			}
 		}
-		/* Mobile CPU ? */
-		if (rdmsr64(0x17) & (1<<28)) {
+		/* Mobile CPU */
+		if (rdmsr64(MSR_IA32_PLATFORM_ID) & (1<<28)) {
 			p->CPU.Features |= CPU_FEATURE_MOBILE;
 		}
 	}
@@ -372,15 +372,16 @@
 	p->CPU.FSBFrequency = fsbFrequency;
 	p->CPU.CPUFrequency = cpuFrequency;
 
-	DBG("CPU: Vendor/Model/ExtModel: 0x%x/0x%x/0x%x\n", p->CPU.Vendor, p->CPU.Model, p->CPU.ExtModel);
-	DBG("CPU: Family/ExtFamily:      0x%x/0x%x\n", p->CPU.Family, p->CPU.ExtFamily);
-	DBG("CPU: MaxCoef/CurrCoef:      0x%x/0x%x\n", p->CPU.MaxCoef, p->CPU.CurrCoef);
-	DBG("CPU: MaxDiv/CurrDiv:        0x%x/0x%x\n", p->CPU.MaxDiv, p->CPU.CurrDiv);
-	DBG("CPU: TSCFreq:               %dMHz\n", p->CPU.TSCFrequency / 1000000);
-	DBG("CPU: FSBFreq:               %dMHz\n", p->CPU.FSBFrequency / 1000000);
-	DBG("CPU: CPUFreq:               %dMHz\n", p->CPU.CPUFrequency / 1000000);
-	DBG("CPU: NoCores/NoThreads:     %d/%d\n", p->CPU.NoCores, p->CPU.NoThreads);
-	DBG("CPU: Features:              0x%08x\n", p->CPU.Features);
+	DBG("CPU: Brand String:             %s\n",				p->CPU.BrandString);
+	DBG("CPU: Vendor/Family/ExtFamily:  0x%x/0x%x/0x%x\n",	p->CPU.Vendor, p->CPU.Family, p->CPU.ExtFamily);
+	DBG("CPU: Model/ExtModel/Stepping:  0x%x/0x%x/0x%x\n",	p->CPU.Model, p->CPU.ExtModel, p->CPU.Stepping);
+	DBG("CPU: MaxCoef/CurrCoef:         0x%x/0x%x\n",		p->CPU.MaxCoef, p->CPU.CurrCoef);
+	DBG("CPU: MaxDiv/CurrDiv:           0x%x/0x%x\n",		p->CPU.MaxDiv, p->CPU.CurrDiv);
+	DBG("CPU: TSCFreq:                  %dMHz\n",			p->CPU.TSCFrequency / 1000000);
+	DBG("CPU: FSBFreq:                  %dMHz\n",			p->CPU.FSBFrequency / 1000000);
+	DBG("CPU: CPUFreq:                  %dMHz\n",			p->CPU.CPUFrequency / 1000000);
+	DBG("CPU: NoCores/NoThreads:        %d/%d\n",			p->CPU.NoCores, p->CPU.NoThreads);
+	DBG("CPU: Features:                 0x%08x\n",			p->CPU.Features);
 #if DEBUG_CPU
 	pause();
 #endif
Index: trunk/i386/libsaio/cpu.h
===================================================================
--- trunk/i386/libsaio/cpu.h	(revision 971)
+++ trunk/i386/libsaio/cpu.h	(revision 972)
@@ -23,6 +23,7 @@
 #define MSR_TURBO_RATIO_LIMIT	0x1AD
 #define	MSR_PLATFORM_INFO		0xCE
 #define MSR_CORE_THREAD_COUNT	0x35			// Undocumented
+#define MSR_IA32_PLATFORM_ID	0x17
 
 #define K8_FIDVID_STATUS		0xC0010042
 #define K10_COFVID_STATUS		0xC0010071
@@ -44,9 +45,10 @@
 #define CPUID_MODEL_ATOM		28	// Intel Atom (45nm)
 #define CPUID_MODEL_FIELDS		30	// Intel Core i5, i7, Xeon X34xx LGA1156 (45nm)
 #define CPUID_MODEL_DALES		31	// Havendale, Auburndale
-#define CPUID_MODEL_NEHALEM_EX	46	// Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65x
 #define CPUID_MODEL_DALES_32NM	37	// Intel Core i3, i5 LGA1156 (32nm)
+#define CPUID_MODEL_SANDY		42	// Intel Core i3, i5, i7 LGA1155 (32nm)
 #define CPUID_MODEL_WESTMERE	44	// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core
+#define CPUID_MODEL_NEHALEM_EX	46	// Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65x
 #define CPUID_MODEL_WESTMERE_EX	47	// Intel Xeon E7
 
 
Index: trunk/i386/libsaio/smbios.c
===================================================================
--- trunk/i386/libsaio/smbios.c	(revision 971)
+++ trunk/i386/libsaio/smbios.c	(revision 972)
@@ -325,30 +325,30 @@
 					{
 						switch (Platform.CPU.Model)
 						{
-							case CPU_MODEL_FIELDS:				// Intel Core i5, i7, Xeon X34xx LGA1156 (45nm)
+							case CPU_MODEL_FIELDS:			// Intel Core i5, i7, Xeon X34xx LGA1156 (45nm)
 							case CPU_MODEL_DALES:
-							case CPU_MODEL_DALES_32NM:			// Intel Core i3, i5 LGA1156 (32nm)
-							case 0x19:							// ??? Intel Core i5 650 @3.20 GHz 
+							case CPU_MODEL_DALES_32NM:		// Intel Core i3, i5 LGA1156 (32nm)
+							case 0x19:						// ??? Intel Core i5 650 @3.20 GHz 
 								defaultBIOSInfo.version			= kDefaultiMacNehalemBIOSVersion;
 								defaultSystemInfo.productName	= kDefaultiMacNehalem;
 								defaultSystemInfo.family		= kDefaultiMacFamily;
 								break;
 
-							case CPU_MODEL_SANDY:				// Intel Core i3, i5, i7 LGA1155 (32nm)
-							case CPU_MODEL_SANDY_XEON:			// Intel Xeon E3
+							case CPU_MODEL_SANDY:			// Intel Core i3, i5, i7 LGA1155 (32nm)
+							case CPU_MODEL_SANDY_XEON:		// Intel Xeon E3
 								defaultBIOSInfo.version			= kDefaultiMacSandyBIOSVersion;
 								defaultSystemInfo.productName	= kDefaultiMacSandy;
 								defaultSystemInfo.family		= kDefaultiMacFamily;
 								break;
-							case CPU_MODEL_NEHALEM:				// Intel Core i7, Xeon W35xx, Xeon X55xx, Xeon E55xx LGA1366 (45nm)
-							case CPU_MODEL_NEHALEM_EX:			// Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65x
+							case CPU_MODEL_NEHALEM:			// Intel Core i7, Xeon W35xx, Xeon X55xx, Xeon E55xx LGA1366 (45nm)
+							case CPU_MODEL_NEHALEM_EX:		// Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65x
 								defaultBIOSInfo.version			= kDefaultMacProNehalemBIOSVersion;
 								defaultSystemInfo.productName	= kDefaultMacProNehalem;
 								defaultSystemInfo.family		= kDefaultMacProFamily;
 								break;
 
-							case CPU_MODEL_WESTMERE:			// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core
-							case CPU_MODEL_WESTMERE_EX:			// Intel Xeon E7
+							case CPU_MODEL_WESTMERE:		// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core
+							case CPU_MODEL_WESTMERE_EX:		// Intel Xeon E7
 								defaultBIOSInfo.version			= kDefaultMacProWestmereBIOSVersion;
 								defaultBIOSInfo.releaseDate		= kDefaulMacProWestmereBIOSReleaseDate;
 								defaultSystemInfo.productName	= kDefaultMacProWestmere;
Index: trunk/i386/libsaio/smbios_getters.c
===================================================================
--- trunk/i386/libsaio/smbios_getters.c	(revision 971)
+++ trunk/i386/libsaio/smbios_getters.c	(revision 972)
@@ -41,20 +41,20 @@
 				switch (Platform.CPU.Model)
 				{
 					case 0x0D:					// ???
-					case CPU_MODEL_YONAH:		// Yonah		0x0E
-					case CPU_MODEL_MEROM:		// Merom		0x0F
-					case CPU_MODEL_PENRYN:		// Penryn		0x17
-					case CPU_MODEL_ATOM:		// Atom 45nm	0x1C
+					case CPU_MODEL_YONAH:		// Intel Mobile Core Solo, Duo
+					case CPU_MODEL_MEROM:		// Intel Mobile Core 2 Solo, Duo, Xeon 30xx, Xeon 51xx, Xeon X53xx, Xeon E53xx, Xeon X32xx
+					case CPU_MODEL_PENRYN:		// Intel Core 2 Solo, Duo, Quad, Extreme, Xeon X54xx, Xeon X33xx
+					case CPU_MODEL_ATOM:		// Intel Atom (45nm)
 						return false;
 
 					case 0x19:					// ??? Intel Core i5 650 @3.20 GHz 
-					case CPU_MODEL_NEHALEM:		// Intel Core i7 LGA1366 (45nm)
-					case CPU_MODEL_FIELDS:		// Intel Core i5, i7 LGA1156 (45nm)
-					case CPU_MODEL_DALES:		// Intel Core i5, i7 LGA1156 (45nm) ???
-					case CPU_MODEL_DALES_32NM:	// Intel Core i3, i5, i7 LGA1156 (32nm)
-					case CPU_MODEL_WESTMERE:	// Intel Core i7 LGA1366 (32nm) 6 Core
-					case CPU_MODEL_NEHALEM_EX:	// Intel Core i7 LGA1366 (45nm) 6 Core ???
-					case CPU_MODEL_WESTMERE_EX:	// Intel Core i7 LGA1366 (45nm) 6 Core ???
+					case CPU_MODEL_NEHALEM:		// Intel Core i7, Xeon W35xx, Xeon X55xx, Xeon E55xx LGA1366 (45nm)
+					case CPU_MODEL_FIELDS:		// Intel Core i5, i7, Xeon X34xx LGA1156 (45nm)
+					case CPU_MODEL_DALES:
+					case CPU_MODEL_DALES_32NM:	// Intel Core i3, i5 LGA1156 (32nm)
+					case CPU_MODEL_WESTMERE:	// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core
+					case CPU_MODEL_NEHALEM_EX:	// Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65x
+					case CPU_MODEL_WESTMERE_EX:	// Intel Xeon E7
 					{
 						// thanks to dgobe for i3/i5/i7 bus speed detection
 						int nhm_bus = 0x3F;
@@ -144,37 +144,37 @@
 
 					case CPU_MODEL_FIELDS:				// Intel Core i5, i7, Xeon X34xx LGA1156 (45nm)
 						if (strstr(Platform.CPU.BrandString, "Core(TM) i5"))
-							value->word = 0x601;		// Core i5
+							value->word = 0x0601;			// Core i5
 						else
-							value->word = 0x0701;		// Core i7
+							value->word = 0x0701;			// Core i7
 						return true;
 
-					case CPU_MODEL_DALES:				// Havendale, Auburndale
+					case CPU_MODEL_DALES:
 						if (strstr(Platform.CPU.BrandString, "Core(TM) i5"))
-							value->word = 0x601;		// Core i5
+							value->word = 0x0601;			// Core i5
 						else
-							value->word = 0x0701;		// Core i7
+							value->word = 0x0701;			// Core i7
 						return true;
 
 					case CPU_MODEL_SANDY:				// Intel Core i3, i5, i7 LGA1155 (32nm)
                     case CPU_MODEL_SANDY_XEON:			// Intel Xeon E3
 					case CPU_MODEL_DALES_32NM:			// Intel Core i3, i5 LGA1156 (32nm)
 						if (strstr(Platform.CPU.BrandString, "Core(TM) i3"))
-							value->word = 0x901;		// Core i3
+							value->word = 0x0901;			// Core i3
 						else
 							if (strstr(Platform.CPU.BrandString, "Core(TM) i5"))
-								value->word = 0x601;	// Core i5
+								value->word = 0x0601;		// Core i5
 							else
-								value->word = 0x0701;	// Core i7
+								value->word = 0x0701;		// Core i7
 						return true;
 
 					case CPU_MODEL_WESTMERE:			// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core
 					case CPU_MODEL_WESTMERE_EX:			// Intel Xeon E7
-						value->word = 0x0501;			// Core i7
+						value->word = 0x0501;				// Core i7
 						return true;
 
 					case 0x19:							// ??? Intel Core i5 650 @3.20 GHz
-						value->word = 0x601;			// Core i5
+						value->word = 0x0601;				// Core i5
 						return true;
 				}
 			}