diff --git a/main.cc b/main.cc index 6d4291a..8929433 100644 --- a/main.cc +++ b/main.cc @@ -6,10 +6,20 @@ #include "arch/textwindow.h" #include "arch/serial.h" #include "device/serialstream.h" +#include "device/textstream.h" TextStream kout = TextStream(0, 80, 0, 12, true); -TextStream dout[8]; +TextStream dout[8] = { + TextStream(0 ,20,12,25,false), + TextStream(20,40,12,25,false), + TextStream(40,60,12,25,false), + TextStream(60,80,12,25,false), + TextStream(0 ,0 ,0, 0,false), + TextStream(0 ,0 ,0, 0,false), + TextStream(0 ,0 ,0, 0,false), + TextStream(0 ,0 ,0, 0,false), +}; // Main function @@ -59,6 +69,8 @@ extern "C" int main() { << " -> 0x1badcafefee1dead" << endl; kout << "smiley: " << static_cast(1) << endl; + dout[0] << "test main!\n"; + /* Start application processors * To avoid unexpected behaviour, make sure that interrupts are not * enabled before the APs are booted. Otherwise it might interfere with the @@ -87,9 +99,10 @@ extern "C" int main_ap() { s.write('a'); - uint8_t from = static_cast(LAPIC::getID()) * 20; - uint8_t to = from+20; - dout[LAPIC::getID()] = TextStream(from, to, 0, 6, true); + //uint8_t from = static_cast(LAPIC::getID()) * 20; + //uint8_t to = from+20; + //dout[LAPIC::getID()] = TextStream(from, to, 0, 6, false); + dout[LAPIC::getID()] << "test\n"; return 0; }