Okay, just create a console object when you need one... for now

This commit is contained in:
Eryn Wells 2016-02-28 13:33:20 -05:00
parent e86960a283
commit a7d0607c92
3 changed files with 10 additions and 41 deletions

View file

@ -10,16 +10,6 @@
namespace kernel {
/*
* TODO: The build currently complains about missing __cxa_guard_acquire and
* __cxa_guard_release symbols if I add it there though. Once I've written
* those, this can be moved Console::systemConsole().
*
* See http://wiki.osdev.org/C%2B%2B for details.
*/
static Console sSystemConsole;
/** Create a VGA color pair. */
static inline uint8_t
makeVGAColor(Console::Color fg,
@ -39,21 +29,10 @@ makeVGAEntry(char c,
return c16 | color16 << 8;
}
/*
* Static
*/
auto
Console::systemConsole() -> Console&
{
return sSystemConsole;
}
/*
* Public
*/
// TODO: Make this private once the kernel supports local static variables.
Console::Console()
: mBase(reinterpret_cast<uint16_t *>(0xB8000)),
mCursor{0, 0},