Fix fill-in magic.

 * changed regexp for parsing driver line, just PCI ID is
   relevant.
 * all magic is now in data
 * eliminated most unnecessary console.logs ... either changed
   to console.error or just removed.

2 files changed, 583 insertions, 0 deletions

diff --git a/chip-data/ati/drm_pciids.awk b/chip-data/ati/drm_pciids.awk
new file mode 100755
index 0000000..dea8fd2
--- /dev/null
+++ b/chip-data/ati/drm_pciids.awk
@@ -0,0 +1,93 @@
+#!/usr/bin/gawk -f
+
+BEGIN {
+	FS=", "
+
+	# NOTE: please edit flags template as well
+	flag_letter["RADEON_IS_MOBILITY"] = "m"
+	flag_letter["RADEON_NEW_MEMMAP"] = "M"
+	flag_letter["RADEON_IS_IGP"] = "i"
+	flag_letter["RADEON_IS_IGPGART"] = "I"
+	flag_letter["RADEON_SINGLE_CRTC"] = "c"
+	flags_template = "mMiIc"
+	first_line = ""
+	printf("{\n")
+}
+
+function error(f, s1, s2) {
+	printf("%s:%d: " f "\n", FILENAME, NR, s1, s2) >"/dev/stderr"
+	error_code = 1
+}
+
+function flag_to_letter(f_name)
+{
+	if (f_name in flag_letter) {
+		return flag_letter[f_name]
+	} else {
+		error("unknown flag %s%s", f_name)
+		return f_name
+	}
+}
+
+function format_flags(f_code,        i, n, l, out) {
+	n = length(flags_template)
+	for (i=1; i<=n; i++) {
+		l = substr(flags_template, i, 1)
+		out = out f_code[l]
+		delete f_code[l]
+	}
+	for (l in f_code) {
+		out = out f_code[l]
+		if (length(l)==1)
+			error("flag \"%s\" missing from flags_template", l, "")
+	}
+	if (length(out)>0) {
+	    out = ",\"" out "\""
+	}
+	return out
+}
+		
+/^[[:blank:]]+{0x/ {
+	sub(/^[[:blank:]]+{/,"")
+	sub(/},[[:blank:]]*\\$/,"")
+
+	id_vendor = $1; sub(/^0x/, "", id_vendor)
+	id_type = $2; sub(/^0x/, "", id_type)
+
+	flags = $7
+
+	if (flags == "0")
+		next
+
+	n_flag_arr = split(flags, flag_arr, "|")
+	first_flag = flag_arr[1]
+	delete f_code
+	for (i=2; i<=n_flag_arr; i++) {
+		l = flag_to_letter(flag_arr[i])
+		f_code[l] = l
+	}
+
+	formatted_flags = format_flags(f_code)
+
+	# second param to gensub is the replacement text:
+	chip_type = tolower(gensub(/^CHIP_/, "", "", first_flag))
+
+    if (length(first_line) > 0) {
+        printf(",\n")
+    } else {
+        first_line = "TRUE"
+    }
+	if ((chip_type in types) && types[chip_type] != first_flag)
+		error("chip name collision: %s vs. %s", \
+			types[chip_type], first_flag)
+
+	types[chip_type] = first_flag
+
+	printf("\t\"%s,%s\":[\"%s\"%s]", toupper(id_vendor), toupper(id_type),\
+	    chip_type, formatted_flags)
+}
+
+END {
+    printf("\n}\n")
+	exit error_code
+}
diff --git a/chip-data/ati/drm_pciids.json b/chip-data/ati/drm_pciids.json
new file mode 100644
index 0000000..20ad905
--- /dev/null
+++ b/chip-data/ati/drm_pciids.json
@@ -0,0 +1,490 @@
+{
+	"1002,3150":["rv380","m"],
+	"1002,3152":["rv380","mM"],
+	"1002,3154":["rv380","mM"],
+	"1002,3155":["rv380","mM"],
+	"1002,3E50":["rv380","M"],
+	"1002,3E54":["rv380","M"],
+	"1002,4136":["rs100","i"],
+	"1002,4137":["rs200","i"],
+	"1002,4144":["r300"],
+	"1002,4145":["r300"],
+	"1002,4146":["r300"],
+	"1002,4147":["r300"],
+	"1002,4148":["r350"],
+	"1002,4149":["r350"],
+	"1002,414A":["r350"],
+	"1002,414B":["r350"],
+	"1002,4150":["rv350"],
+	"1002,4151":["rv350"],
+	"1002,4152":["rv350"],
+	"1002,4153":["rv350"],
+	"1002,4154":["rv350"],
+	"1002,4155":["rv350"],
+	"1002,4156":["rv350"],
+	"1002,4237":["rs200","i"],
+	"1002,4242":["r200"],
+	"1002,4336":["rs100","mi"],
+	"1002,4337":["rs200","mi"],
+	"1002,4437":["rs200","mi"],
+	"1002,4966":["rv250"],
+	"1002,4967":["rv250"],
+	"1002,4A48":["r420","M"],
+	"1002,4A49":["r420","M"],
+	"1002,4A4A":["r420","M"],
+	"1002,4A4B":["r420","M"],
+	"1002,4A4C":["r420","M"],
+	"1002,4A4D":["r420","M"],
+	"1002,4A4E":["r420","mM"],
+	"1002,4A4F":["r420","M"],
+	"1002,4A50":["r420","M"],
+	"1002,4A54":["r420","M"],
+	"1002,4B48":["r420","M"],
+	"1002,4B49":["r420","M"],
+	"1002,4B4A":["r420","M"],
+	"1002,4B4B":["r420","M"],
+	"1002,4B4C":["r420","M"],
+	"1002,4C57":["rv200","m"],
+	"1002,4C58":["rv200","m"],
+	"1002,4C59":["rv100","m"],
+	"1002,4C5A":["rv100","m"],
+	"1002,4C64":["rv250","m"],
+	"1002,4C66":["rv250","m"],
+	"1002,4C67":["rv250","m"],
+	"1002,4E44":["r300"],
+	"1002,4E45":["r300"],
+	"1002,4E46":["r300"],
+	"1002,4E47":["r300"],
+	"1002,4E48":["r350"],
+	"1002,4E49":["r350"],
+	"1002,4E4A":["r350"],
+	"1002,4E4B":["r350"],
+	"1002,4E50":["rv350","m"],
+	"1002,4E51":["rv350","m"],
+	"1002,4E52":["rv350","m"],
+	"1002,4E53":["rv350","m"],
+	"1002,4E54":["rv350","m"],
+	"1002,4E56":["rv350","m"],
+	"1002,5144":["r100","c"],
+	"1002,5145":["r100","c"],
+	"1002,5146":["r100","c"],
+	"1002,5147":["r100","c"],
+	"1002,5148":["r200"],
+	"1002,514C":["r200"],
+	"1002,514D":["r200"],
+	"1002,5157":["rv200"],
+	"1002,5158":["rv200"],
+	"1002,5159":["rv100"],
+	"1002,515A":["rv100"],
+	"1002,515E":["rv100","c"],
+	"1002,5460":["rv380","m"],
+	"1002,5462":["rv380","m"],
+	"1002,5464":["rv380","m"],
+	"1002,5548":["r423","M"],
+	"1002,5549":["r423","M"],
+	"1002,554A":["r423","M"],
+	"1002,554B":["r423","M"],
+	"1002,554C":["r423","M"],
+	"1002,554D":["r423","M"],
+	"1002,554E":["r423","M"],
+	"1002,554F":["r423","M"],
+	"1002,5550":["r423","M"],
+	"1002,5551":["r423","M"],
+	"1002,5552":["r423","M"],
+	"1002,5554":["r423","M"],
+	"1002,564A":["rv410","mM"],
+	"1002,564B":["rv410","mM"],
+	"1002,564F":["rv410","mM"],
+	"1002,5652":["rv410","mM"],
+	"1002,5653":["rv410","mM"],
+	"1002,5657":["rv410","M"],
+	"1002,5834":["rs300","i"],
+	"1002,5835":["rs300","mi"],
+	"1002,5954":["rs480","miI"],
+	"1002,5955":["rs480","miI"],
+	"1002,5974":["rs480","miI"],
+	"1002,5975":["rs480","miI"],
+	"1002,5960":["rv280"],
+	"1002,5961":["rv280"],
+	"1002,5962":["rv280"],
+	"1002,5964":["rv280"],
+	"1002,5965":["rv280"],
+	"1002,5969":["rv100","c"],
+	"1002,5A41":["rs400","iI"],
+	"1002,5A42":["rs400","miI"],
+	"1002,5A61":["rs400","iI"],
+	"1002,5A62":["rs400","miI"],
+	"1002,5B60":["rv380","M"],
+	"1002,5B62":["rv380","M"],
+	"1002,5B63":["rv380","M"],
+	"1002,5B64":["rv380","M"],
+	"1002,5B65":["rv380","M"],
+	"1002,5C61":["rv280","m"],
+	"1002,5C63":["rv280","m"],
+	"1002,5D48":["r423","mM"],
+	"1002,5D49":["r423","mM"],
+	"1002,5D4A":["r423","mM"],
+	"1002,5D4C":["r423","M"],
+	"1002,5D4D":["r423","M"],
+	"1002,5D4E":["r423","M"],
+	"1002,5D4F":["r423","M"],
+	"1002,5D50":["r423","M"],
+	"1002,5D52":["r423","M"],
+	"1002,5D57":["r423","M"],
+	"1002,5E48":["rv410","M"],
+	"1002,5E4A":["rv410","M"],
+	"1002,5E4B":["rv410","M"],
+	"1002,5E4C":["rv410","M"],
+	"1002,5E4D":["rv410","M"],
+	"1002,5E4F":["rv410","M"],
+	"1002,6720":["barts","mM"],
+	"1002,6721":["barts","mM"],
+	"1002,6722":["barts","M"],
+	"1002,6723":["barts","M"],
+	"1002,6724":["barts","mM"],
+	"1002,6725":["barts","mM"],
+	"1002,6726":["barts","M"],
+	"1002,6727":["barts","M"],
+	"1002,6728":["barts","M"],
+	"1002,6729":["barts","M"],
+	"1002,6738":["barts","M"],
+	"1002,6739":["barts","M"],
+	"1002,6740":["turks","mM"],
+	"1002,6741":["turks","mM"],
+	"1002,6742":["turks","mM"],
+	"1002,6743":["turks","mM"],
+	"1002,6744":["turks","mM"],
+	"1002,6745":["turks","mM"],
+	"1002,6746":["turks","M"],
+	"1002,6747":["turks","M"],
+	"1002,6748":["turks","M"],
+	"1002,6749":["turks","M"],
+	"1002,6750":["turks","M"],
+	"1002,6758":["turks","M"],
+	"1002,6759":["turks","M"],
+	"1002,6760":["caicos","mM"],
+	"1002,6761":["caicos","mM"],
+	"1002,6762":["caicos","M"],
+	"1002,6763":["caicos","M"],
+	"1002,6764":["caicos","mM"],
+	"1002,6765":["caicos","mM"],
+	"1002,6766":["caicos","M"],
+	"1002,6767":["caicos","M"],
+	"1002,6768":["caicos","M"],
+	"1002,6770":["caicos","M"],
+	"1002,6779":["caicos","M"],
+	"1002,6880":["cypress","mM"],
+	"1002,6888":["cypress","M"],
+	"1002,6889":["cypress","M"],
+	"1002,688A":["cypress","M"],
+	"1002,688C":["cypress","M"],
+	"1002,688D":["cypress","M"],
+	"1002,6898":["cypress","M"],
+	"1002,6899":["cypress","M"],
+	"1002,689C":["hemlock","M"],
+	"1002,689D":["hemlock","M"],
+	"1002,689E":["cypress","M"],
+	"1002,68A0":["juniper","mM"],
+	"1002,68A1":["juniper","mM"],
+	"1002,68A8":["juniper","M"],
+	"1002,68A9":["juniper","M"],
+	"1002,68B0":["juniper","mM"],
+	"1002,68B8":["juniper","M"],
+	"1002,68B9":["juniper","M"],
+	"1002,68BE":["juniper","M"],
+	"1002,68C0":["redwood","mM"],
+	"1002,68C1":["redwood","mM"],
+	"1002,68C7":["redwood","mM"],
+	"1002,68C8":["redwood","M"],
+	"1002,68C9":["redwood","M"],
+	"1002,68D8":["redwood","M"],
+	"1002,68D9":["redwood","M"],
+	"1002,68DA":["redwood","M"],
+	"1002,68DE":["redwood","M"],
+	"1002,68E0":["cedar","mM"],
+	"1002,68E1":["cedar","mM"],
+	"1002,68E4":["cedar","mM"],
+	"1002,68E5":["cedar","mM"],
+	"1002,68E8":["cedar","M"],
+	"1002,68E9":["cedar","M"],
+	"1002,68F1":["cedar","M"],
+	"1002,68F2":["cedar","M"],
+	"1002,68F8":["cedar","M"],
+	"1002,68F9":["cedar","M"],
+	"1002,68FE":["cedar","M"],
+	"1002,7100":["r520","M"],
+	"1002,7101":["r520","mM"],
+	"1002,7102":["r520","mM"],
+	"1002,7103":["r520","mM"],
+	"1002,7104":["r520","M"],
+	"1002,7105":["r520","M"],
+	"1002,7106":["r520","mM"],
+	"1002,7108":["r520","M"],
+	"1002,7109":["r520","M"],
+	"1002,710A":["r520","M"],
+	"1002,710B":["r520","M"],
+	"1002,710C":["r520","M"],
+	"1002,710E":["r520","M"],
+	"1002,710F":["r520","M"],
+	"1002,7140":["rv515","M"],
+	"1002,7141":["rv515","M"],
+	"1002,7142":["rv515","M"],
+	"1002,7143":["rv515","M"],
+	"1002,7144":["rv515","mM"],
+	"1002,7145":["rv515","mM"],
+	"1002,7146":["rv515","M"],
+	"1002,7147":["rv515","M"],
+	"1002,7149":["rv515","mM"],
+	"1002,714A":["rv515","mM"],
+	"1002,714B":["rv515","mM"],
+	"1002,714C":["rv515","mM"],
+	"1002,714D":["rv515","M"],
+	"1002,714E":["rv515","M"],
+	"1002,714F":["rv515","M"],
+	"1002,7151":["rv515","M"],
+	"1002,7152":["rv515","M"],
+	"1002,7153":["rv515","M"],
+	"1002,715E":["rv515","M"],
+	"1002,715F":["rv515","M"],
+	"1002,7180":["rv515","M"],
+	"1002,7181":["rv515","M"],
+	"1002,7183":["rv515","M"],
+	"1002,7186":["rv515","mM"],
+	"1002,7187":["rv515","M"],
+	"1002,7188":["rv515","mM"],
+	"1002,718A":["rv515","mM"],
+	"1002,718B":["rv515","mM"],
+	"1002,718C":["rv515","mM"],
+	"1002,718D":["rv515","mM"],
+	"1002,718F":["rv515","M"],
+	"1002,7193":["rv515","M"],
+	"1002,7196":["rv515","mM"],
+	"1002,719B":["rv515","M"],
+	"1002,719F":["rv515","M"],
+	"1002,71C0":["rv530","M"],
+	"1002,71C1":["rv530","M"],
+	"1002,71C2":["rv530","M"],
+	"1002,71C3":["rv530","M"],
+	"1002,71C4":["rv530","mM"],
+	"1002,71C5":["rv530","mM"],
+	"1002,71C6":["rv530","M"],
+	"1002,71C7":["rv530","M"],
+	"1002,71CD":["rv530","M"],
+	"1002,71CE":["rv530","M"],
+	"1002,71D2":["rv530","M"],
+	"1002,71D4":["rv530","mM"],
+	"1002,71D5":["rv530","mM"],
+	"1002,71D6":["rv530","mM"],
+	"1002,71DA":["rv530","M"],
+	"1002,71DE":["rv530","mM"],
+	"1002,7200":["rv515","M"],
+	"1002,7210":["rv515","mM"],
+	"1002,7211":["rv515","mM"],
+	"1002,7240":["r580","M"],
+	"1002,7243":["r580","M"],
+	"1002,7244":["r580","M"],
+	"1002,7245":["r580","M"],
+	"1002,7246":["r580","M"],
+	"1002,7247":["r580","M"],
+	"1002,7248":["r580","M"],
+	"1002,7249":["r580","M"],
+	"1002,724A":["r580","M"],
+	"1002,724B":["r580","M"],
+	"1002,724C":["r580","M"],
+	"1002,724D":["r580","M"],
+	"1002,724E":["r580","M"],
+	"1002,724F":["r580","M"],
+	"1002,7280":["rv570","M"],
+	"1002,7281":["rv560","M"],
+	"1002,7283":["rv560","M"],
+	"1002,7284":["r580","mM"],
+	"1002,7287":["rv560","M"],
+	"1002,7288":["rv570","M"],
+	"1002,7289":["rv570","M"],
+	"1002,728B":["rv570","M"],
+	"1002,728C":["rv570","M"],
+	"1002,7290":["rv560","M"],
+	"1002,7291":["rv560","M"],
+	"1002,7293":["rv560","M"],
+	"1002,7297":["rv560","M"],
+	"1002,7834":["rs300","Mi"],
+	"1002,7835":["rs300","mMi"],
+	"1002,791E":["rs690","MiI"],
+	"1002,791F":["rs690","MiI"],
+	"1002,793F":["rs600","Mi"],
+	"1002,7941":["rs600","Mi"],
+	"1002,7942":["rs600","Mi"],
+	"1002,796C":["rs740","MiI"],
+	"1002,796D":["rs740","MiI"],
+	"1002,796E":["rs740","MiI"],
+	"1002,796F":["rs740","MiI"],
+	"1002,9400":["r600","M"],
+	"1002,9401":["r600","M"],
+	"1002,9402":["r600","M"],
+	"1002,9403":["r600","M"],
+	"1002,9405":["r600","M"],
+	"1002,940A":["r600","M"],
+	"1002,940B":["r600","M"],
+	"1002,940F":["r600","M"],
+	"1002,94A0":["rv740","mM"],
+	"1002,94A1":["rv740","mM"],
+	"1002,94A3":["rv740","mM"],
+	"1002,94B1":["rv740","M"],
+	"1002,94B3":["rv740","M"],
+	"1002,94B4":["rv740","M"],
+	"1002,94B5":["rv740","M"],
+	"1002,94B9":["rv740","mM"],
+	"1002,9440":["rv770","M"],
+	"1002,9441":["rv770","M"],
+	"1002,9442":["rv770","M"],
+	"1002,9443":["rv770","M"],
+	"1002,9444":["rv770","M"],
+	"1002,9446":["rv770","M"],
+	"1002,944A":["rv770","mM"],
+	"1002,944B":["rv770","mM"],
+	"1002,944C":["rv770","M"],
+	"1002,944E":["rv770","M"],
+	"1002,9450":["rv770","M"],
+	"1002,9452":["rv770","M"],
+	"1002,9456":["rv770","M"],
+	"1002,945A":["rv770","mM"],
+	"1002,945B":["rv770","mM"],
+	"1002,945E":["rv770","mM"],
+	"1002,9460":["rv770","M"],
+	"1002,9462":["rv770","M"],
+	"1002,946A":["rv770","mM"],
+	"1002,946B":["rv770","mM"],
+	"1002,947A":["rv770","mM"],
+	"1002,947B":["rv770","mM"],
+	"1002,9480":["rv730","mM"],
+	"1002,9487":["rv730","M"],
+	"1002,9488":["rv730","mM"],
+	"1002,9489":["rv730","mM"],
+	"1002,948A":["rv730","mM"],
+	"1002,948F":["rv730","M"],
+	"1002,9490":["rv730","M"],
+	"1002,9491":["rv730","mM"],
+	"1002,9495":["rv730","M"],
+	"1002,9498":["rv730","M"],
+	"1002,949C":["rv730","M"],
+	"1002,949E":["rv730","M"],
+	"1002,949F":["rv730","M"],
+	"1002,94C0":["rv610","M"],
+	"1002,94C1":["rv610","M"],
+	"1002,94C3":["rv610","M"],
+	"1002,94C4":["rv610","M"],
+	"1002,94C5":["rv610","M"],
+	"1002,94C6":["rv610","M"],
+	"1002,94C7":["rv610","M"],
+	"1002,94C8":["rv610","mM"],
+	"1002,94C9":["rv610","mM"],
+	"1002,94CB":["rv610","mM"],
+	"1002,94CC":["rv610","M"],
+	"1002,94CD":["rv610","M"],
+	"1002,9500":["rv670","M"],
+	"1002,9501":["rv670","M"],
+	"1002,9504":["rv670","mM"],
+	"1002,9505":["rv670","M"],
+	"1002,9506":["rv670","mM"],
+	"1002,9507":["rv670","M"],
+	"1002,9508":["rv670","mM"],
+	"1002,9509":["rv670","mM"],
+	"1002,950F":["rv670","M"],
+	"1002,9511":["rv670","M"],
+	"1002,9515":["rv670","M"],
+	"1002,9517":["rv670","M"],
+	"1002,9519":["rv670","M"],
+	"1002,9540":["rv710","M"],
+	"1002,9541":["rv710","M"],
+	"1002,9542":["rv710","M"],
+	"1002,954E":["rv710","M"],
+	"1002,954F":["rv710","M"],
+	"1002,9552":["rv710","mM"],
+	"1002,9553":["rv710","mM"],
+	"1002,9555":["rv710","mM"],
+	"1002,9557":["rv710","mM"],
+	"1002,955F":["rv710","mM"],
+	"1002,9580":["rv630","M"],
+	"1002,9581":["rv630","mM"],
+	"1002,9583":["rv630","mM"],
+	"1002,9586":["rv630","M"],
+	"1002,9587":["rv630","M"],
+	"1002,9588":["rv630","M"],
+	"1002,9589":["rv630","M"],
+	"1002,958A":["rv630","M"],
+	"1002,958B":["rv630","mM"],
+	"1002,958C":["rv630","M"],
+	"1002,958D":["rv630","M"],
+	"1002,958E":["rv630","M"],
+	"1002,958F":["rv630","mM"],
+	"1002,9590":["rv635","M"],
+	"1002,9591":["rv635","mM"],
+	"1002,9593":["rv635","mM"],
+	"1002,9595":["rv635","mM"],
+	"1002,9596":["rv635","M"],
+	"1002,9597":["rv635","M"],
+	"1002,9598":["rv635","M"],
+	"1002,9599":["rv635","M"],
+	"1002,959B":["rv635","mM"],
+	"1002,95C0":["rv620","M"],
+	"1002,95C2":["rv620","mM"],
+	"1002,95C4":["rv620","mM"],
+	"1002,95C5":["rv620","M"],
+	"1002,95C6":["rv620","M"],
+	"1002,95C7":["rv620","M"],
+	"1002,95C9":["rv620","M"],
+	"1002,95CC":["rv620","M"],
+	"1002,95CD":["rv620","M"],
+	"1002,95CE":["rv620","M"],
+	"1002,95CF":["rv620","M"],
+	"1002,9610":["rs780","Mi"],
+	"1002,9611":["rs780","Mi"],
+	"1002,9612":["rs780","Mi"],
+	"1002,9613":["rs780","Mi"],
+	"1002,9614":["rs780","Mi"],
+	"1002,9615":["rs780","Mi"],
+	"1002,9616":["rs780","Mi"],
+	"1002,9710":["rs880","Mi"],
+	"1002,9711":["rs880","Mi"],
+	"1002,9712":["rs880","mMi"],
+	"1002,9713":["rs880","mMi"],
+	"1002,9714":["rs880","Mi"],
+	"1002,9715":["rs880","Mi"],
+	"1002,9802":["palm","Mi"],
+	"1002,9803":["palm","Mi"],
+	"1002,9804":["palm","Mi"],
+	"1002,9805":["palm","Mi"],
+	"102B,0520":["mga_card_type_g200"],
+	"102B,0521":["mga_card_type_g200"],
+	"102B,0525":["mga_card_type_g400"],
+	"102B,2527":["mga_card_type_g550"],
+	"1039,6330":["sis_chip_315"],
+	"18CA,0040":["sis_chip_315"],
+	"18CA,0042":["sis_chip_315"],
+	"1106,3118":["via_pro_group_a"],
+	"1106,3230":["via_dx9_0"],
+	"1106,3157":["via_pro_group_a"],
+	"5333,8A20":["s3_savage3d"],
+	"5333,8A21":["s3_savage3d"],
+	"5333,8A22":["s3_savage4"],
+	"5333,8A23":["s3_savage4"],
+	"5333,8C10":["s3_savage_mx"],
+	"5333,8C11":["s3_savage_mx"],
+	"5333,8C12":["s3_savage_mx"],
+	"5333,8C13":["s3_savage_mx"],
+	"5333,8C22":["s3_supersavage"],
+	"5333,8C24":["s3_supersavage"],
+	"5333,8C26":["s3_supersavage"],
+	"5333,8C2A":["s3_supersavage"],
+	"5333,8C2B":["s3_supersavage"],
+	"5333,8C2C":["s3_supersavage"],
+	"5333,8C2D":["s3_supersavage"],
+	"5333,8C2E":["s3_supersavage"],
+	"5333,8C2F":["s3_supersavage"],
+	"5333,8A25":["s3_prosavage"],
+	"5333,8A26":["s3_prosavage"],
+	"5333,8D01":["s3_twister"],
+	"5333,8D02":["s3_twister"],
+	"5333,8D03":["s3_prosavageddr"],
+	"5333,8D04":["s3_prosavageddr"]
+}