move logger

c_os/devices/CGA.cc

@@ -12,7 +12,7 @@
  *                  Aenderungen von Michael Schoettner, HHU, 21.8.2016       *
  *****************************************************************************/
 #include "devices/CGA.h"
-#include "user/lib/Memory.h"
+#include "user/lib/mem/Memory.h"
 
 const IOport CGA::index_port(0x3d4);
 const IOport CGA::data_port(0x3d5);

c_os/devices/VESA.h

@@ -12,7 +12,7 @@
 #define VESA_include__
 
 #include "devices/LFBgraphics.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 // Ausgewaehlte Grafikmodi mit Mode-Nummer
 constexpr const unsigned int MODE_640_480_16BITS = 0x111;

c_os/devices/fonts/Fonts.h

@@ -11,6 +11,8 @@
 #ifndef FONTS_H__
 #define FONTS_H__
 
+#include "user/lib/Array.h"
+
 class Font {
 public:
     virtual ~Font() = default;
@@ -48,12 +50,12 @@ extern const unsigned char fontdata_pearl_8x8[];
 extern const unsigned char fontdata_sun_12x22[];
 extern const unsigned char fontdata_sun_8x16[];
 
-typedef FontInstance<8, 16, fontdata_8x16> Font_8x16;
-typedef FontInstance<8, 8, fontdata_8x8> Font_8x8;
-typedef FontInstance<8, 8, acorndata_8x8> Font_acorn_8x8;
-typedef FontInstance<8, 8, fontdata_pearl_8x8> Font_pearl_8x8;
-typedef FontInstance<12, 22, fontdata_sun_12x22> Font_sun_12x22;
-typedef FontInstance<8, 16, fontdata_sun_8x16> Font_sun_8x16;
+using Font_8x16 = FontInstance<8, 16, fontdata_8x16>;
+using Font_8x8 = FontInstance<8, 8, fontdata_8x8>;
+using Font_acorn_8x8 = FontInstance<8, 8, acorndata_8x8>;
+using Font_pearl_8x8 = FontInstance<8, 8, fontdata_pearl_8x8>;
+using Font_sun_12x22 = FontInstance<12, 22, fontdata_sun_12x22>;
+using Font_sun_8x16 = FontInstance<8, 16, fontdata_sun_8x16>;
 
 extern const Font_8x16 std_font_8x16;
 extern const Font_8x8 std_font_8x8;

c_os/kernel/Paging.cc

@@ -50,7 +50,7 @@
  *****************************************************************************/
 #include "kernel/Paging.h"
 #include "kernel/Globals.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 // Bits fuer Eintraege in der Page-Table
 constexpr const unsigned int PAGE_PRESENT = 0x001;

c_os/kernel/allocator/BumpAllocator.h

@@ -13,7 +13,7 @@
 #define BumpAllocator_include__
 
 #include "kernel/Allocator.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 class BumpAllocator : Allocator {
 private:

c_os/kernel/allocator/LinkedListAllocator.cc

@@ -11,7 +11,7 @@
 
 #include "kernel/allocator/LinkedListAllocator.h"
 #include "kernel/Globals.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 // I don't order the list by size so that the block order corresponds to the location in memory
 // Then I can easily merge adjacent free blocks by finding the previous block without looking at

c_os/kernel/allocator/LinkedListAllocator.h

@@ -14,7 +14,7 @@
 
 #include "kernel/Allocator.h"
 #include "lib/SpinLock.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 // Format eines freien Blocks, 4 + 4 + 4 Byte
 typedef struct free_block {

c_os/kernel/allocator/TreeAllocator.h

@@ -2,7 +2,7 @@
 #define TreeAllocator_include__
 
 #include "kernel/Allocator.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 // I can't imagine that this is fast with all the tree logic?
 

c_os/kernel/interrupts/IntDispatcher.h

@@ -14,8 +14,8 @@
 #define IntDispatcher_include__
 
 #include "kernel/interrupts/ISR.h"
-#include "user/lib/Logger.h"
 #include "user/lib/Array.h"
+#include "user/lib/utility/Logger.h"
 
 class IntDispatcher {
 private:

c_os/kernel/threads/Scheduler.h

@@ -13,8 +13,8 @@
 #define Scheduler_include__
 
 #include "kernel/threads/Thread.h"
-#include "user/lib/Logger.h"
 #include "user/lib/mem/UniquePointer.h"
+#include "user/lib/utility/Logger.h"
 #include "user/lib/Vector.h"
 
 class Scheduler {

c_os/kernel/threads/Thread.h

@@ -28,7 +28,7 @@
 #ifndef Thread_include__
 #define Thread_include__
 
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 
 class Thread {
 private:

c_os/user/event/KeyEventManager.h

@@ -2,7 +2,7 @@
 #define KeyEventManager_Include_H_
 
 #include "user/event/KeyEventListener.h"
-#include "user/lib/Logger.h"
+#include "user/lib/utility/Logger.h"
 #include "user/lib/Vector.h"
 
 // NOTE: Could do this more generally but we only have key events

c_os/user/lib/String.cc

@@ -1,6 +1,5 @@
 #include "user/lib/String.h"
-#include "user/lib/Math.h"
-#include "user/lib/Memory.h"
+#include "user/lib/mem/Memory.h"
 
 unsigned int bse::strlen(const char* str) {
     const char* current = str;

c_os/user/lib/mem/Memory.cc

@@ -1,4 +1,4 @@
-#include "user/lib/Memory.h"
+#include "Memory.h"
 
 void bse::memset(char* destination, const char value, const unsigned int bytes) {
     for (unsigned int byte = 0; byte < bytes; ++byte) {

c_os/user/lib/utility/Logger.cc

@@ -1,4 +1,4 @@
-#include "user/lib/Logger.h"
+#include "Logger.h"
 #include "kernel/Globals.h"
 
 bool Logger::kout_enabled = true;