Compare commits

..

No commits in common. "ce350a946cb61debed3234c4b0b6569f9ee22318" and "036bba468507d7a0fcebb5b6f830ff00419d46cb" have entirely different histories.

4 changed files with 9 additions and 11 deletions

1
.gitignore vendored
View File

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

View File

@ -7,7 +7,7 @@ NAME := bozOS
AS := i386-elf-as AS := i386-elf-as
ASFLAGS := ASFLAGS :=
CC := i386-elf-gcc CC := i386-elf-gcc
CCFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers -g CCFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers
LD := $(CC) 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

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

View File

@ -1,5 +1,5 @@
#include "kprintf.h"
#include "terminal.h" #include "terminal.h"
#include "kprintf.h"
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
@ -16,11 +16,10 @@
#error "This tutorial needs to be compiled with a ix86-elf compiler" #error "This tutorial needs to be compiled with a ix86-elf compiler"
#endif #endif
void kernel_main(void) void kernel_main(void) {
{
/* Initialize terminal interface */ /* Initialize terminal interface */
terminal_initialize(); terminal_initialize();
/* 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, "Hello world!");
} }