mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2024-12-16 16:35:45 +00:00
Code Issues Releases Wiki Activity

Port to MSVC7.1: C89 compliance and project updates.

Browse source
This commit is contained in:
Veselin Georgiev 2016-07-09 05:48:35 +03:00
parent 568db71156
commit 03d54ae61c
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libcpuid/libcpuid_vc71.vcproj
View file

@ -178,15 +178,24 @@
Name="Header Files" Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath=".\amd_code_t.h">
</File>
<File <File
RelativePath=".\asm-bits.h"> RelativePath=".\asm-bits.h">
</File> </File>
<File
RelativePath=".\intel_code_t.h">
</File>
<File <File
RelativePath=".\libcpuid.h"> RelativePath=".\libcpuid.h">
</File> </File>
<File <File
RelativePath=".\libcpuid_constants.h"> RelativePath=".\libcpuid_constants.h">
</File> </File>
<File
RelativePath=".\libcpuid_internal.h">
</File>
<File <File
RelativePath=".\libcpuid_types.h"> RelativePath=".\libcpuid_types.h">
</File> </File>

3
libcpuid/rdmsr.c
View file

@ -802,7 +802,8 @@ int cpu_msrinfo(struct msr_driver_t* handle, cpu_msrinfo_request_t which)
{ {
struct cpu_raw_data_t raw; struct cpu_raw_data_t raw;
static struct cpu_id_t id; static struct cpu_id_t id;
static struct internal_id_info_t internal = { .score = -1 }; static struct internal_id_info_t internal;
internal.score = -1;
if (handle == NULL) if (handle == NULL)
return set_error(ERR_HANDLE); return set_error(ERR_HANDLE);

11
libcpuid/recog_intel.c
View file

@ -776,6 +776,11 @@ static intel_model_t get_model_code(struct cpu_id_t* data)
int cpuid_identify_intel(struct cpu_raw_data_t* raw, struct cpu_id_t* data, struct internal_id_info_t* internal) int cpuid_identify_intel(struct cpu_raw_data_t* raw, struct cpu_id_t* data, struct internal_id_info_t* internal)
{ {
intel_code_t brand_code;
intel_model_t model_code;
int i;
char* brand_code_str = NULL;
load_intel_features(raw, data); load_intel_features(raw, data);
if (raw->basic_cpuid[0][0] >= 4) { if (raw->basic_cpuid[0][0] >= 4) {
/* Deterministic way is preferred, being more generic */ /* Deterministic way is preferred, being more generic */
@ -785,10 +790,8 @@ int cpuid_identify_intel(struct cpu_raw_data_t* raw, struct cpu_id_t* data, stru
} }
decode_intel_number_of_cores(raw, data); decode_intel_number_of_cores(raw, data);
intel_code_t brand_code = get_brand_code(data); brand_code = get_brand_code(data);
intel_model_t model_code = get_model_code(data); model_code = get_model_code(data);
int i;
char* brand_code_str = NULL;
for (i = 0; i < COUNT_OF(intel_bcode_str); i++) { for (i = 0; i < COUNT_OF(intel_bcode_str); i++) {
if (brand_code == intel_bcode_str[i].code) { if (brand_code == intel_bcode_str[i].code) {
brand_code_str = intel_bcode_str[i].str; brand_code_str = intel_bcode_str[i].str;