justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-09 16:04:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add logging framework

Browse Source
This commit is contained in:
Justin C. Miller
2018-04-28 19:18:53 -07:00
parent 358837ed69
commit b3e49590a7
10 changed files with 274 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/kernel/console.cpp
View File

@@ -1,4 +1,3 @@
#include <stdarg.h>
#include "console.h"
#include "io.h"
@@ -229,6 +228,9 @@ serial_write(char c) {
console::console() :
m_screen(nullptr)
{
const char *fgseq = "\x1b[2J";
while (*fgseq)
serial_write(*fgseq++);
}
void
@@ -236,6 +238,22 @@ console::set_color(uint8_t fg, uint8_t bg)
{
if (m_screen)
m_screen->set_color(fg, bg);
const char *fgseq = "\x1b[38;5;";
while (*fgseq)
serial_write(*fgseq++);
if (fg >= 100) serial_write('0' + (fg/100));
if (fg >= 10) serial_write('0' + (fg/10) % 10);
serial_write('0' + fg % 10);
serial_write('m');
const char *bgseq = "\x1b[48;5;";
while (*bgseq)
serial_write(*bgseq++);
if (bg >= 100) serial_write('0' + (bg/100));
if (bg >= 10) serial_write('0' + (bg/10) % 10);
serial_write('0' + bg % 10);
serial_write('m');
}
void
@@ -250,7 +268,7 @@ console::puts(const char *message)
}
}
void console::printf(const char *fmt, ...)
void console::vprintf(const char *fmt, va_list args)
{
static const unsigned buf_size = 256;
char buffer[256];
@@ -259,9 +277,6 @@ void console::printf(const char *fmt, ...)
char *w = buffer;
char *wend = buffer + buf_size;
va_list args;
va_start(args, fmt);
#define flush() do { *w = 0; puts(buffer); w = buffer; } while(0)
while (r && *r) {
@@ -330,5 +345,4 @@ void console::printf(const char *fmt, ...)
}
flush();
va_end(args);
}