aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMarvin Borner2020-10-24 23:30:42 +0200
committerMarvin Borner2020-10-24 23:30:42 +0200
commitffb2c74435ad0e313b7c33ae1f00f02824bb6fc0 (patch)
tree9200b51e77ea66fb439e15a9bd41287a00cfa654 /kernel
parent37b2fde1efd1527ca1462ab10f56ae049ca3525b (diff)
Started new GFX/GUI abstraction
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile4
-rw-r--r--kernel/drivers/keyboard.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index fcee759..c449cd9 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -23,9 +23,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld
OC = ccache ../cross/opt/bin/i686-elf-objcopy
AS = ccache nasm
-# TODO: Remove fixflags?
-FIXFLAGS = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter
-CFLAGS = -Wall -Wextra -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(FIXFLAGS) -Ofast
+CFLAGS = -Wall -Wextra -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(CFLAGS_EXTRA) $(OPTIMIZATION)
ASFLAGS = -f elf32
all: compile
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index 854ab3b..2bd67ba 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -67,7 +67,7 @@ char keymap[128] = {
0, // Alt key
' ', // Space bar
15, // Caps lock
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
0, // Num lock
0, // Scroll lock
0, // Home key