From b077a17fa4d3ccf32a9c63329bdfeb30c24a7490 Mon Sep 17 00:00:00 2001 From: Jarkko Toivanen Date: Sat, 23 Sep 2023 21:19:53 +0300 Subject: [PATCH] Renaming putchar to putc --- src/framebuffer.c | 2 +- src/framebuffer.h | 2 +- src/kernel.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/framebuffer.c b/src/framebuffer.c index c033722..35b73b5 100644 --- a/src/framebuffer.c +++ b/src/framebuffer.c @@ -48,7 +48,7 @@ void putpixel( } } -void putchar( +void putc( unsigned char *character, unsigned short x, unsigned short y, diff --git a/src/framebuffer.h b/src/framebuffer.h index 8cb760b..96ed6d7 100644 --- a/src/framebuffer.h +++ b/src/framebuffer.h @@ -18,7 +18,7 @@ void putpixel( unsigned char g, unsigned char b ); -void putchar( +void putc( unsigned char *character, unsigned short x, unsigned short y, diff --git a/src/kernel.c b/src/kernel.c index 3364929..1fab654 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -87,11 +87,11 @@ void kmain (unsigned int mbootmagick, multiboot_info_t* mbootinfo) } } - putchar("r", 412, 5, 0xff, 0xff, 0xff); - putchar("O", 452, 5, 0xff, 0xff, 0xff); - putchar("S", 492, 5, 0xff, 0xff, 0xff); - putchar("k", 532, 5, 0xff, 0xff, 0xff); - putchar("a", 572, 5, 0xff, 0xff, 0xff); + putc("r", 412, 5, 0xff, 0xff, 0xff); + putc("O", 452, 5, 0xff, 0xff, 0xff); + putc("S", 492, 5, 0xff, 0xff, 0xff); + putc("k", 532, 5, 0xff, 0xff, 0xff); + putc("a", 572, 5, 0xff, 0xff, 0xff); //while(1){} serial_write_string("\nExecution finished, halting...\n");