From ed34392443c411214e6e91c3f912185115a39175 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Tue, 19 Mar 2024 22:59:13 -0400 Subject: kernel: syslog: Make syslog_screen extern Signed-off-by: Ian Moffett --- sys/include/sys/syslog.h | 3 +++ sys/kern/kern_syslog.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/include/sys/syslog.h b/sys/include/sys/syslog.h index 7706eec..3015f6b 100644 --- a/sys/include/sys/syslog.h +++ b/sys/include/sys/syslog.h @@ -35,6 +35,7 @@ #define _SYS_SYSLOG_H_ #include +#include #if defined(_KERNEL) @@ -58,6 +59,8 @@ void syslog_init(void); void kprintf(const char *fmt, ...); void vkprintf(const char *fmt, va_list *ap); +extern struct vcons_screen g_syslog_screen; + #endif /* defined(_KERNEL) */ #endif /* !_SYS_SYSLOG_H_ */ diff --git a/sys/kern/kern_syslog.c b/sys/kern/kern_syslog.c index d8880a9..cdce157 100644 --- a/sys/kern/kern_syslog.c +++ b/sys/kern/kern_syslog.c @@ -32,7 +32,7 @@ #include #include -static struct vcons_screen syslog_screen = {0}; +struct vcons_screen g_syslog_screen = {0}; static void syslog_write(const char *s, size_t len) @@ -44,7 +44,7 @@ syslog_write(const char *s, size_t len) #if defined(__SERIAL_DEBUG) serial_dbgch(*tmp_s); #endif /* defined(__SERIAL_DEBUG) */ - vcons_putch(&syslog_screen, *tmp_s++); + vcons_putch(&g_syslog_screen, *tmp_s++); } } @@ -129,9 +129,9 @@ syslog_init(void) termios.c_oflag |= OCRNL; /* Map CR to NL by default */ - syslog_screen.bg = 0x000000; - syslog_screen.fg = 0x808080; - syslog_screen.termios = termios; + g_syslog_screen.bg = 0x000000; + g_syslog_screen.fg = 0x808080; + g_syslog_screen.termios = termios; - vcons_attach(&syslog_screen); + vcons_attach(&g_syslog_screen); } -- cgit v1.2.3