From 179c4b98e2ab7e4fcd887aa5bd72e11671baa419 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Sun, 2 Nov 2025 14:16:10 +0100 Subject: [PATCH] Only one fb-terminal-based putchar_() --- kernel/Makefile | 6 ------ kernel/putchar.h | 7 ------- kernel/term/term.c | 11 ++++------- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 kernel/putchar.h diff --git a/kernel/Makefile b/kernel/Makefile index 4857147..f9ecb06 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -28,12 +28,6 @@ CFLAGS += -I. \ -DPICO_SUPPORT_IPV4 \ -DPICO_SUPPORT_MUTEX \ -ifeq ($(PUTCHAR_),fb) -CFLAGS += -DPUTCHAR_=PUTCHAR_FB -else -CFLAGS += -DPUTCHAR_=PUTCHAR_SERIAL -endif - include arch/$(ARCH)/$(ARCH).mk include extconf/extra.mk diff --git a/kernel/putchar.h b/kernel/putchar.h deleted file mode 100644 index 1c4334d..0000000 --- a/kernel/putchar.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef PUTCHAR_H_ -#define PUTCHAR_H_ - -#define PUTCHAR_FB 1 -#define PUTCHAR_SERIAL 2 - -#endif // PUTCHAR_H_ diff --git a/kernel/term/term.c b/kernel/term/term.c index b9f49bc..910f7f5 100644 --- a/kernel/term/term.c +++ b/kernel/term/term.c @@ -3,7 +3,6 @@ #include "spinlock/spinlock.h" #include "bootinfo/bootinfo.h" #include "term.h" -#include "putchar.h" #include "fm-t-437.f16.h" Term TERM; @@ -48,9 +47,7 @@ void term_write_unsafe(const char *s, size_t len) { flanterm_write(TERM.ftctx, s, len); } -#if PUTCHAR_ == PUTCHAR_FB - // For printf library - void putchar_(char c) { - term_write_unsafe(&c, 1); - } -#endif +// For printf library +void putchar_(char c) { + term_write_unsafe(&c, 1); +}