eryn/polka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use printFormat from kstd instead of from Console

Browse source
This commit is contained in:
Eryn Wells 2016-03-29 12:00:49 -04:00
parent 31c13bcba2
commit 014a18add0
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Interrupts.cc
View file

@ -10,6 +10,7 @@
#include "Console.hh"
#include "IO.hh"
#include "Kernel.hh"
#include "kstd/PrintFormat.hh"
extern "C" {
@ -164,7 +165,7 @@ InterruptHandler::doKeyboardInterrupt()
auto& console = kernel::Console::systemConsole();
do {
c = kernel::io::inw(0x60);
console.printFormat("Key! (scancode 0x%02X)\n", c);
kstd::printFormat("Key! (scancode 0x%02X)\n", c);
} while (c == 0);
}

32
src/Kernel.cc
View file

@ -9,6 +9,7 @@
#include <stdarg.h>
#include "Kernel.hh"
#include "Interrupts.hh"
#include "kstd/PrintFormat.hh"
namespace {
@ -42,26 +43,30 @@ void
Kernel::initialize(const StartupInformation& startupInformation)
{
mConsole.clear(kernel::Console::Color::Blue);
mConsole.printString("Loading Polka...\n");
mConsole.printFormat("Kernel image: start = 0x%08lX, end = 0x%08lX, size = %ld bytes\n", startupInformation.kernelStart, startupInformation.kernelEnd, startupInformation.kernelEnd - startupInformation.kernelStart);
kstd::printString("Loading Polka...\n");
kstd::printFormat("Kernel image: start = 0x%08lX, end = 0x%08lX, size = %ld bytes\n",
startupInformation.kernelStart, startupInformation.kernelEnd,
startupInformation.kernelEnd - startupInformation.kernelStart);
auto multiboot = startupInformation.multibootInformation;
mConsole.printFormat("Multiboot: start = 0x%08lX\n", u32(multiboot));
mConsole.printFormat("Command line: \"%s\"\n", multiboot->commandLine());
kstd::printFormat("Multiboot: start = 0x%08lX\n", u32(multiboot));
kstd::printFormat("Command line: \"%s\"\n", multiboot->commandLine());
mConsole.printFormat("Memory map:\n");
mConsole.printFormat(" available: lower = %ld KB, upper = %ld KB\n", multiboot->lowerMemoryKB(), multiboot->upperMemoryKB());
kstd::printFormat("Memory map:\n");
kstd::printFormat(" available: lower = %ld KB, upper = %ld KB\n",
multiboot->lowerMemoryKB(), multiboot->upperMemoryKB());
for (auto it = multiboot->memoryMapBegin(); it != multiboot->memoryMapEnd(); ++it) {
auto begin = (*it).base;
auto end = begin + (*it).length - 1;
mConsole.printFormat(" begin = 0x%08lX %08lX, end = 0x%08lX %08lX (%s)\n",
u32(begin >> 32), u32(begin & 0xFFFFFFFF),
u32(end >> 32), u32(end & 0xFFFFFFFF),
(*it).type == 1 ? "available" : "reserved");
kstd::printFormat(" begin = 0x%08lX %08lX, end = 0x%08lX %08lX (%s)\n",
u32(begin >> 32), u32(begin & 0xFFFFFFFF),
u32(end >> 32), u32(end & 0xFFFFFFFF),
(*it).type == 1 ? "available" : "reserved");
}
mMemoryManager.initialize(mConsole);
mMemoryManager.initialize();
}
@ -70,11 +75,12 @@ Kernel::panic(const char* msg,
...)
{
mConsole.clear(Console::Color::Magenta);
mConsole.printString("PANIC! PANIC! PANIC! :-(\n");
kstd::printString("PANIC! PANIC! PANIC! :-(\n");
va_list args;
va_start(args, msg);
mConsole.printFormat(msg, args);
kstd::printFormat(msg, args);
va_end(args);
// TODO: Dump registers.