From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Mar 2015 22:26:10 +0000 (+0100)
Subject: fireinfo: Shorten some more CPU names of AMD
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74638712ab3fbb0f1ed67dff8e43bf5a006e09e5;p=ipfire.org.git

fireinfo: Shorten some more CPU names of AMD
---

diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py
index aa405f40..91abbf47 100644
--- a/webapp/backend/fireinfo.py
+++ b/webapp/backend/fireinfo.py
@@ -34,6 +34,7 @@ CPU_STRINGS = (
 	### AMD ###
 	# APU
 	(r"AMD ([\w\-]+) APU with Radeon\(tm\) HD Graphics", r"AMD \1 APU"),
+	(r"AMD ([\w\-]+) Radeon R\d+, \d+ Compute Cores \d+C\+\d+G", r"AMD \1 APU"),
 	# Athlon
 	(r"AMD Athlon.* II X2 ([a-z0-9]+).*", r"AMD Athlon X2 \1"),
 	(r"AMD Athlon\(tm\) 64 Processor (\w+)", r"AMD Athlon64 \1"),
@@ -45,6 +46,8 @@ CPU_STRINGS = (
 	# Geode
 	(r"Geode\(TM\) Integrated Processor by AMD PCS", r"AMD Geode"),
 	(r"(Geode).*", r"\1"),
+	# Mobile
+	(r"Mobile AMD (Athlon|Sempron)\(tm\) Processor (\d+\+?)", r"AMD \1-M \2"),
 
 	# Intel
 	(r"Intel\(R\) (Atom|Celeron).*CPU\s*([A-Z0-9]+) .*", r"Intel \1 \2"),