christoph/lecture-operating-system-development
1
Fork 0
Code Activity

add serial + eventmanager to globals

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-16 01:02:06 +02:00
parent f41eda0215
commit 694e835142
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c_os/kernel/Globals.cc
View File

@ -17,8 +17,8 @@ VESA vesa; // VESA-Treiber
PIC pic; // Interrupt-Controller PIC pic; // Interrupt-Controller
IntDispatcher intdis; // Unterbrechungsverteilung IntDispatcher intdis; // Unterbrechungsverteilung
PIT pit(10000); PIT pit(10000); // 10000
PCSPK pcspk; // PC-Lautsprecher PCSPK pcspk; // PC-Lautsprecher
Keyboard kb; // Tastatur Keyboard kb; // Tastatur
KeyEventManager kevman; KeyEventManager kevman;
@ -26,7 +26,10 @@ KeyEventManager kevman;
// BumpAllocator allocator; // BumpAllocator allocator;
LinkedListAllocator allocator; LinkedListAllocator allocator;
// TreeAllocator allocator; // TreeAllocator allocator;
Scheduler scheduler; Scheduler scheduler;
SerialOut serial;
unsigned int total_mem; // RAM total unsigned int total_mem; // RAM total
unsigned long systime = 0; unsigned long systime = 0;

8
c_os/kernel/Globals.h
View File

@ -23,7 +23,8 @@
#include "kernel/interrupts/IntDispatcher.h" #include "kernel/interrupts/IntDispatcher.h"
#include "kernel/interrupts/PIC.h" #include "kernel/interrupts/PIC.h"
#include "kernel/threads/Scheduler.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 CPU cpu; // CPU-spezifische Funktionen
extern CGA_Stream kout; // Ausgabe-Strom fuer Kernel extern CGA_Stream kout; // Ausgabe-Strom fuer Kernel
@ -42,9 +43,12 @@ extern KeyEventManager kevman;
// extern BumpAllocator allocator; // extern BumpAllocator allocator;
extern LinkedListAllocator allocator; extern LinkedListAllocator allocator;
// extern TreeAllocator allocator; // extern TreeAllocator allocator;
extern Scheduler scheduler; extern Scheduler scheduler;
constexpr bool DEBUG = true; extern SerialOut serial;
constexpr bool DEBUG = false;
extern unsigned int total_mem; // RAM total extern unsigned int total_mem; // RAM total
extern unsigned long systime; // wird all 10ms hochgezaehlt extern unsigned long systime; // wird all 10ms hochgezaehlt