Compare commits

...

2 Commits

4 changed files with 11 additions and 9 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
build
obj
.*

View File

@ -7,7 +7,7 @@ NAME := bozOS
AS := i386-elf-as
ASFLAGS :=
CC := i386-elf-gcc
CCFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers
CCFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers -g
LD := $(CC)
LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib
LIBS := ./libbozo/build/libbozo.a -lgcc

@ -1 +1 @@
Subproject commit 8968c3769d7f60a255d1aca5fdbe644d488df936
Subproject commit 27ec2f24c248d3a6f30e6e07b09ea6c4a9c7c342

View File

@ -1,5 +1,5 @@
#include "terminal.h"
#include "kprintf.h"
#include "terminal.h"
#include <stdbool.h>
#include <stddef.h>
@ -16,10 +16,11 @@
#error "This tutorial needs to be compiled with a ix86-elf compiler"
#endif
void kernel_main(void) {
/* Initialize terminal interface */
terminal_initialize();
void kernel_main(void)
{
/* Initialize terminal interface */
terminal_initialize();
/* Newline support is left as an exercise. */
kprintf(0, "Hello world!");
/* Newline support is left as an exercise. */
kprintf(0, "test %d a %d b %d\n", 10, 2, 3);
}