X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/28c176b668c841a3b7fb093faccf0efa39257603..34f6af4f61e0eec9c96113e07f140b609b4113c8:/lunaix-os/arch/x86/hal/cpu.c

diff --git a/lunaix-os/arch/x86/hal/cpu.c b/lunaix-os/arch/x86/hal/cpu.c
index 00ba7f4..e77d14e 100644
--- a/lunaix-os/arch/x86/hal/cpu.c
+++ b/lunaix-os/arch/x86/hal/cpu.c
@@ -1,50 +1,7 @@
-#include <cpuid.h>
 #include <lunaix/types.h>
-#include <sys/cpu.h>
-#include <sys/vectors.h>
 
-#define BRAND_LEAF 0x80000000UL
-
-void
-cpu_get_model(char* model_out)
-{
-    u32_t* out = (u32_t*)model_out;
-    u32_t eax = 0, ebx = 0, edx = 0, ecx = 0;
-
-    __get_cpuid(0, &eax, &ebx, &ecx, &edx);
-
-    out[0] = ebx;
-    out[1] = edx;
-    out[2] = ecx;
-    model_out[12] = '\0';
-}
-
-int
-cpu_brand_string_supported()
-{
-    u32_t supported = __get_cpuid_max(BRAND_LEAF, 0);
-    return (supported >= 0x80000004UL);
-}
-
-void
-cpu_get_id(char* id_out)
-{
-    if (!cpu_brand_string_supported()) {
-        id_out[0] = '?';
-        id_out[1] = '\0';
-    }
-    u32_t* out = (u32_t*)id_out;
-    u32_t eax = 0, ebx = 0, edx = 0, ecx = 0;
-    for (u32_t i = 2, j = 0; i < 5; i++) {
-        __get_cpuid(BRAND_LEAF + i, &eax, &ebx, &ecx, &edx);
-        out[j] = eax;
-        out[j + 1] = ebx;
-        out[j + 2] = ecx;
-        out[j + 3] = edx;
-        j += 4;
-    }
-    id_out[48] = '\0';
-}
+#include "asm/x86_ivs.h"
+#include "asm/x86_cpu.h"
 
 void
 cpu_rdmsr(u32_t msr_idx, u32_t* reg_high, u32_t* reg_low)
@@ -67,9 +24,3 @@ cpu_trap_sched()
 {
     asm("int %0" ::"i"(LUNAIX_SCHED));
 }
-
-void
-cpu_trap_panic(char* message)
-{
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(message));
-}