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

Merge pull request #49 from X0rg/master

Browse source 
Fix & Athlon 64 FX X2
This commit is contained in:
Veselin Georgiev 2016-06-16 12:44:12 +01:00 committed by GitHub
commit 612d2135f6
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,3 +1,4 @@
*~
*.lo *.lo
*.la *.la
*.o *.o
@ -26,5 +27,6 @@ install-sh
libcpuid.pc libcpuid.pc
libcpuid/docs libcpuid/docs
libcpuid/Doxyfile libcpuid/Doxyfile
libcpuid/doxyfile.stamp
ar-lib ar-lib
compile compile

10
libcpuid/rdmsr.c
View file

@ -616,7 +616,7 @@ static double get_info_min_multiplier(struct msr_driver_t* handle, struct cpu_id
if (!err) return reg; if (!err) return reg;
} }
return CPU_INVALID_VALUE; return (double) CPU_INVALID_VALUE / 100;
} }
static double get_info_cur_multiplier(struct msr_driver_t* handle, struct cpu_id_t *id, static double get_info_cur_multiplier(struct msr_driver_t* handle, struct cpu_id_t *id,
@ -645,7 +645,7 @@ static double get_info_cur_multiplier(struct msr_driver_t* handle, struct cpu_id
if (!err) return reg; if (!err) return reg;
} }
return CPU_INVALID_VALUE; return (double) CPU_INVALID_VALUE / 100;
} }
static double get_info_max_multiplier(struct msr_driver_t* handle, struct cpu_id_t *id, static double get_info_max_multiplier(struct msr_driver_t* handle, struct cpu_id_t *id,
@ -685,7 +685,7 @@ static double get_info_max_multiplier(struct msr_driver_t* handle, struct cpu_id
if (!err) return reg; if (!err) return reg;
} }
return CPU_INVALID_VALUE; return (double) CPU_INVALID_VALUE / 100;
} }
static int get_info_temperature(struct msr_driver_t* handle, struct cpu_id_t *id, static int get_info_temperature(struct msr_driver_t* handle, struct cpu_id_t *id,
@ -740,7 +740,7 @@ static double get_info_voltage(struct msr_driver_t* handle, struct cpu_id_t *id,
if (!err && MSR_PSTATE_0 + reg <= MSR_PSTATE_7) return 1.550 - 0.0125 * CpuVid; if (!err && MSR_PSTATE_0 + reg <= MSR_PSTATE_7) return 1.550 - 0.0125 * CpuVid;
} }
return CPU_INVALID_VALUE; return (double) CPU_INVALID_VALUE / 100;
} }
static double get_info_bus_clock(struct msr_driver_t* handle, struct cpu_id_t *id, static double get_info_bus_clock(struct msr_driver_t* handle, struct cpu_id_t *id,
@ -775,7 +775,7 @@ static double get_info_bus_clock(struct msr_driver_t* handle, struct cpu_id_t *i
if (!err) return (double) clock / reg; if (!err) return (double) clock / reg;
} }
return CPU_INVALID_VALUE; return (double) CPU_INVALID_VALUE / 100;
} }
int cpu_rdmsr_range(struct msr_driver_t* handle, uint32_t msr_index, uint8_t highbit, int cpu_rdmsr_range(struct msr_driver_t* handle, uint32_t msr_index, uint8_t highbit,

1
libcpuid/recog_amd.c
View file

@ -115,6 +115,7 @@ const struct match_entry_t cpudb_amd[] = {
{ 15, -1, -1, 15, -1, 1, 1024, -1, ATHLON_64 , 0, "Athlon 64 (1024K)" }, { 15, -1, -1, 15, -1, 1, 1024, -1, ATHLON_64 , 0, "Athlon 64 (1024K)" },
{ 15, -1, -1, 15, -1, 1, -1, -1, ATHLON_FX , 0, "Athlon FX" }, { 15, -1, -1, 15, -1, 1, -1, -1, ATHLON_FX , 0, "Athlon FX" },
{ 15, -1, -1, 15, -1, 1, -1, -1, ATHLON_64_FX , 0, "Athlon 64 FX" }, { 15, -1, -1, 15, -1, 1, -1, -1, ATHLON_64_FX , 0, "Athlon 64 FX" },
{ 15, 3, -1, 15, 35, 2, -1, -1, ATHLON_64_FX , 0, "Athlon 64 FX X2 (Toledo)" },
{ 15, -1, -1, 15, -1, 2, 512, -1, ATHLON_64_X2 , 0, "Athlon 64 X2 (512K)" }, { 15, -1, -1, 15, -1, 2, 512, -1, ATHLON_64_X2 , 0, "Athlon 64 X2 (512K)" },
{ 15, -1, -1, 15, -1, 2, 1024, -1, ATHLON_64_X2 , 0, "Athlon 64 X2 (1024K)" }, { 15, -1, -1, 15, -1, 2, 1024, -1, ATHLON_64_X2 , 0, "Athlon 64 X2 (1024K)" },
{ 15, -1, -1, 15, -1, 1, 512, -1, TURION_64 , 0, "Turion 64 (512K)" }, { 15, -1, -1, 15, -1, 1, 512, -1, TURION_64 , 0, "Turion 64 (512K)" },