reformat

c_os/user/demo/HeapDemo.cc

@@ -19,7 +19,7 @@ void HeapDemo::run() {
 
     // Rounding to word border
     kout << "ROUNDING ====================================================================" << endl;
-    void* alloc = allocator.alloc(1); // 1 Byte
+    void* alloc = allocator.alloc(1);  // 1 Byte
     allocator.dump_free_memory();
     allocator.free(alloc);
     allocator.dump_free_memory();
@@ -32,9 +32,9 @@ void HeapDemo::run() {
     allocator.dump_free_memory();
     MyObj* c = new MyObj(15);
     allocator.dump_free_memory();
-    delete b; // No merge
+    delete b;  // No merge
     allocator.dump_free_memory();
-    delete a; // Merge forward
+    delete a;  // Merge forward BUG: Bluescreen
     allocator.dump_free_memory();
     delete c;
     allocator.dump_free_memory();

c_os/user/demo/HeapDemo.h

@@ -32,5 +32,4 @@ public:
     void run() override;
 };
 
-
 #endif

c_os/user/demo/KeyboardDemo.h

@@ -13,7 +13,7 @@
 
 #include "kernel/Globals.h"
 #include "kernel/threads/Thread.h"
-#include "user/KeyEventListener.h"
+#include "user/event/KeyEventListener.h"
 
 class KeyboardDemo : public Thread {
 private:
@@ -24,7 +24,7 @@ private:
 public:
     KeyboardDemo() : listener(*this) {
         kout << "Initialized KeyboardDemo" << endl;
-        kevman.subscribe(listener);
+        kevman.subscribe(this->listener);
     }
 
     void run() override;