I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge of '9d97a97ab57669b6ed2c246c966df9d4afcda899'

Browse Source 
and 'bc18ab31728be1d004b18d113343c50f25f0a678'
This commit is contained in:
dev
2011-01-12 20:06:29 +00:00
parent 7289c89171 330f1f341e
commit 4dd78ed31b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/src/freenet/support/CPUInformation/CPUID.java
View File

@ -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 {