fix: kprintf now works with multiple arguments
This commit is contained in:
parent
7d58ce2824
commit
7b9a5e0ef7
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
build
|
build
|
||||||
obj
|
obj
|
||||||
|
.*
|
||||||
|
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
|||||||
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
|
CCFLAGS := -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquotelibbozo/headers -g
|
||||||
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
|
||||||
|
13
src/kernel.c
13
src/kernel.c
@ -1,5 +1,5 @@
|
|||||||
#include "terminal.h"
|
|
||||||
#include "kprintf.h"
|
#include "kprintf.h"
|
||||||
|
#include "terminal.h"
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
@ -16,10 +16,11 @@
|
|||||||
#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 */
|
{
|
||||||
terminal_initialize();
|
/* Initialize terminal interface */
|
||||||
|
terminal_initialize();
|
||||||
|
|
||||||
/* Newline support is left as an exercise. */
|
/* Newline support is left as an exercise. */
|
||||||
kprintf(0, "Hello world!");
|
kprintf(0, "test %d a %d b %d\n", 10, 2, 3);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user