formated code and fix include error in interrupts.c

diff --git a/lunaix-os/arch/x86/gdt.c b/lunaix-os/arch/x86/gdt.c
index 12bebba3693f6b7c20d8df8f1eed6572b1b8dbef..c7eec3470a7be048ca41bc4c8f9838e9c2a07901 100644 (file)
--- 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 60f59432a1ab3d0896b21164b04afca6f98bbd30..4aa587a19e7d28c5e9a9d5bd4fc7bb7730e00068 100644 (file)
--- 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 9cbf41bc791fd56f8bda0253d1c50b8646656b79..ee023de494f649c6e4a9f84e20e6e6ae21b1d0df 100644 (file)
--- a/lunaix-os/kernel/interrupts/interrupts.c
+++ b/lunaix-os/kernel/interrupts/interrupts.c
@@ -1,4 +1,4 @@
-#include "interrupts.h"
+#include <lunaix/interrupts/interrupts.h>
 #include <lunaix/tty/tty.h>
 
 void isr0 (isr_param* param) {

diff --git a/lunaix-os/kernel/tty/tty.c b/lunaix-os/kernel/tty/tty.c
index bef5c5a90213a1271c7d10cca1a7bdb6f67a2efb..2629c747f96b1dae44324895d09675ed18a315c4 100644 (file)
--- 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;