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

switch order

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-19 14:47:37 +02:00
parent e6194247cb
commit 304458a816
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c_os/kernel/Globals.cc
View File

@ -19,9 +19,7 @@ PIC pic; // Interrupt-Controller
IntDispatcher intdis; // Unterbrechungsverteilung IntDispatcher intdis; // Unterbrechungsverteilung
PIT pit(10000); // 10000 PIT pit(10000); // 10000
PCSPK pcspk; // PC-Lautsprecher PCSPK pcspk; // PC-Lautsprecher
Keyboard kb; // Tastatur
Keyboard kb; // Tastatur
KeyEventManager kevman;
// BumpAllocator allocator; // BumpAllocator allocator;
LinkedListAllocator allocator; LinkedListAllocator allocator;
@ -29,6 +27,7 @@ LinkedListAllocator allocator;
Scheduler scheduler; Scheduler scheduler;
KeyEventManager kevman;
SerialOut serial; SerialOut serial;
unsigned int total_mem; // RAM total unsigned int total_mem; // RAM total

8
c_os/kernel/Globals.h
View File

@ -34,11 +34,8 @@ extern VESA vesa; // VESA-Treiber
extern PIC pic; // Interrupt-Controller extern PIC pic; // Interrupt-Controller
extern IntDispatcher intdis; // Unterbrechungsverteilung extern IntDispatcher intdis; // Unterbrechungsverteilung
extern PIT pit; // Zeitgeber extern PIT pit; // Zeitgeber
extern PCSPK pcspk; // PC-Lautsprecher
extern PCSPK pcspk; // PC-Lautsprecher extern Keyboard kb; // Tastatur
extern Keyboard kb; // Tastatur
extern KeyEventManager kevman;
// extern BumpAllocator allocator; // extern BumpAllocator allocator;
extern LinkedListAllocator allocator; extern LinkedListAllocator allocator;
@ -46,6 +43,7 @@ extern LinkedListAllocator allocator;
extern Scheduler scheduler; extern Scheduler scheduler;
extern KeyEventManager kevman;
extern SerialOut serial; extern SerialOut serial;
extern unsigned int total_mem; // RAM total extern unsigned int total_mem; // RAM total