mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2024-11-10 22:59:13 +00:00
Code Issues Releases Wiki Activity

Rename ATOM enum value as it clashes with some Windows headers.

Browse source
This commit is contained in:
Veselin Georiev 2016-07-07 21:47:20 +03:00 committed by Veselin Georgiev
parent 87f3052a7b
commit 296b1efe7a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcpuid/intel_code_t.h
View file

@ -59,7 +59,7 @@
CODE(MORE_THAN_QUADCORE), CODE(MORE_THAN_QUADCORE),
CODE(PENTIUM_D), CODE(PENTIUM_D),
CODE(ATOM), CODE(ATOM_UNKNOWN),
CODE(ATOM_SILVERTHORNE), CODE(ATOM_SILVERTHORNE),
CODE(ATOM_DIAMONDVILLE), CODE(ATOM_DIAMONDVILLE),
CODE(ATOM_PINEVIEW), CODE(ATOM_PINEVIEW),

4
libcpuid/recog_intel.c
View file

@ -169,7 +169,7 @@ const struct match_entry_t cpudb_intel[] = {
{ 6, 13, -1, -1, -1, 1, -1, -1, MOBILE_PENTIUM_M , 0, "Pentium M (Dothan)" }, { 6, 13, -1, -1, -1, 1, -1, -1, MOBILE_PENTIUM_M , 0, "Pentium M (Dothan)" },
{ 6, 13, -1, -1, -1, 1, -1, -1, CELERON , 0, "Celeron M" }, { 6, 13, -1, -1, -1, 1, -1, -1, CELERON , 0, "Celeron M" },
{ 6, 12, -1, -1, -1, -1, -1, -1, ATOM , 0, "Unknown Atom" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_UNKNOWN , 0, "Unknown Atom" },
{ 6, 12, -1, -1, -1, -1, -1, -1, ATOM_DIAMONDVILLE , 0, "Atom (Diamondville)" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_DIAMONDVILLE , 0, "Atom (Diamondville)" },
{ 6, 12, -1, -1, -1, -1, -1, -1, ATOM_SILVERTHORNE , 0, "Atom (Silverthorne)" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_SILVERTHORNE , 0, "Atom (Silverthorne)" },
{ 6, 12, -1, -1, -1, -1, -1, -1, ATOM_CEDARVIEW , 0, "Atom (Cedarview)" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_CEDARVIEW , 0, "Atom (Cedarview)" },
@ -615,7 +615,7 @@ static intel_code_t get_brand_code(struct cpu_id_t* data)
{ ATOM_SILVERTHORNE, "Atom(TM) CPU Z" }, { ATOM_SILVERTHORNE, "Atom(TM) CPU Z" },
{ ATOM_PINEVIEW, "Atom(TM) CPU D" }, { ATOM_PINEVIEW, "Atom(TM) CPU D" },
{ ATOM_CEDARVIEW, "Atom(TM) CPU N####" }, { ATOM_CEDARVIEW, "Atom(TM) CPU N####" },
{ ATOM, "Atom(TM) CPU" }, { ATOM_UNKNOWN, "Atom(TM) CPU" },
}; };
if (strstr(bs, "Mobile")) { if (strstr(bs, "Mobile")) {