From 330f1f341e1539926dd745ad0e4ca28ec3ba922f Mon Sep 17 00:00:00 2001
From: dev <dev@robertfoss.se>
Date: Wed, 12 Jan 2011 20:06:22 +0000
Subject: [PATCH] Fixes to Atom identification.
---
.../java/src/freenet/support/CPUInformation/CPUID.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index d8f8967fba..921f497dde 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -326,10 +326,10 @@ public class CPUID {
public boolean IsPentium3Compatible()
{
// Atom
- if (getCPUExtendedModel() == 1 && (getCPUFamily() == 6 && (getCPUModel() == 10))){
+ if (getCPUExtendedModel() == 1 && (getCPUFamily() == 6 && (getCPUModel() == 12))){
return true;
// ??
- } else if (getCPUFamily() > 6 || (getCPUFamily() == 6 && getCPUModel() >=7)){
+ } else if (getCPUExtendedModel() == 0 && (getCPUFamily() > 6 || (getCPUFamily() == 6 && getCPUModel() >=7))){
return true;
} else {
return false;
@@ -337,13 +337,13 @@ public class CPUID {
}
public boolean IsPentium4Compatible()
{
- // P4
+ // P4
if (getCPUFamily() >= 15){
return true;
- // Xeon MP (45nm) or Core i7
+ // Xeon MP (45nm) or Core i7
} else if (getCPUExtendedModel() == 1 && (getCPUFamily() == 6 && (getCPUModel() == 10 || getCPUModel() == 13))){
return true;
- // Core 2 Duo
+ // Core 2 Duo
} else if (getCPUExtendedModel() == 0 && getCPUFamily() == 6 && getCPUModel() == 15){
return true;
} else {
--
GitLab