Index: branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj
===================================================================
--- branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj	(revision 1924)
+++ branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj	(revision 1925)
@@ -1369,6 +1369,36 @@
 		B43E407714EE869800CD79F9 /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = "<group>"; };
 		B43E407814EE869A00CD79F9 /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = "<group>"; };
 		B43E407914EE869C00CD79F9 /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = "<group>"; };
+		B4526097153EFCE90018E994 /* ar.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ar.po; sourceTree = "<group>"; };
+		B4526098153EFCE90018E994 /* bg.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bg.po; sourceTree = "<group>"; };
+		B4526099153EFCE90018E994 /* bs.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bs.po; sourceTree = "<group>"; };
+		B452609A153EFCE90018E994 /* ca.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.po; sourceTree = "<group>"; };
+		B452609B153EFCE90018E994 /* chameleon.pot */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = chameleon.pot; sourceTree = "<group>"; };
+		B452609C153EFCE90018E994 /* cs.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cs.po; sourceTree = "<group>"; };
+		B452609D153EFCE90018E994 /* de.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = de.po; sourceTree = "<group>"; };
+		B452609E153EFCE90018E994 /* el.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = el.po; sourceTree = "<group>"; };
+		B452609F153EFCE90018E994 /* en.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = en.po; sourceTree = "<group>"; };
+		B45260A0153EFCE90018E994 /* es.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = es.po; sourceTree = "<group>"; };
+		B45260A1153EFCE90018E994 /* fa.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fa.po; sourceTree = "<group>"; };
+		B45260A2153EFCE90018E994 /* fr.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fr.po; sourceTree = "<group>"; };
+		B45260A3153EFCE90018E994 /* he.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = he.po; sourceTree = "<group>"; };
+		B45260A4153EFCE90018E994 /* hr.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hr.po; sourceTree = "<group>"; };
+		B45260A5153EFCE90018E994 /* hu.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hu.po; sourceTree = "<group>"; };
+		B45260A6153EFCE90018E994 /* id.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = id.po; sourceTree = "<group>"; };
+		B45260A7153EFCE90018E994 /* it.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = it.po; sourceTree = "<group>"; };
+		B45260A8153EFCE90018E994 /* ja.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ja.po; sourceTree = "<group>"; };
+		B45260A9153EFCE90018E994 /* ko.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ko.po; sourceTree = "<group>"; };
+		B45260AA153EFCE90018E994 /* mk.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mk.po; sourceTree = "<group>"; };
+		B45260AB153EFCE90018E994 /* nl.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nl.po; sourceTree = "<group>"; };
+		B45260AC153EFCE90018E994 /* pl.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pl.po; sourceTree = "<group>"; };
+		B45260AD153EFCE90018E994 /* pt-BR.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "pt-BR.po"; sourceTree = "<group>"; };
+		B45260AE153EFCE90018E994 /* pt-PT.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "pt-PT.po"; sourceTree = "<group>"; };
+		B45260AF153EFCE90018E994 /* ro.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ro.po; sourceTree = "<group>"; };
+		B45260B0153EFCE90018E994 /* ru.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ru.po; sourceTree = "<group>"; };
+		B45260B1153EFCE90018E994 /* sr.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sr.po; sourceTree = "<group>"; };
+		B45260B2153EFCE90018E994 /* zh_CN.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = zh_CN.po; sourceTree = "<group>"; };
+		B45260B3153EFCE90018E994 /* zh_TW.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = zh_TW.po; sourceTree = "<group>"; };
+		B45260B4153EFCF60018E994 /* po4a-chameleon.cfg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "po4a-chameleon.cfg"; sourceTree = "<group>"; };
 		B4AABE5914C3B8B90055ECD1 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = "<group>"; };
 		B4AABE5B14C3B8C70055ECD1 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = "<group>"; };
 		B4AABE5D14C3B8D70055ECD1 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = "<group>"; };
@@ -1394,9 +1424,9 @@
 				019DFBAF11FB94090013E8CC /* MEMTEST86_LICENSE */,
 				B0056D8311F3868000754B65 /* package */,
 				B0146EFF11FDEF550010765C /* README */,
+				A31301A71503CB9900E8C718 /* README.translators */,
 				B0056D7C11F3868000754B65 /* TODO */,
 				369689D214BD0B470013D77F /* version */,
-				A31301A71503CB9900E8C718 /* README.translators */,
 			);
 			name = Chameleon;
 			sourceTree = "<group>";
@@ -3245,15 +3275,17 @@
 		B0056D8311F3868000754B65 /* package */ = {
 			isa = PBXGroup;
 			children = (
-				B0056D8511F3868000754B65 /* Distribution */,
 				A35D2189141A75DC00969AC0 /* builddmg.sh */,
 				A35D2188141A75DC00969AC0 /* buildpkg.sh */,
 				361BC70214BD977700236488 /* Changes.txt */,
-				A396E4F31502D0580025A245 /* Resources.old */,
-				A396E2CA150247630025A245 /* Resources */,
+				B0056D8511F3868000754B65 /* Distribution */,
 				361BC70514BD97A800236488 /* dmg */,
 				361BC70414BD979700236488 /* Icons */,
 				36B43E8114BCE91300D29461 /* OptionalSettings */,
+				B4526096153EFCE90018E994 /* po */,
+				B45260B4153EFCF60018E994 /* po4a-chameleon.cfg */,
+				A396E2CA150247630025A245 /* Resources */,
+				A396E4F31502D0580025A245 /* Resources.old */,
 				A3F1F20D141B9B0D00DDA709 /* Scripts */,
 				364E0DDF14BCFB6600F55E58 /* Scripts.templates */,
 				A35D2187141A75DC00969AC0 /* slimpkg.sh */,
@@ -3505,6 +3537,42 @@
 			name = lxdialog;
 			sourceTree = "<group>";
 		};
+		B4526096153EFCE90018E994 /* po */ = {
+			isa = PBXGroup;
+			children = (
+				B4526097153EFCE90018E994 /* ar.po */,
+				B4526098153EFCE90018E994 /* bg.po */,
+				B4526099153EFCE90018E994 /* bs.po */,
+				B452609A153EFCE90018E994 /* ca.po */,
+				B452609B153EFCE90018E994 /* chameleon.pot */,
+				B452609C153EFCE90018E994 /* cs.po */,
+				B452609D153EFCE90018E994 /* de.po */,
+				B452609E153EFCE90018E994 /* el.po */,
+				B452609F153EFCE90018E994 /* en.po */,
+				B45260A0153EFCE90018E994 /* es.po */,
+				B45260A1153EFCE90018E994 /* fa.po */,
+				B45260A2153EFCE90018E994 /* fr.po */,
+				B45260A3153EFCE90018E994 /* he.po */,
+				B45260A4153EFCE90018E994 /* hr.po */,
+				B45260A5153EFCE90018E994 /* hu.po */,
+				B45260A6153EFCE90018E994 /* id.po */,
+				B45260A7153EFCE90018E994 /* it.po */,
+				B45260A8153EFCE90018E994 /* ja.po */,
+				B45260A9153EFCE90018E994 /* ko.po */,
+				B45260AA153EFCE90018E994 /* mk.po */,
+				B45260AB153EFCE90018E994 /* nl.po */,
+				B45260AC153EFCE90018E994 /* pl.po */,
+				B45260AD153EFCE90018E994 /* pt-BR.po */,
+				B45260AE153EFCE90018E994 /* pt-PT.po */,
+				B45260AF153EFCE90018E994 /* ro.po */,
+				B45260B0153EFCE90018E994 /* ru.po */,
+				B45260B1153EFCE90018E994 /* sr.po */,
+				B45260B2153EFCE90018E994 /* zh_CN.po */,
+				B45260B3153EFCE90018E994 /* zh_TW.po */,
+			);
+			path = po;
+			sourceTree = "<group>";
+		};
 		B4AABE5814C3B8B90055ECD1 /* AddOption */ = {
 			isa = PBXGroup;
 			children = (
Index: branches/ErmaC/Trunk/i386/libsaio/nvidia.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/nvidia.c	(revision 1924)
+++ branches/ErmaC/Trunk/i386/libsaio/nvidia.c	(revision 1925)
@@ -92,11 +92,9 @@
 
 #define NVCAP_LEN ( sizeof(default_NVCAP) / sizeof(uint8_t) )
 
-static uint8_t default_dcfg_0[]		=	{0xff, 0xff, 0xff, 0xff};
-static uint8_t default_dcfg_1[]		=	{0xff, 0xff, 0xff, 0xff};
+static uint8_t default_dcfg_0[]		=	{0x03, 0x01, 0x03, 0x00};
+static uint8_t default_dcfg_1[]		=	{0xff, 0xff, 0x00, 0x01};
 
-// uint8_t display_cfg_0[]			=	{0x03, 0x01, 0x03, 0x00};
-// uint8_t display_cfg_1[]			=	{0xff, 0xff, 0x00, 0x01};
 // uint8_t connector_type_1[]		=	{0x00, 0x08, 0x00, 0x00};
 
 #define DCFG0_LEN ( sizeof(default_dcfg_0) / sizeof(uint8_t) )
@@ -112,309 +110,309 @@
 #define NVPM_LEN ( sizeof(default_NVPM) / sizeof(uint8_t) )
 
 static struct nv_chipsets_t NVKnownChipsets[] = {
-	{ 0x00000000, "Unknown" },
+	{ 0x00000000,	/*0x00000000,*/	"Unknown" },
 //========================================
 	// 0000 - 0040	
-//	{ 0x10DE0001, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0002, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0003, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0005, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0006, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0007, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0008, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0009, "NVIDIA HDMI Audio" },
-//	{ 0x10DE000A, "NVIDIA HDMI Audio" },
-//	{ 0x10DE000B, "NVIDIA HDMI Audio" },
-//	{ 0x10DE000C, "NVIDIA HDMI Audio" },
-//	{ 0x10DE000D, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0010, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0011, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0012, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0014, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0018, "NVIDIA HDMI Audio" },
+    //	{ 0x10DE0001,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0002,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0003,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0005,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0006,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0007,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0008,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0009,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE000A,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE000B,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE000C,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE000D,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0010,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0011,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0012,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0014,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0018,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
 	// 0040 - 004F	
-	{ 0x10DE0040, "GeForce 6800 Ultra" },
-	{ 0x10DE0041, "GeForce 6800" },
-	{ 0x10DE0042, "GeForce 6800 LE" },
-	{ 0x10DE0043, "GeForce 6800 XE" },
-	{ 0x10DE0044, "GeForce 6800 XT" },
-	{ 0x10DE0045, "GeForce 6800 GT" },
-	{ 0x10DE0046, "GeForce 6800 GT" },
-	{ 0x10DE0047, "GeForce 6800 GS" },
-	{ 0x10DE0048, "GeForce 6800 XT" },
-	{ 0x10DE004D, "Quadro FX 3400" },
-	{ 0x10DE004E, "Quadro FX 4000" },
+	{ 0x10DE0040,	/*0x00000000,*/	"GeForce 6800 Ultra" },
+	{ 0x10DE0041,	/*0x00000000,*/	"GeForce 6800" },
+	{ 0x10DE0042,	/*0x00000000,*/	"GeForce 6800 LE" },
+	{ 0x10DE0043,	/*0x00000000,*/	"GeForce 6800 XE" },
+	{ 0x10DE0044,	/*0x00000000,*/	"GeForce 6800 XT" },
+	{ 0x10DE0045,	/*0x00000000,*/	"GeForce 6800 GT" },
+	{ 0x10DE0046,	/*0x00000000,*/	"GeForce 6800 GT" },
+	{ 0x10DE0047,	/*0x00000000,*/	"GeForce 6800 GS" },
+	{ 0x10DE0048,	/*0x00000000,*/	"GeForce 6800 XT" },
+	{ 0x10DE004D,	/*0x00000000,*/	"Quadro FX 3400" },
+	{ 0x10DE004E,	/*0x00000000,*/	"Quadro FX 4000" },
 	// 0050 - 005F
-//	{ 0x10DE0059, "CK804 AC'97 Audio Controller" },
+    //	{ 0x10DE0059,	/*0x00000000,*/	"CK804 AC'97 Audio Controller" },
 	// 0060 - 006F
-//	{ 0x10DE006A, "nForce2 AC97 Audio Controler (MCP)" },
-//	{ 0x10DE0067, "NVIDIA HDMI Audio" },
-//	{ 0x10DE0073, "NVIDIA HDMI Audio" },
+    //	{ 0x10DE006A,	/*0x00000000,*/	"nForce2 AC97 Audio Controler (MCP)" },
+    //	{ 0x10DE0067,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE0073,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
 	// 0070 - 007F
 	// 0080 - 008F
 	// 0090 - 009F
-	{ 0x10DE0090, "GeForce 7800 GTX" },
-	{ 0x10DE0091, "GeForce 7800 GTX" },
-	{ 0x10DE0092, "GeForce 7800 GT" },
-	{ 0x10DE0093, "GeForce 7800 GS" },
-	{ 0x10DE0095, "GeForce 7800 SLI" },
-	{ 0x10DE0098, "GeForce Go 7800" },
-	{ 0x10DE0099, "GeForce Go 7800 GTX" },
-	{ 0x10DE009D, "Quadro FX 4500" },
+	{ 0x10DE0090,	/*0x00000000,*/	"GeForce 7800 GTX" },
+	{ 0x10DE0091,	/*0x00000000,*/	"GeForce 7800 GTX" },
+	{ 0x10DE0092,	/*0x00000000,*/	"GeForce 7800 GT" },
+	{ 0x10DE0093,	/*0x00000000,*/	"GeForce 7800 GS" },
+	{ 0x10DE0095,	/*0x00000000,*/	"GeForce 7800 SLI" },
+	{ 0x10DE0098,	/*0x00000000,*/	"GeForce Go 7800" },
+	{ 0x10DE0099,	/*0x00000000,*/	"GeForce Go 7800 GTX" },
+	{ 0x10DE009D,	/*0x00000000,*/	"Quadro FX 4500" },
 	// 00A0 - 00AF	
 	// 00B0 - 00BF	
 	// 00C0 - 00CF	
-	{ 0x10DE00C0, "GeForce 6800 GS" },
-	{ 0x10DE00C1, "GeForce 6800" },
-	{ 0x10DE00C2, "GeForce 6800 LE" },
-	{ 0x10DE00C3, "GeForce 6800 XT" },
-	{ 0x10DE00C8, "GeForce Go 6800" },
-	{ 0x10DE00C9, "GeForce Go 6800 Ultra" },
-	{ 0x10DE00CC, "Quadro FX Go1400" },
-	{ 0x10DE00CD, "Quadro FX 3450/4000 SDI" },
-	{ 0x10DE00CE, "Quadro FX 1400" },
-//	{ 0x10DE00DA, "nForce3 Audio" },
+	{ 0x10DE00C0,	/*0x00000000,*/	"GeForce 6800 GS" },
+	{ 0x10DE00C1,	/*0x00000000,*/	"GeForce 6800" },
+	{ 0x10DE00C2,	/*0x00000000,*/	"GeForce 6800 LE" },
+	{ 0x10DE00C3,	/*0x00000000,*/	"GeForce 6800 XT" },
+	{ 0x10DE00C8,	/*0x00000000,*/	"GeForce Go 6800" },
+	{ 0x10DE00C9,	/*0x00000000,*/	"GeForce Go 6800 Ultra" },
+	{ 0x10DE00CC,	/*0x00000000,*/	"Quadro FX Go1400" },
+	{ 0x10DE00CD,	/*0x00000000,*/	"Quadro FX 3450/4000 SDI" },
+	{ 0x10DE00CE,	/*0x00000000,*/	"Quadro FX 1400" },
+    //	{ 0x10DE00DA,	/*0x00000000,*/	"nForce3 Audio" },
 	// 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" },
+	{ 0x10DE00F1,	/*0x00000000,*/	"GeForce 6600 GT" },
+	{ 0x10DE00F2,	/*0x00000000,*/	"GeForce 6600" },
+	{ 0x10DE00F3,	/*0x00000000,*/	"GeForce 6200" },
+	{ 0x10DE00F4,	/*0x00000000,*/	"GeForce 6600 LE" },
+	{ 0x10DE00F5,	/*0x00000000,*/	"GeForce 7800 GS" },
+	{ 0x10DE00F6,	/*0x00000000,*/	"GeForce 6800 GS/XT" },
+	{ 0x10DE00F8,	/*0x00000000,*/	"Quadro FX 3400/4400" },
+	{ 0x10DE00F9,	/*0x00000000,*/	"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" },
-	{ 0x10DE0143, "GeForce 6600 VE" },
-	{ 0x10DE0144, "GeForce Go 6600" },
-	{ 0x10DE0145, "GeForce 6610 XL" },
-	{ 0x10DE0146, "GeForce Go 6600 TE/6200 TE" },
-	{ 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" },
+	{ 0x10DE0140,	/*0x00000000,*/	"GeForce 6600 GT" },
+	{ 0x10DE0141,	/*0x00000000,*/	"GeForce 6600" },
+	{ 0x10DE0142,	/*0x00000000,*/	"GeForce 6600 LE" },
+	{ 0x10DE0143,	/*0x00000000,*/	"GeForce 6600 VE" },
+	{ 0x10DE0144,	/*0x00000000,*/	"GeForce Go 6600" },
+	{ 0x10DE0145,	/*0x00000000,*/	"GeForce 6610 XL" },
+	{ 0x10DE0146,	/*0x00000000,*/	"GeForce Go 6600 TE/6200 TE" },
+	{ 0x10DE0147,	/*0x00000000,*/	"GeForce 6700 XL" },
+	{ 0x10DE0148,	/*0x00000000,*/	"GeForce Go 6600" },
+	{ 0x10DE0149,	/*0x00000000,*/	"GeForce Go 6600 GT" },
+	{ 0x10DE014A,	/*0x00000000,*/	"Quadro NVS 440" },
+	{ 0x10DE014C,	/*0x00000000,*/	"Quadro FX 550" },
+	{ 0x10DE014D,	/*0x00000000,*/	"Quadro FX 550" },
+	{ 0x10DE014E,	/*0x00000000,*/	"Quadro FX 540" },
+	{ 0x10DE014F,	/*0x00000000,*/	"GeForce 6200" },
 	// 0150 - 015F	
 	// 0160 - 016F	
-	{ 0x10DE0160, "GeForce 6500" },
-	{ 0x10DE0161, "GeForce 6200 TurboCache(TM)" },
-	{ 0x10DE0162, "GeForce 6200SE TurboCache(TM)" },
-	{ 0x10DE0163, "GeForce 6200 LE" },
-	{ 0x10DE0164, "GeForce Go 6200" },
-	{ 0x10DE0165, "Quadro NVS 285" },
-	{ 0x10DE0166, "GeForce Go 6400" },
-	{ 0x10DE0167, "GeForce Go 6200" },
-	{ 0x10DE0168, "GeForce Go 6400" },
-	{ 0x10DE0169, "GeForce 6250" },
-	{ 0x10DE016A, "GeForce 7100 GS" },
-	{ 0x10DE016C, "NVIDIA NV44GLM" }, //
-	{ 0x10DE016D, "NVIDIA NV44GLM" }, //
+	{ 0x10DE0160,	/*0x00000000,*/	"GeForce 6500" },
+	{ 0x10DE0161,	/*0x00000000,*/	"GeForce 6200 TurboCache(TM)" },
+	{ 0x10DE0162,	/*0x00000000,*/	"GeForce 6200SE TurboCache(TM)" },
+	{ 0x10DE0163,	/*0x00000000,*/	"GeForce 6200 LE" },
+	{ 0x10DE0164,	/*0x00000000,*/	"GeForce Go 6200" },
+	{ 0x10DE0165,	/*0x00000000,*/	"Quadro NVS 285" },
+	{ 0x10DE0166,	/*0x00000000,*/	"GeForce Go 6400" },
+	{ 0x10DE0167,	/*0x00000000,*/	"GeForce Go 6200" },
+	{ 0x10DE0168,	/*0x00000000,*/	"GeForce Go 6400" },
+	{ 0x10DE0169,	/*0x00000000,*/	"GeForce 6250" },
+	{ 0x10DE016A,	/*0x00000000,*/	"GeForce 7100 GS" },
+	{ 0x10DE016C,	/*0x00000000,*/	"NVIDIA NV44GLM" }, //
+	{ 0x10DE016D,	/*0x00000000,*/	"NVIDIA NV44GLM" }, //
 	// 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" },
+	{ 0x10DE0191,	/*0x00000000,*/	"GeForce 8800 GTX" },
+	{ 0x10DE0193,	/*0x00000000,*/	"GeForce 8800 GTS" },
+	{ 0x10DE0194,	/*0x00000000,*/	"GeForce 8800 Ultra" },
+	{ 0x10DE0197,	/*0x00000000,*/	"Tesla C870" },
+	{ 0x10DE019D,	/*0x00000000,*/	"Quadro FX 5600" },
+	{ 0x10DE019E,	/*0x00000000,*/	"Quadro FX 4600" },
 	// 01A0 - 01AF
 	// 01B0 - 01BF
-//	{ 0x10DE01B1, "nForce AC'97 Audio Controller" },
+    //	{ 0x10DE01B1,	/*0x00000000,*/	"nForce AC'97 Audio Controller" },
 	// 01C0 - 01CF
 	// 01D0 - 01DF
-	{ 0x10DE01D0, "GeForce 7350 LE" },
-	{ 0x10DE01D1, "GeForce 7300 LE" },
-	{ 0x10DE01D2, "GeForce 7550 LE" },
-	{ 0x10DE01D3, "GeForce 7300 SE/7200 GS" },
-	{ 0x10DE01D6, "GeForce Go 7200" },
-	{ 0x10DE01D7, "GeForce Go 7300" },
-	{ 0x10DE01D8, "GeForce Go 7400" },
-	{ 0x10DE01D9, "GeForce Go 7400 GS" },
-	{ 0x10DE01DA, "Quadro NVS 110M" },
-	{ 0x10DE01DB, "Quadro NVS 120M" },
-	{ 0x10DE01DC, "Quadro FX 350M" },
-	{ 0x10DE01DD, "GeForce 7500 LE" },
-	{ 0x10DE01DE, "Quadro FX 350" },
-	{ 0x10DE01DF, "GeForce 7300 GS" },
+	{ 0x10DE01D0,	/*0x00000000,*/	"GeForce 7350 LE" },
+	{ 0x10DE01D1,	/*0x00000000,*/	"GeForce 7300 LE" },
+	{ 0x10DE01D2,	/*0x00000000,*/	"GeForce 7550 LE" },
+	{ 0x10DE01D3,	/*0x00000000,*/	"GeForce 7300 SE/7200 GS" },
+	{ 0x10DE01D6,	/*0x00000000,*/	"GeForce Go 7200" },
+	{ 0x10DE01D7,	/*0x00000000,*/	"GeForce Go 7300" },
+	{ 0x10DE01D8,	/*0x00000000,*/	"GeForce Go 7400" },
+	{ 0x10DE01D9,	/*0x00000000,*/	"GeForce Go 7400 GS" },
+	{ 0x10DE01DA,	/*0x00000000,*/	"Quadro NVS 110M" },
+	{ 0x10DE01DB,	/*0x00000000,*/	"Quadro NVS 120M" },
+	{ 0x10DE01DC,	/*0x00000000,*/	"Quadro FX 350M" },
+	{ 0x10DE01DD,	/*0x00000000,*/	"GeForce 7500 LE" },
+	{ 0x10DE01DE,	/*0x00000000,*/	"Quadro FX 350" },
+	{ 0x10DE01DF,	/*0x00000000,*/	"GeForce 7300 GS" },
 	// 01E0 - 01EF	
 	// 01F0 - 01FF
-	{ 0x10DE01F0, "GeForce4 MX" }, //
+	{ 0x10DE01F0,	/*0x00000000,*/	"GeForce4 MX" }, //
 	// 0200 - 020F	
 	// 0210 - 021F	
-	{ 0x10DE0211, "GeForce 6800" },
-	{ 0x10DE0212, "GeForce 6800 LE" },
-	{ 0x10DE0215, "GeForce 6800 GT" },
-	{ 0x10DE0218, "GeForce 6800 XT" },
+	{ 0x10DE0211,	/*0x00000000,*/	"GeForce 6800" },
+	{ 0x10DE0212,	/*0x00000000,*/	"GeForce 6800 LE" },
+	{ 0x10DE0215,	/*0x00000000,*/	"GeForce 6800 GT" },
+	{ 0x10DE0218,	/*0x00000000,*/	"GeForce 6800 XT" },
 	// 0220 - 022F
-	{ 0x10DE0221, "GeForce 6200" },
-	{ 0x10DE0222, "GeForce 6200 A-LE" },
-	{ 0x10DE0228, "NVIDIA NV44M" }, // 
+	{ 0x10DE0221,	/*0x00000000,*/	"GeForce 6200" },
+	{ 0x10DE0222,	/*0x00000000,*/	"GeForce 6200 A-LE" },
+	{ 0x10DE0228,	/*0x00000000,*/	"NVIDIA NV44M" }, // 
 	// 0230 - 023F
 	// 0240 - 024F
-	{ 0x10DE0240, "GeForce 6150" },
-	{ 0x10DE0241, "GeForce 6150 LE" },
-	{ 0x10DE0242, "GeForce 6100" },
-	{ 0x10DE0243, "NVIDIA C51" }, //
-	{ 0x10DE0244, "GeForce Go 6150" },
-	{ 0x10DE0245, "Quadro NVS 210S / GeForce 6150LE" },
-	{ 0x10DE0247, "GeForce Go 6100" },
+	{ 0x10DE0240,	/*0x00000000,*/	"GeForce 6150" },
+	{ 0x10DE0241,	/*0x00000000,*/	"GeForce 6150 LE" },
+	{ 0x10DE0242,	/*0x00000000,*/	"GeForce 6100" },
+	{ 0x10DE0243,	/*0x00000000,*/	"NVIDIA C51" }, //
+	{ 0x10DE0244,	/*0x00000000,*/	"GeForce Go 6150" },
+	{ 0x10DE0245,	/*0x00000000,*/	"Quadro NVS 210S / GeForce 6150LE" },
+	{ 0x10DE0247,	/*0x00000000,*/	"GeForce Go 6100" },
 	// 0250 - 025F
-	{ 0x10DE025B, "Quadro4 700 XGL" }, //
+	{ 0x10DE025B,	/*0x00000000,*/	"Quadro4 700 XGL" }, //
 	// 0260 - 026F
 	// 0270 - 027F
 	// 0280 - 028F
 	// 0290 - 029F
-	{ 0x10DE0290, "GeForce 7900 GTX" },
-	{ 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" },
-	{ 0x10DE029B, "Quadro FX 1500M" },
-	{ 0x10DE029C, "Quadro FX 5500" },
-	{ 0x10DE029D, "Quadro FX 3500" },
-	{ 0x10DE029E, "Quadro FX 1500" },
-	{ 0x10DE029F, "Quadro FX 4500 X2" },
+	{ 0x10DE0290,	/*0x00000000,*/	"GeForce 7900 GTX" },
+	{ 0x10DE0291,	/*0x00000000,*/	"GeForce 7900 GT/GTO" },
+	{ 0x10DE0292,	/*0x00000000,*/	"GeForce 7900 GS" },
+	{ 0x10DE0293,	/*0x00000000,*/	"GeForce 7950 GX2" },
+	{ 0x10DE0294,	/*0x00000000,*/	"GeForce 7950 GX2" },
+	{ 0x10DE0295,	/*0x00000000,*/	"GeForce 7950 GT" },
+	{ 0x10DE0298,	/*0x00000000,*/	"GeForce Go 7900 GS" },
+	{ 0x10DE0299,	/*0x00000000,*/	"GeForce Go 7900 GTX" },
+	{ 0x10DE029A,	/*0x00000000,*/	"Quadro FX 2500M" },
+	{ 0x10DE029B,	/*0x00000000,*/	"Quadro FX 1500M" },
+	{ 0x10DE029C,	/*0x00000000,*/	"Quadro FX 5500" },
+	{ 0x10DE029D,	/*0x00000000,*/	"Quadro FX 3500" },
+	{ 0x10DE029E,	/*0x00000000,*/	"Quadro FX 1500" },
+	{ 0x10DE029F,	/*0x00000000,*/	"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" },
+	{ 0x10DE02E0,	/*0x00000000,*/	"GeForce 7600 GT" },
+	{ 0x10DE02E1,	/*0x00000000,*/	"GeForce 7600 GS" },
+	{ 0x10DE02E2,	/*0x00000000,*/	"GeForce 7300 GT" },
+	{ 0x10DE02E3,	/*0x00000000,*/	"GeForce 7900 GS" },
+	{ 0x10DE02E4,	/*0x00000000,*/	"GeForce 7950 GT" },
 	// 02F0 - 02FF
 	// 0300 - 030F
-	{ 0x10DE0301, "GeForce FX 5800 Ultra" },
-	{ 0x10DE0302, "GeForce FX 5800" },
-	{ 0x10DE0308, "Quadro FX 2000" },
-	{ 0x10DE0309, "Quadro FX 1000" },
+	{ 0x10DE0301,	/*0x00000000,*/	"GeForce FX 5800 Ultra" },
+	{ 0x10DE0302,	/*0x00000000,*/	"GeForce FX 5800" },
+	{ 0x10DE0308,	/*0x00000000,*/	"Quadro FX 2000" },
+	{ 0x10DE0309,	/*0x00000000,*/	"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" },
+	{ 0x10DE0311,	/*0x00000000,*/	"GeForce FX 5600 Ultra" },
+	{ 0x10DE0312,	/*0x00000000,*/	"GeForce FX 5600" },
+	{ 0x10DE0314,	/*0x00000000,*/	"GeForce FX 5600XT" },
+	{ 0x10DE031A,	/*0x00000000,*/	"GeForce FX Go5600" },
+	{ 0x10DE031B,	/*0x00000000,*/	"GeForce FX Go5650" },
+	{ 0x10DE031C,	/*0x00000000,*/	"Quadro FX Go700" },
 	// 0320 - 032F
-	{ 0x10DE0320, "GeForce FX 5200" }, //
-	{ 0x10DE0321, "GeForce FX 5200 Ultra" }, //
-	{ 0x10DE0322, "GeForce FX 5200" }, //
-	{ 0x10DE0323, "GeForce FX 5200 LE" }, //
-	{ 0x10DE0324, "GeForce FX Go5200" },
-	{ 0x10DE0325, "GeForce FX Go5250" },
-	{ 0x10DE0326, "GeForce FX 5500" },
-	{ 0x10DE0328, "GeForce FX Go5200 32M/64M" },
-	{ 0x10DE0329, "GeForce FX Go5200" }, //
-	{ 0x10DE032A, "Quadro NVS 55/280 PCI" },
-	{ 0x10DE032B, "Quadro FX 500/600 PCI" },
-	{ 0x10DE032C, "GeForce FX Go53xx Series" },
-	{ 0x10DE032D, "GeForce FX Go5100" },
-//	{ 0x10DE032F, "NVIDIA NV34GL" },//
+	{ 0x10DE0320,	/*0x00000000,*/	"GeForce FX 5200" }, //
+	{ 0x10DE0321,	/*0x00000000,*/	"GeForce FX 5200 Ultra" }, //
+	{ 0x10DE0322,	/*0x00000000,*/	"GeForce FX 5200" }, //
+	{ 0x10DE0323,	/*0x00000000,*/	"GeForce FX 5200 LE" }, //
+	{ 0x10DE0324,	/*0x00000000,*/	"GeForce FX Go5200" },
+	{ 0x10DE0325,	/*0x00000000,*/	"GeForce FX Go5250" },
+	{ 0x10DE0326,	/*0x00000000,*/	"GeForce FX 5500" },
+	{ 0x10DE0328,	/*0x00000000,*/	"GeForce FX Go5200 32M/64M" },
+	{ 0x10DE0329,	/*0x00000000,*/	"GeForce FX Go5200" }, //
+	{ 0x10DE032A,	/*0x00000000,*/	"Quadro NVS 55/280 PCI" },
+	{ 0x10DE032B,	/*0x00000000,*/	"Quadro FX 500/600 PCI" },
+	{ 0x10DE032C,	/*0x00000000,*/	"GeForce FX Go53xx Series" },
+	{ 0x10DE032D,	/*0x00000000,*/	"GeForce FX Go5100" },
+    //	{ 0x10DE032F,	/*0x00000000,*/	"NVIDIA NV34GL" },//
 	// 0330 - 033F
-	{ 0x10DE0330, "GeForce FX 5900 Ultra" },
-	{ 0x10DE0331, "GeForce FX 5900" },
-	{ 0x10DE0332, "GeForce FX 5900XT" },
-	{ 0x10DE0333, "GeForce FX 5950 Ultra" },
-	{ 0x10DE0334, "GeForce FX 5900ZT" },
-	{ 0x10DE0338, "Quadro FX 3000" },
-	{ 0x10DE033F, "Quadro FX 700" },
+	{ 0x10DE0330,	/*0x00000000,*/	"GeForce FX 5900 Ultra" },
+	{ 0x10DE0331,	/*0x00000000,*/	"GeForce FX 5900" },
+	{ 0x10DE0332,	/*0x00000000,*/	"GeForce FX 5900XT" },
+	{ 0x10DE0333,	/*0x00000000,*/	"GeForce FX 5950 Ultra" },
+	{ 0x10DE0334,	/*0x00000000,*/	"GeForce FX 5900ZT" },
+	{ 0x10DE0338,	/*0x00000000,*/	"Quadro FX 3000" },
+	{ 0x10DE033F,	/*0x00000000,*/	"Quadro FX 700" },
 	// 0340 - 034F
-	{ 0x10DE0341, "GeForce FX 5700 Ultra" },
-	{ 0x10DE0342, "GeForce FX 5700" },
-	{ 0x10DE0343, "GeForce FX 5700LE" },
-	{ 0x10DE0344, "GeForce FX 5700VE" },
-//	{ 0x10DE0345, "NVIDIA NV36.5" }, //
-	{ 0x10DE0347, "GeForce FX Go5700" },
-	{ 0x10DE0348, "GeForce FX Go5700" },
-//	{ 0x10DE0349, "NVIDIA NV36M Pro" }, //
-//	{ 0x10DE034B, "NVIDIA NV36MAP" }, //
-	{ 0x10DE034C, "Quadro FX Go1000" },
-	{ 0x10DE034E, "Quadro FX 1100" },
-//	{ 0x10DE034F, "NVIDIA NV36GL" }, //
+	{ 0x10DE0341,	/*0x00000000,*/	"GeForce FX 5700 Ultra" },
+	{ 0x10DE0342,	/*0x00000000,*/	"GeForce FX 5700" },
+	{ 0x10DE0343,	/*0x00000000,*/	"GeForce FX 5700LE" },
+	{ 0x10DE0344,	/*0x00000000,*/	"GeForce FX 5700VE" },
+    //	{ 0x10DE0345,	/*0x00000000,*/	"NVIDIA NV36.5" }, //
+	{ 0x10DE0347,	/*0x00000000,*/	"GeForce FX Go5700" },
+	{ 0x10DE0348,	/*0x00000000,*/	"GeForce FX Go5700" },
+    //	{ 0x10DE0349,	/*0x00000000,*/	"NVIDIA NV36M Pro" }, //
+    //	{ 0x10DE034B,	/*0x00000000,*/	"NVIDIA NV36MAP" }, //
+	{ 0x10DE034C,	/*0x00000000,*/	"Quadro FX Go1000" },
+	{ 0x10DE034E,	/*0x00000000,*/	"Quadro FX 1100" },
+    //	{ 0x10DE034F,	/*0x00000000,*/	"NVIDIA NV36GL" }, //
 	// 0350 - 035F
 	// 0360 - 036F
 	// 0370 - 037F
 	// 0380 - 038F
-	{ 0x10DE038B, "GeForce 7650 GS" },
+	{ 0x10DE038B,	/*0x00000000,*/	"GeForce 7650 GS" },
 	// 0390 - 039F
-	{ 0x10DE0390, "GeForce 7650 GS" },
-	{ 0x10DE0391, "GeForce 7600 GT" },
-	{ 0x10DE0392, "GeForce 7600 GS" },
-	{ 0x10DE0393, "GeForce 7300 GT" },
-	{ 0x10DE0394, "GeForce 7600 LE" },
-	{ 0x10DE0395, "GeForce 7300 GT" },
-	{ 0x10DE0397, "GeForce Go 7700" },
-	{ 0x10DE0398, "GeForce Go 7600" },
-	{ 0x10DE0399, "GeForce Go 7600 GT"},
-	{ 0x10DE039A, "Quadro NVS 300M" },
-	{ 0x10DE039B, "GeForce Go 7900 SE" },
-	{ 0x10DE039C, "Quadro FX 560M" },
-	{ 0x10DE039E, "Quadro FX 560" },
+	{ 0x10DE0390,	/*0x00000000,*/	"GeForce 7650 GS" },
+	{ 0x10DE0391,	/*0x00000000,*/	"GeForce 7600 GT" },
+	{ 0x10DE0392,	/*0x00000000,*/	"GeForce 7600 GS" },
+	{ 0x10DE0393,	/*0x00000000,*/	"GeForce 7300 GT" },
+	{ 0x10DE0394,	/*0x00000000,*/	"GeForce 7600 LE" },
+	{ 0x10DE0395,	/*0x00000000,*/	"GeForce 7300 GT" },
+	{ 0x10DE0397,	/*0x00000000,*/	"GeForce Go 7700" },
+	{ 0x10DE0398,	/*0x00000000,*/	"GeForce Go 7600" },
+	{ 0x10DE0399,	/*0x00000000,*/	"GeForce Go 7600 GT"},
+	{ 0x10DE039A,	/*0x00000000,*/	"Quadro NVS 300M" },
+	{ 0x10DE039B,	/*0x00000000,*/	"GeForce Go 7900 SE" },
+	{ 0x10DE039C,	/*0x00000000,*/	"Quadro FX 560M" },
+	{ 0x10DE039E,	/*0x00000000,*/	"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" },
+	{ 0x10DE03D0,	/*0x00000000,*/	"GeForce 6150SE nForce 430" },
+	{ 0x10DE03D1,	/*0x00000000,*/	"GeForce 6100 nForce 405" },
+	{ 0x10DE03D2,	/*0x00000000,*/	"GeForce 6100 nForce 400" },
+	{ 0x10DE03D5,	/*0x00000000,*/	"GeForce 6100 nForce 420" },
+	{ 0x10DE03D6,	/*0x00000000,*/	"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" },
-	{ 0x10DE040A, "Quadro FX 370" },
-	{ 0x10DE040B, "Quadro NVS 320M" },
-	{ 0x10DE040C, "Quadro FX 570M" },
-	{ 0x10DE040D, "Quadro FX 1600M" },
-	{ 0x10DE040E, "Quadro FX 570" },
-	{ 0x10DE040F, "Quadro FX 1700" },
+	{ 0x10DE0400,	/*0x00000000,*/	"GeForce 8600 GTS" },
+	{ 0x10DE0401,	/*0x00000000,*/	"GeForce 8600 GT" },
+	{ 0x10DE0402,	/*0x00000000,*/	"GeForce 8600 GT" },
+	{ 0x10DE0403,	/*0x00000000,*/	"GeForce 8600 GS" },
+	{ 0x10DE0404,	/*0x00000000,*/	"GeForce 8400 GS" },
+	{ 0x10DE0405,	/*0x00000000,*/	"GeForce 9500M GS" },
+	{ 0x10DE0406,	/*0x00000000,*/	"GeForce 8300 GS" },
+	{ 0x10DE0407,	/*0x00000000,*/	"GeForce 8600M GT" },
+	{ 0x10DE0408,	/*0x00000000,*/	"GeForce 9650M GS" },
+	{ 0x10DE0409,	/*0x00000000,*/	"GeForce 8700M GT" },
+	{ 0x10DE040A,	/*0x00000000,*/	"Quadro FX 370" },
+	{ 0x10DE040B,	/*0x00000000,*/	"Quadro NVS 320M" },
+	{ 0x10DE040C,	/*0x00000000,*/	"Quadro FX 570M" },
+	{ 0x10DE040D,	/*0x00000000,*/	"Quadro FX 1600M" },
+	{ 0x10DE040E,	/*0x00000000,*/	"Quadro FX 570" },
+	{ 0x10DE040F,	/*0x00000000,*/	"Quadro FX 1700" },
 	// 0410 - 041F
-	{ 0x10DE0410, "GeForce GT 330" },
+	{ 0x10DE0410,	/*0x00000000,*/	"GeForce GT 330" },
 	// 0420 - 042F
-	{ 0x10DE0420, "GeForce 8400 SE" },
-	{ 0x10DE0421, "GeForce 8500 GT" },
-	{ 0x10DE0422, "GeForce 8400 GS" },
-	{ 0x10DE0423, "GeForce 8300 GS" },
-	{ 0x10DE0424, "GeForce 8400 GS" },
-	{ 0x10DE0425, "GeForce 8600M GS" },
-	{ 0x10DE0426, "GeForce 8400M GT" },
-	{ 0x10DE0427, "GeForce 8400M GS" },
-	{ 0x10DE0428, "GeForce 8400M G" },
-	{ 0x10DE0429, "Quadro NVS 140M" },
-	{ 0x10DE042A, "Quadro NVS 130M" },
-	{ 0x10DE042B, "Quadro NVS 135M" },
-	{ 0x10DE042C, "GeForce 9400 GT" },
-	{ 0x10DE042D, "Quadro FX 360M" },
-	{ 0x10DE042E, "GeForce 9300M G" },
-	{ 0x10DE042F, "Quadro NVS 290" },
+	{ 0x10DE0420,	/*0x00000000,*/	"GeForce 8400 SE" },
+	{ 0x10DE0421,	/*0x00000000,*/	"GeForce 8500 GT" },
+	{ 0x10DE0422,	/*0x00000000,*/	"GeForce 8400 GS" },
+	{ 0x10DE0423,	/*0x00000000,*/	"GeForce 8300 GS" },
+	{ 0x10DE0424,	/*0x00000000,*/	"GeForce 8400 GS" },
+	{ 0x10DE0425,	/*0x00000000,*/	"GeForce 8600M GS" },
+	{ 0x10DE0426,	/*0x00000000,*/	"GeForce 8400M GT" },
+	{ 0x10DE0427,	/*0x00000000,*/	"GeForce 8400M GS" },
+	{ 0x10DE0428,	/*0x00000000,*/	"GeForce 8400M G" },
+	{ 0x10DE0429,	/*0x00000000,*/	"Quadro NVS 140M" },
+	{ 0x10DE042A,	/*0x00000000,*/	"Quadro NVS 130M" },
+	{ 0x10DE042B,	/*0x00000000,*/	"Quadro NVS 135M" },
+	{ 0x10DE042C,	/*0x00000000,*/	"GeForce 9400 GT" },
+	{ 0x10DE042D,	/*0x00000000,*/	"Quadro FX 360M" },
+	{ 0x10DE042E,	/*0x00000000,*/	"GeForce 9300M G" },
+	{ 0x10DE042F,	/*0x00000000,*/	"Quadro NVS 290" },
 	// 0430 - 043F
 	// 0440 - 044F
 	// 0450 - 045F
@@ -425,22 +423,22 @@
 	// 04A0 - 04AF
 	// 04B0 - 04BF
 	// 04C0 - 04CF
-	{ 0x10DE04C0, "NVIDIA G78" }, //
-	{ 0x10DE04C1, "NVIDIA G78" }, //
-	{ 0x10DE04C2, "NVIDIA G78" }, //
-	{ 0x10DE04C3, "NVIDIA G78" }, //
-	{ 0x10DE04C4, "NVIDIA G78" }, //
-	{ 0x10DE04C5, "NVIDIA G78" }, //
-	{ 0x10DE04C6, "NVIDIA G78" }, //
-	{ 0x10DE04C7, "NVIDIA G78" }, //
-	{ 0x10DE04C8, "NVIDIA G78" }, //
-	{ 0x10DE04C9, "NVIDIA G78" }, //
-	{ 0x10DE04CA, "NVIDIA G78" }, //
-	{ 0x10DE04CB, "NVIDIA G78" }, //
-	{ 0x10DE04CC, "NVIDIA G78" }, //
-	{ 0x10DE04CD, "NVIDIA G78" }, //
-	{ 0x10DE04CE, "NVIDIA G78" }, //
-	{ 0x10DE04CF, "NVIDIA G78" }, //
+	{ 0x10DE04C0,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C1,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C2,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C3,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C4,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C5,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C6,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C7,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C8,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04C9,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04CA,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04CB,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04CC,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04CD,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04CE,	/*0x00000000,*/	"NVIDIA G78" }, //
+	{ 0x10DE04CF,	/*0x00000000,*/	"NVIDIA G78" }, //
 	// 04D0 - 04DF
 	// 04E0 - 04EF
 	// 04F0 - 04FF
@@ -448,12 +446,12 @@
 	// 0510 - 051F
 	// 0520 - 052F
 	// 0530 - 053F
-	{ 0x10DE0530, "GeForce 7190M / nForce 650M" },
-	{ 0x10DE0531, "GeForce 7150M / nForce 630M" },
-	{ 0x10DE0533, "GeForce 7000M / nForce 610M" },
-	{ 0x10DE053A, "GeForce 7050 PV / nForce 630a" },
-	{ 0x10DE053B, "GeForce 7050 PV / nForce 630a" },
-	{ 0x10DE053E, "GeForce 7025 / nForce 630a" },
+	{ 0x10DE0530,	/*0x00000000,*/	"GeForce 7190M / nForce 650M" },
+	{ 0x10DE0531,	/*0x00000000,*/	"GeForce 7150M / nForce 630M" },
+	{ 0x10DE0533,	/*0x00000000,*/	"GeForce 7000M / nForce 610M" },
+	{ 0x10DE053A,	/*0x00000000,*/	"GeForce 7050 PV / nForce 630a" },
+	{ 0x10DE053B,	/*0x00000000,*/	"GeForce 7050 PV / nForce 630a" },
+	{ 0x10DE053E,	/*0x00000000,*/	"GeForce 7025 / nForce 630a" },
 	// 0540 - 054F
 	// 0550 - 055F
 	// 0560 - 056F
@@ -465,210 +463,210 @@
 	// 05C0 - 05CF
 	// 05D0 - 05DF
 	// 05E0 - 05EF
-	{ 0x10DE05E0, "GeForce GTX 295" },
-	{ 0x10DE05E1, "GeForce GTX 280" },
-	{ 0x10DE05E2, "GeForce GTX 260" },
-	{ 0x10DE05E3, "GeForce GTX 285" },
-	{ 0x10DE05E4, "NVIDIA GT200" }, //
-	{ 0x10DE05E5, "NVIDIA GT200" }, //
-	{ 0x10DE05E6, "GeForce GTX 275" },
-	{ 0x10DE05E7, "Tesla C1060" },
-	{ 0x10DE05E8, "NVIDIA GT200" }, //
-	{ 0x10DE05E9, "NVIDIA GT200" }, //
-	{ 0x10DE05EA, "GeForce GTX 260" },
-	{ 0x10DE05EB, "GeForce GTX 295" },
-	{ 0x10DE05EC, "NVIDIA GT200" }, //
-	{ 0x10DE05ED, "Quadroplex 2200 D2" },
-	{ 0x10DE05EE, "NVIDIA GT200" }, //
-	{ 0x10DE05EF, "NVIDIA GT200" }, //
+	{ 0x10DE05E0,	/*0x00000000,*/	"GeForce GTX 295" },
+	{ 0x10DE05E1,	/*0x00000000,*/	"GeForce GTX 280" },
+	{ 0x10DE05E2,	/*0x00000000,*/	"GeForce GTX 260" },
+	{ 0x10DE05E3,	/*0x00000000,*/	"GeForce GTX 285" },
+	{ 0x10DE05E4,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05E5,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05E6,	/*0x00000000,*/	"GeForce GTX 275" },
+	{ 0x10DE05E7,	/*0x00000000,*/	"Tesla C1060" },
+	{ 0x10DE05E8,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05E9,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05EA,	/*0x00000000,*/	"GeForce GTX 260" },
+	{ 0x10DE05EB,	/*0x00000000,*/	"GeForce GTX 295" },
+	{ 0x10DE05EC,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05ED,	/*0x00000000,*/	"Quadroplex 2200 D2" },
+	{ 0x10DE05EE,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05EF,	/*0x00000000,*/	"NVIDIA GT200" }, //
 	// 05F0 - 05FF
-	{ 0x10DE05F0, "NVIDIA GT200" }, //
-	{ 0x10DE05F1, "NVIDIA GT200" }, //
-	{ 0x10DE05F2, "NVIDIA GT200" }, //
-	{ 0x10DE05F3, "NVIDIA GT200" }, //
-	{ 0x10DE05F4, "NVIDIA GT200" }, //
-	{ 0x10DE05F5, "NVIDIA GT200" }, //
-	{ 0x10DE05F6, "NVIDIA GT200" }, //
-	{ 0x10DE05F7, "NVIDIA GT200" }, //
-	{ 0x10DE05F8, "Quadroplex 2200 S4" },
-	{ 0x10DE05F9, "Quadro CX" },
-	{ 0x10DE05FA, "NVIDIA GT200" }, //
-	{ 0x10DE05FB, "NVIDIA GT200" }, //
-	{ 0x10DE05FC, "NVIDIA GT200" }, //
-	{ 0x10DE05FD, "Quadro FX 5800" },
-	{ 0x10DE05FE, "Quadro FX 4800" },
-	{ 0x10DE05FF, "Quadro FX 3800" },
+	{ 0x10DE05F0,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F1,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F2,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F3,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F4,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F5,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F6,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F7,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05F8,	/*0x00000000,*/	"Quadroplex 2200 S4" },
+	{ 0x10DE05F9,	/*0x00000000,*/	"Quadro CX" },
+	{ 0x10DE05FA,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05FB,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05FC,	/*0x00000000,*/	"NVIDIA GT200" }, //
+	{ 0x10DE05FD,	/*0x00000000,*/	"Quadro FX 5800" },
+	{ 0x10DE05FE,	/*0x00000000,*/	"Quadro FX 4800" },
+	{ 0x10DE05FF,	/*0x00000000,*/	"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" },
-	{ 0x10DE0607, "GeForce GTS 240" },
-	{ 0x10DE0608, "GeForce 9800M GTX" },
-	{ 0x10DE0609, "GeForce 8800M GTS" },
-	{ 0x10DE060A, "GeForce GTX 280M" },
-	{ 0x10DE060B, "GeForce 9800M GT" },
-	{ 0x10DE060C, "GeForce 8800M GTX" },
-	{ 0x10DE060D, "GeForce 8800 GS" },
-	{ 0x10DE060F, "GeForce GTX 285M" },
+	{ 0x10DE0600,	/*0x00000000,*/	"GeForce 8800 GTS 512" },
+	{ 0x10DE0601,	/*0x00000000,*/	"GeForce 9800 GT" },
+	{ 0x10DE0602,	/*0x00000000,*/	"GeForce 8800 GT" },
+	{ 0x10DE0603,	/*0x00000000,*/	"GeForce GT 230" },
+	{ 0x10DE0604,	/*0x00000000,*/	"GeForce 9800 GX2" },
+	{ 0x10DE0605,	/*0x00000000,*/	"GeForce 9800 GT" },
+	{ 0x10DE0606,	/*0x00000000,*/	"GeForce 8800 GS" },
+	{ 0x10DE0607,	/*0x00000000,*/	"GeForce GTS 240" },
+	{ 0x10DE0608,	/*0x00000000,*/	"GeForce 9800M GTX" },
+	{ 0x10DE0609,	/*0x00000000,*/	"GeForce 8800M GTS" },
+	{ 0x10DE060A,	/*0x00000000,*/	"GeForce GTX 280M" },
+	{ 0x10DE060B,	/*0x00000000,*/	"GeForce 9800M GT" },
+	{ 0x10DE060C,	/*0x00000000,*/	"GeForce 8800M GTX" },
+	{ 0x10DE060D,	/*0x00000000,*/	"GeForce 8800 GS" },
+	{ 0x10DE060F,	/*0x00000000,*/	"GeForce GTX 285M" },
 	// 0610 - 061F
-	{ 0x10DE0610, "GeForce 9600 GSO" },
-	{ 0x10DE0611, "GeForce 8800 GT" },
-	{ 0x10DE0612, "GeForce 9800 GTX" },
-	{ 0x10DE0613, "GeForce 9800 GTX+" },
-	{ 0x10DE0614, "GeForce 9800 GT" },
-	{ 0x10DE0615, "GeForce GTS 250" },
-	{ 0x10DE0617, "GeForce 9800M GTX" },
-	{ 0x10DE0618, "GeForce GTX 260M" }, // Subsystem Id: 1043 202B Asus GTX 680
-	{ 0x10DE0619, "Quadro FX 4700 X2" },
-	{ 0x10DE061A, "Quadro FX 3700" },
-	{ 0x10DE061B, "Quadro VX 200" },
-	{ 0x10DE061C, "Quadro FX 3600M" },
-	{ 0x10DE061D, "Quadro FX 2800M" },
-	{ 0x10DE061E, "Quadro FX 3700M" },
-	{ 0x10DE061F, "Quadro FX 3800M" },
+	{ 0x10DE0610,	/*0x00000000,*/	"GeForce 9600 GSO" },
+	{ 0x10DE0611,	/*0x00000000,*/	"GeForce 8800 GT" },
+	{ 0x10DE0612,	/*0x00000000,*/	"GeForce 9800 GTX" },
+	{ 0x10DE0613,	/*0x00000000,*/	"GeForce 9800 GTX+" },
+	{ 0x10DE0614,	/*0x00000000,*/	"GeForce 9800 GT" },
+	{ 0x10DE0615,	/*0x00000000,*/	"GeForce GTS 250" },
+	{ 0x10DE0617,	/*0x00000000,*/	"GeForce 9800M GTX" },
+	{ 0x10DE0618,	/*0x00000000,*/	"GeForce GTX 260M" }, // Subsystem Id: 1043 202B Asus GTX 680
+	{ 0x10DE0619,	/*0x00000000,*/	"Quadro FX 4700 X2" },
+	{ 0x10DE061A,	/*0x00000000,*/	"Quadro FX 3700" },
+	{ 0x10DE061B,	/*0x00000000,*/	"Quadro VX 200" },
+	{ 0x10DE061C,	/*0x00000000,*/	"Quadro FX 3600M" },
+	{ 0x10DE061D,	/*0x00000000,*/	"Quadro FX 2800M" },
+	{ 0x10DE061E,	/*0x00000000,*/	"Quadro FX 3700M" },
+	{ 0x10DE061F,	/*0x00000000,*/	"Quadro FX 3800M" },
 	// 0620 - 062F
-	{ 0x10DE0620, "NVIDIA G94" }, // GeForce 8100/8200/8300
-	{ 0x10DE0621, "GeForce GT 230" },
-	{ 0x10DE0622, "GeForce 9600 GT" },
-	{ 0x10DE0623, "GeForce 9600 GS" },
-	{ 0x10DE0624, "NVIDIA G94" }, //
-	{ 0x10DE0625, "GeForce 9600 GSO 512"},
-	{ 0x10DE0626, "GeForce GT 130" },
-	{ 0x10DE0627, "GeForce GT 140" },
-	{ 0x10DE0628, "GeForce 9800M GTS" },
-	{ 0x10DE0629, "NVIDIA G94" }, //
-	{ 0x10DE062A, "GeForce 9700M GTS" },
-	{ 0x10DE062B, "GeForce 9800M GS" },
-	{ 0x10DE062C, "GeForce 9800M GTS" },
-	{ 0x10DE062D, "GeForce 9600 GT" },
-	{ 0x10DE062E, "GeForce 9600 GT" },
-	{ 0x10DE062F, "GeForce 9800 S" }, //
+	{ 0x10DE0620,	/*0x00000000,*/	"NVIDIA G94" }, // GeForce 8100/8200/8300
+	{ 0x10DE0621,	/*0x00000000,*/	"GeForce GT 230" },
+	{ 0x10DE0622,	/*0x00000000,*/	"GeForce 9600 GT" },
+	{ 0x10DE0623,	/*0x00000000,*/	"GeForce 9600 GS" },
+	{ 0x10DE0624,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE0625,	/*0x00000000,*/	"GeForce 9600 GSO 512"},
+	{ 0x10DE0626,	/*0x00000000,*/	"GeForce GT 130" },
+	{ 0x10DE0627,	/*0x00000000,*/	"GeForce GT 140" },
+	{ 0x10DE0628,	/*0x00000000,*/	"GeForce 9800M GTS" },
+	{ 0x10DE0629,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE062A,	/*0x00000000,*/	"GeForce 9700M GTS" },
+	{ 0x10DE062B,	/*0x00000000,*/	"GeForce 9800M GS" },
+	{ 0x10DE062C,	/*0x00000000,*/	"GeForce 9800M GTS" },
+	{ 0x10DE062D,	/*0x00000000,*/	"GeForce 9600 GT" },
+	{ 0x10DE062E,	/*0x00000000,*/	"GeForce 9600 GT" },
+	{ 0x10DE062F,	/*0x00000000,*/	"GeForce 9800 S" }, //
 	// 0630 - 063F
-	{ 0x10DE0630, "NVIDIA G94" }, //
-	{ 0x10DE0631, "GeForce GTS 160M" },
-	{ 0x10DE0632, "GeForce GTS 150M" },
-	{ 0x10DE0633, "NVIDIA G94" }, //
-	{ 0x10DE0634, "NVIDIA G94" }, //
-	{ 0x10DE0635, "GeForce 9600 GSO" },
-	{ 0x10DE0636, "NVIDIA G94" }, //
-	{ 0x10DE0637, "GeForce 9600 GT" },
-	{ 0x10DE0638, "Quadro FX 1800" },
-	{ 0x10DE0639, "NVIDIA G94" }, //
-	{ 0x10DE063A, "Quadro FX 2700M" },
-	{ 0x10DE063B, "NVIDIA G94" }, //
-	{ 0x10DE063C, "NVIDIA G94" }, //
-	{ 0x10DE063D, "NVIDIA G94" }, //
-	{ 0x10DE063E, "NVIDIA G94" }, //
-	{ 0x10DE063F, "NVIDIA G94" }, //
+	{ 0x10DE0630,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE0631,	/*0x00000000,*/	"GeForce GTS 160M" },
+	{ 0x10DE0632,	/*0x00000000,*/	"GeForce GTS 150M" },
+	{ 0x10DE0633,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE0634,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE0635,	/*0x00000000,*/	"GeForce 9600 GSO" },
+	{ 0x10DE0636,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE0637,	/*0x00000000,*/	"GeForce 9600 GT" },
+	{ 0x10DE0638,	/*0x00000000,*/	"Quadro FX 1800" },
+	{ 0x10DE0639,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE063A,	/*0x00000000,*/	"Quadro FX 2700M" },
+	{ 0x10DE063B,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE063C,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE063D,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE063E,	/*0x00000000,*/	"NVIDIA G94" }, //
+	{ 0x10DE063F,	/*0x00000000,*/	"NVIDIA G94" }, //
 	// 0640 - 064F
-	{ 0x10DE0640, "GeForce 9500 GT" },
-	{ 0x10DE0641, "GeForce 9400 GT" },
-	{ 0x10DE0642, "GeForce 8400 GS" },
-	{ 0x10DE0643, "GeForce 9500 GT" },
-	{ 0x10DE0644, "GeForce 9500 GS" },
-	{ 0x10DE0645, "GeForce 9500 GS" },
-	{ 0x10DE0646, "GeForce GT 120" },
-	{ 0x10DE0647, "GeForce 9600M GT" },
-	{ 0x10DE0648, "GeForce 9600M GS" },
-	{ 0x10DE0649, "GeForce 9600M GT" },
-	{ 0x10DE064A, "GeForce 9700M GT" },
-	{ 0x10DE064B, "GeForce 9500M G" },
-	{ 0x10DE064C, "GeForce 9650M GT" },
+	{ 0x10DE0640,	/*0x00000000,*/	"GeForce 9500 GT" },
+	{ 0x10DE0641,	/*0x00000000,*/	"GeForce 9400 GT" },
+	{ 0x10DE0642,	/*0x00000000,*/	"GeForce 8400 GS" },
+	{ 0x10DE0643,	/*0x00000000,*/	"GeForce 9500 GT" },
+	{ 0x10DE0644,	/*0x00000000,*/	"GeForce 9500 GS" },
+	{ 0x10DE0645,	/*0x00000000,*/	"GeForce 9500 GS" },
+	{ 0x10DE0646,	/*0x00000000,*/	"GeForce GT 120" },
+	{ 0x10DE0647,	/*0x00000000,*/	"GeForce 9600M GT" },
+	{ 0x10DE0648,	/*0x00000000,*/	"GeForce 9600M GS" },
+	{ 0x10DE0649,	/*0x00000000,*/	"GeForce 9600M GT" },
+	{ 0x10DE064A,	/*0x00000000,*/	"GeForce 9700M GT" },
+	{ 0x10DE064B,	/*0x00000000,*/	"GeForce 9500M G" },
+	{ 0x10DE064C,	/*0x00000000,*/	"GeForce 9650M GT" },
 	// 0650 - 065F
-	{ 0x10DE0650, "NVIDIA G96-825" }, //
-	{ 0x10DE0651, "GeForce G 110M" },
-	{ 0x10DE0652, "GeForce GT 130M" },
-	{ 0x10DE0653, "GeForce GT 120M" },
-	{ 0x10DE0654, "GeForce GT 220M" },
-	{ 0x10DE0655, "GeForce GT 120" },
-	{ 0x10DE0656, "GeForce 9650 S" },
-	{ 0x10DE0657, "NVIDIA G96" }, //
-	{ 0x10DE0658, "Quadro FX 380" },
-	{ 0x10DE0659, "Quadro FX 580" },
-	{ 0x10DE065A, "Quadro FX 1700M" },
-	{ 0x10DE065B, "GeForce 9400 GT" },
-	{ 0x10DE065C, "Quadro FX 770M" },
-	{ 0x10DE065D, "NVIDIA G96" }, //
-	{ 0x10DE065E, "NVIDIA G96" }, //
-	{ 0x10DE065F, "GeForce G210" },
+	{ 0x10DE0650,	/*0x00000000,*/	"NVIDIA G96-825" }, //
+	{ 0x10DE0651,	/*0x00000000,*/	"GeForce G 110M" },
+	{ 0x10DE0652,	/*0x00000000,*/	"GeForce GT 130M" },
+	{ 0x10DE0653,	/*0x00000000,*/	"GeForce GT 120M" },
+	{ 0x10DE0654,	/*0x00000000,*/	"GeForce GT 220M" },
+	{ 0x10DE0655,	/*0x00000000,*/	"GeForce GT 120" },
+	{ 0x10DE0656,	/*0x00000000,*/	"GeForce 9650 S" },
+	{ 0x10DE0657,	/*0x00000000,*/	"NVIDIA G96" }, //
+	{ 0x10DE0658,	/*0x00000000,*/	"Quadro FX 380" },
+	{ 0x10DE0659,	/*0x00000000,*/	"Quadro FX 580" },
+	{ 0x10DE065A,	/*0x00000000,*/	"Quadro FX 1700M" },
+	{ 0x10DE065B,	/*0x00000000,*/	"GeForce 9400 GT" },
+	{ 0x10DE065C,	/*0x00000000,*/	"Quadro FX 770M" },
+	{ 0x10DE065D,	/*0x00000000,*/	"NVIDIA G96" }, //
+	{ 0x10DE065E,	/*0x00000000,*/	"NVIDIA G96" }, //
+	{ 0x10DE065F,	/*0x00000000,*/	"GeForce G210" },
 	// 0660 - 066F
 	// 0670 - 067F
 	// 0680 - 068F
 	// 0690 - 069F
 	// 06A0 - 06AF
-	{ 0x10DE06A0, "NVIDIA GT214" }, //
+	{ 0x10DE06A0,	/*0x00000000,*/	"NVIDIA GT214" }, //
 	// 06B0 - 06BF
-	{ 0x10DE06B0, "NVIDIA GT214" }, //
+	{ 0x10DE06B0,	/*0x00000000,*/	"NVIDIA GT214" }, //
 	// 06C0 - 06CF
-	{ 0x10DE06C0, "GeForce GTX 480" },
-	{ 0x10DE06C3, "GeForce GTX D12U" },
-	{ 0x10DE06C4, "GeForce GTX 465" },
-	{ 0x10DE06CA, "GeForce GTX 480M" },
-	{ 0x10DE06CD, "GeForce GTX 470" },
+	{ 0x10DE06C0,	/*0x00000000,*/	"GeForce GTX 480" },
+	{ 0x10DE06C3,	/*0x00000000,*/	"GeForce GTX D12U" },
+	{ 0x10DE06C4,	/*0x00000000,*/	"GeForce GTX 465" },
+	{ 0x10DE06CA,	/*0x00000000,*/	"GeForce GTX 480M" },
+	{ 0x10DE06CD,	/*0x00000000,*/	"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: ?	
-	{ 0x10DE06DF, "Tesla M2070-Q" },
+	{ 0x10DE06D1,	/*0x00000000,*/	"Tesla C2050" },	// TODO: sub-device id: 0x0771
+	{ 0x10DE06D1,	/*0x00000000,*/	"Tesla C2070" },	// TODO: sub-device id: 0x0772
+	{ 0x10DE06D2,	/*0x00000000,*/	"Tesla M2070" },
+	{ 0x10DE06D8,	/*0x00000000,*/	"Quadro 6000" },
+	{ 0x10DE06D9,	/*0x00000000,*/	"Quadro 5000" },
+	{ 0x10DE06DA,	/*0x00000000,*/	"Quadro 5000M" },
+	{ 0x10DE06DC,	/*0x00000000,*/	"Quadro 6000" },
+	{ 0x10DE06DD,	/*0x00000000,*/	"Quadro 4000" },
+	{ 0x10DE06DE,	/*0x00000000,*/	"Tesla M2050" },	// TODO: sub-device id: 0x0846
+	{ 0x10DE06DE,	/*0x00000000,*/	"Tesla M2070" },	// TODO: sub-device id: ?	
+	{ 0x10DE06DF,	/*0x00000000,*/	"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" },
-	{ 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" },
-	{ 0x10DE06ED, "NVIDIA G98" }, //
-	{ 0x10DE06EF, "GeForce G 103M" },
+	{ 0x10DE06E0,	/*0x00000000,*/	"GeForce 9300 GE" },
+	{ 0x10DE06E1,	/*0x00000000,*/	"GeForce 9300 GS" },
+	{ 0x10DE06E2,	/*0x00000000,*/	"GeForce 8400" },
+	{ 0x10DE06E3,	/*0x00000000,*/	"GeForce 8400 SE" },
+	{ 0x10DE06E4,	/*0x00000000,*/	"GeForce 8400 GS" },
+	{ 0x10DE06E5,	/*0x00000000,*/	"GeForce 9300M GS" },
+	{ 0x10DE06E6,	/*0x00000000,*/	"GeForce G100" },
+	{ 0x10DE06E7,	/*0x00000000,*/	"GeForce 9300 SE" },
+	{ 0x10DE06E8,	/*0x00000000,*/	"GeForce 9200M GS" },
+	{ 0x10DE06E9,	/*0x00000000,*/	"GeForce 9300M GS" },
+	{ 0x10DE06EA,	/*0x00000000,*/	"Quadro NVS 150M" },
+	{ 0x10DE06EB,	/*0x00000000,*/	"Quadro NVS 160M" },
+	{ 0x10DE06EC,	/*0x00000000,*/	"GeForce G 105M" },
+	{ 0x10DE06ED,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06EF,	/*0x00000000,*/	"GeForce G 103M" },
 	// 06F0 - 06FF
-	{ 0x10DE06F0, "NVIDIA G98" }, //
-	{ 0x10DE06F1, "GeForce G105M" },
-	{ 0x10DE06F2, "NVIDIA G98" }, //
-	{ 0x10DE06F3, "NVIDIA G98" }, //
-	{ 0x10DE06F4, "NVIDIA G98" }, //
-	{ 0x10DE06F5, "NVIDIA G98" }, //
-	{ 0x10DE06F6, "NVIDIA G98" }, //
-	{ 0x10DE06F7, "NVIDIA G98" }, //
-	{ 0x10DE06F8, "Quadro NVS 420" },
-	{ 0x10DE06F9, "Quadro FX 370 LP" },
-	{ 0x10DE06FA, "Quadro NVS 450" },
-	{ 0x10DE06FB, "Quadro FX 370M" },
-	{ 0x10DE06FC, "NVIDIA G98" }, //
-	{ 0x10DE06FD, "Quadro NVS 295" },
-	{ 0x10DE06FE, "NVIDIA G98" }, //
-	{ 0x10DE06FF, "HICx16 + Graphics" },
+	{ 0x10DE06F0,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F1,	/*0x00000000,*/	"GeForce G105M" },
+	{ 0x10DE06F2,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F3,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F4,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F5,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F6,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F7,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06F8,	/*0x00000000,*/	"Quadro NVS 420" },
+	{ 0x10DE06F9,	/*0x00000000,*/	"Quadro FX 370 LP" },
+	{ 0x10DE06FA,	/*0x00000000,*/	"Quadro NVS 450" },
+	{ 0x10DE06FB,	/*0x00000000,*/	"Quadro FX 370M" },
+	{ 0x10DE06FC,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06FD,	/*0x00000000,*/	"Quadro NVS 295" },
+	{ 0x10DE06FE,	/*0x00000000,*/	"NVIDIA G98" }, //
+	{ 0x10DE06FF,	/*0x00000000,*/	"HICx16 + Graphics" },
 	// 0700 - 070F
 	// 0710 - 071F
 	// 0720 - 072F
 	// 0730 - 073F
 	// 0740 - 074F
 	// 0750 - 075F
-//	{ 0x10DE0759, "nVidia Standard Dual Channel PCI IDE Controller" },
+    //	{ 0x10DE0759,	/*0x00000000,*/	"nVidia Standard Dual Channel PCI IDE Controller" },
 	// 0760 - 076F
 	// 0770 - 077F
-//	{ 0x10DE0774, "nVidia Microsoft UAA Bus Driver for High Definition Audio" },
-//	{ 0x10DE077B, "nVidia Standard OpenHCD USB Host Controller" },
-//	{ 0x10DE077C, "nVidia Standard Enhanced PCI to USB Host Controller" },
-//	{ 0x10DE077D, "nVidia Standard OpenHCD USB Host Controller" },
-//	{ 0x10DE077E, "nVidia Standard Enhanced PCI to USB Host Controller" },
+    //	{ 0x10DE0774,	/*0x00000000,*/	"nVidia Microsoft UAA Bus Driver for High Definition Audio" },
+    //	{ 0x10DE077B,	/*0x00000000,*/	"nVidia Standard OpenHCD USB Host Controller" },
+    //	{ 0x10DE077C,	/*0x00000000,*/	"nVidia Standard Enhanced PCI to USB Host Controller" },
+    //	{ 0x10DE077D,	/*0x00000000,*/	"nVidia Standard OpenHCD USB Host Controller" },
+    //	{ 0x10DE077E,	/*0x00000000,*/	"nVidia Standard Enhanced PCI to USB Host Controller" },
 	// 0780 - 078F
 	// 0790 - 079F
 	// 07A0 - 07AF
@@ -676,99 +674,99 @@
 	// 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" },
-//	{ 0x10DE07E4, "NVIDIA MCP73" },
-	{ 0x10DE07E5, "GeForce 7050 / nForce 620i" },
-//	{ 0x10DE07E6, "NVIDIA MCP73" },
-//	{ 0x10DE07E7, "NVIDIA MCP73" },
-//	{ 0x10DE07E8, "NVIDIA MCP73" },
-//	{ 0x10DE07E9, "NVIDIA MCP73" },
-//	{ 0x10DE07EA, "NVIDIA MCP73" },
-//	{ 0x10DE07EB, "NVIDIA MCP73" },
-//	{ 0x10DE07ED, "NVIDIA MCP73" },
-//	{ 0x10DE07EE, "NVIDIA MCP73" },
-//	{ 0x10DE07EF, "NVIDIA MCP73" },
+	{ 0x10DE07E0,	/*0x00000000,*/	"GeForce 7150 / nForce 630i" },
+	{ 0x10DE07E1,	/*0x00000000,*/	"GeForce 7100 / nForce 630i" },
+	{ 0x10DE07E2,	/*0x00000000,*/	"GeForce 7050 / nForce 630i" },
+	{ 0x10DE07E3,	/*0x00000000,*/	"GeForce 7050 / nForce 610i" },
+    //	{ 0x10DE07E4,	/*0x00000000,*/	"NVIDIA MCP73" },
+	{ 0x10DE07E5,	/*0x00000000,*/	"GeForce 7050 / nForce 620i" },
+    //	{ 0x10DE07E6,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07E7,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07E8,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07E9,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07EA,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07EB,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07ED,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07EE,	/*0x00000000,*/	"NVIDIA MCP73" },
+    //	{ 0x10DE07EF,	/*0x00000000,*/	"NVIDIA MCP73" },
 	// 07F0 - 07FF
 	// 0800 - 080F
 	// 0810 - 081F
 	// 0820 - 082F
 	// 0830 - 083F
 	// 0840 - 084F
-	{ 0x10DE0840, "GeForce 8200M" },
-//	{ 0x10DE0841, "NVIDIA MCP77/78" },
-//	{ 0x10DE0842, "NVIDIA MCP77/78" },
-	{ 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" },
+	{ 0x10DE0840,	/*0x00000000,*/	"GeForce 8200M" },
+    //	{ 0x10DE0841,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0842,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+	{ 0x10DE0844,	/*0x00000000,*/	"GeForce 9100M G" },
+	{ 0x10DE0845,	/*0x00000000,*/	"GeForce 8200M G" },
+	{ 0x10DE0846,	/*0x00000000,*/	"GeForce 9200" },
+	{ 0x10DE0847,	/*0x00000000,*/	"GeForce 9100" },
+	{ 0x10DE0848,	/*0x00000000,*/	"GeForce 8300" },
+	{ 0x10DE0849,	/*0x00000000,*/	"GeForce 8200" },
+	{ 0x10DE084A,	/*0x00000000,*/	"nForce 730a" },
+	{ 0x10DE084B,	/*0x00000000,*/	"GeForce 9200" },
+	{ 0x10DE084C,	/*0x00000000,*/	"nForce 980a/780a SLI" },
+	{ 0x10DE084D,	/*0x00000000,*/	"nForce 750a SLI" },
+	{ 0x10DE084F,	/*0x00000000,*/	"GeForce 8100 / nForce 720a" },
 	// 0850 - 085F
-//	{ 0x10DE0850, "NVIDIA MCP77/78" },
-//	{ 0x10DE0851, "NVIDIA MCP77/78" },
-//	{ 0x10DE0852, "NVIDIA MCP77/78" },
-//	{ 0x10DE0853, "NVIDIA MCP77/78" },
-//	{ 0x10DE0854, "NVIDIA MCP77/78" },
-//	{ 0x10DE0855, "NVIDIA MCP77/78" },
-//	{ 0x10DE0856, "NVIDIA MCP77/78" },
-//	{ 0x10DE0857, "NVIDIA MCP77/78" },
-//	{ 0x10DE0858, "NVIDIA MCP77/78" },
-//	{ 0x10DE0859, "NVIDIA MCP77/78" },
-//	{ 0x10DE085A, "NVIDIA MCP77/78" },
-//	{ 0x10DE085B, "NVIDIA MCP77/78" },
-//	{ 0x10DE085C, "NVIDIA MCP77/78" },
-//	{ 0x10DE085D, "NVIDIA MCP77/78" },
-//	{ 0x10DE085E, "NVIDIA MCP77/78" },
-//	{ 0x10DE085F, "NVIDIA MCP77/78" },
+    //	{ 0x10DE0850,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0851,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0852,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0853,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0854,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0855,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0856,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0857,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0858,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE0859,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE085A,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE085B,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE085C,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE085D,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE085E,	/*0x00000000,*/	"NVIDIA MCP77/78" },
+    //	{ 0x10DE085F,	/*0x00000000,*/	"NVIDIA MCP77/78" },
 	// 0860 - 086F
-	{ 0x10DE0860, "GeForce 9300" }, //
-	{ 0x10DE0861, "GeForce 9400" },
-	{ 0x10DE0862, "GeForce 9400M G" },
-	{ 0x10DE0863, "GeForce 9400M" },
-	{ 0x10DE0864, "GeForce 9300" },
-	{ 0x10DE0865, "GeForce 9300" }, //
-	{ 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" },
-	{ 0x10DE086E, "GeForce 9100M G" },
-	{ 0x10DE086F, "GeForce 8200M G" },
+	{ 0x10DE0860,	/*0x00000000,*/	"GeForce 9300" }, //
+	{ 0x10DE0861,	/*0x00000000,*/	"GeForce 9400" },
+	{ 0x10DE0862,	/*0x00000000,*/	"GeForce 9400M G" },
+	{ 0x10DE0863,	/*0x00000000,*/	"GeForce 9400M" },
+	{ 0x10DE0864,	/*0x00000000,*/	"GeForce 9300" },
+	{ 0x10DE0865,	/*0x00000000,*/	"GeForce 9300" }, //
+	{ 0x10DE0866,	/*0x00000000,*/	"GeForce 9400M G" },
+	{ 0x10DE0867,	/*0x00000000,*/	"GeForce 9400" },
+	{ 0x10DE0868,	/*0x00000000,*/	"nForce 760i SLI" },
+	{ 0x10DE0869,	/*0x00000000,*/	"GeForce 9400" },
+	{ 0x10DE086A,	/*0x00000000,*/	"GeForce 9400" },
+	{ 0x10DE086C,	/*0x00000000,*/	"GeForce 9300 / nForce 730i" },
+	{ 0x10DE086D,	/*0x00000000,*/	"GeForce 9200" },
+	{ 0x10DE086E,	/*0x00000000,*/	"GeForce 9100M G" },
+	{ 0x10DE086F,	/*0x00000000,*/	"GeForce 8200M G" },
 	// 0870 - 087F
-	{ 0x10DE0870, "GeForce 9400M" },
-	{ 0x10DE0871, "GeForce 9200" },
-	{ 0x10DE0872, "GeForce G102M" },
-	{ 0x10DE0873, "GeForce G102M" },
-	{ 0x10DE0874, "ION 9300M" },	
-	{ 0x10DE0876, "ION 9400M" }, //
-	{ 0x10DE087A, "GeForce 9400" },
-	{ 0x10DE087D, "ION 9400M" },
-	{ 0x10DE087E, "ION LE" },
-	{ 0x10DE087F, "ION LE" },
+	{ 0x10DE0870,	/*0x00000000,*/	"GeForce 9400M" },
+	{ 0x10DE0871,	/*0x00000000,*/	"GeForce 9200" },
+	{ 0x10DE0872,	/*0x00000000,*/	"GeForce G102M" },
+	{ 0x10DE0873,	/*0x00000000,*/	"GeForce G102M" },
+	{ 0x10DE0874,	/*0x00000000,*/	"ION 9300M" },	
+	{ 0x10DE0876,	/*0x00000000,*/	"ION 9400M" }, //
+	{ 0x10DE087A,	/*0x00000000,*/	"GeForce 9400" },
+	{ 0x10DE087D,	/*0x00000000,*/	"ION 9400M" },
+	{ 0x10DE087E,	/*0x00000000,*/	"ION LE" },
+	{ 0x10DE087F,	/*0x00000000,*/	"ION LE" },
 	// 0880 - 088F
 	// 0890 - 089F
 	// 08A0 - 08AF
-	{ 0x10DE08A0, "GeForce 320M" },
-//	{ 0x10DE08A1, "NVIDIA MCP89-MZT" },
-//	{ 0x10DE08A2, "NVIDIA MCP89-EPT" },
-	{ 0x10DE08A3, "GeForce 320M" },
-	{ 0x10DE08A4, "GeForce 320M" },
-	{ 0x10DE08A5, "GeForce 320M" },
+	{ 0x10DE08A0,	/*0x00000000,*/	"GeForce 320M" },
+    //	{ 0x10DE08A1,	/*0x00000000,*/	"NVIDIA MCP89-MZT" },
+    //	{ 0x10DE08A2,	/*0x00000000,*/	"NVIDIA MCP89-EPT" },
+	{ 0x10DE08A3,	/*0x00000000,*/	"GeForce 320M" },
+	{ 0x10DE08A4,	/*0x00000000,*/	"GeForce 320M" },
+	{ 0x10DE08A5,	/*0x00000000,*/	"GeForce 320M" },
 	// 08B0 - 08BF
-//	{ 0x10DE08B0, "Unknown" },
-	{ 0x10DE08B1, "GeForce 300M" },
-//	{ 0x10DE08B2, "NVIDIA MCP83-MJ" },
-//	{ 0x10DE08B3, "NVIDIA MCP89 MM9" },
+    //	{ 0x10DE08B0,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE08B1,	/*0x00000000,*/	"GeForce 300M" },
+    //	{ 0x10DE08B2,	/*0x00000000,*/	"NVIDIA MCP83-MJ" },
+    //	{ 0x10DE08B3,	/*0x00000000,*/	"NVIDIA MCP89 MM9" },
 	// 08C0 - 08CF
 	// 08D0 - 08DF
 	// 08E0 - 08EF
@@ -790,62 +788,62 @@
 	// 09E0 - 09EF
 	// 09F0 - 09FF
 	// 0A00 - 0A0F
-//	{ 0x10DE0A00, "NVIDIA GT212" },
+    //	{ 0x10DE0A00,	/*0x00000000,*/	"NVIDIA GT212" },
 	// 0A10 - 0A1F
-//	{ 0x10DE0A10, "NVIDIA GT212" },
+    //	{ 0x10DE0A10,	/*0x00000000,*/	"NVIDIA GT212" },
 	// 0A20 - 0A2F
-	{ 0x10DE0A20, "GeForce GT 220" }, // subsystem 10de:0a20:1043:8311
-//	{ 0x10DE0A21, "NVIDIA D10M2-20" },
-	{ 0x10DE0A22, "GeForce 315" },
-	{ 0x10DE0A23, "GeForce 210" },
-	{ 0x10DE0A26, "GeForce 405" },
-	{ 0x10DE0A27, "GeForce 405" },
-	{ 0x10DE0A28, "GeForce GT 230M" },
-	{ 0x10DE0A29, "GeForce GT 330M" },
-	{ 0x10DE0A2A, "GeForce GT 230M" },
-	{ 0x10DE0A2B, "GeForce GT 330M" },
-	{ 0x10DE0A2C, "NVS 5100M" },
-	{ 0x10DE0A2D, "GeForce GT 320M" },	
+	{ 0x10DE0A20,	/*0x00000000,*/	"GeForce GT 220" }, // subsystem 10de:0a20:1043:8311
+    //	{ 0x10DE0A21,	/*0x00000000,*/	"NVIDIA D10M2-20" },
+	{ 0x10DE0A22,	/*0x00000000,*/	"GeForce 315" },
+	{ 0x10DE0A23,	/*0x00000000,*/	"GeForce 210" },
+	{ 0x10DE0A26,	/*0x00000000,*/	"GeForce 405" },
+	{ 0x10DE0A27,	/*0x00000000,*/	"GeForce 405" },
+	{ 0x10DE0A28,	/*0x00000000,*/	"GeForce GT 230M" },
+	{ 0x10DE0A29,	/*0x00000000,*/	"GeForce GT 330M" },
+	{ 0x10DE0A2A,	/*0x00000000,*/	"GeForce GT 230M" },
+	{ 0x10DE0A2B,	/*0x00000000,*/	"GeForce GT 330M" },
+	{ 0x10DE0A2C,	/*0x00000000,*/	"NVS 5100M" },
+	{ 0x10DE0A2D,	/*0x00000000,*/	"GeForce GT 320M" },	
 	// 0A30 - 0A3F
-//	{ 0x10DE0A30, "NVIDIA GT216" },
-	{ 0x10DE0A34, "GeForce GT 240M" },
-	{ 0x10DE0A35, "GeForce GT 325M" },
-	{ 0x10DE0A38, "Quadro 400" },
-	{ 0x10DE0A3C, "Quadro FX 880M" },
-//	{ 0x10DE0A3D, "NVIDIA N10P-ES" },
-//	{ 0x10DE0A3F, "NVIDIA GT216-INT" },
+    //	{ 0x10DE0A30,	/*0x00000000,*/	"NVIDIA GT216" },
+	{ 0x10DE0A34,	/*0x00000000,*/	"GeForce GT 240M" },
+	{ 0x10DE0A35,	/*0x00000000,*/	"GeForce GT 325M" },
+	{ 0x10DE0A38,	/*0x00000000,*/	"Quadro 400" },
+	{ 0x10DE0A3C,	/*0x00000000,*/	"Quadro FX 880M" },
+    //	{ 0x10DE0A3D,	/*0x00000000,*/	"NVIDIA N10P-ES" },
+    //	{ 0x10DE0A3F,	/*0x00000000,*/	"NVIDIA GT216-INT" },
 	// 0A40 - 0A4F
 	// 0A50 - 0A5F
 	// 0A60 - 0A6F
-	{ 0x10DE0A60, "GeForce G210" },
-//	{ 0x10DE0A61, "NVIDIA NVS 2100" },
-	{ 0x10DE0A62, "GeForce 205" },
-	{ 0x10DE0A63, "GeForce 310" },
-	{ 0x10DE0A64, "ION" },
-	{ 0x10DE0A65, "GeForce 210" }, // subsystem 10de:0a65:1043:8334
-	{ 0x10DE0A66, "GeForce 310" },
-	{ 0x10DE0A67, "GeForce 315" },
-	{ 0x10DE0A68, "GeForce G105M" },
-	{ 0x10DE0A69, "GeForce G105M" },
-	{ 0x10DE0A6A, "NVS 2100M" },
-	{ 0x10DE0A6C, "NVS 3100M" }, // subsystem 10de:0a6c:1028:040b & 10de:0a6c:17aa:2142
-	{ 0x10DE0A6E, "GeForce 305M" },
-	{ 0x10DE0A6F, "ION" },	
+	{ 0x10DE0A60,	/*0x00000000,*/	"GeForce G210" },
+    //	{ 0x10DE0A61,	/*0x00000000,*/	"NVIDIA NVS 2100" },
+	{ 0x10DE0A62,	/*0x00000000,*/	"GeForce 205" },
+	{ 0x10DE0A63,	/*0x00000000,*/	"GeForce 310" },
+	{ 0x10DE0A64,	/*0x00000000,*/	"ION" },
+	{ 0x10DE0A65,	/*0x00000000,*/	"GeForce 210" }, // subsystem 10de:0a65:1043:8334
+	{ 0x10DE0A66,	/*0x00000000,*/	"GeForce 310" },
+	{ 0x10DE0A67,	/*0x00000000,*/	"GeForce 315" },
+	{ 0x10DE0A68,	/*0x00000000,*/	"GeForce G105M" },
+	{ 0x10DE0A69,	/*0x00000000,*/	"GeForce G105M" },
+	{ 0x10DE0A6A,	/*0x00000000,*/	"NVS 2100M" },
+	{ 0x10DE0A6C,	/*0x00000000,*/	"NVS 3100M" }, // subsystem 10de:0a6c:1028:040b & 10de:0a6c:17aa:2142
+	{ 0x10DE0A6E,	/*0x00000000,*/	"GeForce 305M" },
+	{ 0x10DE0A6F,	/*0x00000000,*/	"ION" },	
 	// 0A70 - 0A7F
-	{ 0x10DE0A70, "GeForce 310M" },
-	{ 0x10DE0A71, "GeForce 305M" },
-	{ 0x10DE0A72, "GeForce 310M" },
-	{ 0x10DE0A73, "GeForce 305M" },
-	{ 0x10DE0A74, "GeForce G210M" },
-	{ 0x10DE0A75, "GeForce G310M" },
-	{ 0x10DE0A76, "ION" },
-	{ 0x10DE0A78, "Quadro FX 380 LP" },
-//	{ 0x10DE0A79, "Unknown" },
-	{ 0x10DE0A7A, "GeForce 315M" },
-	{ 0x10DE0A7C, "Quadro FX 380M" },
-//	{ 0x10DE0A7D, "NVIDIA GT218-ES" },
-//	{ 0x10DE0A7E, "NVIDIA GT218-INT-S" },
-//	{ 0x10DE0A7F, "NVIDIA GT218-INT-B" },
+	{ 0x10DE0A70,	/*0x00000000,*/	"GeForce 310M" },
+	{ 0x10DE0A71,	/*0x00000000,*/	"GeForce 305M" },
+	{ 0x10DE0A72,	/*0x00000000,*/	"GeForce 310M" },
+	{ 0x10DE0A73,	/*0x00000000,*/	"GeForce 305M" },
+	{ 0x10DE0A74,	/*0x00000000,*/	"GeForce G210M" },
+	{ 0x10DE0A75,	/*0x00000000,*/	"GeForce G310M" },
+	{ 0x10DE0A76,	/*0x00000000,*/	"ION" },
+	{ 0x10DE0A78,	/*0x00000000,*/	"Quadro FX 380 LP" },
+    //	{ 0x10DE0A79,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE0A7A,	/*0x00000000,*/	"GeForce 315M" },
+	{ 0x10DE0A7C,	/*0x00000000,*/	"Quadro FX 380M" },
+    //	{ 0x10DE0A7D,	/*0x00000000,*/	"NVIDIA GT218-ES" },
+    //	{ 0x10DE0A7E,	/*0x00000000,*/	"NVIDIA GT218-INT-S" },
+    //	{ 0x10DE0A7F,	/*0x00000000,*/	"NVIDIA GT218-INT-B" },
 	// 0A80 - 0A8F
 	// 0A90 - 0A9F
 	// 0AA0 - 0AAF
@@ -869,8 +867,8 @@
 	// 0BC0 - 0BCF
 	// 0BD0 - 0BDF
 	// 0BE0 - 0BEF
-//	{ 0x10DE0BE4, "nVidia High Definition Audio Controller" },
-//	{ 0x10DE0BE9, "nVidia High Definition Audio Controller" },
+    //	{ 0x10DE0BE4,	/*0x00000000,*/	"nVidia High Definition Audio Controller" },
+    //	{ 0x10DE0BE9,	/*0x00000000,*/	"nVidia High Definition Audio Controller" },
 	// 0BF0 - 0BFF
 	// 0C00 - 0C0F
 	// 0C10 - 0C1F
@@ -883,22 +881,22 @@
 	// 0C80 - 0C8F
 	// 0C90 - 0C9F
 	// 0CA0 - 0CAF
-	{ 0x10DE0CA0, "GeForce GT 330 " },
-	{ 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 GT 220" },
-//	{ 0x10DE0CAD, "NVIDIA N10E-ES" },
-//	{ 0x10DE0CAE, "NVIDIA GT215-INT" },
-	{ 0x10DE0CAF, "GeForce GT 335M" },
+	{ 0x10DE0CA0,	/*0x00000000,*/	"GeForce GT 330 " },
+	{ 0x10DE0CA2,	/*0x00000000,*/	"GeForce GT 320" },
+	{ 0x10DE0CA3,	/*0x00000000,*/	"GeForce GT 240" },
+	{ 0x10DE0CA4,	/*0x00000000,*/	"GeForce GT 340" },
+	{ 0x10DE0CA5,	/*0x00000000,*/	"GeForce GT 220" },
+	{ 0x10DE0CA7,	/*0x00000000,*/	"GeForce GT 330" },
+	{ 0x10DE0CA8,	/*0x00000000,*/	"GeForce GTS 260M" },
+	{ 0x10DE0CA9,	/*0x00000000,*/	"GeForce GTS 250M" },
+	{ 0x10DE0CAC,	/*0x00000000,*/	"GeForce GT 220" },
+    //	{ 0x10DE0CAD,	/*0x00000000,*/	"NVIDIA N10E-ES" },
+    //	{ 0x10DE0CAE,	/*0x00000000,*/	"NVIDIA GT215-INT" },
+	{ 0x10DE0CAF,	/*0x00000000,*/	"GeForce GT 335M" },
 	// 0CB0 - 0CBF	
-	{ 0x10DE0CB0, "GeForce GTS 350M" },
-	{ 0x10DE0CB1, "GeForce GTS 360M" },
-	{ 0x10DE0CBC, "Quadro FX 1800M" },
+	{ 0x10DE0CB0,	/*0x00000000,*/	"GeForce GTS 350M" },
+	{ 0x10DE0CB1,	/*0x00000000,*/	"GeForce GTS 360M" },
+	{ 0x10DE0CBC,	/*0x00000000,*/	"Quadro FX 1800M" },
 	// 0CC0 - 0CCF
 	// 0CD0 - 0CDF
 	// 0CE0 - 0CEF
@@ -916,73 +914,73 @@
 	// 0DA0 - 0DAF
 	// 0DB0 - 0DBF
 	// 0DC0 - 0DCF
-	{ 0x10DE0DC0, "GeForce GT 440" },
-	{ 0x10DE0DC1, "D12-P1-35" },
-	{ 0x10DE0DC2, "D12-P1-35" },
-	{ 0x10DE0DC4, "GeForce GTS 450" },
-	{ 0x10DE0DC5, "GeForce GTS 450" },
-	{ 0x10DE0DC6, "GeForce GTS 450" },
-	{ 0x10DE0DCA, "GF10x" },
-//	{ 0x10DE0DCC, "Unknown" },
-	{ 0x10DE0DCD, "GeForce GT 555M" },
-	{ 0x10DE0DCE, "GeForce GT 555M" },
-//	{ 0x10DE0DCF, "Unknown" },
+	{ 0x10DE0DC0,	/*0x00000000,*/	"GeForce GT 440" },
+	{ 0x10DE0DC1,	/*0x00000000,*/	"D12-P1-35" },
+	{ 0x10DE0DC2,	/*0x00000000,*/	"D12-P1-35" },
+	{ 0x10DE0DC4,	/*0x00000000,*/	"GeForce GTS 450" },
+	{ 0x10DE0DC5,	/*0x00000000,*/	"GeForce GTS 450" },
+	{ 0x10DE0DC6,	/*0x00000000,*/	"GeForce GTS 450" },
+	{ 0x10DE0DCA,	/*0x00000000,*/	"GF10x" },
+    //	{ 0x10DE0DCC,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE0DCD,	/*0x00000000,*/	"GeForce GT 555M" },
+	{ 0x10DE0DCE,	/*0x00000000,*/	"GeForce GT 555M" },
+    //	{ 0x10DE0DCF,	/*0x00000000,*/	"Unknown" },
 	// 0DD0 - 0DDF	
-//	{ 0x10DE0DD0, "Unknown" },
-	{ 0x10DE0DD1, "GeForce GTX 460M" }, // subsystem 10de:0dd1:1558:8687
-	{ 0x10DE0DD2, "GeForce GT 445M" },
-	{ 0x10DE0DD3, "GeForce GT 435M" },
-	{ 0x10DE0DD6, "GeForce GT 550M" },
-	{ 0x10DE0DD8, "Quadro 2000" },
-	{ 0x10DE0DDA, "Quadro 2000M" },
-	{ 0x10DE0DDE, "GF106-ES" },
-	{ 0x10DE0DDF, "GF106-INT" },
+    //	{ 0x10DE0DD0,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE0DD1,	/*0x00000000,*/	"GeForce GTX 460M" }, // subsystem 10de:0dd1:1558:8687
+	{ 0x10DE0DD2,	/*0x00000000,*/	"GeForce GT 445M" },
+	{ 0x10DE0DD3,	/*0x00000000,*/	"GeForce GT 435M" },
+	{ 0x10DE0DD6,	/*0x00000000,*/	"GeForce GT 550M" },
+	{ 0x10DE0DD8,	/*0x00000000,*/	"Quadro 2000" },
+	{ 0x10DE0DDA,	/*0x00000000,*/	"Quadro 2000M" },
+	{ 0x10DE0DDE,	/*0x00000000,*/	"GF106-ES" },
+	{ 0x10DE0DDF,	/*0x00000000,*/	"GF106-INT" },
 	// 0DE0 - 0DEF
-	{ 0x10DE0DE0, "GeForce GT 440" },
-	{ 0x10DE0DE1, "GeForce GT 430" }, // subsystem 10de:0de1:3842:1430
-	{ 0x10DE0DE2, "GeForce GT 420" },
-	{ 0x10DE0DE4, "GeForce GT 520" },
-	{ 0x10DE0DE5, "GeForce GT 530" },
-	{ 0x10DE0DE8, "GeForce GT 620M" },
-	{ 0x10DE0DE9, "GeForce GT 630M" },
-	{ 0x10DE0DEA, "GeForce GT 610M" },
-	{ 0x10DE0DEB, "GeForce GT 555M" },
-	{ 0x10DE0DEC, "GeForce GT 525M" },
-	{ 0x10DE0DED, "GeForce GT 520M" },
-	{ 0x10DE0DEE, "GeForce GT 415M" },
-//	{ 0x10DE0DEF, "Unknown" },
+	{ 0x10DE0DE0,	/*0x00000000,*/	"GeForce GT 440" },
+	{ 0x10DE0DE1,	/*0x00000000,*/	"GeForce GT 430" }, // subsystem 10de:0de1:3842:1430
+	{ 0x10DE0DE2,	/*0x00000000,*/	"GeForce GT 420" },
+	{ 0x10DE0DE4,	/*0x00000000,*/	"GeForce GT 520" },
+	{ 0x10DE0DE5,	/*0x00000000,*/	"GeForce GT 530" },
+	{ 0x10DE0DE8,	/*0x00000000,*/	"GeForce GT 620M" },
+	{ 0x10DE0DE9,	/*0x00000000,*/	"GeForce GT 630M" },
+	{ 0x10DE0DEA,	/*0x00000000,*/	"GeForce GT 610M" },
+	{ 0x10DE0DEB,	/*0x00000000,*/	"GeForce GT 555M" },
+	{ 0x10DE0DEC,	/*0x00000000,*/	"GeForce GT 525M" },
+	{ 0x10DE0DED,	/*0x00000000,*/	"GeForce GT 520M" },
+	{ 0x10DE0DEE,	/*0x00000000,*/	"GeForce GT 415M" },
+    //	{ 0x10DE0DEF,	/*0x00000000,*/	"Unknown" },
 	// 0DF0 - 0DFF	
-	{ 0x10DE0DF0, "GeForce GT 425M" },
-	{ 0x10DE0DF1, "GeForce GT 420M" },
-	{ 0x10DE0DF2, "GeForce GT 435M" },
-	{ 0x10DE0DF3, "GeForce GT 420M" },
-	{ 0x10DE0DF4, "GeForce GT 540M" },
-	{ 0x10DE0DF5, "GeForce GT 525M" },
-	{ 0x10DE0DF6, "GeForce GT 550M" },
-	{ 0x10DE0DF7, "GeForce GT 520M" },
-	{ 0x10DE0DF8, "Quadro 600" },
-//	{ 0x10DE0DF9, "Unknown" },
-	{ 0x10DE0DFA, "Quadro 1000M" },
-	{ 0x10DE0DFC, "NVS 5200M" },
-	{ 0x10DE0DFE, "GF108 ES" },
-	{ 0x10DE0DFF, "GF108 INT" },
+	{ 0x10DE0DF0,	/*0x00000000,*/	"GeForce GT 425M" },
+	{ 0x10DE0DF1,	/*0x00000000,*/	"GeForce GT 420M" },
+	{ 0x10DE0DF2,	/*0x00000000,*/	"GeForce GT 435M" },
+	{ 0x10DE0DF3,	/*0x00000000,*/	"GeForce GT 420M" },
+	{ 0x10DE0DF4,	/*0x00000000,*/	"GeForce GT 540M" },
+	{ 0x10DE0DF5,	/*0x00000000,*/	"GeForce GT 525M" },
+	{ 0x10DE0DF6,	/*0x00000000,*/	"GeForce GT 550M" },
+	{ 0x10DE0DF7,	/*0x00000000,*/	"GeForce GT 520M" },
+	{ 0x10DE0DF8,	/*0x00000000,*/	"Quadro 600" },
+    //	{ 0x10DE0DF9,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE0DFA,	/*0x00000000,*/	"Quadro 1000M" },
+	{ 0x10DE0DFC,	/*0x00000000,*/	"NVS 5200M" },
+	{ 0x10DE0DFE,	/*0x00000000,*/	"GF108 ES" },
+	{ 0x10DE0DFF,	/*0x00000000,*/	"GF108 INT" },
 	// 0E00 - 0E0F
 	// 0E10 - 0E1F
 	// 0E20 - 0E2F
-	{ 0x10DE0E21, "D12U-25" },
-	{ 0x10DE0E22, "GeForce GTX 460" }, // subsystem 10de:0e22:1462:2322
-	{ 0x10DE0E23, "GeForce GTX 460 SE" },
-	{ 0x10DE0E24, "GeForce GTX 460" },
-	{ 0x10DE0E25, "D12U-50" },
+	{ 0x10DE0E21,	/*0x00000000,*/	"D12U-25" },
+	{ 0x10DE0E22,	/*0x00000000,*/	"GeForce GTX 460" }, // subsystem 10de:0e22:1462:2322
+	{ 0x10DE0E23,	/*0x00000000,*/	"GeForce GTX 460 SE" },
+	{ 0x10DE0E24,	/*0x00000000,*/	"GeForce GTX 460" },
+	{ 0x10DE0E25,	/*0x00000000,*/	"D12U-50" },
 	// 0E30 - 0E3F
-	{ 0x10DE0E30, "GeForce GTX 470M" },
-	{ 0x10DE0E31, "GeForce GTX 485M" },
-//	{ 0x10DE0E32, "Unknown" },
-	{ 0x10DE0E38, "GF104GL" },
-	{ 0x10DE0E3A, "Quadro 3000M" },
-	{ 0x10DE0E3B, "Quadro 4000M" },
-	{ 0x10DE0E3E, "GF104-ES" },
-	{ 0x10DE0E3F, "GF104-INT" },
+	{ 0x10DE0E30,	/*0x00000000,*/	"GeForce GTX 470M" },
+	{ 0x10DE0E31,	/*0x00000000,*/	"GeForce GTX 485M" },
+    //	{ 0x10DE0E32,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE0E38,	/*0x00000000,*/	"GF104GL" },
+	{ 0x10DE0E3A,	/*0x00000000,*/	"Quadro 3000M" },
+	{ 0x10DE0E3B,	/*0x00000000,*/	"Quadro 4000M" },
+	{ 0x10DE0E3E,	/*0x00000000,*/	"GF104-ES" },
+	{ 0x10DE0E3F,	/*0x00000000,*/	"GF104-INT" },
 	// 0E40 - 0E4F
 	// 0E50 - 0E5F
 	// 0E60 - 0E6F
@@ -1009,9 +1007,9 @@
 	// 0FB0 - 0FBF
 	// 0FC0 - 0FCF
 	// 0FD0 - 0FDF
-	{ 0x10DE0FD1, "GeForce GT 650M" },
-	{ 0x10DE0FD2, "GeForce GT 640M" },
-	{ 0x10DE0FD4, "GeForce GTX 660M" },
+	{ 0x10DE0FD1,	/*0x00000000,*/	"GeForce GT 650M" },
+	{ 0x10DE0FD2,	/*0x00000000,*/	"GeForce GT 640M" },
+	{ 0x10DE0FD4,	/*0x00000000,*/	"GeForce GTX 660M" },
 	// 0FE0 - 0FEF
 	// 0FF0 - 0FFF
 	// 1000 - 100F
@@ -1019,52 +1017,52 @@
 	// 1020 - 102F
 	// 1030 - 103F
 	// 1040 - 104F
-	{ 0x10DE1040, "GeForce GT 520" },
-	{ 0x10DE1042, "GeForce 510" },
-	{ 0x10DE1049, "GeForce GT 620" },
+	{ 0x10DE1040,	/*0x00000000,*/	"GeForce GT 520" },
+	{ 0x10DE1042,	/*0x00000000,*/	"GeForce 510" },
+	{ 0x10DE1049,	/*0x00000000,*/	"GeForce GT 620" },
 	// 1050 - 105F
-	{ 0x10DE1050, "GeForce GT 520M" },
-	{ 0x10DE1051, "GeForce GT 520MX" },
-//	{ 0x10DE1052, "Unknown" },
-	{ 0x10DE1054, "GeForce GT 410M" },
-	{ 0x10DE1055, "GeForce 410M" },
-	{ 0x10DE1056, "Quadro NVS 4200M" },
-	{ 0x10DE1057, "Quadro NVS 4200M" },
-	{ 0x10DE1058, "GeForce 610M" },
-//	{ 0x10DE1059, "AUDIO" },
-	{ 0x10DE105A, "GeForce 610M" },
+	{ 0x10DE1050,	/*0x00000000,*/	"GeForce GT 520M" },
+	{ 0x10DE1051,	/*0x00000000,*/	"GeForce GT 520MX" },
+    //	{ 0x10DE1052,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE1054,	/*0x00000000,*/	"GeForce GT 410M" },
+	{ 0x10DE1055,	/*0x00000000,*/	"GeForce 410M" },
+	{ 0x10DE1056,	/*0x00000000,*/	"Quadro NVS 4200M" },
+	{ 0x10DE1057,	/*0x00000000,*/	"Quadro NVS 4200M" },
+	{ 0x10DE1058,	/*0x00000000,*/	"GeForce 610M" },
+    //	{ 0x10DE1059,	/*0x00000000,*/	"AUDIO" },
+	{ 0x10DE105A,	/*0x00000000,*/	"GeForce 610M" },
 	// 1060 - 106F
 	// 1070 - 107F
-//	{ 0x10DE107D, "Unknown" },
-//	{ 0x10DE107E, "Unknown" },
-	{ 0x10DE107F, "NVIDIA GF119-ES" },
+    //	{ 0x10DE107D,	/*0x00000000,*/	"Unknown" },
+    //	{ 0x10DE107E,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE107F,	/*0x00000000,*/	"NVIDIA GF119-ES" },
 	// 1080 - 108F
-	{ 0x10DE1080, "GeForce GTX 580" },
-	{ 0x10DE1081, "GeForce GTX 570" }, // subsystem 10de:1081:10de:087e
-	{ 0x10DE1082, "GeForce GTX 560 Ti" },
-	{ 0x10DE1083, "D13U" },
-	{ 0x10DE1084, "GeForce GTX 560" },
-	{ 0x10DE1086, "GeForce GTX 570" },
-	{ 0x10DE1087, "GeForce GTX 560 Ti-448" },
-	{ 0x10DE1088, "GeForce GTX 590" },
-	{ 0x10DE1089, "GeForce GTX 580" },
-	{ 0x10DE108B, "GeForce GTX 590" },
+	{ 0x10DE1080,	/*0x00000000,*/	"GeForce GTX 580" },
+	{ 0x10DE1081,	/*0x00000000,*/	"GeForce GTX 570" }, // subsystem 10de:1081:10de:087e
+	{ 0x10DE1082,	/*0x00000000,*/	"GeForce GTX 560 Ti" },
+	{ 0x10DE1083,	/*0x00000000,*/	"D13U" },
+	{ 0x10DE1084,	/*0x00000000,*/	"GeForce GTX 560" },
+	{ 0x10DE1086,	/*0x00000000,*/	"GeForce GTX 570" },
+	{ 0x10DE1087,	/*0x00000000,*/	"GeForce GTX 560 Ti-448" },
+	{ 0x10DE1088,	/*0x00000000,*/	"GeForce GTX 590" },
+	{ 0x10DE1089,	/*0x00000000,*/	"GeForce GTX 580" },
+	{ 0x10DE108B,	/*0x00000000,*/	"GeForce GTX 590" },
 	// 1090 - 109F
-	{ 0x10DE1091, "Tesla M2090" },
-	{ 0x10DE1094, "Tesla M2075 Dual-Slot Computing Processor Module" },
-	{ 0x10DE1096, "Tesla C2075" },
-	{ 0x10DE1098, "D13U" },
-	{ 0x10DE109A, "Quadro 5010M" },
-	{ 0x10DE109B, "Quadro 7000" },
+	{ 0x10DE1091,	/*0x00000000,*/	"Tesla M2090" },
+	{ 0x10DE1094,	/*0x00000000,*/	"Tesla M2075 Dual-Slot Computing Processor Module" },
+	{ 0x10DE1096,	/*0x00000000,*/	"Tesla C2075" },
+	{ 0x10DE1098,	/*0x00000000,*/	"D13U" },
+	{ 0x10DE109A,	/*0x00000000,*/	"Quadro 5010M" },
+	{ 0x10DE109B,	/*0x00000000,*/	"Quadro 7000" },
 	// 10A0 - 10AF
 	// 10B0 - 10BF
 	// 10C0 - 10CF
-	{ 0x10DE10C0, "GeForce 9300 GS" },
-	{ 0x10DE10C3, "GeForce 8400 GS" },
-//	{ 0x10DE10C4, "NVIDIA ION" },
-	{ 0x10DE10C5, "GeForce 405" },
+	{ 0x10DE10C0,	/*0x00000000,*/	"GeForce 9300 GS" },
+	{ 0x10DE10C3,	/*0x00000000,*/	"GeForce 8400 GS" },
+    //	{ 0x10DE10C4,	/*0x00000000,*/	"NVIDIA ION" },
+	{ 0x10DE10C5,	/*0x00000000,*/	"GeForce 405" },
 	// 10D0 - 10DF
-	{ 0x10DE10D8, "NVS 300" },
+	{ 0x10DE10D8,	/*0x00000000,*/	"NVS 300" },
 	// 10E0 - 10EF
 	// 10F0 - 10FF
 	// 1100 - 110F
@@ -1076,7 +1074,7 @@
 	// 1160 - 116F
 	// 1170 - 117F
 	// 1180 - 118F
-	{ 0x10DE1180, "GeForce GTX 680" },
+	{ 0x10DE1180,	/*0x00000000,*/	"GeForce GTX 680" },
 	// 1190 - 119F
 	// 11A0 - 11AF
 	// 11B0 - 11BF
@@ -1085,26 +1083,26 @@
 	// 11E0 - 11EF
 	// 11F0 - 11FF
 	// 1200 - 120F
-	{ 0x10DE1200, "GeForce GTX 560 Ti" },
-	{ 0x10DE1201, "GeForce GTX 560" },
-	{ 0x10DE1203, "GeForce GTX 460 SE v2" },
-	{ 0x10DE1205, "GeForce GTX 460 v2" },
-	{ 0x10DE1208, "GeForce GTX 560 SE" },
-	{ 0x10DE1210, "GeForce GTX 570M" },
-	{ 0x10DE1211, "GeForce GTX 580M" },
-	{ 0x10DE1212, "GeForce GTX 675M" },
-	{ 0x10DE1213, "GeForce GTX 670M" },
-	{ 0x10DE1240, "GeForce GT 620M" },
-	{ 0x10DE1241, "GeForce GT 545" },
-	{ 0x10DE1243, "GeForce GT 545" },
-	{ 0x10DE1244, "GeForce GTX 550 Ti" },
-	{ 0x10DE1245, "GeForce GTS 450" },
-	{ 0x10DE1246, "GeForce GTX 550M" },
-	{ 0x10DE1247, "GeForce GT 635M" }, // Subsystem Id: 1043 212C Asus GeForce GT 635M
-	{ 0x10DE1248, "GeForce GTX 555M" },
-	{ 0x10DE124D, "GeForce GTX 555M" },
-//	{ 0x10DE1250, "Unknown" },
-	{ 0x10DE1251, "GeForce GTX 560M" },
+	{ 0x10DE1200,	/*0x00000000,*/	"GeForce GTX 560 Ti" },
+	{ 0x10DE1201,	/*0x00000000,*/	"GeForce GTX 560" },
+	{ 0x10DE1203,	/*0x00000000,*/	"GeForce GTX 460 SE v2" },
+	{ 0x10DE1205,	/*0x00000000,*/	"GeForce GTX 460 v2" },
+	{ 0x10DE1208,	/*0x00000000,*/	"GeForce GTX 560 SE" },
+	{ 0x10DE1210,	/*0x00000000,*/	"GeForce GTX 570M" },
+	{ 0x10DE1211,	/*0x00000000,*/	"GeForce GTX 580M" },
+	{ 0x10DE1212,	/*0x00000000,*/	"GeForce GTX 675M" },
+	{ 0x10DE1213,	/*0x00000000,*/	"GeForce GTX 670M" },
+	{ 0x10DE1240,	/*0x00000000,*/	"GeForce GT 620M" },
+	{ 0x10DE1241,	/*0x00000000,*/	"GeForce GT 545" },
+	{ 0x10DE1243,	/*0x00000000,*/	"GeForce GT 545" },
+	{ 0x10DE1244,	/*0x00000000,*/	"GeForce GTX 550 Ti" },
+	{ 0x10DE1245,	/*0x00000000,*/	"GeForce GTS 450" },
+	{ 0x10DE1246,	/*0x00000000,*/	"GeForce GTX 550M" },
+	{ 0x10DE1247,	/*0x00000000,*/	"GeForce GT 635M" }, // Subsystem Id: 1043 212C Asus GeForce GT 635M
+	{ 0x10DE1248,	/*0x00000000,*/	"GeForce GTX 555M" },
+	{ 0x10DE124D,	/*0x00000000,*/	"GeForce GTX 555M" },
+    //	{ 0x10DE1250,	/*0x00000000,*/	"Unknown" },
+	{ 0x10DE1251,	/*0x00000000,*/	"GeForce GTX 560M" },
 	// 1260 - 126F
 	// 1270 - 127F
 	// 1280 - 128F
@@ -1115,9 +1113,9 @@
 	// 12D0 - 12DF
 	// 12E0 - 12EF
 	// 12F0 - 12FF
-//	{ 0x10DE8001, "NVIDIA HDMI Audio" },
-//	{ 0x10DE8067, "NVIDIA HDMI Audio" },
-//	{ 0x10DE8073, "NVIDIA HDMI Audio" },
+    //	{ 0x10DE8001,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE8067,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
+    //	{ 0x10DE8073,	/*0x00000000,*/	"NVIDIA HDMI Audio" },
 };
 
 static uint16_t swap16(uint16_t x)
@@ -1507,7 +1505,7 @@
 		vram_size *= REG32(NVC0_MEM_CTRLR_COUNT);
 	}
 	
-	// Workaround for 9600M GT, GT 210/420/430/440/525M & 540M
+	// Workaround for 9600M GT, GT 210/420/430/440/525M/540M & GTX 560M
 	switch (nvda_dev->device_id)
 	{
 		case 0x0647: vram_size = 512*1024*1024; break;	// 9600M GT 0647
@@ -1519,6 +1517,7 @@
 		case 0x0DEC: vram_size = 1024*1024*1024; break; // GT 525M 0DEC
 		case 0x0DF4: vram_size = 1024*1024*1024; break; // GT 540M
 		case 0x0DF5: vram_size = 1024*1024*1024; break; // GT 525M 0DF5
+		case 0x1251: vram_size = 1536*1024*1024; break; // GTX 560M
 		default: break;
 	}
 	
Index: branches/ErmaC/Trunk/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1924)
+++ branches/ErmaC/Trunk/i386/libsaio/ati.c	(revision 1925)
@@ -27,7 +27,16 @@
 
 typedef enum {
 	CHIP_FAMILY_UNKNOW,
-	/* IGP */
+	/* Old */
+	CHIP_FAMILY_R420,
+	CHIP_FAMILY_RV410,
+	CHIP_FAMILY_RV515,
+	CHIP_FAMILY_R520,
+	CHIP_FAMILY_RV530,
+	CHIP_FAMILY_RV560,
+	CHIP_FAMILY_RV570,
+	CHIP_FAMILY_R580,
+  	/* IGP */
 	CHIP_FAMILY_RS600,
 	CHIP_FAMILY_RS690,
 	CHIP_FAMILY_RS740,
@@ -74,6 +83,14 @@
 
 static const char *chip_family_name[] = {
 	"UNKNOW",
+	"R420",
+	"RV410",
+	"RV515",
+	"R520",
+	"RV530",
+	"RV560",
+	"RV570",
+	"R580",
 	/* IGP */
 	"RS600",
 	"RS690",
@@ -111,7 +128,7 @@
 	"Turks",
 	/* Southern Islands */
 	"Tahiti",
-//	"Pitcairn",
+	"Pitcairn",
 //	"CapeVerde",
 //	"Thames",
 //	"Lombok",
@@ -126,6 +143,7 @@
 
 static card_config_t card_configs[] = {
 	{NULL,			0},
+	{"Wormy",		2},
 	{"Alopias",		2},
 	{"Alouatta",		4},
 	{"Baboon",		3},
@@ -175,6 +193,7 @@
 
 typedef enum {
 	kNull,
+	kWormy,
 	kAlopias,
 	kAlouatta,
 	kBaboon,
@@ -220,6 +239,7 @@
 	kMangabey,
 	kMuskgrass,
 	kJuncus,
+//	kOsmunda,
 	kCfgEnd
 } config_name_t;
 
@@ -238,159 +258,160 @@
 	// Layout is device_id, subsys_id (subsystem id plus vendor id), chip_family_name, display name, frame buffer
 	// Cards are grouped by device id and vendor id then sorted by subsystem id to make it easier to add new cards
 	//  
-//	{ 0x9400,	0x021E1043, CHIP_FAMILY_R600,		"ATI Radeon HD ????",               kNull		},
-	{ 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		},
-	{ 0x9440,	0x114A174B, CHIP_FAMILY_RV770,		"Sapphire Radeon HD4870 Vapor-X",		kCardinal	},
-	{ 0x9440,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
-	{ 0x9440,	0x24411682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
-	{ 0x9440,	0x24441682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
-	{ 0x9440,	0x24451682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",				kMotmot		},
+//	{ 0x9400,	0x021E1043, CHIP_FAMILY_R600,		"ATI Radeon HD ????",                   kNull		},
+	{ 0x9400,	0x25521002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",                kNull		},
+	{ 0x9400,	0x30001002, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 PRO",               kNull		},
 
-	{ 0x9441,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870 X2",			kMotmot		},
+	{ 0x9440,	0x0851174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",                   kMotmot		},
+	{ 0x9440,	0x114A174B, CHIP_FAMILY_RV770,		"Sapphire Radeon HD4870 Vapor-X",       kCardinal	},
+	{ 0x9440,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",                   kMotmot		},
+	{ 0x9440,	0x24411682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",                   kMotmot		},
+	{ 0x9440,	0x24441682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",                   kMotmot		},
+	{ 0x9440,	0x24451682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870",                   kMotmot		},
 
-	{ 0x9442,	0x080110B0, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x9442,	0x24701682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x9442,	0x24711682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x9442,	0xE104174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
+	{ 0x9441,	0x24401682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870 X2",                kMotmot		},
 
-	{ 0x944A,	0x30001043, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x30001458, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x30001462, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x30001545, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x30001682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x3000174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
-	{ 0x944A,	0x300017AF, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",				kMotmot		},
+	{ 0x9442,	0x080110B0, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x9442,	0x24701682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x9442,	0x24711682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x9442,	0xE104174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
 
-	{ 0x944C,	0x24801682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4830",				kMotmot		},
-	{ 0x944C,	0x24811682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4830",				kMotmot		},
+	{ 0x944A,	0x30001043, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x30001458, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x30001462, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x30001545, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x30001682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x3000174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
+	{ 0x944A,	0x300017AF, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850",                   kMotmot		},
 
-	{ 0x944E,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4730",				kMotmot		},
-	{ 0x944E,	0x30101787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810",				kMotmot		},
-	{ 0x944E,	0x31001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4820",				kMotmot		},
-	{ 0x944E,	0x3260174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810",				kMotmot		},
-	{ 0x944E,	0x3261174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810",				kMotmot		},
+	{ 0x944C,	0x24801682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4830",                   kMotmot		},
+	{ 0x944C,	0x24811682, CHIP_FAMILY_RV770,		"ATI Radeon HD 4830",                   kMotmot		},
 
-	{ 0x9480,	0x01211025, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kGliff		},
-	{ 0x9480,	0x3628103C, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kGliff		},
-	{ 0x9480,	0x9035104D, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kGliff		},
-	{ 0x9480,	0xFD001179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kNull		},
-	{ 0x9480,	0xFDD01179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kNull		},
-	{ 0x9480,	0xFD121179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kNull		},
-	{ 0x9480,	0xFD501179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",				kNull		},
-	{ 0x9480,	0xFF001179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",				kNull		},
-	{ 0x9480,	0xFF151179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",				kNull		},
-	{ 0x9480,	0xFF221179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",				kNull		},
-	{ 0x9480,	0xFF501179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",				kNull		},
-	{ 0x9480,	0xFF801179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",				kNull		},
-	{ 0x9480,	0xFF821179, CHIP_FAMILY_RV730,		"ATI Radeon HD 5165M",				kNull		},
-	{ 0x9480,	0xFFA01179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",				kNull		},
-	{ 0x9480,	0xFFA21179, CHIP_FAMILY_RV730,		"ATI Radeon HD 5165M",				kNull		},
+	{ 0x944E,	0x30001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4730",                   kMotmot		},
+	{ 0x944E,	0x30101787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810",                   kMotmot		},
+	{ 0x944E,	0x31001787, CHIP_FAMILY_RV770,		"ATI Radeon HD 4820",                   kMotmot		},
+	{ 0x944E,	0x3260174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810",                   kMotmot		},
+	{ 0x944E,	0x3261174B, CHIP_FAMILY_RV770,		"ATI Radeon HD 4810",                   kMotmot		},
 
-	{ 0x9490,	0x20031787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4670",				kFlicker	},
-	{ 0x9490,	0x30501787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",				kNull		},
-	{ 0x9490,	0x300017AF, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",				kNull		},
-	{ 0x9490,	0x4710174B, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",				kNull		},
+	{ 0x9480,	0x01211025, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kGliff		},
+	{ 0x9480,	0x3628103C, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kGliff		},
+	{ 0x9480,	0x9035104D, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kGliff		},
+	{ 0x9480,	0xFD001179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kNull		},
+	{ 0x9480,	0xFDD01179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kNull		},
+	{ 0x9480,	0xFD121179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kNull		},
+	{ 0x9480,	0xFD501179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650M",                  kNull		},
+	{ 0x9480,	0xFF001179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",                  kNull		},
+	{ 0x9480,	0xFF151179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",                  kNull		},
+	{ 0x9480,	0xFF221179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",                  kNull		},
+	{ 0x9480,	0xFF501179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",                  kNull		},
+	{ 0x9480,	0xFF801179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",                  kNull		},
+	{ 0x9480,	0xFF821179, CHIP_FAMILY_RV730,		"ATI Radeon HD 5165M",                  kNull		},
+	{ 0x9480,	0xFFA01179, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600M",                  kNull		},
+	{ 0x9480,	0xFFA21179, CHIP_FAMILY_RV730,		"ATI Radeon HD 5165M",                  kNull		},
 
-//	{ 0x9498,	0x10001043, CHIP_FAMILY_RV730,		"ATI Radeon HD ????",				kNull		},
-	{ 0x9498,	0x21CF1458, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600",				kNull		},
-	{ 0x9498,	0x24511682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",				kNull		},
-	{ 0x9498,	0x24521682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",				kNull		},
-	{ 0x9498,	0x24541682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",				kNull		},
-	{ 0x9498,	0x29331682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4670",				kNull		},
-	{ 0x9498,	0x29341682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4670",				kNull		},
-	{ 0x9498,	0x30501787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4700",				kNull		},
-	{ 0x9498,	0x31001787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4720",				kNull		},
+	{ 0x9490,	0x20031787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4670",                   kFlicker	},
+	{ 0x9490,	0x30501787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",                   kNull		},
+	{ 0x9490,	0x300017AF, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",                   kNull		},
+	{ 0x9490,	0x4710174B, CHIP_FAMILY_RV730,		"ATI Radeon HD 4710",                   kNull		},
 
-	{ 0x94B3,	0x0D001002, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
-	{ 0x94B3,	0x1170174B, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
-	{ 0x94B3,	0x29001682, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
+//	{ 0x9498,	0x10001043, CHIP_FAMILY_RV730,		"ATI Radeon HD ????",                   kNull		},
+	{ 0x9498,	0x21CF1458, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600",                   kNull		},
+	{ 0x9498,	0x24511682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",                   kNull		},
+	{ 0x9498,	0x24521682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",                   kNull		},
+	{ 0x9498,	0x24541682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650",                   kNull		},
+	{ 0x9498,	0x29331682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4670",                   kNull		},
+	{ 0x9498,	0x29341682, CHIP_FAMILY_RV730,		"ATI Radeon HD 4670",                   kNull		},
+	{ 0x9498,	0x30501787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4700",                   kNull		},
+	{ 0x9498,	0x31001787, CHIP_FAMILY_RV730,		"ATI Radeon HD 4720",                   kNull		},
 
-	{ 0x94C1,	0x0D021002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",			kNull		},
-	{ 0x94C1,	0x10021002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Pro",			kNull		},
-	{ 0x94C1,	0x0D021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",			kNull		},
-	{ 0x94C1,	0x21741458, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",			kNull		},
-	{ 0x94C1,	0x10331462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",			kNull		},
-	{ 0x94C1,	0x10401462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",			kNull		},
-	{ 0x94C1,	0x11101462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",			kNull		},
+	{ 0x94B3,	0x0D001002, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",                   kFlicker	},
+	{ 0x94B3,	0x1170174B, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",                   kFlicker	},
+	{ 0x94B3,	0x29001682, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",                   kFlicker	},
 
-	{ 0x94C3,	0x03421002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
+	{ 0x94C1,	0x0D021002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",                kNull		},
+	{ 0x94C1,	0x10021002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Pro",               kNull		},
+	{ 0x94C1,	0x0D021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",                kNull		},
+	{ 0x94C1,	0x21741458, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",                kNull		},
+	{ 0x94C1,	0x10331462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",                kNull		},
+	{ 0x94C1,	0x10401462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",                kNull		},
+	{ 0x94C1,	0x11101462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 XT",                kNull		},
 
+	{ 0x94C3,	0x03421002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+
 	{ 0x94C3,	0x01011A93, CHIP_FAMILY_RV610,		"Qimonda Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x03021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x03421002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x04021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x10321462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x10411462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",				kNull		},
-	{ 0x94C3,	0x11041462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",				kNull		},
-	{ 0x94C3,	0x11051462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",				kNull		},
-	{ 0x94C3,	0x203817AF, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",				kNull		},
-	{ 0x94C3,	0x216A1458, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x21721458, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0x2247148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 LE",			kNull		},
-	{ 0x94C3,	0x22471787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 LE",			kNull		},
-	{ 0x94C3,	0x30001025, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",				kNull		},
-	{ 0x94C3,	0x30001458, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",				kNull		},
-	{ 0x94C3,	0x30001462, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",				kNull		},
-	{ 0x94C3,	0x3000148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",				kNull		},
-	{ 0x94C3,	0x30001642, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",				kNull		},
-	{ 0x94C3,	0x3000174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",				kNull		},
-	{ 0x94C3,	0x30001787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",				kNull		},
-	{ 0x94C3,	0x37161642, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0xE370174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
-	{ 0x94C3,	0xE400174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",			kNull		},
+	{ 0x94C3,	0x03021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0x03421002, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0x04021028, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0x10321462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0x10411462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",                   kNull		},
+	{ 0x94C3,	0x11041462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",                   kNull		},
+	{ 0x94C3,	0x11051462, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",                   kNull		},
+	{ 0x94C3,	0x203817AF, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400",                   kNull		},
+	{ 0x94C3,	0x216A1458, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0x21721458, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0x2247148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 LE",                kNull		},
+	{ 0x94C3,	0x22471787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 LE",                kNull		},
+	{ 0x94C3,	0x30001025, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",                   kNull		},
+	{ 0x94C3,	0x30001458, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",                   kNull		},
+	{ 0x94C3,	0x30001462, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",                   kNull		},
+	{ 0x94C3,	0x3000148C, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",                   kNull		},
+	{ 0x94C3,	0x30001642, CHIP_FAMILY_RV610,		"ATI Radeon HD 3410",                   kNull		},
+	{ 0x94C3,	0x3000174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",                   kNull		},
+	{ 0x94C3,	0x30001787, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",                   kNull		},
+	{ 0x94C3,	0x37161642, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0xE370174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
+	{ 0x94C3,	0xE400174B, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 PRO",               kNull		},
 	
-	{ 0x9501,	0x25421002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3870",				kNull		},
-	{ 0x9501,	0x30001002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",				kNull		},
-	{ 0x9501,	0x3000174B, CHIP_FAMILY_RV670,		"Sapphire Radeon HD 3690",			kNull		},
-	{ 0x9501,	0x30001787, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",				kNull		},
-	{ 0x9501,	0x4750174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",				kNull		},
+	{ 0x9501,	0x25421002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3870",                   kNull		},
+	{ 0x9501,	0x30001002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",                   kNull		},
+	{ 0x9501,	0x3000174B, CHIP_FAMILY_RV670,		"Sapphire Radeon HD 3690",              kNull		},
+	{ 0x9501,	0x30001787, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",                   kNull		},
+	{ 0x9501,	0x4750174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",                   kNull		},
 
-//	{ 0x9505,	0x024A1043, CHIP_FAMILY_RV670,		"ATI Radeon HD ???",				kNull		},
-	{ 0x9505,	0x25421002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850",				kNull		},
-	{ 0x9505,	0x30001002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",				kNull		},
-	{ 0x9505,	0x3000148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850",				kNull		},
-	{ 0x9505,	0x3000174B, CHIP_FAMILY_RV670,		"Sapphire Radeon HD 3690",			kNull		},
-	{ 0x9505,	0x30001787, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",				kNull		},
-	{ 0x9505,	0x30011043, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",				kNull		},
-	{ 0x9505,	0x3001148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",				kNull		},
-	{ 0x9505,	0x3001174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",				kNull		},
-	{ 0x9505,	0x3002148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",				kNull		},
-	{ 0x9505,	0x3003148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",				kNull		},
-	{ 0x9505,	0x3004148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",				kNull		},
-	{ 0x9505,	0x3010174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",				kNull		},
-	{ 0x9505,	0x301017AF, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",				kNull		},
-	{ 0x9505,	0x4730174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",				kNull		},
+//	{ 0x9505,	0x024A1043, CHIP_FAMILY_RV670,		"ATI Radeon HD ???",                    kNull		},
+	{ 0x9505,	0x25421002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850",                   kNull		},
+	{ 0x9505,	0x30001002, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",                   kNull		},
+	{ 0x9505,	0x3000148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850",                   kNull		},
+	{ 0x9505,	0x3000174B, CHIP_FAMILY_RV670,		"Sapphire Radeon HD 3690",              kNull		},
+	{ 0x9505,	0x30001787, CHIP_FAMILY_RV670,		"ATI Radeon HD 3690",                   kNull		},
+	{ 0x9505,	0x30011043, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",                   kNull		},
+	{ 0x9505,	0x3001148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",                   kNull		},
+	{ 0x9505,	0x3001174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",                   kNull		},
+	{ 0x9505,	0x3002148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",                   kNull		},
+	{ 0x9505,	0x3003148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",                   kNull		},
+	{ 0x9505,	0x3004148C, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",                   kNull		},
+	{ 0x9505,	0x3010174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",                   kNull		},
+	{ 0x9505,	0x301017AF, CHIP_FAMILY_RV670,		"ATI Radeon HD 4750",                   kNull		},
+	{ 0x9505,	0x4730174B, CHIP_FAMILY_RV670,		"ATI Radeon HD 4730",                   kNull		},
 	
-	{ 0x9540,	0x30501787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4590",				kNull		},
-	{ 0x9540,	0x4590174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4590",				kNull		},
+	{ 0x9540,	0x30501787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4590",                   kNull		},
+	{ 0x9540,	0x4590174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4590",                   kNull		},
 
-	{ 0x954F,	0x16131462, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
-	{ 0x954F,	0x20081787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4350",				kNull		},
-	{ 0x954F,	0x29201682, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
-	{ 0x954F,	0x29211682, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
-	{ 0x954F,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4520",				kNull		},
-	{ 0x954F,	0x301017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",				kNull		},
-	{ 0x954F,	0x30501787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",				kNull		},
-	{ 0x954F,	0x30901682, CHIP_FAMILY_RV710,		"XFX Radeon HD 4570",				kNull		},
-	{ 0x954F,	0x31001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4520",				kNull		},
-	{ 0x954F,	0x4450174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",				kNull		},
-	{ 0x954F,	0x4570174B, CHIP_FAMILY_RV710,		"Sapphire Radeon HD 4570",			kNull		},
-//	{ 0x954F,	0x66661043, CHIP_FAMILY_RV710,		"ATI Radeon HD ????",				kNull		},
-	{ 0x954F,	0xE990174B, CHIP_FAMILY_RV710,		"Sapphire Radeon HD 4350",			kNull		},
+	{ 0x954F,	0x16131462, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",                   kNull		},
+	{ 0x954F,	0x20081787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4350",                   kNull		},
+	{ 0x954F,	0x29201682, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",                   kNull		},
+	{ 0x954F,	0x29211682, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",                   kNull		},
+	{ 0x954F,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4520",                   kNull		},
+	{ 0x954F,	0x301017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",                   kNull		},
+	{ 0x954F,	0x30501787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",                   kNull		},
+	{ 0x954F,	0x30901682, CHIP_FAMILY_RV710,		"XFX Radeon HD 4570",                   kNull		},
+	{ 0x954F,	0x31001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4520",                   kNull		},
+	{ 0x954F,	0x4450174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4450",                   kNull		},
+	{ 0x954F,	0x4570174B, CHIP_FAMILY_RV710,		"Sapphire Radeon HD 4570",              kNull		},
+//	{ 0x954F,	0x66661043, CHIP_FAMILY_RV710,		"ATI Radeon HD ????",                   kNull		},
+	{ 0x954F,	0xE990174B, CHIP_FAMILY_RV710,		"Sapphire Radeon HD 4350",              kNull		},
 
-	{ 0x9552,	0x04341028, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4330",			kShrike		},
-	{ 0x9552,	0x21AC1458, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",			kNull		},
-	{ 0x9552,	0x21ED1458, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",			kNull		},
-	{ 0x9552,	0x308B103C, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4330",			kShrike		},
-	{ 0x9552,	0x3000148C, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",			kNull		},
-	{ 0x9552,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",			kNull		},
-	{ 0x9552,	0x30001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",			kNull		},
-	{ 0x9552,	0x300017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",			kNull		},
-	{ 0x9552,	0x44721545, CHIP_FAMILY_RV710,		"VisionTek Radeon 4350",			kNull		},
+	{ 0x9552,	0x04341028, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4330",          kShrike		},
+	{ 0x9552,	0x21AC1458, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",              kNull		},
+	{ 0x9552,	0x21ED1458, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",              kNull		},
+	{ 0x9552,	0x308B103C, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4330",          kShrike		},
+	{ 0x9552,	0x3000148C, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",              kNull		},
+	{ 0x9552,	0x3000174B, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",              kNull		},
+	{ 0x9552,	0x30001787, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",              kNull		},
+	{ 0x9552,	0x300017AF, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500",              kNull		},
+	{ 0x9552,	0x44721545, CHIP_FAMILY_RV710,		"VisionTek Radeon 4350",                kNull		},
 
 	{ 0x9553,	0x18751043, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4570",			kShrike		},
 	{ 0x9553,	0x1B321043, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4570",			kShrike		},
@@ -417,88 +438,88 @@
 	{ 0x9555,	0x24651682, CHIP_FAMILY_RV710,		"ATI Radeon HD4300/HD4500",             kNull		}, 
 	{ 0x9555,	0x3711174B, CHIP_FAMILY_RV710,		"ATI Radeon HD4300/HD4500",             kNull		},
 
-	{ 0x9581,	0x011F1025, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0x0562107B, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0x15621043, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",				kNull		},
-	{ 0x9581,	0x30C5103C, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0x3C2D17AA, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0x63F61462, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0x95811002, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",				kNull		},
-	{ 0x9581,	0xFF001179, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
-	{ 0x9581,	0xFF011179, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",				kNull		},
+	{ 0x9581,	0x011F1025, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0x0562107B, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0x15621043, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",                   kNull		},
+	{ 0x9581,	0x30C5103C, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0x3C2D17AA, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0x63F61462, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0x95811002, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",                   kNull		},
+	{ 0x9581,	0xFF001179, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
+	{ 0x9581,	0xFF011179, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600",                   kNull		},
 
 	{ 0x9583,	0x0083106B, CHIP_FAMILY_RV630,		"ATI Mobility Radeon HD 2600 XT",		kNull		},
 	{ 0x9583,	0x11071734, CHIP_FAMILY_RV630,		"ATI Mobility Radeon HD 2600 XT",		kNull		},
-	{ 0x9583,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",				kNull		},
+	{ 0x9583,	0x3000148C, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",                   kNull		},
 	{ 0x9583,	0x30D4103C, CHIP_FAMILY_RV630,		"ATI Mobility Radeon HD 2600 XT",		kNull		},
 
 	{ 0x9588,	0x01021A93, CHIP_FAMILY_RV630,		"Qimonda Radeon HD 2600 XT",			kNull		},
 
 	{ 0x9589,	0x01001A93, CHIP_FAMILY_RV630,		"Qimonda Radeon HD 2600 PRO",			kNull		},
-	{ 0x9589,	0x0E41174B, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",				kNull		},
-	{ 0x9589,	0x30001462, CHIP_FAMILY_RV630,		"ATI Radeon HD 3610",				kNull		},
-	{ 0x9589,	0x30001642, CHIP_FAMILY_RV630,		"ATI Radeon HD 3610",				kNull		},
-	{ 0x9589,	0x30001787, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",				kNull		},
+	{ 0x9589,	0x0E41174B, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",                   kNull		},
+	{ 0x9589,	0x30001462, CHIP_FAMILY_RV630,		"ATI Radeon HD 3610",                   kNull		},
+	{ 0x9589,	0x30001642, CHIP_FAMILY_RV630,		"ATI Radeon HD 3610",                   kNull		},
+	{ 0x9589,	0x30001787, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600",                   kNull		},
 
-	{ 0x9591,	0x15453992, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600",				kNull		},
-	{ 0x9591,	0x2303148C, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600/3600 Series",		kNull		},
+	{ 0x9591,	0x15453992, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600",                   kNull		},
+	{ 0x9591,	0x2303148C, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600/3600 Series", kNull		},
 
-	{ 0x9598,	0xB3831002, CHIP_FAMILY_RV635,		"ATI All-in-Wonder HD",				kNull		},
-	{ 0x9598,	0x30001043, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",				kNull		},
-	{ 0x9598,	0x3000148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",				kNull		},
+	{ 0x9598,	0xB3831002, CHIP_FAMILY_RV635,		"ATI All-in-Wonder HD",                 kNull		},
+	{ 0x9598,	0x30001043, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",                   kNull		},
+	{ 0x9598,	0x3000148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 3730",                   kNull		},
 	{ 0x9598,	0x30001545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 XT",			kNull		},
-	{ 0x9598,	0x3000174B, CHIP_FAMILY_RV635,		"Sapphire Radeon HD 3730",			kNull		},
-	{ 0x9598,	0x30011043, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
-	{ 0x9598,	0x3001148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
-	{ 0x9598,	0x3031148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
+	{ 0x9598,	0x3000174B, CHIP_FAMILY_RV635,		"Sapphire Radeon HD 3730",              kNull		},
+	{ 0x9598,	0x30011043, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",                   kNull		},
+	{ 0x9598,	0x3001148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",                   kNull		},
+	{ 0x9598,	0x3031148C, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",                   kNull		},
 	{ 0x9598,	0x30011545, CHIP_FAMILY_RV635,		"VisionTek Radeon HD 2600 Pro",			kNull		},
-	{ 0x9598,	0x3001174B, CHIP_FAMILY_RV635,		"Sapphire Radeon HD 3750",			kNull		},
-	{ 0x9598,	0x300117AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 3750",				kNull		},
-	{ 0x9598,	0x301017AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",				kNull		},
-	{ 0x9598,	0x301117AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",				kNull		},
-	{ 0x9598,	0x30501787, CHIP_FAMILY_RV635,		"ATI Radeon HD 4610",				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		},
+	{ 0x9598,	0x3001174B, CHIP_FAMILY_RV635,		"Sapphire Radeon HD 3750",              kNull		},
+	{ 0x9598,	0x300117AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 3750",                   kNull		},
+	{ 0x9598,	0x301017AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 4570",                   kNull		},
+	{ 0x9598,	0x301117AF, CHIP_FAMILY_RV635,		"ATI Radeon HD 4580",                   kNull		},
+	{ 0x9598,	0x30501787, CHIP_FAMILY_RV635,		"ATI Radeon HD 4610",                   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		},
 
-	{ 0x95C0,	0x3000148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",				kNull		},
-	{ 0x95C0,	0x3000174B, CHIP_FAMILY_RV620,		"Sapphire Radeon HD 3550",			kNull		},
-	{ 0x95C0,	0x3002174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 3570",				kNull		},
-	{ 0x95C0,	0x3020174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	{ 0x95C0,	0xE3901745, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",				kNull		},
+	{ 0x95C0,	0x3000148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",                   kNull		},
+	{ 0x95C0,	0x3000174B, CHIP_FAMILY_RV620,		"Sapphire Radeon HD 3550",              kNull		},
+	{ 0x95C0,	0x3002174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 3570",                   kNull		},
+	{ 0x95C0,	0x3020174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",                   kNull		},
+	{ 0x95C0,	0xE3901745, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",                   kNull		},
 
-	{ 0x95C5,	0x01041A93, CHIP_FAMILY_RV620,		"Qimonda Radeon HD 3450",			kNull		},
-	{ 0x95C5,	0x01051A93, CHIP_FAMILY_RV620,		"Qimonda Radeon HD 3450",			kNull		},
-	{ 0x95C5,	0x3000148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3450",				kNull		},
-	{ 0x95C5,	0x3001148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",				kNull		},
-	{ 0x95C5,	0x3002148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",				kNull		},
-	{ 0x95C5,	0x3003148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	{ 0x95C5,	0x3010174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	{ 0x95C5,	0x301017AF, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",				kNull		},
-	{ 0x95C5,	0x3032148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	{ 0x95C5,	0x3033148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",				kNull		},
-	{ 0x95C5,	0x30501787, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
-	{ 0x95C5,	0x4250174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",				kNull		},
+	{ 0x95C5,	0x01041A93, CHIP_FAMILY_RV620,		"Qimonda Radeon HD 3450",               kNull		},
+	{ 0x95C5,	0x01051A93, CHIP_FAMILY_RV620,		"Qimonda Radeon HD 3450",               kNull		},
+	{ 0x95C5,	0x3000148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3450",                   kNull		},
+	{ 0x95C5,	0x3001148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 3550",                   kNull		},
+	{ 0x95C5,	0x3002148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",                   kNull		},
+	{ 0x95C5,	0x3003148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",                   kNull		},
+	{ 0x95C5,	0x3010174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",                   kNull		},
+	{ 0x95C5,	0x301017AF, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",                   kNull		},
+	{ 0x95C5,	0x3032148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",                   kNull		},
+	{ 0x95C5,	0x3033148C, CHIP_FAMILY_RV620,		"ATI Radeon HD 4230",                   kNull		},
+	{ 0x95C5,	0x30501787, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",                   kNull		},
+	{ 0x95C5,	0x4250174B, CHIP_FAMILY_RV620,		"ATI Radeon HD 4250",                   kNull		},
 
 	/* Evergreen */
-	{ 0x6898,	0x00D0106B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kLangur		},
-	{ 0x6898,	0x032E1043, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kUakari		},
-//	{ 0x6898,	0x038C1043, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD ????",				kNull		},
-	{ 0x6898,	0x0B001002, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kZonalis	},
-	{ 0x6898,	0x29611682, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kUakari		},
-	{ 0x6898,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",				kUakari		},
+	{ 0x6898,	0x00D0106B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",                   kLangur		},
+	{ 0x6898,	0x032E1043, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",                   kUakari		},
+//	{ 0x6898,	0x038C1043, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD ????",                   kNull		},
+	{ 0x6898,	0x0B001002, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",                   kZonalis	},
+	{ 0x6898,	0x29611682, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",                   kUakari		},
+	{ 0x6898,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5870",                   kUakari		},
 
-	{ 0x6899,	0x200A1787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
-	{ 0x6899,	0x21E41458, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
-	{ 0x6899,	0x22901787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
-	{ 0x6899,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",				kUakari		},
-	{ 0x6899,	0xE174174B, CHIP_FAMILY_CYPRESS,	"ATI Sapphire Radeon HD 5850",		kUakari		},
+	{ 0x6899,	0x200A1787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",                   kUakari		},
+	{ 0x6899,	0x21E41458, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",                   kUakari		},
+	{ 0x6899,	0x22901787, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",                   kUakari		},
+	{ 0x6899,	0xE140174B, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5850",                   kUakari		},
+	{ 0x6899,	0xE174174B, CHIP_FAMILY_CYPRESS,	"ATI Sapphire Radeon HD 5850",          kUakari		},
 
-	{ 0x689C,	0x034A1043, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",				kUakari		},
-	{ 0x689C,	0x03521043, CHIP_FAMILY_HEMLOCK,	"ASUS ARES",                        kUakari		},
-	{ 0x689C,	0x039E1043, CHIP_FAMILY_HEMLOCK,	"ASUS EAH5870",                     kUakari		},
-	{ 0x689C,	0x30201682, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",				kUakari		},
+	{ 0x689C,	0x034A1043, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",                   kUakari		},
+	{ 0x689C,	0x03521043, CHIP_FAMILY_HEMLOCK,	"ASUS ARES",                            kUakari		},
+	{ 0x689C,	0x039E1043, CHIP_FAMILY_HEMLOCK,	"ASUS EAH5870",                         kUakari		},
+	{ 0x689C,	0x30201682, CHIP_FAMILY_HEMLOCK,	"ATI Radeon HD 5970",                   kUakari		},
 
 	{ 0x68A0,	0x03081025, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5830",			kNomascus	},
 	{ 0x68A0,	0x030A1025, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5830",			kNomascus	},
@@ -517,42 +538,42 @@
 	{ 0x68A1,	0x22411462, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",			kNull	},
 	{ 0x68A1,	0x39961462, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5850",			kNull	},
 
-	{ 0x68A8,	0x050E1025, CHIP_FAMILY_CYPRESS,	"AMD Radeon HD 6850M",				kUakari		},
+	{ 0x68A8,	0x050E1025, CHIP_FAMILY_CYPRESS,	"AMD Radeon HD 6850M",                  kUakari		},
 
-	{ 0x68B8,	0x00CF106B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	},
-	{ 0x68B8,	0x1482174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x200A1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x200B1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x21D71458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x21F61458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x29901682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x29911682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
-	{ 0x68B8,	0x30001002, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6700",				kVervet		},
-	{ 0x68B8,	0xE144174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kHoolock	},
-	{ 0x68B8,	0xE147174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",				kVervet		},
+	{ 0x68B8,	0x00CF106B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kHoolock	},
+	{ 0x68B8,	0x1482174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x200A1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x200B1787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x21D71458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x21F61458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x29901682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x29911682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
+	{ 0x68B8,	0x30001002, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6700",                   kVervet		},
+	{ 0x68B8,	0xE144174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kHoolock	},
+	{ 0x68B8,	0xE147174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770",                   kVervet		},
 
-	{ 0x68BA,	0x03FE1043, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x1482174B, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x174B1482, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x200A1787, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x21421462, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x25431458, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x31501682, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x31521682, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0x31531682, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
-	{ 0x68BA,	0xE144174B, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",				kVervet		},
+	{ 0x68BA,	0x03FE1043, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x1482174B, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x174B1482, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x200A1787, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x21421462, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x25431458, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x31501682, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x31521682, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0x31531682, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
+	{ 0x68BA,	0xE144174B, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6770",                   kVervet		},
 
-	{ 0x68BE,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5750",				kVervet		},
-	{ 0x68BE,	0x3000148C, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kNull		},
-	{ 0x68BE,	0x3000174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kNull		},
-	{ 0x68BE,	0x300017AF, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kNull		},
-	{ 0x68BE,	0x39821642, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6750",				kNull		},
+	{ 0x68BE,	0x22881787, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5750",                   kVervet		},
+	{ 0x68BE,	0x3000148C, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",                   kNull		},
+	{ 0x68BE,	0x3000174B, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",                   kNull		},
+	{ 0x68BE,	0x300017AF, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",                   kNull		},
+	{ 0x68BE,	0x39821642, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6750",                   kNull		},
 
-	{ 0x68BF,	0x220E1458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kVervet		},
-	{ 0x68BF,	0x31401682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",				kVervet		},
+	{ 0x68BF,	0x220E1458, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",                   kVervet		},
+	{ 0x68BF,	0x31401682, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6750",                   kVervet		},
 
-	{ 0x68C0,	0x1594103C, CHIP_FAMILY_REDWOOD,	"AMD Radeon HD 6570M",				kNull		},
+	{ 0x68C0,	0x1594103C, CHIP_FAMILY_REDWOOD,	"AMD Radeon HD 6570M",                  kNull		},
 	{ 0x68C0,	0x392717AA, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5730",			kNull		},
 	{ 0x68C0,	0x395217AA, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5730",			kNull		},
 //	{ 0x68C0,	0x84721043, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD ???",			kNull		},
@@ -585,359 +606,543 @@
 	{ 0x68C8,	0x240A1002, CHIP_FAMILY_REDWOOD,	"ATI FirePro V4800 (FireGL)",			kNull		},
 	{ 0x68C8,	0x240A1028, CHIP_FAMILY_REDWOOD,	"ATI FirePro V4800 (FireGL)",			kNull		},
 
-	{ 0x68D8,	0x03561043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		},
-	{ 0x68D8,	0x03C01043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kNull		},
-	{ 0x68D8,	0x20091787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kNull		},
-	{ 0x68D8,	0x21D91458, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kBaboon		},
-	{ 0x68D8,	0x21F41458, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kNull		},
-	{ 0x68D8,	0x22051462, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x22941787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
-	{ 0x68D8,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
-	{ 0x68D8,	0x301117AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x30601682, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x30651682, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x56701545, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x5690174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",				kNull		},
-	{ 0x68D8,	0x5730174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",				kNull		},
-	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kEulemur	},
-	{ 0x68D8,	0xE155174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kNull		},
-	{ 0x68D8,	0xE166174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",				kUakari		},
+	{ 0x68D8,	0x03561043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kBaboon		},
+	{ 0x68D8,	0x03C01043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kNull		},
+	{ 0x68D8,	0x20091787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kNull		},
+	{ 0x68D8,	0x21D91458, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kBaboon		},
+	{ 0x68D8,	0x21F41458, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kNull		},
+	{ 0x68D8,	0x22051462, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x22941787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",                   kNull		},
+	{ 0x68D8,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",                   kNull		},
+	{ 0x68D8,	0x301117AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x30601682, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x30651682, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x56701545, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x5690174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5690",                   kNull		},
+	{ 0x68D8,	0x5730174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5730",                   kNull		},
+	{ 0x68D8,	0xE151174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kEulemur	},
+	{ 0x68D8,	0xE155174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kNull		},
+	{ 0x68D8,	0xE166174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5670",                   kUakari		},
     
-//	{ 0x68D9,	0x03CE1043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD ????",				kNull		},
-	{ 0x68D9,	0x22401462, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5570",				kNull		},
-	{ 0x68D9,	0x3000148C, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6510",				kNull		},
-	{ 0x68D9,	0x3000174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6510",				kNull		},
-	{ 0x68D9,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
-	{ 0x68D9,	0x39691642, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5570",				kNull		},
+//	{ 0x68D9,	0x03CE1043, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD ????",                   kNull		},
+	{ 0x68D9,	0x22401462, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5570",                   kNull		},
+	{ 0x68D9,	0x3000148C, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6510",                   kNull		},
+	{ 0x68D9,	0x3000174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6510",                   kNull		},
+	{ 0x68D9,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",                   kNull		},
+	{ 0x68D9,	0x39691642, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5570",                   kNull		},
 
-	{ 0x68DA,	0x3000148C, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6390",				kNull		},
-	{ 0x68DA,	0x3000174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6390",				kNull		},
-	{ 0x68DA,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
-	{ 0x68DA,	0x300017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6390",				kNull		},
-	{ 0x68DA,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
-	{ 0x68DA,	0x5630174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",				kNull		},
+	{ 0x68DA,	0x3000148C, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6390",                   kNull		},
+	{ 0x68DA,	0x3000174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6390",                   kNull		},
+	{ 0x68DA,	0x30001787, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",                   kNull		},
+	{ 0x68DA,	0x300017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 6390",                   kNull		},
+	{ 0x68DA,	0x301017AF, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",                   kNull		},
+	{ 0x68DA,	0x5630174B, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5630",                   kNull		},
 
-	{ 0x68E0,	0x02931025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x03581025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x03591025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x035C1025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x035D1025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x036D1025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kLangur     },
-	{ 0x68E0,	0x04471028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x04561028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x04831025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x1433103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x1441103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0x144A103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-//	{ 0x68E0,	0x1BF21043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ????",				kNull       },
-//	{ 0x68E0,	0x848F1043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ????",               kNull       },
-	{ 0x68E0,	0xFD001179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0xFD121179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0xFD501179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0xFD921179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E0,	0xFDD01179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
+	{ 0x68E0,	0x02931025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x03581025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x03591025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x035C1025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x035D1025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x036D1025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kLangur     },
+	{ 0x68E0,	0x04471028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x04561028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x04831025, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x1433103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x1441103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0x144A103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+//	{ 0x68E0,	0x1BF21043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ????",                   kNull       },
+//	{ 0x68E0,	0x848F1043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ????",                   kNull       },
+	{ 0x68E0,	0xFD001179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0xFD121179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0xFD501179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0xFD921179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E0,	0xFDD01179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
 
-	{ 0x68E1,	0x04661028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x10021B61, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450M",				kEulemur	},
-	{ 0x68E1,	0x10501462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x142A103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 545vM",				kEulemur	},
-	{ 0x68E1,	0x14E110CF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400M",				kEulemur	},
-	{ 0x68E1,	0x21D81458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x21E21458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x21F11458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x22021458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x23421462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x23431462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x25481458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400M Series",		kEulemur	},
-	{ 0x68E1,	0x254A1458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5000M Series",		kEulemur	},
-	{ 0x68E1,	0x30001043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x3000148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x30001682, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x3000174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	}, // http://forge.voodooprojects.org/p/chameleon/issues/238/
-	{ 0x68E1,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x300017AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x3001148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x301417AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",				kEulemur	},
-	{ 0x68E1,	0x3002148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-   	{ 0x68E1,	0x3003148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450M",				kEulemur	},
-	{ 0x68E1,	0x54501545, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",				kEulemur	},
-	{ 0x68E1,	0x60001092, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x60001682, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x6000174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
-	{ 0x68E1,	0x6230174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",				kEulemur	},
-	{ 0x68E1,	0x6350174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",				kEulemur	},
-	{ 0x68E1,	0xFDD01179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",				kEulemur	},
+	{ 0x68E1,	0x04661028, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x10021B61, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450M",                  kEulemur	},
+	{ 0x68E1,	0x10501462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x1426103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x142A103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 545vM",                  kEulemur	},
+	{ 0x68E1,	0x14E110CF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400M",                  kEulemur	},
+	{ 0x68E1,	0x21D81458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x21E21458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x21F11458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x22021458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x23421462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x23431462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x25481458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400M Series",           kEulemur	},
+	{ 0x68E1,	0x254A1458, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5000M Series",           kEulemur	},
+	{ 0x68E1,	0x30001043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x3000148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x30001682, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x3000174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	}, 
+	{ 0x68E1,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x300017AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x3001148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x301417AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",                   kEulemur	},
+	{ 0x68E1,	0x3002148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+   	{ 0x68E1,	0x3003148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450M",                  kEulemur	},
+	{ 0x68E1,	0x54501545, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x5470174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470M",                  kEulemur	},
+	{ 0x68E1,	0x60001092, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x60001682, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x6000174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
+	{ 0x68E1,	0x6230174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",                   kEulemur	},
+	{ 0x68E1,	0x6350174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",                   kEulemur	},
+	{ 0x68E1,	0xFDD01179, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5430M",                  kEulemur	},
 
-	{ 0x68E4,	0x04821025, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",				kNull		},
-	{ 0x68E4,	0x1426103C, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",				kNull		},
-	{ 0x68E4,	0x1C921043, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",				kNull		},
-	{ 0x68E4,	0x397917AA, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",				kNull		},
-	{ 0x68E4,	0x84A01043, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",				kNull		},
+	{ 0x68E4,	0x04821025, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",                  kNull		},
+	{ 0x68E4,	0x1426103C, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",                  kNull		},
+	{ 0x68E4,	0x1C921043, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",                  kNull		},
+	{ 0x68E4,	0x397917AA, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",                  kNull		},
+	{ 0x68E4,	0x84A01043, CHIP_FAMILY_CEDAR,		"AMD Radeon HD 6370M",                  kNull		},
 
-	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x03CA1043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x174B3000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6230",				kNull		},
-	{ 0x68F9,	0x174B6250, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6250",				kNull		},
-	{ 0x68F9,	0x174B6290, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6290",				kNull		},
-	{ 0x68F9,	0x20091787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x2126103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",				kNull		},
-	{ 0x68F9,	0x22911787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x22301462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x23401462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
-	{ 0x68F9,	0x300017AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6250",				kNull		},
-	{ 0x68F9,	0x3001148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6250",				kNull		},
-	{ 0x68F9,	0x30011787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",				kNull		},
-	{ 0x68F9,	0x3002148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6290",				kNull		},
-	{ 0x68F9,	0x30021787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
-	{ 0x68F9,	0x300217AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6290",				kNull		},
-	{ 0x68F9,	0x3003148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6230",				kNull		},
-	{ 0x68F9,	0x301117AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
-	{ 0x68F9,	0x301217AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",				kNull		},
-	{ 0x68F9,	0x301317AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",				kNull		},
-	{ 0x68F9,	0x360317AA, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x39971462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0x3B311642, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350A",				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,	0xE145174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
-	{ 0x68F9,	0xE153174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",				kEulemur	},
+	{ 0x68F9,	0x010E1002, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x03741043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x03CA1043, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x174B3000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6230",                   kNull		},
+	{ 0x68F9,	0x174B6250, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6250",                   kNull		},
+	{ 0x68F9,	0x174B6290, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6290",                   kNull		},
+	{ 0x68F9,	0x20091787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x2126103C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350",                   kNull		},
+	{ 0x68F9,	0x22911787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x22301462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x23401462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x30001787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",                   kNull		},
+	{ 0x68F9,	0x300017AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6250",                   kNull		},
+	{ 0x68F9,	0x3001148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6250",                   kNull		},
+	{ 0x68F9,	0x30011787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5530",                   kNull		},
+	{ 0x68F9,	0x3002148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6290",                   kNull		},
+	{ 0x68F9,	0x30021787, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",                   kNull		},
+	{ 0x68F9,	0x300217AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6290",                   kNull		},
+	{ 0x68F9,	0x3003148C, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6230",                   kNull		},
+	{ 0x68F9,	0x301117AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",                   kNull		},
+	{ 0x68F9,	0x301217AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5490",                   kNull		},
+	{ 0x68F9,	0x301317AF, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5470",                   kNull		},
+	{ 0x68F9,	0x360317AA, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x39971462, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0x3B311642, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6350A",                  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,	0xE145174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
+	{ 0x68F9,	0xE153174B, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5450",                   kEulemur	},
 
 	/* Northen Islands */
-	{ 0x6718,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0x20101458, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0x22001458, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0x23061787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0x23701462, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0x31301682, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0x67181002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
-	{ 0x6718,	0xE182174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",				kGibba		},
+	{ 0x6718,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0x20101458, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0x22001458, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0x23061787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0x23701462, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0x31301682, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0x67181002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
+	{ 0x6718,	0xE182174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970",                   kGibba		},
 
-	{ 0x6719,	0x03D41043, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		},
-	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		},
-	{ 0x6719,	0x186B174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		},
-	{ 0x6719,	0x20101787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		},
-	{ 0x6719,	0x21FD1458, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kGibba		},
-	{ 0x6719,	0x23071787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",				kNull		},
+	{ 0x6719,	0x03D41043, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",                   kNull		},
+	{ 0x6719,	0x0B001002, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",                   kGibba		},
+	{ 0x6719,	0x186B174B, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",                   kNull		},
+	{ 0x6719,	0x20101787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",                   kGibba		},
+	{ 0x6719,	0x21FD1458, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",                   kGibba		},
+	{ 0x6719,	0x23071787, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950",                   kNull		},
 
-//	{ 0x671D,	0x0B2A1002, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		},
-//	{ 0x671D,	0x1B2A1002, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		},
-//	{ 0x671D,	0x31601682, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",				kNull		},
+//	{ 0x671D,	0x0B2A1002, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",                   kNull		},
+//	{ 0x671D,	0x1B2A1002, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",                   kNull		},
+//	{ 0x671D,	0x31601682, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6990",                   kNull		},
 
-	{ 0x6720,	0x04901028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",				kElodea		},
-	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",				kElodea		},
-	{ 0x6720,	0x51041558, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6990M",				kElodea		},
+	{ 0x6720,	0x04901028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",                  kElodea		},
+	{ 0x6720,	0x04BA1028, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6970M",                  kElodea		},
+	{ 0x6720,	0x51041558, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6990M",                  kElodea		},
 
-	{ 0x6738,	0x00D01002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x03AE1043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x03C61043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x174B174B, CHIP_FAMILY_BARTS,		"Sapphire Radeon HD6870",			kBulrushes	},
-	{ 0x6738,	0x20101787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x21FA1002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x21FA1458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x23051787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x25101462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x31031682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x31041682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x31071682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0x31081682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},  // ?? kJuncus ??
-	{ 0x6738,	0x67381002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
-	{ 0x6738,	0xE178174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",				kDuckweed	},
+	{ 0x6738,	0x00D01002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x03AE1043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x03C61043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x174B174B, CHIP_FAMILY_BARTS,		"Sapphire Radeon HD6870",               kBulrushes	},
+	{ 0x6738,	0x20101787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x21FA1002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x21FA1458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x23051787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x25101462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x31031682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x31041682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x31071682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0x31081682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},  // ?? kJuncus ??
+	{ 0x6738,	0x67381002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
+	{ 0x6738,	0xE178174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6870",                   kDuckweed	},
 
-	{ 0x6739,	0x03B41043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x174B174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x200F1787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x21F81458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kBulrushes	},
-	{ 0x6739,	0x23041787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x24001462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x24411462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x30001787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x31101682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x31131682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x31141682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0x67391002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0xAA881002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0xE174174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0xE177174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
-	{ 0x6739,	0xE183174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",				kDuckweed	},
+	{ 0x6739,	0x03B41043, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x174B174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x200F1787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x21F81458, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kBulrushes	},
+	{ 0x6739,	0x23041787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x24001462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x24411462, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x30001787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x31101682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x31131682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x31141682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0x67391002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0xAA881002, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0xE174174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0xE177174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
+	{ 0x6739,	0xE183174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6850",                   kDuckweed	},
 
-	{ 0x673E,	0x174B174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",               kNull		},
-	{ 0x673E,	0x23101787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",               kNull		},
-	{ 0x673E,	0x31701682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",               kNull		},
-	{ 0x673E,	0x31721682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",               kNull		},
+	{ 0x673E,	0x174B174B, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",                   kNull		},
+	{ 0x673E,	0x23101787, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",                   kNull		},
+	{ 0x673E,	0x31701682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",                   kNull		},
+	{ 0x673E,	0x31721682, CHIP_FAMILY_BARTS,		"AMD Radeon HD 6790",                   kNull		},
 
-	{ 0x6740,	0x04A31028, CHIP_FAMILY_TURKS,		"Dell HD 6770M",                    kNull		}, // ??
-	{ 0x6740,	0x1D121043, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6730M",				kNull		},
-	{ 0x6740,	0x1631103C, CHIP_FAMILY_TURKS,		"AMD FirePro M5950",				kNull		},
-	{ 0x6740,	0x1657103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",				kNull		},
-	{ 0x6740,	0x165A103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",				kNull		},
-	{ 0x6740,	0x3388103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",				kNull		},
-	{ 0x6740,	0x3389103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",				kNull		}, // ?? kHydrilla ??
-	{ 0x6740,	0x6740106B, CHIP_FAMILY_TURKS,		"Apple HD 6770M",                   kNull		}, // ??
+	{ 0x6740,	0x04A31028, CHIP_FAMILY_TURKS,		"Dell HD 6770M",                        kNull		}, // ??
+	{ 0x6740,	0x1D121043, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6730M",                  kNull		},
+	{ 0x6740,	0x1631103C, CHIP_FAMILY_TURKS,		"AMD FirePro M5950",                    kNull		},
+	{ 0x6740,	0x1657103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",                  kNull		},
+	{ 0x6740,	0x165A103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",                  kNull		},
+	{ 0x6740,	0x3388103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",                  kNull		},
+	{ 0x6740,	0x3389103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6770M",                  kNull		}, // ?? kHydrilla ??
+	{ 0x6740,	0x6740106B, CHIP_FAMILY_TURKS,		"Apple HD 6770M",                       kNull		}, // ??
 
-	{ 0x6741,	0x050E1025, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6650M",				kNull		},
-	{ 0x6741,	0x05131025, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6650M",				kNull		},
-	{ 0x6741,	0x1646103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6750M",				kNull		},
-	{ 0x6741,	0x1688103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 7690M",				kNull		},
-	{ 0x6741,	0x358D103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M/6650M/6750M",	kNull		},
- 	{ 0x6741,	0x9080104D, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M",				kNull		},
+	{ 0x6741,	0x050E1025, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6650M",                  kNull		},
+	{ 0x6741,	0x05131025, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6650M",                  kNull		},
+	{ 0x6741,	0x1646103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6750M",                  kNull		},
+	{ 0x6741,	0x1688103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 7690M",                  kNull		},
+	{ 0x6741,	0x358D103C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M/6650M/6750M",      kNull		},
+ 	{ 0x6741,	0x9080104D, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6630M",                  kNull		},
 
-	{ 0x6758,	0x00121028, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0x22051458, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0x31811682, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0x31831682, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0x67581002, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0xE1941746, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
-	{ 0x6758,	0xE194174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",				kBulrushes	},
+	{ 0x6758,	0x00121028, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
+	{ 0x6758,	0x22051458, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
+	{ 0x6758,	0x31811682, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
+	{ 0x6758,	0x31831682, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
+	{ 0x6758,	0x67581002, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
+	{ 0x6758,	0xE1941746, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
+	{ 0x6758,	0xE194174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6670",                   kBulrushes	},
 
-	{ 0x6759,	0x20121787, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6570",				kPithecia	},
-	{ 0x6759,	0xE193174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6570",				kPithecia	},
+	{ 0x6759,	0x20121787, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6570",                   kPithecia	},
+	{ 0x6759,	0xE193174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 6570",                   kPithecia	},
 
-	{ 0x675F,	0x23141787, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",				kNull		},
-	{ 0x675F,	0x254B1458, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",				kNull		},
-	{ 0x675F,	0x6510148C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",				kNull		},
-	{ 0x675F,	0x6510174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",				kNull		},
+	{ 0x675F,	0x23141787, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",                   kNull		},
+	{ 0x675F,	0x254B1458, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",                   kNull		},
+	{ 0x675F,	0x6510148C, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",                   kNull		},
+	{ 0x675F,	0x6510174B, CHIP_FAMILY_TURKS,		"AMD Radeon HD 5570",                   kNull		},
 
-	{ 0x6760,	0x00031179, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		},
-	{ 0x6760,	0x04C11028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		},
-	{ 0x6760,	0x04CA1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		},
-	{ 0x6760,	0x04CC1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		},
-	{ 0x6760,	0x101C1043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",				kNull		},
-	{ 0x6760,	0x165A103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		},
-	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		},
-	{ 0x6760,	0x1CB21043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",				kNull		},
-//	{ 0x6760,	0x85171043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD ?????",				kNull		},
+	{ 0x6760,	0x00031179, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",                  kNull		},
+	{ 0x6760,	0x04C11028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",                  kNull		},
+	{ 0x6760,	0x04CA1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",                  kNull		},
+	{ 0x6760,	0x04CC1028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",                  kNull		},
+	{ 0x6760,	0x101C1043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450M",                  kNull		},
+	{ 0x6760,	0x165A103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",                  kNull		},
+	{ 0x6760,	0x167D103C, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",                  kNull		},
+	{ 0x6760,	0x1CB21043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6470M",                  kNull		},
+//	{ 0x6760,	0x85171043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD ?????",                  kNull		},
 
-	{ 0x6779,	0x00001002, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x03DA1043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x03DC1043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x20121787, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x21201028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x21251462, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x22031458, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x22041458, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x23111787, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x32001682, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x64501092, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0x909D1B0A, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0xE164174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kIpomoea	},
-	{ 0x6779,	0xE180174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kPithecia	},
-	{ 0x6779,	0xE190174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
-	{ 0x6779,	0xE199174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",				kBulrushes	},
+	{ 0x6779,	0x00001002, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x03DA1043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x03DC1043, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x20121787, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x21201028, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x21251462, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x22031458, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x22041458, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x23111787, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x32001682, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x64501092, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0x909D1B0A, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0xE164174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kIpomoea	},
+	{ 0x6779,	0xE180174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kPithecia	},
+	{ 0x6779,	0xE190174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
+	{ 0x6779,	0xE199174B, CHIP_FAMILY_CAICOS,		"AMD Radeon HD 6450",                   kBulrushes	},
 
 	/* Southen Islands */
 
-	{ 0x6798,	0x04181043, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x04201043, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x0B001002, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x201C1787, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x23171787, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x254D1458, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x27701462, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x32101682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x32111682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x32121682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0x32131682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
-	{ 0x6798,	0xE208174B, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",               kNull		},
+	{ 0x6798,	0x04181043, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x04201043, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x0B001002, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x201C1787, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x23171787, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x254D1458, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x27701462, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x32101682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x32111682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x32121682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0x32131682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
+	{ 0x6798,	0xE208174B, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970",                   kNull		},
 
-	{ 0x679A,	0x0B001002, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",               kNull		},
-	{ 0x679A,	0x23161787, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",               kNull		},
-	{ 0x679A,	0x254C1458, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",               kNull		},
-	{ 0x679A,	0x27601462, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",               kNull		},
-	{ 0x679A,	0x32211682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",               kNull		},
-	{ 0x679A,	0xE207174B, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",               kNull		},
+	{ 0x679A,	0x0B001002, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",                   kNull		},
+	{ 0x679A,	0x23161787, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",                   kNull		},
+	{ 0x679A,	0x254C1458, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",                   kNull		},
+	{ 0x679A,	0x27601462, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",                   kNull		},
+	{ 0x679A,	0x32211682, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",                   kNull		},
+	{ 0x679A,	0xE207174B, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950",                   kNull		},
 
-//	{ 0x6818,	0x042F1043, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7870",               kNull		},
-//	{ 0x6818,	0xE217174B, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7870",               kNull		},
-//	{ 0x6819,	0x23201787, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7800 Series",		kNull		},
+	{ 0x6818,	0x042F1043, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7870",                   kNull		},
+	{ 0x6818,	0xE217174B, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7870",                   kNull		},
+	{ 0x6819,	0x23201787, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7800 Series",            kNull		},
 
-//	{ 0x683D,	0x04211043, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",               kNull		},
-//	{ 0x683D,	0x25561458, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",               kNull		},
-//	{ 0x683D,	0x27101462, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",               kNull		},
-//	{ 0x683D,	0x2B301002, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",               kNull		},
-//	{ 0x683D,	0x32331682, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",               kNull		},
-//	{ 0x683D,	0xE214174B, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",               kNull		},
+//	{ 0x683D,	0x04211043, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",                   kNull		},
+//	{ 0x683D,	0x25561458, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",                   kNull		},
+//	{ 0x683D,	0x27101462, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",                   kNull		},
+//	{ 0x683D,	0x2B301002, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",                   kNull		},
+//	{ 0x683D,	0x32331682, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",                   kNull		},
+//	{ 0x683D,	0xE214174B, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7770",                   kNull		},
 
-//	{ 0x683F,	0x200B1787, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7750",               kNull		},
-//	{ 0x683F,	0x27921462, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7750",               kNull		},
-//	{ 0x683F,	0xE213174B, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7750",               kNull		},
+//	{ 0x683F,	0x200B1787, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7750",                   kNull		},
+//	{ 0x683F,	0x27921462, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7750",                   kNull		},
+//	{ 0x683F,	0xE213174B, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7750",                   kNull		},
 
+	/*old series*/
+
+	{ 0x5D48,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Mobile ",                kNull		 },
+	{ 0x5D49,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Mobile ",                kNull		 },
+	{ 0x5D4A,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Mobile ",                kNull		 },
+
+	{ 0x5D4C,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5D4D,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5D4E,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5D4F,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5D50,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x5D52,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x5D57,	0x00000000, CHIP_FAMILY_R420,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x5E48,	0x00000000, CHIP_FAMILY_RV410,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x5E4A,	0x00000000, CHIP_FAMILY_RV410,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5E4B,	0x00000000, CHIP_FAMILY_RV410,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5E4C,	0x00000000, CHIP_FAMILY_RV410,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x5E4D,	0x00000000, CHIP_FAMILY_RV410,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x5E4F,	0x00000000, CHIP_FAMILY_RV410,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x7100,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x7101,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Mobile ",                kNull		 },
+	{ 0x7102,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Mobile ",                kNull		 },
+	{ 0x7103,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Mobile ",                kNull		 },
+	{ 0x7104,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x7105,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x7106,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Mobile ",                kNull		 },
+	{ 0x7108,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x7109,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x710A,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x710B,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x710C,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x710E,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+	{ 0x710F,	0x00000000, CHIP_FAMILY_R520,		"ATI Radeon HD Desktop ",               kNull		 },
+
+	{ 0x7140,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7141,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7142,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7143,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7144,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x7145,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x7146,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7147,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x7149,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x714A,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x714B,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x714C,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x714D,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x714E,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x714F,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x7151,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7152,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7153,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x715E,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x715F,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x7180,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7181,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7183,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x7186,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x7187,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+	{ 0x7188,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+
+	{ 0x718A,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x718B,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x718C,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+	{ 0x718D,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+
+	{ 0x718F,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x7193,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x7196,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Mobile ",                kCaretta		 },
+
+	{ 0x719B,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x719F,	0x00000000, CHIP_FAMILY_RV515,		"ATI Radeon HD Desktop ",               kCaretta		 },
+
+	{ 0x71C0,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+	{ 0x71C1,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+	{ 0x71C2,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+	{ 0x71C3,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+	{ 0x71C4,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+
+	{ 0x71C5,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+	{ 0x71C6,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+	{ 0x71C7,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+
+	{ 0x71CD,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+	{ 0x71CE,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+
+	{ 0x71D2,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+
+	{ 0x71D4,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+	{ 0x71D5,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+	{ 0x71D6,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+
+	{ 0x71DA,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+
+	{ 0x71DE,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+
+	{ 0x7200,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Desktop ",               kWormy		 },
+
+	{ 0x7210,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+	{ 0x7211,	0x00000000, CHIP_FAMILY_RV530,		"ATI Radeon HD Mobile ",                kWormy		 },
+
+	{ 0x7240,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	{ 0x7243,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7244,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7245,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7246,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7247,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7248,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7249,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x724A,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x724B,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x724C,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x724D,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x724E,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x724F,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	{ 0x7280,	0x00000000, CHIP_FAMILY_RV570,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7281,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7283,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7284,	0x00000000, CHIP_FAMILY_R580,		"ATI Radeon HD Mobile ",                kAlopias		 },
+
+	{ 0x7287,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7288,	0x00000000, CHIP_FAMILY_RV570,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7289,	0x00000000, CHIP_FAMILY_RV570,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	{ 0x728B,	0x00000000, CHIP_FAMILY_RV570,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x728C,	0x00000000, CHIP_FAMILY_RV570,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	{ 0x7290,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+	{ 0x7291,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	{ 0x7293,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	{ 0x7297,	0x00000000, CHIP_FAMILY_RV560,		"ATI Radeon HD Desktop ",               kAlopias		 },
+
+	/* IGP */
+
+	{ 0x791E,	0x00000000, CHIP_FAMILY_RS690,		"ATI Radeon IGP ",                      kNull		 },
+	{ 0x791F,	0x00000000, CHIP_FAMILY_RS690,		"ATI Radeon IGP ",                      kNull		},
+	{ 0x796C,	0x00000000, CHIP_FAMILY_RS740,		"ATI Radeon IGP ",                      kNull		 },
+	{ 0x796D,	0x00000000, CHIP_FAMILY_RS740,		"ATI Radeon IGP ",                      kNull		},
+	{ 0x796E,	0x00000000, CHIP_FAMILY_RS740,		"ATI Radeon IGP ",                      kNull		},
+	{ 0x796F,	0x00000000, CHIP_FAMILY_RS740,		"ATI Radeon HD ",                       kNull		 },
+
 	/* standard/default models */
-	{ 0x9400,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",			kNull		},
-	{ 0x9405,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",			kNull		},
 
-	{ 0x9440,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x9441,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870 X2",			kMotmot		},
-	{ 0x9442,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x9443,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850 X2",			kMotmot		},
-	{ 0x944A,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x944C,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x944E,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4700 Series",		kMotmot		},
+	{ 0x9400,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 XT",                kNull		},
+	{ 0x9401,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
+	{ 0x9402,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
+	{ 0x9403,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
+	{ 0x9405,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
+	{ 0x940A,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
+	{ 0x940B,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
+	{ 0x940F,	0x00000000, CHIP_FAMILY_R600,		"ATI Radeon HD 2900 GT",                kNull		},
 
-	{ 0x9450,	0x00000000, CHIP_FAMILY_RV770,		"AMD FireStream 9270",				kMotmot		},
-	{ 0x9452,	0x00000000, CHIP_FAMILY_RV770,		"AMD FireStream 9250",				kMotmot		},
+	{ 0x9440,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x9441,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4870 X2",                kMotmot		},
+	{ 0x9442,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x9443,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4850 X2",                kMotmot		},
+	{ 0x944A,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x944C,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x944E,	0x00000000, CHIP_FAMILY_RV770,		"ATI Radeon HD 4700 Series",			kMotmot		},
 
-	{ 0x9460,	0x00000000, CHIP_FAMILY_RV790,		"ATI Radeon HD 4800 Series",		kMotmot		},
-	{ 0x9462,	0x00000000, CHIP_FAMILY_RV790,		"ATI Radeon HD 4800 Series",		kMotmot		},
+	{ 0x9450,	0x00000000, CHIP_FAMILY_RV770,		"AMD FireStream 9270",                  kMotmot		},
+	{ 0x9452,	0x00000000, CHIP_FAMILY_RV770,		"AMD FireStream 9250",                  kMotmot		},
 
-	{ 0x9480,	0x00000000, CHIP_FAMILY_RV730,		"ATI Mobility Radeon HD 4650 Series",		kGliff		},
+	{ 0x9460,	0x00000000, CHIP_FAMILY_RV790,		"ATI Radeon HD 4800 Series",			kMotmot		},
+	{ 0x9462,	0x00000000, CHIP_FAMILY_RV790,		"ATI Radeon HD 4800 Series",			kMotmot		},
 
-	{ 0x9490,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",		kFlicker	},
-	{ 0x9498,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",		kFlicker	},
+	{ 0x9480,	0x00000000, CHIP_FAMILY_RV730,		"ATI Mobility Radeon HD 4650 Series",   kGliff		},
 
-	{ 0x94B3,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
-	{ 0x94B4,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4700 Series",		kFlicker	},
-	{ 0x94B5,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",				kFlicker	},
+	{ 0x9488,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4650 Series",			kGliff	},
 
-	{ 0x94C1,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",		kIago		},
-	{ 0x94C3,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",		kIago		},
-	{ 0x94C7,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",				kIago		},
-	{ 0x94CC,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",		kIago		},
+	{ 0x9490,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",			kFlicker	},
+	{ 0x9498,	0x00000000, CHIP_FAMILY_RV730,		"ATI Radeon HD 4600 Series",			kFlicker	},
 
-	{ 0x9501,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3800 Series",		kMegalodon	},
-	{ 0x9505,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3800 Series",		kMegalodon	},
-	{ 0x9507,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3830",				kMegalodon	},
-	{ 0x950F,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3870 X2",			kMegalodon	},
+	{ 0x94B3,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",                   kFlicker	},
+	{ 0x94B4,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4700 Series",			kFlicker	},
+	{ 0x94B5,	0x00000000, CHIP_FAMILY_RV740,		"ATI Radeon HD 4770",                   kFlicker	},
 
-	{ 0x9513,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3850 X2",			kMegalodon	},
-	{ 0x9519,	0x00000000, CHIP_FAMILY_RV630,		"AMD FireStream 9170",				kMegalodon	},
+	{ 0x94C1,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
 
-	{ 0x9540,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",				kNull		},
+	{ 0x94C3,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+	{ 0x94C4,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+	{ 0x94C5,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+	{ 0x94C6,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+	{ 0x94C7,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2350",                   kIago		},
+	{ 0x94C8,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+	{ 0x94C9,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+
+	{ 0x94CB,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+	{ 0x94CC,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 2400 Series",            kIago		},
+
+	{ 0x9500,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",            kMegalodon	},
+	{ 0x9501,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",            kMegalodon	},
+	{ 0x9505,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3800 Series",            kMegalodon	},
+	{ 0x9507,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3830",                   kMegalodon	},
+	{ 0x950F,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3870 X2",                kMegalodon	},
+
+	{ 0x9511,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850 X2",                kMegalodon	},
+
+	{ 0x9513,	0x00000000, CHIP_FAMILY_RV670,		"ATI Radeon HD 3850 X2",                kMegalodon	},
+	{ 0x9519,	0x00000000, CHIP_FAMILY_RV670,		"AMD FireStream 9170",                  kMegalodon	},
+
+	{ 0x9540,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4550",                   kNull		},
 	{ 0x954F,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kNull		},
 
 	{ 0x9552,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4300/4500 Series",		kShrike		},
-	{ 0x9553,	0x00000000, CHIP_FAMILY_RV710,		"ATI Mobility Radeon HD 4500/5100 Series",	kShrike 	},
+	{ 0x9553,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD 4500M/5100M Series",     kShrike 	},
 
-//	{ 0x9555,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD4300/HD4500 series",		kNull		}, 
+	{ 0x9555,	0x00000000, CHIP_FAMILY_RV710,		"ATI Radeon HD4300/HD4500 series",		kNull		}, 
 
 	{ 0x9581,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
 
 	{ 0x9583,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kNull		},
 
-	{ 0x9588,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 XT",			kNull		},
+	{ 0x9588,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 XT",                kNull		},
 	{ 0x9589,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3610 Series",			kNull		},
 	{ 0x958A,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",			kLamna		},
+	{ 0x958B,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",			kLamna		},
+	{ 0x958C,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",			kLamna		},
+	{ 0x958D,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",			kLamna		},
+	{ 0x958E,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 2600 X2 Series",			kLamna		},
 
 	{ 0x9591,	0x00000000, CHIP_FAMILY_RV635,		"ATI Radeon HD 3600 Series",			kNull		},
 
 	{ 0x9598,	0x00000000, CHIP_FAMILY_RV630,		"ATI Radeon HD 3600 Series",			kMegalodon	},
 
-	{ 0x95C0,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 3400 Series",			kIago		},
+	{ 0x95C0,	0x00000000, CHIP_FAMILY_RV620,		"ATI Radeon HD 3400 Series",			kIago		},
 
-	{ 0x95C5,	0x00000000, CHIP_FAMILY_RV610,		"ATI Radeon HD 3400 Series",			kIago		},
+	{ 0x95C5,	0x00000000, CHIP_FAMILY_RV620,		"ATI Radeon HD 3400 Series",			kIago		},
 
 	/* IGP */
 	{ 0x9610,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon HD 3200 Graphics",			kNull		},
-	{ 0x9611,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon 3100 Graphics",			kNull		},
+	{ 0x9611,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon 3100 Graphics",             kNull		},
 
 	{ 0x9614,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon HD 3300 Graphics",			kNull		},
 
-	{ 0x9616,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon 3000 Graphics",			kNull		},
+	{ 0x9616,	0x00000000, CHIP_FAMILY_RS780,		"ATI Radeon 3000 Graphics",             kNull		},
 
 	{ 0x9710,	0x00000000, CHIP_FAMILY_RS880,		"ATI Radeon HD 4200 Series",			kNull		},
 
@@ -954,13 +1159,16 @@
 
 	{ 0x689E,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Radeon HD 5800 Series",			kUakari		},
 
-	{ 0x68A0,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5800 Series",		kNomascus	}, // CHIP_FAMILY_BROADWAY ??
-	{ 0x68A1,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5800 Series",		kNomascus	}, // CHIP_FAMILY_BROADWAY ??
+	{ 0x68A0,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Mobility Radeon HD 5800 Series",   kNomascus	}, // CHIP_FAMILY_BROADWAY ??
+	{ 0x68A1,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Mobility Radeon HD 5800 Series",   kNomascus	}, // CHIP_FAMILY_BROADWAY ??
 
-	{ 0x68A8,	0x00000000, CHIP_FAMILY_CYPRESS,	"AMD Mobility Radeon HD 6800 Series",		kUakari		}, 
+	{ 0x68A8,	0x00000000, CHIP_FAMILY_JUNIPER,	"AMD Mobility Radeon HD 6800 Series",   kUakari		}, 
+//	{ 0x68A9,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD ??? Series",			kNull		},
 
-	{ 0x68B0,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5800 Series",		kNull		}, // CHIP_FAMILY_BROADWAY ??
 
+	{ 0x68B0,	0x00000000, CHIP_FAMILY_CYPRESS,	"ATI Mobility Radeon HD 5800 Series",   kNull		}, // CHIP_FAMILY_BROADWAY ??
+	{ 0x68B1,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5770 Series",			kVervet		},
+
 	{ 0x68B8,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5700 Series",			kVervet		},
 	{ 0x68B9,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 5600 Series",			kVervet		},
 	{ 0x68BA,	0x00000000, CHIP_FAMILY_JUNIPER,	"ATI Radeon HD 6700 Series",			kVervet		},
@@ -969,24 +1177,37 @@
 	{ 0x68BF,	0x00000000, CHIP_FAMILY_JUNIPER,	"AMD Radeon HD 6700 Series",			kVervet		},
 
 	{ 0x68C0,	0x00000000, CHIP_FAMILY_REDWOOD,	"AMD Radeon HD 6570M/5700 Series",		kNull		},
-	{ 0x68C1,	0x00000000, CHIP_FAMILY_REDWOOD,	"AMD Radeon HD 6500M/5600/5700 Series",		kNull		},
+	{ 0x68C1,	0x00000000, CHIP_FAMILY_REDWOOD,	"AMD Radeon HD 6500M/5600/5700 Series", kNull		},
+	{ 0x68C8,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5650 Series",			kVervet		},	
+//	{ 0x68C9,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD ??? Series",			kNull		},
 
 	{ 0x68D8,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5600 Series",			kBaboon		},
 	{ 0x68D9,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500/5600 Series",		kBaboon		},
 	{ 0x68DA,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD 5500 Series",			kBaboon		},
 
-	{ 0x68E0,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Mobility Radeon HD 5400 Series",		kEulemur	},
-	{ 0x68E1,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Mobility Radeon HD 5400 Series",		kEulemur	},
+//	{ 0x68DE,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Radeon HD ??? Series",			kNull		},
 
+
+	{ 0x68E0,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5400 Series",   kEulemur	},
+	{ 0x68E1,	0x00000000, CHIP_FAMILY_REDWOOD,	"ATI Mobility Radeon HD 5400 Series",   kEulemur	},
+
 	{ 0x68E4,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 6300M Series",			kNull		},
 
+//	{ 0x68E8,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ??? Series",			kNull		},
+//	{ 0x68E9,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ??? Series",			kNull		},
+
+//	{ 0x68F8,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ??? Series",			kNull		},
 	{ 0x68F9,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD 5400 Series",			kNull		},
 
+//	{ 0x68FE,	0x00000000, CHIP_FAMILY_CEDAR,		"ATI Radeon HD ??? Series",			kNull		},
+
+
 	/* Northen Islands */
 	{ 0x6718,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",			kNull		},
 	{ 0x6719,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6950 Series",			kGibba		},
 
-//	{ 0x671D,	0x00000000, CHIP_FAMILY_ANTILLES,	"AMD Radeon HD 6900 Series",			kNull		},
+	{ 0x671C,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6970 Series",			kLotus		},
+	{ 0x671D,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6900 Series",			kNull		},
 
 	{ 0x671F,	0x00000000, CHIP_FAMILY_CAYMAN,		"AMD Radeon HD 6900 Series",			kNull		},
 
@@ -1015,79 +1236,63 @@
 
 	/* Southen Islands */
 
-//	{ 0x6780,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6780,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x6784,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6784,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x6788,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6788,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x678A,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x678A,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x6790,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6790,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
 
-	{ 0x6798,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970 Series",		kNull		},
-	{ 0x6799,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7990 Series",        kNull		},
-	{ 0x679A,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950 Series",        kNull		},
+	{ 0x6798,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7970 Series",            kNull		},
+	{ 0x6799,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7990 Series",            kNull		},
+	{ 0x679A,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD 7950 Series",            kNull		},
 
-//	{ 0x679E,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",         kNull		},
-//	{ 0x679F,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",         kNull		},
+//	{ 0x679E,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x679F,	0x00000000, CHIP_FAMILY_TAHITI,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x6800,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6801,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6802,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ???M Series",		kNull		},
+//	{ 0x6800,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6801,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6802,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ???M Series",            kNull		},
 
-//	{ 0x6808,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",			kNull		},
-//	{ 0x6809,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",			kNull		},
-//	{ 0x6810,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6808,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x6809,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x6810,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x6818,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7800 Series",		kNull		},
-//	{ 0x6819,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7800 Series",		kNull		},
-//	{ 0x6820,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6821,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
+	{ 0x6818,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7800 Series",            kNull		},
+	{ 0x6819,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD 7800 Series",            kNull		},
+//	{ 0x6820,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6821,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
 
-//	{ 0x6823,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6824,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6825,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6826,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6827,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
-//	{ 0x6828,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
-//	{ 0x6829,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6823,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6824,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6825,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6826,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6827,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
+//	{ 0x6828,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x6829,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x682D,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
+//	{ 0x682D,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
 
-//	{ 0x682F,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",		kNull		},
+//	{ 0x682F,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ???M Series",            kNull		},
 
-//	{ 0x6830,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
-//	{ 0x6831,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6830,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x6831,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x6837,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
-//	{ 0x6838,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
-//	{ 0x6839,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x6837,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x6838,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
+//	{ 0x6839,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x683B,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x683B,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD ??? Series",             kNull		},
 
-//	{ 0x683D,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7700 Series",		kNull		},
+//	{ 0x683D,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7700 Series",            kNull		},
 
-//	{ 0x683F,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7700 Series",		kNull		},
+//	{ 0x683F,	0x00000000, CHIP_FAMILY_VERDE,		"AMD Radeon HD 7700 Series",            kNull		},
 
-//	{ 0x684C,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",			kNull		},
+//	{ 0x684C,	0x00000000, CHIP_FAMILY_PITCAIRN,	"AMD Radeon HD ??? Series",             kNull		},
 
-/*
-
- HDAUDIO\FUNC_01&VEN_1002&DEV_793C&SUBSYS_00793C00&REV_1000
- HDAUDIO\FUNC_01&VEN_1002&DEV_791A&SUBSYS_00791A00&REV_1000
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_00AA0100&REV_1000
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_00AA0100&REV_1001
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_00AA0100&REV_1002
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_00AA0100&REV_1003
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_104D6800&REV_1002
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_104D6900&REV_1002
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_104D6A00&REV_1002
- HDAUDIO\FUNC_01&VEN_1002&DEV_AA01&SUBSYS_104D6B00&REV_1002
-
- */
-
-
 	{ 0x0000,	0x00000000, CHIP_FAMILY_UNKNOW,		NULL,						kNull		}
 };
 
@@ -1173,7 +1378,7 @@
 //	{FLAGTRUE,	false,	"AAPL,aux-power-connected", NULL,					DWRVAL((uint32_t)1)				},
 //	{FLAGTRUE,	false,	"AAPL,backlight-control",	NULL,					DWRVAL((uint32_t)0)				},
 	{FLAGTRUE,	false,	"ATY,bin_image",			get_binimage_val,		NULVAL							},
-	{FLAGTRUE,	false,	"ATY,Copyright",			NULL,	STRVAL("Copyright AMD Inc. All Rights Reserved. 2005-2010") },
+	{FLAGTRUE,	false,	"ATY,Copyright",			NULL,	STRVAL("Copyright AMD Inc. All Rights Reserved. 2005-2011") },
 	{FLAGTRUE,	false,	"ATY,Card#",				get_romrevision_val,	NULVAL							},
 	{FLAGTRUE,	false,	"ATY,VendorID",				NULL,					WRDVAL((uint16_t)0x1002)		},
 	{FLAGTRUE,	false,	"ATY,DeviceID",				get_deviceid_val,		NULVAL							},
Index: branches/ErmaC/Trunk/package/po/cs.po
===================================================================
--- branches/ErmaC/Trunk/package/po/cs.po	(revision 1924)
+++ branches/ErmaC/Trunk/package/po/cs.po	(revision 1925)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Chameleon 2.1svn-r1870\n"
 "POT-Creation-Date: 2012-03-06 22:38+0000\n"
-"PO-Revision-Date: 2012-04-16 16:12+0200\n"
-"Last-Translator: Radek <valin@buchlovice.org>\n"
+"PO-Revision-Date: 2012-04-18 09:55+0200\n"
+"Last-Translator: martin63 <martin.badin@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@
 #. type: Content of: <html><body><div><p>
 #: Resources/templates/Welcome.html:36 Resources/templates/Conclusion.html:30
 msgid "Package built by: %WHOBUILD%, language translated by: blackosx"
-msgstr "Program sestavil: %WHOBUILD%, jazyk přeložil: vaLin"
+msgstr "Program sestavil: %WHOBUILD%, jazyk přeložil: vaLin, martin63"
 
 #. type: Content of: <html><body><div><p>
 #: Resources/templates/Welcome.html:37 Resources/templates/Conclusion.html:31
@@ -734,7 +734,7 @@
 #: Resources/templates/Localizable.strings:140
 #, no-wrap
 msgid "Set Graphics Mode to 1024x600x32"
-msgstr "Nastavit Graphics Mode na 1024x600x32"
+msgstr "Nastavit rozlišení na 1024x600x32"
 
 #. type: "1024x768x32_title"
 #: Resources/templates/Localizable.strings:142
@@ -746,7 +746,7 @@
 #: Resources/templates/Localizable.strings:143
 #, no-wrap
 msgid "Set Graphics Mode to 1024x768x32"
-msgstr "Nastavit Graphics Mode na 1024x768x32"
+msgstr "Nastavit rozlišení na 1024x768x32"
 
 #. type: "1280x768x32_title"
 #: Resources/templates/Localizable.strings:145
@@ -758,7 +758,7 @@
 #: Resources/templates/Localizable.strings:146
 #, no-wrap
 msgid "Set Graphics Mode to 1280x768x32"
-msgstr "Nastavit Graphics Mode na 1280x768x32"
+msgstr "Nastavit rozlišení na 1280x768x32"
 
 #. type: "1280x800x32_title"
 #: Resources/templates/Localizable.strings:148
@@ -770,7 +770,7 @@
 #: Resources/templates/Localizable.strings:149
 #, no-wrap
 msgid "Set Graphics Mode to 1280x800x32"
-msgstr "Nastavit Graphics Mode na 1280x800x32"
+msgstr "Nastavit rozlišení na 1280x800x32"
 
 #. type: "1280x1024x32_title"
 #: Resources/templates/Localizable.strings:151
@@ -782,7 +782,7 @@
 #: Resources/templates/Localizable.strings:152
 #, no-wrap
 msgid "Set Graphics Mode to 1280x1024x32"
-msgstr "Nastavit Graphics Mode na 1280x1024x32"
+msgstr "Nastavit rozlišení na 1280x1024x32"
 
 #. type: "1280x960x32_title"
 #: Resources/templates/Localizable.strings:154
@@ -794,7 +794,7 @@
 #: Resources/templates/Localizable.strings:155
 #, no-wrap
 msgid "Set Graphics Mode to 1280x960x32"
-msgstr "Nastavit Graphics Mode na 1280x960x32"
+msgstr "Nastavit rozlišení na 1280x960x32"
 
 #. type: "1440x900x32_title"
 #: Resources/templates/Localizable.strings:157
@@ -806,7 +806,7 @@
 #: Resources/templates/Localizable.strings:158
 #, no-wrap
 msgid "Set Graphics Mode to 1440x900x32"
-msgstr "Nastavit Graphics Mode na 1440x900x32"
+msgstr "Nastavit rozlišení na 1440x900x32"
 
 #. type: "1600x900x32_title"
 #: Resources/templates/Localizable.strings:160
@@ -818,7 +818,7 @@
 #: Resources/templates/Localizable.strings:161
 #, no-wrap
 msgid "Set Graphics Mode to 1600x900x32"
-msgstr "Nastavit Graphics Mode na 1600x900x32"
+msgstr "Nastavit rozlišení na 1600x900x32"
 
 #. type: "1600x1200x32_title"
 #: Resources/templates/Localizable.strings:163
@@ -830,7 +830,7 @@
 #: Resources/templates/Localizable.strings:164
 #, no-wrap
 msgid "Set Graphics Mode to 1600x1200x32"
-msgstr "Nastavit Graphics Mode na 1600x1200x32"
+msgstr "Nastavit rozlišení na 1600x1200x32"
 
 #. type: "1680x1050x32_title"
 #: Resources/templates/Localizable.strings:166
@@ -842,7 +842,7 @@
 #: Resources/templates/Localizable.strings:167
 #, no-wrap
 msgid "Set Graphics Mode to 1680x1050x32"
-msgstr "Nastavit Graphics Mode na 1680x1050x32"
+msgstr "Nastavit rozlišení na 1680x1050x32"
 
 #. type: "1920x1080x32_title"
 #: Resources/templates/Localizable.strings:169
@@ -854,7 +854,7 @@
 #: Resources/templates/Localizable.strings:170
 #, no-wrap
 msgid "Set Graphics Mode to 1920x1080x32"
-msgstr "Nastavit Graphics Mode na 1920x1080x32"
+msgstr "Nastavit rozlišení na 1920x1080x32"
 
 #. type: "1920x1200x32_title"
 #: Resources/templates/Localizable.strings:172
@@ -866,7 +866,7 @@
 #: Resources/templates/Localizable.strings:173
 #, no-wrap
 msgid "Set Graphics Mode to 1920x1200x32"
-msgstr "Nastavit Graphics Mode na 1920x1200x32"
+msgstr "Nastavit rozlišení na 1920x1200x32"
 
 #. type: "GraphicsEnabler_title"
 #: Resources/templates/Localizable.strings:177