RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:47:44 +00:00
Code Issues Activity Actions

Fix crashy bug where we'd try to deactivate VC -1 on boot.

Browse source
This commit is contained in:
Andreas Kling 2018-10-30 16:16:20 +01:00
parent 7a7956a595
commit 1b81813a66
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/VirtualConsole.cpp
View file

@ -6,12 +6,13 @@
#include "Keyboard.h" #include "Keyboard.h"
#include <AK/String.h> #include <AK/String.h>
static byte* s_vgaBuffer = (byte*)0xb8000; static byte* s_vgaBuffer;
static VirtualConsole* s_consoles[6]; static VirtualConsole* s_consoles[6];
static int s_activeConsole; static int s_activeConsole;
void VirtualConsole::initialize() void VirtualConsole::initialize()
{ {
s_vgaBuffer = (byte*)0xb8000;
memset(s_consoles, 0, sizeof(s_consoles)); memset(s_consoles, 0, sizeof(s_consoles));
s_activeConsole = -1; s_activeConsole = -1;
} }
@ -21,8 +22,8 @@ VirtualConsole::VirtualConsole(unsigned index, InitialContents initialContents)
, m_index(index) , m_index(index)
{ {
s_consoles[index] = this; s_consoles[index] = this;
kprintf("VirtualConsole %u @ %p\n", index, this);
m_buffer = (byte*)kmalloc(80 * 25 * 2); m_buffer = (byte*)kmalloc(80 * 25 * 2);
dbgprintf("VirtualConsole %u @ %p, m_buffer = %p\n", index, this, m_buffer);
if (initialContents == AdoptCurrentVGABuffer) { if (initialContents == AdoptCurrentVGABuffer) {
memcpy(m_buffer, s_vgaBuffer, 80 * 25 * 2); memcpy(m_buffer, s_vgaBuffer, 80 * 25 * 2);
auto vgaCursor = vga_get_cursor(); auto vgaCursor = vga_get_cursor();
@ -43,11 +44,12 @@ void VirtualConsole::switchTo(unsigned index)
{ {
if ((int)index == s_activeConsole) if ((int)index == s_activeConsole)
return; return;
dbgprintf("[VC] Switch to %u\n", index); dbgprintf("[VC] Switch to %u (%p)\n", index, s_consoles[index]);
ASSERT(index < 6); ASSERT(index < 6);
ASSERT(s_consoles[index]); ASSERT(s_consoles[index]);
InterruptDisabler disabler; InterruptDisabler disabler;
s_consoles[s_activeConsole]->setActive(false); if (s_activeConsole != -1)
s_consoles[s_activeConsole]->setActive(false);
s_activeConsole = index; s_activeConsole = index;
s_consoles[s_activeConsole]->setActive(true); s_consoles[s_activeConsole]->setActive(true);
Console::the().setImplementation(s_consoles[s_activeConsole]); Console::the().setImplementation(s_consoles[s_activeConsole]);