From 21a793d211d33721410ec9d780e1a107f8671694 Mon Sep 17 00:00:00 2001 From: Quinten Kock Date: Fri, 4 Dec 2020 21:36:43 +0100 Subject: [PATCH] Fix compiler warnings --- kernel/Makefile | 5 +++-- kernel/src/arch/x86/panic.c | 3 ++- kernel/src/arch/x86/vga.c | 2 +- kernel/src/arch/x86/vga.h | 2 +- kernel/src/hal/ops.h | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index ca4fc50..6e8056a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -27,11 +27,12 @@ default: bin/$(TARGET)-$(ARCH) all: $(ARCHES) $(ARCHES): - $(MAKE) ARCH=$@ + @$(MAKE) ARCH=$@ bin/$(TARGET)-$(ARCH): $(OBJ) @mkdir -p $(@D) - $(LD) $(LDFLAGS) $(OBJ) -o $@ + @echo Linking $@ + @$(LD) $(LDFLAGS) $(OBJ) -o $@ obj/$(ARCH)/%.o: src/%.c $(HFILES) @mkdir -p $(@D) diff --git a/kernel/src/arch/x86/panic.c b/kernel/src/arch/x86/panic.c index 7ecd232..345de60 100644 --- a/kernel/src/arch/x86/panic.c +++ b/kernel/src/arch/x86/panic.c @@ -1,9 +1,10 @@ #include "vga.h" #include +#include void panic(const char *message, const char *filename, int line) { vga_clear(VGA_BLUE); printf("KernOS kernel panic:\n%s\n", message); printf("at %s:%d", filename, line); halt_catch_fire(); -} \ No newline at end of file +} diff --git a/kernel/src/arch/x86/vga.c b/kernel/src/arch/x86/vga.c index 128d6ef..7b80ac2 100644 --- a/kernel/src/arch/x86/vga.c +++ b/kernel/src/arch/x86/vga.c @@ -58,4 +58,4 @@ void vga_clear(uint8_t color) { } terminal_row = 0; terminal_column = 0; -} \ No newline at end of file +} diff --git a/kernel/src/arch/x86/vga.h b/kernel/src/arch/x86/vga.h index b241951..280fa09 100644 --- a/kernel/src/arch/x86/vga.h +++ b/kernel/src/arch/x86/vga.h @@ -22,4 +22,4 @@ void vga_putc(char c); void vga_puts(const char *c); void vga_setcolor(uint8_t color); void vga_write_elsewhere(const char *c, size_t y, size_t x); -void vga_clear(uint8_t color); \ No newline at end of file +void vga_clear(uint8_t color); diff --git a/kernel/src/hal/ops.h b/kernel/src/hal/ops.h index 72e0afa..65610aa 100644 --- a/kernel/src/hal/ops.h +++ b/kernel/src/hal/ops.h @@ -1,4 +1,4 @@ void halt_catch_fire(); #define PANIC(m) panic(m, __FILE__, __LINE__) -void panic(const char *message, const char *filename, int line); \ No newline at end of file +void panic(const char *message, const char *filename, int line);