From 8ef44e8d53fcd532d6c581e1984532df3f01c7b8 Mon Sep 17 00:00:00 2001 From: Minep Date: Sat, 19 Feb 2022 16:39:41 +0000 Subject: [PATCH] formated code and fix include error in interrupts.c --- lunaix-os/arch/x86/gdt.c | 3 ++- lunaix-os/arch/x86/multiboot.h | 6 +++--- lunaix-os/kernel/interrupts/interrupts.c | 2 +- lunaix-os/kernel/tty/tty.c | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lunaix-os/arch/x86/gdt.c b/lunaix-os/arch/x86/gdt.c index 12bebba..c7eec34 100644 --- a/lunaix-os/arch/x86/gdt.c +++ b/lunaix-os/arch/x86/gdt.c @@ -11,7 +11,8 @@ void _set_gdt_entry(uint32_t index, uint32_t base, uint32_t limit, uint32_t flag _gdt[index] <<= 32; _gdt[index] |= SEG_BASE_L(base) | SEG_LIM_L(limit); } -// + + void _init_gdt() { _set_gdt_entry(0, 0, 0, 0); diff --git a/lunaix-os/arch/x86/multiboot.h b/lunaix-os/arch/x86/multiboot.h index 60f5943..4aa587a 100644 --- a/lunaix-os/arch/x86/multiboot.h +++ b/lunaix-os/arch/x86/multiboot.h @@ -1,3 +1,3 @@ -#define MB_MAGIC 0x1BADB002 -#define MB_ALIGNED_4K_MEM_MAP 0x03 -#define CHECKSUM(flags) -(MB_MAGIC+flags) \ No newline at end of file +#define MB_MAGIC 0x1BADB002 +#define MB_ALIGNED_4K_MEM_MAP 0x03 +#define CHECKSUM(flags) -(MB_MAGIC+flags) \ No newline at end of file diff --git a/lunaix-os/kernel/interrupts/interrupts.c b/lunaix-os/kernel/interrupts/interrupts.c index 9cbf41b..ee023de 100644 --- a/lunaix-os/kernel/interrupts/interrupts.c +++ b/lunaix-os/kernel/interrupts/interrupts.c @@ -1,4 +1,4 @@ -#include "interrupts.h" +#include #include void isr0 (isr_param* param) { diff --git a/lunaix-os/kernel/tty/tty.c b/lunaix-os/kernel/tty/tty.c index bef5c5a..2629c74 100644 --- a/lunaix-os/kernel/tty/tty.c +++ b/lunaix-os/kernel/tty/tty.c @@ -26,9 +26,7 @@ tty_put_char(char chr) tty_x += 4; break; case '\n': - tty_x = 0; tty_y++; - break; case '\r': tty_x = 0; break; -- 2.27.0