mirror of
https://github.com/subhobhai943/SUB-OS.git
synced 2026-10-25 16:52:29 +00:00
Boot logo (init/bootlogo.c, init/logo_data.c, scripts/mklogo.py): The logo appears in two forms because the framebuffer does not exist for the first third of boot. An ASCII rendition goes to the text console and serial line from the first moments; once the video driver is up at step [5/14] the real bitmap takes over as a graphical splash with a progress bar tied to the actual boot stages. The asset is 4-bit palette indexed, so 160x160 pixels cost 12.5 KB instead of 100 KB, and carries a transparency mask so the mark composites onto the gradient rather than stamping a flat rectangle over it. scripts/mklogo.py regenerates init/logo_data.c from the source PNG. Boot reaches the desktop in well under a second, so the splash is held for a minimum duration and the bar sweeps to 100% during the hold; without that the logo would flash past unseen. `splashtime=<ms>` tunes it and `nosplash`, `nogui` or `text` skip it. Bootloader (boot/stage2.asm): stage2 staged the whole kernel in conventional RAM before copying it to 1 MB, which capped the kernel at roughly 576 KB before the load ran into video memory at 0xA0000. The logo pushed it over that line and the kernel stopped booting. Each 32 KB chunk now goes into one fixed low buffer and is copied straight to its final address, using unreal mode for the 32-bit reach. The ceiling is now the image itself, 1.375 MB. Console font (lib/font8x8.c): fb_draw_char was a stub that ignored its character argument and drew a filled rectangle, which is why the splash rendered its text as solid blocks. It now renders real glyphs, and the table it uses is shared: the framebuffer console, the canvas rasterizer and the desktop compositor had three divergent private copies, two of which still carried the `// \` line-continuation defect. printk console sink (kernel/printk.c): printk output can be redirected to a callback, so a caller can run a subsystem that reports via printk and capture what it printed. Serial and the dmesg ring still see everything, which keeps a captured run debuggable. Shell builtins (userland/lazybox/shell.c): The builtin chain is extracted into shell_execute_builtin(), so the kernel TTY and the desktop terminal accept the same vocabulary instead of the GUI seeing only the applet table. Callers that cannot be suspended pass allow_blocking = false to refuse the animating ones. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01L5yKJT4Wo2cV3rfPrwY5MP
125 lines
3.2 KiB
C
125 lines
3.2 KiB
C
#include <kernel/printk.h>
|
|
#include <drivers/tty.h>
|
|
#include <drivers/serial.h>
|
|
#include <lib/printf.h>
|
|
#include <lib/string.h>
|
|
#include <kernel/sync.h>
|
|
|
|
#define DMESG_BUFFER_SIZE 65536 // 64 KB Ring Buffer
|
|
|
|
static char dmesg_buffer[DMESG_BUFFER_SIZE];
|
|
static size_t dmesg_head = 0;
|
|
static size_t dmesg_total = 0;
|
|
static spinlock_t printk_lock = SPINLOCK_INIT;
|
|
|
|
// Console redirection state. `sink_active` guards against a sink that calls
|
|
// printk itself, which would otherwise recurse until the stack ran out.
|
|
static printk_sink_fn_t sink_fn = NULL;
|
|
static void* sink_ctx = NULL;
|
|
static bool sink_active = false;
|
|
|
|
void printk_set_sink(printk_sink_fn_t fn, void* ctx) {
|
|
sink_fn = fn;
|
|
sink_ctx = ctx;
|
|
}
|
|
|
|
void printk_clear_sink(void) {
|
|
sink_fn = NULL;
|
|
sink_ctx = NULL;
|
|
}
|
|
|
|
bool printk_has_sink(void) {
|
|
return sink_fn != NULL;
|
|
}
|
|
|
|
void printk_init(void) {
|
|
memset(dmesg_buffer, 0, sizeof(dmesg_buffer));
|
|
dmesg_head = 0;
|
|
dmesg_total = 0;
|
|
}
|
|
|
|
static void dmesg_append(const char* str, size_t len) {
|
|
for (size_t i = 0; i < len; i++) {
|
|
dmesg_buffer[dmesg_head] = str[i];
|
|
dmesg_head = (dmesg_head + 1) % DMESG_BUFFER_SIZE;
|
|
if (dmesg_total < DMESG_BUFFER_SIZE) {
|
|
dmesg_total++;
|
|
}
|
|
}
|
|
}
|
|
|
|
int vprintk(const char* fmt, va_list args) {
|
|
char buffer[1024];
|
|
int len = vsnprintf(buffer, sizeof(buffer), fmt, args);
|
|
if (len <= 0) return 0;
|
|
|
|
spin_lock(&printk_lock);
|
|
|
|
// Skip loglevel prefix if present (e.g. "\0016")
|
|
const char* display_ptr = buffer;
|
|
if (buffer[0] == '\001' && buffer[1] >= '0' && buffer[1] <= '7') {
|
|
display_ptr += 2;
|
|
len -= 2;
|
|
}
|
|
|
|
// 1. Output to the active TTY console, or to the installed sink instead.
|
|
if (sink_fn && !sink_active) {
|
|
sink_active = true;
|
|
sink_fn(display_ptr, (size_t)len, sink_ctx);
|
|
sink_active = false;
|
|
} else if (!sink_fn) {
|
|
tty_write(display_ptr, (size_t)len);
|
|
}
|
|
|
|
// 2. Output to serial console (COM1 on x86, PL011 on ARM/AArch64)
|
|
#if defined(__aarch64__) || defined(__arm__) || defined(__armv8i__)
|
|
extern void uart_pl011_putc(char c);
|
|
for (int i = 0; i < len; i++) {
|
|
uart_pl011_putc(display_ptr[i]);
|
|
}
|
|
#else
|
|
for (int i = 0; i < len; i++) {
|
|
serial_write_char(display_ptr[i]);
|
|
}
|
|
#endif
|
|
|
|
// 3. Store in kernel dmesg ring buffer
|
|
dmesg_append(display_ptr, (size_t)len);
|
|
|
|
spin_unlock(&printk_lock);
|
|
return len;
|
|
}
|
|
|
|
int printk(const char* fmt, ...) {
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
int ret = vprintk(fmt, args);
|
|
va_end(args);
|
|
return ret;
|
|
}
|
|
|
|
int kprintf(const char* fmt, ...) {
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
int ret = vprintk(fmt, args);
|
|
va_end(args);
|
|
return ret;
|
|
}
|
|
|
|
void dmesg_dump(void) {
|
|
spin_lock(&printk_lock);
|
|
if (dmesg_total < DMESG_BUFFER_SIZE) {
|
|
tty_write(dmesg_buffer, dmesg_total);
|
|
} else {
|
|
// Output from head to end, then 0 to head
|
|
tty_write(dmesg_buffer + dmesg_head, DMESG_BUFFER_SIZE - dmesg_head);
|
|
tty_write(dmesg_buffer, dmesg_head);
|
|
}
|
|
spin_unlock(&printk_lock);
|
|
}
|
|
|
|
const char* dmesg_get_buffer(size_t* size_out) {
|
|
if (size_out) *size_out = dmesg_total;
|
|
return dmesg_buffer;
|
|
}
|