From 694e835142c01a6fe1d45422bb70f1ddf4724cd7 Mon Sep 17 00:00:00 2001 From: ChUrl Date: Sat, 16 Jul 2022 01:02:06 +0200 Subject: [PATCH] add serial + eventmanager to globals --- c_os/kernel/Globals.cc | 7 +++++-- c_os/kernel/Globals.h | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/c_os/kernel/Globals.cc b/c_os/kernel/Globals.cc index 76a4ae3..535b298 100755 --- a/c_os/kernel/Globals.cc +++ b/c_os/kernel/Globals.cc @@ -17,8 +17,8 @@ VESA vesa; // VESA-Treiber PIC pic; // Interrupt-Controller IntDispatcher intdis; // Unterbrechungsverteilung -PIT pit(10000); -PCSPK pcspk; // PC-Lautsprecher +PIT pit(10000); // 10000 +PCSPK pcspk; // PC-Lautsprecher Keyboard kb; // Tastatur KeyEventManager kevman; @@ -26,7 +26,10 @@ KeyEventManager kevman; // BumpAllocator allocator; LinkedListAllocator allocator; // TreeAllocator allocator; + Scheduler scheduler; +SerialOut serial; + unsigned int total_mem; // RAM total unsigned long systime = 0; diff --git a/c_os/kernel/Globals.h b/c_os/kernel/Globals.h index 5190a9c..eb08878 100755 --- a/c_os/kernel/Globals.h +++ b/c_os/kernel/Globals.h @@ -23,7 +23,8 @@ #include "kernel/interrupts/IntDispatcher.h" #include "kernel/interrupts/PIC.h" #include "kernel/threads/Scheduler.h" -#include "user/KeyEventManager.h" +#include "user/devices/SerialOut.h" +#include "user/event/KeyEventManager.h" extern CPU cpu; // CPU-spezifische Funktionen extern CGA_Stream kout; // Ausgabe-Strom fuer Kernel @@ -42,9 +43,12 @@ extern KeyEventManager kevman; // extern BumpAllocator allocator; extern LinkedListAllocator allocator; // extern TreeAllocator allocator; + extern Scheduler scheduler; -constexpr bool DEBUG = true; +extern SerialOut serial; + +constexpr bool DEBUG = false; extern unsigned int total_mem; // RAM total extern unsigned long systime; // wird all 10ms hochgezaehlt