Index: branches/ErmaC/Trunk/i386/libsaio/nvidia.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/nvidia.c	(revision 1714)
+++ branches/ErmaC/Trunk/i386/libsaio/nvidia.c	(revision 1715)
@@ -100,8 +100,8 @@
 static struct nv_chipsets_t NVKnownChipsets[] = {
 	{ 0x00000000, "Unknown" },
 // temporary placement
-	{ 0x10DE0DF4, "GeForce GT 450M" }, //Azi + issue #99
-	{ 0x10DE1251, "GeForce GTX 560M" }, // Asus G74SX
+	// { 0x10DE0DF4, "GeForce GT 450M" }, //Azi + issue #99
+	// { 0x10DE1251, "GeForce GTX 560M" }, // Asus G74SX
 //========================================
 	// 0040 - 004F	
 	{ 0x10DE0040, "GeForce 6800 Ultra" },
@@ -400,6 +400,7 @@
 	{ 0x10DE05E2, "GeForce GTX 260" },
 	{ 0x10DE05E3, "GeForce GTX 285" },
 	{ 0x10DE05E6, "GeForce GTX 275" },
+	{ 0x10DE05E7, "Tesla C1060" },
 	{ 0x10DE05EA, "GeForce GTX 260" },
 	{ 0x10DE05EB, "GeForce GTX 295" },
 	{ 0x10DE05ED, "Quadroplex 2200 D2" },
@@ -439,8 +440,10 @@
 	{ 0x10DE061B, "Quadro VX 200" },
 	{ 0x10DE061C, "Quadro FX 3600M" },
 	{ 0x10DE061D, "Quadro FX 2800M" },
+	{ 0x10DE061E, "Quadro FX 3700M" },
 	{ 0x10DE061F, "Quadro FX 3800M" },
 	// 0620 - 062F	
+	{ 0x10DE0621, "GeForce GT 230" },
 	{ 0x10DE0622, "GeForce 9600 GT" },
 	{ 0x10DE0623, "GeForce 9600 GS" },
 	{ 0x10DE0625, "GeForce 9600 GSO 512"},
@@ -448,6 +451,7 @@
 	{ 0x10DE0627, "GeForce GT 140" },
 	{ 0x10DE0628, "GeForce 9800M GTS" },
 	{ 0x10DE062A, "GeForce 9700M GTS" },
+	{ 0x10DE062B, "GeForce 9800M GS" },
 	{ 0x10DE062C, "GeForce 9800M GTS" },
 	{ 0x10DE062D, "GeForce 9600 GT" },
 	{ 0x10DE062E, "GeForce 9600 GT" },
@@ -477,6 +481,7 @@
 	{ 0x10DE0652, "GeForce GT 130M" },
 	{ 0x10DE0653, "GeForce GT 120M" },
 	{ 0x10DE0654, "GeForce GT 220M" },
+	{ 0x10DE0655, "GeForce GT 120" },
 	{ 0x10DE0656, "GeForce 9650 S" },
 	{ 0x10DE0658, "Quadro FX 380" },
 	{ 0x10DE0659, "Quadro FX 580" },
@@ -525,11 +530,13 @@
 	{ 0x10DE06EC, "GeForce G 105M" },
 	{ 0x10DE06EF, "GeForce G 103M" },
 	// 06F0 - 06FF	
+	{ 0x10DE06F1, "GeForce G105M" },
 	{ 0x10DE06F8, "Quadro NVS 420" },
 	{ 0x10DE06F9, "Quadro FX 370 LP" },
 	{ 0x10DE06FA, "Quadro NVS 450" },
 	{ 0x10DE06FB, "Quadro FX 370M" },
 	{ 0x10DE06FD, "Quadro NVS 295" },
+	{ 0x10DE06FF, "HICx16 + Graphics" },
 	// 0700 - 070F
 	// 0710 - 071F
 	// 0720 - 072F
@@ -556,6 +563,7 @@
 	// 0820 - 082F
 	// 0830 - 083F
 	// 0840 - 084F
+	{ 0x10DE0840, "GeForce 8200M" },
 	{ 0x10DE0844, "GeForce 9100M G" },
 	{ 0x10DE0845, "GeForce 8200M G" },
 	{ 0x10DE0846, "GeForce 9200" },
@@ -578,6 +586,7 @@
 	{ 0x10DE0866, "GeForce 9400M G" },
 	{ 0x10DE0867, "GeForce 9400" },
 	{ 0x10DE0868, "nForce 760i SLI" },
+	{ 0x10DE0869, "GeForce 9400" },
 	{ 0x10DE086A, "GeForce 9400" },
 	{ 0x10DE086C, "GeForce 9300 / nForce 730i" },
 	{ 0x10DE086D, "GeForce 9200" },
@@ -597,6 +606,8 @@
 	// 0880 - 088F
 	// 0890 - 089F
 	// 08A0 - 08AF
+	{ 0x10DE08A0, "GeForce 320M" },
+	{ 0x10DE08A4, "GeForce 320M" },
 	// 08B0 - 08BF
 	// 08C0 - 08CF
 	// 08D0 - 08DF	
@@ -624,6 +635,8 @@
 	{ 0x10DE0A20, "GeForce GT220" },
 	{ 0x10DE0A22, "GeForce 315" },
 	{ 0x10DE0A23, "GeForce 210" },
+	{ 0x10DE0A26, "GeForce 405" },
+	{ 0x10DE0A27, "GeForce 405" },
 	{ 0x10DE0A28, "GeForce GT 230M" },
 	{ 0x10DE0A29, "GeForce GT 330M" },
 	{ 0x10DE0A2A, "GeForce GT 230M" },
@@ -633,6 +646,7 @@
 	// 0A30 - 0A3F	
 	{ 0x10DE0A34, "GeForce GT 240M" },
 	{ 0x10DE0A35, "GeForce GT 325M" },
+	{ 0x10DE0A38, "Quadro 400" },
 	{ 0x10DE0A3C, "Quadro FX 880M" },
 	// 0A40 - 0A4F
 	// 0A50 - 0A5F
@@ -657,7 +671,9 @@
 	{ 0x10DE0A73, "GeForce 305M" },
 	{ 0x10DE0A74, "GeForce G210M" },
 	{ 0x10DE0A75, "GeForce G310M" },
+	{ 0x10DE0A76, "ION" },
 	{ 0x10DE0A78, "Quadro FX 380 LP" },
+	{ 0x10DE0A7A, "GeForce 315M" },
 	{ 0x10DE0A7C, "Quadro FX 380M" },
 	// 0A80 - 0A8F
 	// 0A90 - 0A9F
@@ -698,10 +714,11 @@
 	{ 0x10DE0CA2, "GeForce GT 320" },
 	{ 0x10DE0CA3, "GeForce GT 240" },
 	{ 0x10DE0CA4, "GeForce GT 340" },
+	{ 0x10DE0CA5, "GeForce GT 220" },
 	{ 0x10DE0CA7, "GeForce GT 330" },
 	{ 0x10DE0CA8, "GeForce GTS 260M" },
 	{ 0x10DE0CA9, "GeForce GTS 250M" },
-	{ 0x10DE0CAC, "GeForce 315" },
+	{ 0x10DE0CAC, "GeForce GT 220" },
 	{ 0x10DE0CAF, "GeForce GT 335M" },
 	// 0CB0 - 0CBF	
 	{ 0x10DE0CB0, "GeForce GTS 350M" },
@@ -820,29 +837,39 @@
 	// 1070 - 107F
 	// 1080 - 108F
 	{ 0x10DE1054, "GeForce GT 410M" },
-	{ 0x10DE1056, "Quadro NVS 4200M" },
+	{ 0x10DE1056, "NVS 4200M" },
 	{ 0x10DE1057, "NVS 4200M" },
 	{ 0x10DE107F, "NVIDIA GF119-ES" },
 	{ 0x10DE1080, "GeForce GTX 580" },
 	{ 0x10DE1081, "GeForce GTX 570" },
 	{ 0x10DE1082, "GeForce GTX 560 Ti" },
 	{ 0x10DE1083, "D13U" },
+	{ 0x10DE1084, "GeForce GTX 560" },
 	{ 0x10DE1086, "GeForce GTX 570" },
 	{ 0x10DE1088, "GeForce GTX 590" },
+	{ 0x10DE1089, "GeForce GTX 580" },
+	{ 0x10DE108B, "GeForce GTX 590" }, // Subsystem Id: 1043 8391
 	// 1090 - 109F	
+	{ 0x10DE1091, "Tesla M2090" },
 	{ 0x10DE1098, "D13U" },
-	{ 0x10DE109A, "Quadro 5010M / N12E-Q5" },
+	{ 0x10DE109A, "Quadro 5010M" },
+	{ 0x10DE109B, "Quadro 7000" },
 	// 10A0 - 10AF
 	// 10B0 - 10BF
 	// 10C0 - 10CF
+	{ 0x10DE10C0, "GeForce 9300 GS" },
 	{ 0x10DE10C3, "GeForce 8400 GS" },
 	{ 0x10DE10C5, "GeForce 405" },
+	// 10D0 - 10DF
+	{ 0x10DE10D8, "NVS 300" },
 	// 1200 - 
 	{ 0x10DE1200, "GeForce GTX 560 Ti" },
 	{ 0x10DE1201, "GeForce GTX 560" },
+	{ 0x10DE1241, "GeForce GT 545" },
+	{ 0x10DE1243, "GeForce GT 545" },
 	{ 0x10DE1244, "GeForce GTX 550 Ti" },
 	{ 0x10DE1245, "GeForce GTS 450" },
-	{ 0x10DE1251, "N12E-GS-A1" },
+	{ 0x10DE1251, "GeForce GTX 560M" },
 };
 
 static uint16_t swap16(uint16_t x)
Index: branches/ErmaC/Trunk/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1714)
+++ branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1715)
@@ -14,8 +14,8 @@
 
 #define OFFSET_TO_GET_ATOMBIOS_STRINGS_START 0x6e
 
-#define Reg32(reg)		(*(volatile uint32_t *)(card->mmio + reg))
-#define RegRead32(reg)		(Reg32(reg))
+#define Reg32(reg)				(*(volatile uint32_t *)(card->mmio + reg))
+#define RegRead32(reg)			(Reg32(reg))
 #define RegWrite32(reg, value)	(Reg32(reg) = value)
 
 typedef enum {
@@ -44,6 +44,7 @@
 	CHIP_FAMILY_RV710,
 	CHIP_FAMILY_RV730,
 	CHIP_FAMILY_RV740,
+	CHIP_FAMILY_RV772,
 	CHIP_FAMILY_RV770,
 	CHIP_FAMILY_RV790,
 	/* Evergreen */
@@ -53,15 +54,16 @@
 	CHIP_FAMILY_JUNIPER,
 	CHIP_FAMILY_REDWOOD,
 	/* Northern Islands */
+	CHIP_FAMILY_ANTILLES,
 	CHIP_FAMILY_BARTS,
 	CHIP_FAMILY_CAICOS,
 	CHIP_FAMILY_CAYMAN,
 	CHIP_FAMILY_TURKS,
 	/* Southern Islands */
-//	"TAITI"
-//	"THAMES"
-//	"LOMBOK"
-//	"NEW_ZEALAND"
+//	CHIP_FAMILY_TAITI
+//	CHIP_FAMILY_THAMES
+//	CHIP_FAMILY_LOMBOK
+//	CHIP_FAMILY_NEW_ZEALAND
 	CHIP_FAMILY_LAST
 } chip_family_t;
 
@@ -94,6 +96,7 @@
 	"Juniper",
 	"Redwood",
 	/* Northern Islands */
+	"Antilles",
 	"Barts",
 	"Caicos",
 	"Cayman",
@@ -114,9 +117,9 @@
 static card_config_t card_configs[] = {
 	{NULL,			0},
 	{"Alopias",		2},
-	{"Alouatta",		4},
+	{"Alouatta",	4},
 	{"Baboon",		3},
-	{"Cardinal",		2},
+	{"Cardinal",	2},
 	{"Caretta",		1},
 	{"Colobus",		2},
 	{"Douc",		2},
@@ -125,17 +128,17 @@
 	{"Galago",		2},
 	{"Gliff",		3},
 	{"Hoolock",		3},
-	{"Hypoprion",		2},
+	{"Hypoprion",	2},
 	{"Iago",		2},
 	{"Kakapo",		3},
 	{"Kipunji",		4},
 	{"Lamna",		2},
 	{"Langur",		3},
-	{"Megalodon",		3},
+	{"Megalodon",	3},
 	{"Motmot",		2},
-	{"Nomascus",		5},
-	{"Orangutan",		2},
-	{"Peregrine",		2},
+	{"Nomascus",	5},
+	{"Orangutan",	2},
+	{"Peregrine",	2},
 	{"Quail",		3},
 	{"Raven",		3},
 	{"Shrike",		3},
@@ -144,19 +147,19 @@
 	{"Uakari",		4},
 	{"Vervet",		4},
 	{"Zonalis",		6},
-	{"Pithecia",		3},
-	{"Bulrushes",		6},
+	{"Pithecia",	3},
+	{"Bulrushes",	6},
 	{"Cattail",		4},
-	{"Hydrilla",		5},
-	{"Duckweed",		4},
+	{"Hydrilla",	5},
+	{"Duckweed",	4},
 	{"Fanwort",		4},
 	{"Elodea",		5},
 	{"Kudzu",		2},
 	{"Gibba",		5},
 	{"Lotus",		3},
 	{"Ipomoea",		3},
-	{"Mangabey",		2},
-	{"Muskgrass",		4},
+	{"Mangabey",	2},
+	{"Muskgrass",	4},
 	{"Juncus",		4}
 };
 
@@ -211,10 +214,10 @@
 } config_name_t;
 
 typedef struct {
-	uint16_t			device_id;
-	uint32_t			subsys_id;
+	uint16_t				device_id;
+	uint32_t				subsys_id;
 	chip_family_t			chip_family;
-	const char			*model_name;
+	const char				*model_name;
 	config_name_t			cfg_name;
 } radeon_card_info_t;
 
@@ -228,6 +231,7 @@
 	{ 0x9400,	0x25521002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",			kNull		},
 	{ 0x9400,	0x30001002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 PRO",			kNull		},
 
+	{ 0x9440,	0x0851174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		}, // ErmaC
 	{ 0x9440,	0x114A174B, CHIP_FAMILY_RV770,		"Sapphire Radeon HD4870 Vapor-X",		kCardinal	}, // ErmaC
 	{ 0x9440,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
 	{ 0x9440,	0x24411682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
@@ -498,6 +502,8 @@
 
 	{ 0x68A8,	0x050E1025, CHIP_FAMILY_CYPRESS,	"AMD Radeon HD 6850M",				kUakari		},
 
+	{ 0x68BA,	0x174B1482, CHIP_FAMILY_JUNIPER,	"ATI Sapphire Radeon HD 6770",			kVervet		}, // ErmaC
+
 	{ 0x68B8,	0x00CF106B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	},
 
 	{ 0x68B8,	0x145821f6, CHIP_FAMILY_JUNIPER,	"GigaByte HD5770 R577SL-1GD",			kVervet		}, // ErmaC
@@ -580,7 +586,12 @@
 	{ 0x6718,	0x31301682, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		},
 
 	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		}, // ErmaC
+	{ 0x6719,	0x186B174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		}, // ErmaC
 
+	{ 0x671D,	0x10020B2A, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		}, // ErmaC
+	{ 0x671D,	0x10021B2A, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		}, // ErmaC
+	{ 0x671D,	0x16823160, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		}, // ErmaC
+
 	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970m",				kElodea		},
 
 	{ 0x6738,	0x00D01002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
@@ -720,6 +731,9 @@
 	{ 0x6718,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",			kNull		},
 	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",			kNull		},
 
+	{ 0x671D,	0x00000000, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6900 Series",			kNull		},
+	{ 0x671F,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6900 Series",			kNull		},
+
 	{ 0x6720,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6900M Series",			kNull		},
 
 	{ 0x6738,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870 Series",			kDuckweed	},
Index: branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c
===================================================================
--- branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c	(revision 1714)
+++ branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c	(revision 1715)
@@ -107,8 +107,8 @@
 static struct nv_chipsets_t NVKnownChipsets[] = {
 	{ 0x00000000, "Unknown" },
 // temporary placement
-	{ 0x10DE0DF4, "GeForce GT 450M" }, //Azi + issue #99
-	{ 0x10DE1251, "GeForce GTX 560M" }, // Asus G74SX
+	// { 0x10DE0DF4, "GeForce GT 450M" }, //Azi + issue #99
+	// { 0x10DE1251, "GeForce GTX 560M" }, // Asus G74SX
 //========================================
 	// 0040 - 004F	
 	{ 0x10DE0040, "GeForce 6800 Ultra" },
@@ -407,6 +407,7 @@
 	{ 0x10DE05E2, "GeForce GTX 260" },
 	{ 0x10DE05E3, "GeForce GTX 285" },
 	{ 0x10DE05E6, "GeForce GTX 275" },
+	{ 0x10DE05E7, "Tesla C1060" },
 	{ 0x10DE05EA, "GeForce GTX 260" },
 	{ 0x10DE05EB, "GeForce GTX 295" },
 	{ 0x10DE05ED, "Quadroplex 2200 D2" },
@@ -446,8 +447,10 @@
 	{ 0x10DE061B, "Quadro VX 200" },
 	{ 0x10DE061C, "Quadro FX 3600M" },
 	{ 0x10DE061D, "Quadro FX 2800M" },
+	{ 0x10DE061E, "Quadro FX 3700M" },
 	{ 0x10DE061F, "Quadro FX 3800M" },
 	// 0620 - 062F	
+	{ 0x10DE0621, "GeForce GT 230" },
 	{ 0x10DE0622, "GeForce 9600 GT" },
 	{ 0x10DE0623, "GeForce 9600 GS" },
 	{ 0x10DE0625, "GeForce 9600 GSO 512"},
@@ -455,6 +458,7 @@
 	{ 0x10DE0627, "GeForce GT 140" },
 	{ 0x10DE0628, "GeForce 9800M GTS" },
 	{ 0x10DE062A, "GeForce 9700M GTS" },
+	{ 0x10DE062B, "GeForce 9800M GS" },
 	{ 0x10DE062C, "GeForce 9800M GTS" },
 	{ 0x10DE062D, "GeForce 9600 GT" },
 	{ 0x10DE062E, "GeForce 9600 GT" },
@@ -484,6 +488,7 @@
 	{ 0x10DE0652, "GeForce GT 130M" },
 	{ 0x10DE0653, "GeForce GT 120M" },
 	{ 0x10DE0654, "GeForce GT 220M" },
+	{ 0x10DE0655, "GeForce GT 120" },
 	{ 0x10DE0656, "GeForce 9650 S" },
 	{ 0x10DE0658, "Quadro FX 380" },
 	{ 0x10DE0659, "Quadro FX 580" },
@@ -532,11 +537,13 @@
 	{ 0x10DE06EC, "GeForce G 105M" },
 	{ 0x10DE06EF, "GeForce G 103M" },
 	// 06F0 - 06FF	
+	{ 0x10DE06F1, "GeForce G105M" },
 	{ 0x10DE06F8, "Quadro NVS 420" },
 	{ 0x10DE06F9, "Quadro FX 370 LP" },
 	{ 0x10DE06FA, "Quadro NVS 450" },
 	{ 0x10DE06FB, "Quadro FX 370M" },
 	{ 0x10DE06FD, "Quadro NVS 295" },
+	{ 0x10DE06FF, "HICx16 + Graphics" },
 	// 0700 - 070F
 	// 0710 - 071F
 	// 0720 - 072F
@@ -563,6 +570,7 @@
 	// 0820 - 082F
 	// 0830 - 083F
 	// 0840 - 084F
+	{ 0x10DE0840, "GeForce 8200M" },
 	{ 0x10DE0844, "GeForce 9100M G" },
 	{ 0x10DE0845, "GeForce 8200M G" },
 	{ 0x10DE0846, "GeForce 9200" },
@@ -585,6 +593,7 @@
 	{ 0x10DE0866, "GeForce 9400M G" },
 	{ 0x10DE0867, "GeForce 9400" },
 	{ 0x10DE0868, "nForce 760i SLI" },
+	{ 0x10DE0869, "GeForce 9400" },
 	{ 0x10DE086A, "GeForce 9400" },
 	{ 0x10DE086C, "GeForce 9300 / nForce 730i" },
 	{ 0x10DE086D, "GeForce 9200" },
@@ -604,6 +613,8 @@
 	// 0880 - 088F
 	// 0890 - 089F
 	// 08A0 - 08AF
+	{ 0x10DE08A0, "GeForce 320M" },
+	{ 0x10DE08A4, "GeForce 320M" },
 	// 08B0 - 08BF
 	// 08C0 - 08CF
 	// 08D0 - 08DF	
@@ -631,6 +642,8 @@
 	{ 0x10DE0A20, "GeForce GT220" },
 	{ 0x10DE0A22, "GeForce 315" },
 	{ 0x10DE0A23, "GeForce 210" },
+	{ 0x10DE0A26, "GeForce 405" },
+	{ 0x10DE0A27, "GeForce 405" },
 	{ 0x10DE0A28, "GeForce GT 230M" },
 	{ 0x10DE0A29, "GeForce GT 330M" },
 	{ 0x10DE0A2A, "GeForce GT 230M" },
@@ -640,6 +653,7 @@
 	// 0A30 - 0A3F	
 	{ 0x10DE0A34, "GeForce GT 240M" },
 	{ 0x10DE0A35, "GeForce GT 325M" },
+	{ 0x10DE0A38, "Quadro 400" },
 	{ 0x10DE0A3C, "Quadro FX 880M" },
 	// 0A40 - 0A4F
 	// 0A50 - 0A5F
@@ -664,7 +678,9 @@
 	{ 0x10DE0A73, "GeForce 305M" },
 	{ 0x10DE0A74, "GeForce G210M" },
 	{ 0x10DE0A75, "GeForce G310M" },
+	{ 0x10DE0A76, "ION" },
 	{ 0x10DE0A78, "Quadro FX 380 LP" },
+	{ 0x10DE0A7A, "GeForce 315M" },
 	{ 0x10DE0A7C, "Quadro FX 380M" },
 	// 0A80 - 0A8F
 	// 0A90 - 0A9F
@@ -705,10 +721,11 @@
 	{ 0x10DE0CA2, "GeForce GT 320" },
 	{ 0x10DE0CA3, "GeForce GT 240" },
 	{ 0x10DE0CA4, "GeForce GT 340" },
+	{ 0x10DE0CA5, "GeForce GT 220" },
 	{ 0x10DE0CA7, "GeForce GT 330" },
 	{ 0x10DE0CA8, "GeForce GTS 260M" },
 	{ 0x10DE0CA9, "GeForce GTS 250M" },
-	{ 0x10DE0CAC, "GeForce 315" },
+	{ 0x10DE0CAC, "GeForce GT 220" },
 	{ 0x10DE0CAF, "GeForce GT 335M" },
 	// 0CB0 - 0CBF	
 	{ 0x10DE0CB0, "GeForce GTS 350M" },
@@ -827,29 +844,39 @@
 	// 1070 - 107F
 	// 1080 - 108F
 	{ 0x10DE1054, "GeForce GT 410M" },
-	{ 0x10DE1056, "Quadro NVS 4200M" },
+	{ 0x10DE1056, "NVS 4200M" },
 	{ 0x10DE1057, "NVS 4200M" },
 	{ 0x10DE107F, "NVIDIA GF119-ES" },
 	{ 0x10DE1080, "GeForce GTX 580" },
 	{ 0x10DE1081, "GeForce GTX 570" },
 	{ 0x10DE1082, "GeForce GTX 560 Ti" },
 	{ 0x10DE1083, "D13U" },
+	{ 0x10DE1084, "GeForce GTX 560" },
 	{ 0x10DE1086, "GeForce GTX 570" },
 	{ 0x10DE1088, "GeForce GTX 590" },
+	{ 0x10DE1089, "GeForce GTX 580" },
+	{ 0x10DE108B, "GeForce GTX 590" }, // Subsystem Id: 1043 8391
 	// 1090 - 109F	
+	{ 0x10DE1091, "Tesla M2090" },
 	{ 0x10DE1098, "D13U" },
-	{ 0x10DE109A, "Quadro 5010M / N12E-Q5" },
+	{ 0x10DE109A, "Quadro 5010M" },
+	{ 0x10DE109B, "Quadro 7000" },
 	// 10A0 - 10AF
 	// 10B0 - 10BF
 	// 10C0 - 10CF
+	{ 0x10DE10C0, "GeForce 9300 GS" },
 	{ 0x10DE10C3, "GeForce 8400 GS" },
 	{ 0x10DE10C5, "GeForce 405" },
+	// 10D0 - 10DF
+	{ 0x10DE10D8, "NVS 300" },
 	// 1200 - 
 	{ 0x10DE1200, "GeForce GTX 560 Ti" },
 	{ 0x10DE1201, "GeForce GTX 560" },
+	{ 0x10DE1241, "GeForce GT 545" },
+	{ 0x10DE1243, "GeForce GT 545" },
 	{ 0x10DE1244, "GeForce GTX 550 Ti" },
 	{ 0x10DE1245, "GeForce GTS 450" },
-	{ 0x10DE1251, "N12E-GS-A1" },
+	{ 0x10DE1251, "GeForce GTX 560M" },
 };
 
 static uint16_t swap16(uint16_t x)
Index: branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c
===================================================================
--- branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c	(revision 1714)
+++ branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c	(revision 1715)
@@ -60,15 +60,16 @@
 	CHIP_FAMILY_JUNIPER,
 	CHIP_FAMILY_REDWOOD,
 	/* Northern Islands */
+	CHIP_FAMILY_ANTILLES,
 	CHIP_FAMILY_BARTS,
 	CHIP_FAMILY_CAICOS,
 	CHIP_FAMILY_CAYMAN,
 	CHIP_FAMILY_TURKS,
 	/* Southern Islands */
-//	"TAITI"
-//	"THAMES"
-//	"LOMBOK"
-//	"NEW_ZEALAND"
+//	CHIP_FAMILY_TAITI
+//	CHIP_FAMILY_THAMES
+//	CHIP_FAMILY_LOMBOK
+//	CHIP_FAMILY_NEW_ZEALAND
 	CHIP_FAMILY_LAST
 } chip_family_t;
 
@@ -101,6 +102,7 @@
 	"Juniper",
 	"Redwood",
 	/* Northern Islands */
+	"Antilles",
 	"Barts",
 	"Caicos",
 	"Cayman",
@@ -236,6 +238,7 @@
 	{ 0x9400,	0x25521002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",			kNull		, 0 },
 	{ 0x9400,	0x30001002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 PRO",			kNull		, 0 },
 
+	{ 0x9440,	0x0851174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		, 0 }, // ErmaC
 	{ 0x9440,	0x114A174B, CHIP_FAMILY_RV770,		"Sapphire Radeon HD4870 Vapor-X",		kCardinal	, 0 }, // ErmaC
 	{ 0x9440,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		, 0 },
 	{ 0x9440,	0x24411682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		, 0 },
@@ -506,6 +509,8 @@
 
 	{ 0x68A8,	0x050E1025, CHIP_FAMILY_CYPRESS,	"AMD Radeon HD 6850M",				kUakari		, 0 },
 
+	{ 0x68BA,	0x174B1482, CHIP_FAMILY_JUNIPER,	"ATI Sapphire Radeon HD 6770",			kVervet		, 0 }, // ErmaC
+
 	{ 0x68B8,	0x00CF106B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	, 0 },
 
 	{ 0x68B8,	0x145821f6, CHIP_FAMILY_JUNIPER,	"GigaByte HD5770 R577SL-1GD",			kVervet		, 0 }, // ErmaC
@@ -588,7 +593,12 @@
 	{ 0x6718,	0x31301682, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kNull		, 0 },
 
 	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		, 0 }, // ErmaC
+	{ 0x6719,	0x186B174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		, 0 }, // ErmaC
 
+	{ 0x671D,	0x10020B2A, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		, 0 }, // ErmaC
+	{ 0x671D,	0x10021B2A, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		, 0 }, // ErmaC
+	{ 0x671D,	0x16823160, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		, 0 }, // ErmaC
+
 	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970m",				kElodea		, 0 },
 
 	{ 0x6738,	0x00D01002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	, 0 },
@@ -728,6 +738,9 @@
 	{ 0x6718,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",			kNull		, 0 },
 	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",			kNull		, 0 },
 
+	{ 0x671D,	0x00000000, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6900 Series",			kNull		, 0 },
+	{ 0x671F,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6900 Series",			kNull		, 0 },
+
 	{ 0x6720,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6900M Series",			kNull		, 0 },
 
 	{ 0x6738,	0x00000000, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870 Series",			kDuckweed	, 0 },