diff --git a/src/kernel/system/Globals.cc b/src/kernel/system/Globals.cc index 574a4cd..d39f630 100755 --- a/src/kernel/system/Globals.cc +++ b/src/kernel/system/Globals.cc @@ -12,15 +12,12 @@ namespace Kernel { -CGA_Stream kout; // Ausgabe-Strom fuer Kernel -const Device::BIOS &bios = Device::BIOS::instance(); // Schnittstelle zum 16-Bit BIOS -Device::VESA vesa; // VESA-Treiber +const Device::BIOS &bios = Device::BIOS::instance(); +Device::VESA vesa; -Device::PIC pic; // Interrupt-Controller -IntDispatcher intdis; // Unterbrechungsverteilung -Device::PIT pit(10000); // 10000 -Device::PCSPK pcspk; // PC-Lautsprecher -Device::Keyboard kb; // Tastatur +Device::PIT pit(10000); // 10000 +Device::PCSPK pcspk; // PC-Lautsprecher +Device::Keyboard kb; // Tastatur // BumpAllocator allocator; LinkedListAllocator allocator; @@ -31,7 +28,7 @@ Scheduler scheduler; KeyEventManager kevman; Device::SerialOut serial; -unsigned int total_mem; // RAM total +unsigned int total_mem; // RAM total uint64_t systime = 0; } diff --git a/src/kernel/system/Globals.h b/src/kernel/system/Globals.h index 04c7568..0c87f96 100755 --- a/src/kernel/system/Globals.h +++ b/src/kernel/system/Globals.h @@ -31,12 +31,9 @@ namespace Kernel { // I wanted to make more of these singletons but there were problems with atexit missing because of nostdlib I guess -extern CGA_Stream kout; // Ausgabe-Strom fuer Kernel extern const Device::BIOS &bios; // Schnittstelle zum 16-Bit BIOS extern Device::VESA vesa; // VESA-Treiber -extern Device::PIC pic; // Interrupt-Controller -extern IntDispatcher intdis; // Unterbrechungsverteilung extern Device::PIT pit; // Zeitgeber extern Device::PCSPK pcspk; // PC-Lautsprecher extern Device::Keyboard kb; // Tastatur