chore: fix almost *ALL* warnings.

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / gdt.c

diff --git a/lunaix-os/kernel/asm/x86/gdt.c b/lunaix-os/kernel/asm/x86/gdt.c
index 41c597e962e7b9dc02e8e37739d923bac04f3f3f..f84df20cca47ce7c32585a60070858aee425cca1 100644 (file)
--- a/lunaix-os/kernel/asm/x86/gdt.c
+++ b/lunaix-os/kernel/asm/x86/gdt.c
@@ -1,23 +1,30 @@
 #include <arch/x86/gdt.h>
-#include <stdint.h>
+#include <arch/x86/tss.h>
+#include <lunaix/types.h>
 
-#define GDT_ENTRY 5
+#define GDT_ENTRY 6
 
-uint64_t _gdt[GDT_ENTRY];
-uint16_t _gdt_limit = sizeof(_gdt) - 1;
+u64_t _gdt[GDT_ENTRY];
+u16_t _gdt_limit = sizeof(_gdt) - 1;
 
-void _set_gdt_entry(uint32_t index, uint32_t base, uint32_t limit, uint32_t flags) {
-    _gdt[index] = SEG_BASE_H(base) | flags | SEG_LIM_H(limit) | SEG_BASE_M(base);
+void
+_set_gdt_entry(u32_t index, u32_t base, u32_t limit, u32_t flags)
+{
+    _gdt[index] =
+      SEG_BASE_H(base) | flags | SEG_LIM_H(limit) | SEG_BASE_M(base);
     _gdt[index] <<= 32;
     _gdt[index] |= SEG_BASE_L(base) | SEG_LIM_L(limit);
 }
 
- 
+extern struct x86_tss _tss;
+
 void
-_init_gdt() {
+_init_gdt()
+{
     _set_gdt_entry(0, 0, 0, 0);
     _set_gdt_entry(1, 0, 0xfffff, SEG_R0_CODE);
     _set_gdt_entry(2, 0, 0xfffff, SEG_R0_DATA);
     _set_gdt_entry(3, 0, 0xfffff, SEG_R3_CODE);
     _set_gdt_entry(4, 0, 0xfffff, SEG_R3_DATA);
+    _set_gdt_entry(5, (u32_t)&_tss, sizeof(struct x86_tss) - 1, SEG_TSS);
 }
\ No newline at end of file