quintenk
/
kornos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: quintenk:21a793d211d33721410ec9d780e1a107f8671694
Branches Tags
quintenk:master
..
compare: quintenk:fb981bf9942d52f6db1b6852123a452261e20a94
Branches Tags
quintenk:master

No commits in common. "21a793d211d33721410ec9d780e1a107f8671694" and "fb981bf9942d52f6db1b6852123a452261e20a94" have entirely different histories.
21a793d211 ... fb981bf994

7 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

1
.rgignore
View File

@ -1 +0,0 @@
/ext/

5
kernel/Makefile
View File

@ -27,12 +27,11 @@ default: bin/$(TARGET)-$(ARCH)
all: $(ARCHES) all: $(ARCHES)
$(ARCHES): $(ARCHES):
@$(MAKE) ARCH=$@ $(MAKE) ARCH=$@
bin/$(TARGET)-$(ARCH): $(OBJ) bin/$(TARGET)-$(ARCH): $(OBJ)
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Linking $@ $(LD) $(LDFLAGS) $(OBJ) -o $@
@$(LD) $(LDFLAGS) $(OBJ) -o $@
obj/$(ARCH)/%.o: src/%.c $(HFILES) obj/$(ARCH)/%.o: src/%.c $(HFILES)
@mkdir -p $(@D) @mkdir -p $(@D)

1
kernel/src/arch/x86/panic.c
View File

@ -1,6 +1,5 @@
#include "vga.h" #include "vga.h"
#include <hal/ops.h> #include <hal/ops.h>
#include <print/print.h>
void panic(const char *message, const char *filename, int line) { void panic(const char *message, const char *filename, int line) {
vga_clear(VGA_BLUE); vga_clear(VGA_BLUE);

2
kernel/src/arch/x86/stivale2-parse.c
View File

@ -19,7 +19,7 @@ void print_stivale2(struct stivale2_struct *info) {
printf("Memmap (%d entries):\n", m->entries); printf("Memmap (%d entries):\n", m->entries);
for (size_t i = 0; i < m->entries; i++) { for (size_t i = 0; i < m->entries; i++) {
struct stivale2_mmap_entry me = m->memmap[i]; struct stivale2_mmap_entry me = m->memmap[i];
printf("\t[%x+%h] %x\n", (size_t)me.base, (size_t)me.length, me.type); printf("\t[%x+%h] %x\n", me.base, me.length, me.type);
} }
break; break;
} }