Merge branch 'master' into sata-ahci-dev

[lunaix-os.git] / lunaix-os / kernel / spike.c

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 4cb205105d84b6086fbfc9f7573574cdcc17e697..5aa0137421a7e5249aa4b51e8c5ea1d1a69ef044 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,27 +1,26 @@
-#include <lunaix/spike.h>

 #include <arch/x86/interrupts.h>
 #include <klibc/stdio.h>
 #include <arch/x86/interrupts.h>
 #include <klibc/stdio.h>

+#include <lunaix/spike.h>

 
 static char buffer[1024];
 
 
 static char buffer[1024];
 

-void __assert_fail(const char* expr, const char* file, unsigned int line) {
+void
+__assert_fail(const char* expr, const char* file, unsigned int line)
+{

     sprintf(buffer, "%s (%s:%u)", expr, file, line);
 
     // Here we load the buffer's address into %edi ("D" constraint)
     //  This is a convention we made that the LUNAIX_SYS_PANIC syscall will
     sprintf(buffer, "%s (%s:%u)", expr, file, line);
 
     // Here we load the buffer's address into %edi ("D" constraint)
     //  This is a convention we made that the LUNAIX_SYS_PANIC syscall will

-    //  print the panic message passed via %edi. (see kernel/asm/x86/interrupts.c)
-    asm(
-        "int %0"
-        ::"i"(LUNAIX_SYS_PANIC), "D"(buffer)
-    );
+    //  print the panic message passed via %edi. (see
+    //  kernel/asm/x86/interrupts.c)
+    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));

 
 

-    spin();     // never reach
+    spin(); // never reach

 }
 
 }
 

-void panick(const char* msg) {
-    asm(
-        "int %0"
-        ::"i"(LUNAIX_SYS_PANIC), "D"(msg)
-    );
+void
+panick(const char* msg)
+{
+    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(msg));

     spin();
     spin();

-}
\ No newline at end of file
+}