Merge branch 'main' into feature-03-memory-management

2022-05-06 17:33:23 +02:00
parent 4ee0b701d7 38d0ff6e00
commit 84399a2951
8 changed files with 220 additions and 196 deletions
--- a/c_os/main.cc
+++ b/c_os/main.cc
@ -22,12 +22,10 @@ int main() {
    // Bildschirm loeschen.
    kout.clear();

-    // Startmeldung ausgeben
-    kout << "Yo it's booting" << endl;
+    text_demo();
+    // sound_demo();
+    keyboard_demo();

-    heap_demo();
-
-    while (1)
-        ;
+    while (1) {};
    return 0;
 }