change keyboard demo to event listener

c_os/kernel/Globals.cc

@@ -18,9 +18,11 @@ VESA vesa;        // VESA-Treiber
 PIC pic;               // Interrupt-Controller
 IntDispatcher intdis;  // Unterbrechungsverteilung
 PIT pit(10000);
-Keyboard kb;  // Tastatur
 PCSPK pcspk;  // PC-Lautsprecher
 
+Keyboard kb;  // Tastatur
+KeyEventManager kevman;
+
 // BumpAllocator         allocator;
 LinkedListAllocator allocator;
 // TreeAllocator allocator;

c_os/kernel/Globals.h

@@ -23,6 +23,7 @@
 #include "kernel/interrupts/IntDispatcher.h"
 #include "kernel/interrupts/PIC.h"
 #include "kernel/threads/Scheduler.h"
+#include "user/KeyEventManager.h"
 
 extern CPU cpu;          // CPU-spezifische Funktionen
 extern CGA_Stream kout;  // Ausgabe-Strom fuer Kernel
@@ -32,8 +33,11 @@ extern VESA vesa;        // VESA-Treiber
 extern PIC pic;               // Interrupt-Controller
 extern IntDispatcher intdis;  // Unterbrechungsverteilung
 extern PIT pit;               // Zeitgeber
-extern Keyboard kb;           // Tastatur
-extern PCSPK pcspk;           // PC-Lautsprecher
+
+extern PCSPK pcspk;  // PC-Lautsprecher
+
+extern Keyboard kb;  // Tastatur
+extern KeyEventManager kevman;
 
 // extern BumpAllocator         allocator;
 extern LinkedListAllocator allocator;

c_os/kernel/threads/Scheduler.cc

@@ -202,6 +202,32 @@ void Scheduler::deblock(Thread* that) {
     /* hier muss Code eingefuegt werden */
 
     cpu.disable_int();
-    this->readyQueue.enqueue(that);
-    cpu.enable_int();
+    this->readyQueue.enqueue(this->get_active());
+    this->dispatch(*that);  // Prefer deblocked
 }
+
+// NOTE: Don't need these, input blocked threads are managed inside event manager
+// These blocking functions are mainly for KeyEvents
+// void Scheduler::block() {
+//     if (this->readyQueue.isEmpty()) {
+//         // Something went seriously wrong
+//         return;
+//     }
+
+//     cpu.disable_int();
+//     this->blockQueue.enqueue(this->get_active());
+//     Thread& next = *(Thread*)this->readyQueue.dequeue();
+//     this->dispatch(next);
+// }
+
+// void Scheduler::deblock(Thread* that) {
+//     if (this->blockQueue.isEmpty()) {
+//         // Something went seriously wrong
+//         return;
+//     }
+
+//     cpu.disable_int();
+//     this->readyQueue.enqueue(this->get_active());
+//     this->blockQueue.remove(that);
+//     this->dispatch(*that);  // Prefer deblocked
+// }

c_os/kernel/threads/Scheduler.h

@@ -21,6 +21,7 @@ private:
     Scheduler(const Scheduler& copy) = delete;  // Verhindere Kopieren
 
     Queue readyQueue;  // auf die CPU wartende Threads
+    Queue blockQueue;
 
     // Scheduler wird evt. von einer Unterbrechung vom Zeitgeber gerufen,
     // bevor er initialisiert wurde
@@ -55,8 +56,12 @@ public:
     // Thread umschalten; wird aus der ISR des PITs gerufen
     void preempt();
 
+    // TODO: Merge this with usual block/deblock
     void block();
     void deblock(Thread* that);
+
+    // void block();
+    // void deblock(Thread* that);
 };
 
 #endif