starnakin/42_KFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: starnakin:1685f2d0b9e3e90fd4efe0bea365ef0dfe2ba42e
Branches Tags
starnakin:main
..
compare: starnakin:60baa3ec46605af169c19c942a38a43171cdf413
Branches Tags
starnakin:main

No commits in common. "1685f2d0b9e3e90fd4efe0bea365ef0dfe2ba42e" and "60baa3ec46605af169c19c942a38a43171cdf413" have entirely different histories.
1685f2d0b9 ... 60baa3ec46

3 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
Makefile
View File

@ -12,8 +12,8 @@ LD := $(CC)
LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib
LIBS := ./libbozo/build/libbozo.a -lgcc LIBS := ./libbozo/build/libbozo.a -lgcc
SSRC := $(shell find $(SOURCEDIR) -name '*.s') SSRC := $(wildcard $(SOURCEDIR)/*.s)
CSRC := $(shell find $(SOURCEDIR) -name '*.c') CSRC := $(wildcard $(SOURCEDIR)/*.c)
OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\ OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\
$(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC)) $(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC))

2
libbozo

@ -1 +1 @@
Subproject commit 69caa70c38aac2894265887d61223e35aeed5f27 Subproject commit 4fd5ae3a6528cbeff4730af4128b4872ef6f66ea

2
src/kernel.c
View File

@ -23,6 +23,4 @@ void kernel_main(void)
/* Newline support is left as an exercise. */ /* Newline support is left as an exercise. */
kprintf(0, "test %d a %d b %d\n", 10, 2, 3); kprintf(0, "test %d a %d b %d\n", 10, 2, 3);
while (true)
terminal_getkey();
} }