Update IntDispatcher.h, PIC.h: Expose named interrupt structs

src/device/interrupt/PIC.h

@@ -35,10 +35,10 @@ public:
     // Can't make static because atexit
 
     // IRQ-Nummern von Geraeten
-    enum {
+    enum Irq {
-        timer = 0,     // Programmable Interrupt Timer (PIT)
+        TIMER = 0,     // Programmable Interrupt Timer (PIT)
-        keyboard = 1,  // Tastatur
+        KEYBOARD = 1,  // Tastatur
-        com1 = 4
+        COM1 = 4
     };
 
     // Freischalten der Weiterleitung eines IRQs durch den PIC an die CPU

src/kernel/interrupt/IntDispatcher.h

@@ -20,28 +20,26 @@
 namespace Kernel {
 
 class IntDispatcher {
-private:
+public:
-    NamedLogger log;
+    // Vektor-Nummern
-
+    enum Vector {
-    enum {
+        TIMER = 32,
-        size = 256
+        KEYBOARD = 33,
+        COM1 = 36
     };
-    Container::Array<ISR *, size> map;
 
 public:
     IntDispatcher(const IntDispatcher &copy) = delete;  // Verhindere Kopieren
 
-    // Vektor-Nummern
+    // TODO: Somehow the logs don't appear, is this not executed, does the Array::iterator not work?
-    enum {
-        timer = 32,
-        keyboard = 33,
-        com1 = 36
-    };
-
-    // Initialisierung der ISR map mit einer Default-ISR.
     IntDispatcher() : log("IntDis") {
-        for (ISR *&slot: map) {
+        for (ISR *&slot: handlerMap) { // TODO: What the fuck is *&
-            slot = nullptr;
+            if (slot == nullptr) {
+                log.debug() << "SLOT IS NULLPTR" << endl;
+            } else {
+                log.debug() << "SLOT IS NOT NULLPTR" << endl;
+                slot = nullptr;
+            }
         }
     }
 
@@ -49,7 +47,13 @@ public:
     int assign(uint8_t vector, ISR &isr);
 
     // ISR fuer 'vector' ausfuehren
-    int report(uint8_t vector);
+    int dispatch(uint8_t vector);
+
+private:
+    // TODO: Initialize to nullptr like this: handlerMap = {nullptr};
+    Container::Array<ISR *, 256> handlerMap;
+
+    NamedLogger log;
 };
 
 }