diff options
| author | Burt P <pburt0@gmail.com> | 2019-08-09 12:54:10 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-08-10 16:47:44 -0700 |
| commit | 39db0d3af0ff9f7c55cdee988733fb0b3c0023c4 (patch) | |
| tree | febc121a6cb1038af5e5cd907b0ff029efd9a25a /modules/computer/ubuntu_flavors.c | |
| parent | 44841ef5d06a6c7d0e22491901afc067228f7e64 (diff) | |
name cleanup for x86 model strings and intel pci device strings
x86 CPU:
* Remove (R), (TM), etc
* AMD: remove redundant "X2 Dual Core", "X4 Quad Core", etc
* Move vendor to front if not already
* Remove speed, as the actual speed is usually right next to it
* Remove "CPU", "APU", "Processor" to shorten
* Compress space
Intel GPU:
* Remove (R)
* Abbreviate "Generation": "Gen"
* Remove "Processor", "Controller", and "Device" to shorten
* Compress space
Some examples:
x86 CPU:
'AMD Turion(tm) 64 Mobile Technology ML-32' ---> 'AMD Turion 64 Mobile ML-32'
'Cyrix MediaGXtm MMXtm Enhanced' ---> 'Cyrix MediaGX MMX Enhanced'
'Transmeta(tm) Crusoe(tm) Processor TM5800' ---> 'Transmeta Crusoe TM5800'
'VIA Nano X2 L4350 @ 1.6+ GHz' ---> 'VIA Nano X2 L4350'
'AMD Athlon(tm) 64 X2 Dual-Core Processor TK-53' ---> 'AMD Athlon 64 X2 TK-53'
'Embedded AMD Opteron(tm) Processor 23KS EE' ---> 'AMD Embedded Opteron 23KS EE'
'Intel(R) Atom(TM) x5-Z8300 CPU @ 1.44GHz' ---> 'Intel Atom x5-Z8300'
'Intel(R) Pentium(R) III CPU - S 1400MHz' ---> 'Intel Pentium III - S'
'Dual Core AMD Opteron(tm) Processor 165' ---> 'AMD Dual Core Opteron 165'
'Genuine Intel(R) CPU T1350 @ 1.86GHz' ---> 'Intel T1350'
'AMD Phenom(tm) 9350e Quad-Core Processor' ---> 'AMD Phenom 9350e Quad-Core'
Intel GPU:
'Atom/Celeron/Pentium Processor x5-E8000/J3xxx/N3xxx Integrated Graphics Controller' ---> 'Atom/Celeron/Pentium x5-E8000/J3xxx/N3xxx Integrated Graphics'
'4th Generation Core Processor Family Integrated Graphics Controller' ---> '4th Gen Core Family Integrated Graphics'
'Mobile GM965/GL960 Integrated Graphics Controller (secondary)' ---> 'Mobile GM965/GL960 Integrated Graphics (secondary)'
'Mobile 915GM/GMS/910GML Express Graphics Controller' ---> 'Mobile 915GM/GMS/910GML Express Graphics'
Also:
Fix/replace the appf() and SEQ() that were peppered about.
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules/computer/ubuntu_flavors.c')
| -rw-r--r-- | modules/computer/ubuntu_flavors.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/computer/ubuntu_flavors.c b/modules/computer/ubuntu_flavors.c index ff64eb56..20e83c82 100644 --- a/modules/computer/ubuntu_flavors.c +++ b/modules/computer/ubuntu_flavors.c @@ -19,9 +19,7 @@ #include <hardinfo.h> #include "distro_flavors.h" - -#include "dt_util.h" /* for appf() */ -#define SEQ(s,m) (g_strcmp0(s, m) == 0) +#include "util_sysobj.h" /* for appfsp() */ static const UbuntuFlavor ubuntu_flavors[] = { { "Vanilla Server", "distros/ubuntu.svg", "https://ubuntu.org", "ubuntu-server" }, @@ -59,7 +57,7 @@ GSList *ubuntu_flavors_scan(void) { gchar *cmd_line = g_strdup("apt-cache policy"); int i; for(i = 0; ubuntu_flavors[i].base.name; i++) { - cmd_line = appf(cmd_line, "%s", ubuntu_flavors[i].package); + cmd_line = appfsp(cmd_line, "%s", ubuntu_flavors[i].package); } if (!i) return NULL; |