i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/cpu: Do not use get_system_info() to identify CPU

Browse Source
This commit is contained in:
Pawel Dziepak
2013-12-12 02:53:18 +01:00
parent 02749e2429
commit fa15750925
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/cpu/x86/amd.cpp
+3 -7
View File
@@ -10,7 +10,7 @@
#include "amd.h" #include "amd.h"
#include "generic_x86.h" #include "generic_x86.h"
#include <OS.h> #include <cpu.h>
static void static void
@@ -23,16 +23,12 @@ amd_init_mtrrs(void)
static status_t static status_t
amd_init(void) amd_init(void)
{ {
system_info info; if (gCPU[0].arch.vendor != VENDOR_AMD)
if (get_system_info(&info) != B_OK)
return B_ERROR;
if ((info.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_AMD_x86)
return B_ERROR; return B_ERROR;
// The K6-2 doesn't seem to support write-combining (before model 9), // The K6-2 doesn't seem to support write-combining (before model 9),
// so we ignore anything before that one. // so we ignore anything before that one.
if (info.cpu_type <= B_CPU_AMD_K6_2) if (gCPU[0].arch.family <= 5 || gCPU[0].arch.model < 9)
return B_ERROR; return B_ERROR;
generic_mtrr_compute_physical_mask(); generic_mtrr_compute_physical_mask();
src/add-ons/kernel/cpu/x86/intel.cpp
+2 -6
View File
@@ -10,7 +10,7 @@
#include "intel.h" #include "intel.h"
#include "generic_x86.h" #include "generic_x86.h"
#include <OS.h> #include <cpu.h>
static void static void
@@ -23,11 +23,7 @@ intel_init_mtrrs(void)
static status_t static status_t
intel_init(void) intel_init(void)
{ {
system_info info; if (gCPU[0].arch.vendor != VENDOR_INTEL)
if (get_system_info(&info) != B_OK)
return B_ERROR;
if ((info.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86)
return B_ERROR; return B_ERROR;
generic_mtrr_compute_physical_mask(); generic_mtrr_compute_physical_mask();
src/add-ons/kernel/cpu/x86/via.cpp
+2 -6
View File
@@ -10,7 +10,7 @@
#include "via.h" #include "via.h"
#include "generic_x86.h" #include "generic_x86.h"
#include <OS.h> #include <cpu.h>
static uint32 static uint32
@@ -41,11 +41,7 @@ via_set_mtrrs(uint8 defaultType, const x86_mtrr_info* infos, uint32 count)
static status_t static status_t
via_init(void) via_init(void)
{ {
system_info info; if (gCPU[0].arch.vendor != VENDOR_CENTAUR)
if (get_system_info(&info) != B_OK)
return B_ERROR;
if ((info.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_VIA_IDT_x86)
return B_ERROR; return B_ERROR;
// current VIA CPUs have always 36 bit (or less?) // current VIA CPUs have always 36 bit (or less?)