summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-22 11:22:02 +0400
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-22 11:22:02 +0400
commitbf7548410f2f34007ddfe084ce7f34f4c6017fcc (patch)
tree06da33821e06a3977c9dfa873e10bbc193081ece
parentbf534139e35b78535d4c9d8522376a1df5db84b4 (diff)
Move memPrint to helpers
-rw-r--r--kernel/Drivers/memPrint/memPrint.cpp7
-rw-r--r--kernel/Drivers/memPrint/memPrint.hpp32
-rw-r--r--kernel/Helpers/memory.hpp27
-rw-r--r--kernel/main.cpp3
4 files changed, 27 insertions, 42 deletions
diff --git a/kernel/Drivers/memPrint/memPrint.cpp b/kernel/Drivers/memPrint/memPrint.cpp
deleted file mode 100644
index cd93994..0000000
--- a/kernel/Drivers/memPrint/memPrint.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "./memPrint.hpp"
-
-
-
-
-
-//Implement memPrint class to print text on screen
diff --git a/kernel/Drivers/memPrint/memPrint.hpp b/kernel/Drivers/memPrint/memPrint.hpp
deleted file mode 100644
index 71d934b..0000000
--- a/kernel/Drivers/memPrint/memPrint.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __memPrint__
-#define __memPrint__
-
-//Define the bios color
-enum colorBios{
-
- BLACK=0x0,
- BLUE=0x1,
- GREEN=0x2,
- CYAN=0x3,
- RED=0x4,
- MAGENTA=0x5,
- BROWN=0x6,
- LIGHTGRAY=0x7,
- DARKGRAY=0x8,
- LIGHTBLUE=0x9,
- LIGHTGREEN=0xA,
- LIGHTCYAN=0xB,
- LIGHTRED=0xC,
- LIGHTMAGENTA=0xD,
- YELLOW=0xE,
- WHITE=0xF
-
-};
-
-//Type def for biosColor
-typedef enum colorBios colorBios;
-
-
-// Define class to print text on screen
-
-#endif
diff --git a/kernel/Helpers/memory.hpp b/kernel/Helpers/memory.hpp
index fcd08a5..d27ac29 100644
--- a/kernel/Helpers/memory.hpp
+++ b/kernel/Helpers/memory.hpp
@@ -3,6 +3,33 @@
#include "./types.hpp"
+//Define the bios color
+enum colorBios{
+
+ BLACK=0x0,
+ BLUE=0x1,
+ GREEN=0x2,
+ CYAN=0x3,
+ RED=0x4,
+ MAGENTA=0x5,
+ BROWN=0x6,
+ LIGHTGRAY=0x7,
+ DARKGRAY=0x8,
+ LIGHTBLUE=0x9,
+ LIGHTGREEN=0xA,
+ LIGHTCYAN=0xB,
+ LIGHTRED=0xC,
+ LIGHTMAGENTA=0xD,
+ YELLOW=0xE,
+ WHITE=0xF
+
+};
+
+//Type def for biosColor
+typedef enum colorBios colorBios;
+
+
+
int memcpy(u32 source, u32 dest, u32 size);
diff --git a/kernel/main.cpp b/kernel/main.cpp
index 1b62de8..0b80564 100644
--- a/kernel/main.cpp
+++ b/kernel/main.cpp
@@ -1,9 +1,6 @@
//To load GDT
#include "GDT/gdt.hpp"
-//To print text
-#include "Drivers/memPrint/memPrint.hpp"
-
//----- PiegOS kernel main -----
int main(){