juju/k-chow
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rework architecture

Browse Source 
Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
Julien CLEMENT 2021-07-26 08:50:31 +02:00
parent 7ceec0ee06
commit ac1b1f5376
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
k/Makefile
View File

@ -32,16 +32,16 @@ OBJS = \
memory.o \ memory.o \
serial.o \ serial.o \
gdt.o \ gdt.o \
idt.o \ events/idt.o \
isr.o \ events/isr.o \
pic.o events/pic/pic.o
DEPS = $(OBJS:.o=.d) DEPS = $(OBJS:.o=.d)
all: $(TARGET) all: $(TARGET)
$(TARGET): CPPFLAGS += -MMD -Iinclude -I ../libs/libc/include/ $(TARGET): CPPFLAGS += -MMD -Iinclude -I ../libs/libc/include/ -I.
$(TARGET): CFLAGS += $(K_EXTRA_CFLAGS) -g $(TARGET): CFLAGS += $(K_EXTRA_CFLAGS) -g
$(TARGET): LDFLAGS += -Wl,-Tk.lds $(TARGET): LDFLAGS += -Wl,-Tk.lds
$(TARGET): LDLIBS = -L../libs/libc -lc $(TARGET): LDLIBS = -L../libs/libc -lc

2
k/idt.c → k/events/idt.c
View File

@ -1,5 +1,7 @@
#include "idt.h" #include "idt.h"
#include "stdio.h" #include "stdio.h"
#include "pic/pic.h"
#include "io.h"
static struct idt idt = { 0 }; static struct idt idt = { 0 };

0
k/idt.h → k/events/idt.h
View File

0
k/isr.S → k/events/isr.S
View File

0
k/isr.h → k/events/isr.h
View File

2
k/pic.c → k/events/pic/pic.c
View File

@ -1,4 +1,4 @@
#include "idt.h" #include "events/idt.h"
#include "io.h" #include "io.h"
#include "pic.h" #include "pic.h"
#include "stdio.h" #include "stdio.h"

0
k/pic.h → k/events/pic/pic.h
View File

4
k/k.c
View File

@ -24,9 +24,9 @@
#include <k/kstd.h> #include <k/kstd.h>
#include "gdt.h" #include "gdt.h"
#include "idt.h" #include "events/idt.h"
#include "multiboot.h" #include "multiboot.h"
#include "pic.h" #include "events/pic/pic.h"
#include "serial.h" #include "serial.h"
#include "stdio.h" #include "stdio.h"