From 35c6f53656cb3e5c640f07f1a2f4321d12887d00 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Thu, 30 Apr 2015 10:26:29 +0000 Subject: [PATCH] bmk_init -> bmk_cons_clear Also, we don't need to call it in multiboot(), since we already need to call it in early bootstrap to properly deliver the "no multiboot" message if necessary. --- platform/baremetal/arch/i386/locore32.S | 2 +- platform/baremetal/arch/i386/vgacons.c | 2 +- platform/baremetal/include/bmk/kernel.h | 2 -- platform/baremetal/multiboot.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/baremetal/arch/i386/locore32.S b/platform/baremetal/arch/i386/locore32.S index 175d436..165db51 100644 --- a/platform/baremetal/arch/i386/locore32.S +++ b/platform/baremetal/arch/i386/locore32.S @@ -45,7 +45,7 @@ ENTRY(_start32) pushl %ebx pushl %eax - call bmk_init + call bmk_cons_clear popl %eax /* only multiboot is supported for now */ diff --git a/platform/baremetal/arch/i386/vgacons.c b/platform/baremetal/arch/i386/vgacons.c index 5020814..cad0672 100644 --- a/platform/baremetal/arch/i386/vgacons.c +++ b/platform/baremetal/arch/i386/vgacons.c @@ -76,7 +76,7 @@ bmk_cons_putc(int c) } void -bmk_init(void) +bmk_cons_clear(void) { int x; diff --git a/platform/baremetal/include/bmk/kernel.h b/platform/baremetal/include/bmk/kernel.h index 760d1de..211a720 100644 --- a/platform/baremetal/include/bmk/kernel.h +++ b/platform/baremetal/include/bmk/kernel.h @@ -17,8 +17,6 @@ void *bmk_allocpg(size_t); void bmk_halt(const char *) __attribute__((noreturn)); -void bmk_init(void); - struct multiboot_info; void bmk_multiboot(struct multiboot_info *); diff --git a/platform/baremetal/multiboot.c b/platform/baremetal/multiboot.c index 8cb8cee..2eac45d 100644 --- a/platform/baremetal/multiboot.c +++ b/platform/baremetal/multiboot.c @@ -76,7 +76,6 @@ bmk_multiboot(struct multiboot_info *mbi) { unsigned long cmdlinelen; - bmk_init(); /* XXX: convert to cons_clear */ bmk_printf_init(bmk_cons_putc, NULL); bmk_core_init(BMK_THREAD_STACK_PAGE_ORDER, PAGE_SIZE); -- 2.39.5