From e4cf306093d049a8a62f24da4053236fd87b1ebc Mon Sep 17 00:00:00 2001 From: Jarkko Toivanen Date: Tue, 26 Sep 2023 18:03:04 +0300 Subject: [PATCH 1/2] Formatting: Multiline does not seem like a good idea --- src/start32.s | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/start32.s b/src/start32.s index 76cfc63..fd22a82 100644 --- a/src/start32.s +++ b/src/start32.s @@ -3,11 +3,7 @@ .set MULTIBOOT_VIDEO_REQUEST, 1 << 2 .set MULTIBOOT_AOUT_KLUDGE, 0 << 16 .set MULTIBOOT_HEADER_MAGIC, 0x1BADB002 -.set MULTIBOOT_HEADER_FLAGS, \ - MULTIBOOT_PAGE_ALIGN \ - | MULTIBOOT_MEMORY_INFO \ - | MULTIBOOT_VIDEO_REQUEST \ - | MULTIBOOT_AOUT_KLUDGE +.set MULTIBOOT_HEADER_FLAGS, MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_REQUEST | MULTIBOOT_AOUT_KLUDGE .set MULTIBOOT_CHECKSUM, -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) #.section ".multiboottbabeee" From e0be923f35bc0b77c9d5d65e4c14ff0ccb188c29 Mon Sep 17 00:00:00 2001 From: Jarkko Toivanen Date: Tue, 26 Sep 2023 18:10:33 +0300 Subject: [PATCH 2/2] I heard strings are not unsigned lol --- src/framebuffer.c | 4 ++-- src/framebuffer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/framebuffer.c b/src/framebuffer.c index 25ee486..d8ee465 100644 --- a/src/framebuffer.c +++ b/src/framebuffer.c @@ -50,7 +50,7 @@ void putpixel( } void putc( - const unsigned char *character, + const char *character, unsigned short x, unsigned short y, unsigned char r, @@ -84,7 +84,7 @@ void putc( } void puts( - const unsigned char *text, + const char *text, unsigned short x, unsigned short y, unsigned char r, diff --git a/src/framebuffer.h b/src/framebuffer.h index 27c7195..144aa3f 100644 --- a/src/framebuffer.h +++ b/src/framebuffer.h @@ -19,7 +19,7 @@ void putpixel( unsigned char b ); void putc( - const unsigned char *character, + const char *character, unsigned short x, unsigned short y, unsigned char r, @@ -27,7 +27,7 @@ void putc( unsigned char b ); void puts( - const unsigned char *text, + const char *text, unsigned short x, unsigned short y, unsigned char r,