From 74638712ab3fbb0f1ed67dff8e43bf5a006e09e5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 22 Mar 2015 23:26:10 +0100 Subject: [PATCH] fireinfo: Shorten some more CPU names of AMD --- webapp/backend/fireinfo.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py index aa405f4..91abbf4 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"), -- 2.39.2