From 5ddb73fce67c7d927466a9652ed570f11164ec04 Mon Sep 17 00:00:00 2001
From: Baptiste Wicht <baptiste.wicht@gmail.com>
Date: Thu, 31 Oct 2013 16:09:13 +0100
Subject: [PATCH] Refactorings

---
 kernel/include/memory.hpp |  1 +
 kernel/src/memory.cpp     | 21 ++++++++++++++++++++-
 kernel/src/shell.cpp      | 18 ------------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/kernel/include/memory.hpp b/kernel/include/memory.hpp
index d1e540fc..6ab2ebab 100644
--- a/kernel/include/memory.hpp
+++ b/kernel/include/memory.hpp
@@ -13,5 +13,6 @@ void load_memory_map();
 bool mmap_failed();
 std::size_t mmap_entry_count();
 const mmapentry& mmap_entry(std::size_t i);
+const char* str_e820_type(std::size_t type);
 
 #endif
diff --git a/kernel/src/memory.cpp b/kernel/src/memory.cpp
index c71dd920..43cda557 100644
--- a/kernel/src/memory.cpp
+++ b/kernel/src/memory.cpp
@@ -24,7 +24,7 @@ void mmap_query(std::size_t cmd, std::size_t* result){
     *result = tmp;
 }
 
-}
+} //end of anonymous namespace //end of anonymous namespace
 
 void load_memory_map(){
     mmap_query(0, &e820_failed);
@@ -57,3 +57,22 @@ bool mmap_failed(){
 const mmapentry& mmap_entry(std::size_t i){
     return e820_mmap[i];
 }
+
+const char* str_e820_type(std::size_t type){
+    switch(type){
+        case 1:
+            return "Free";
+        case 2:
+            return "Reserved";
+        case 3:
+        case 4:
+            return "ACPI";
+        case 5:
+            return "Unusable";
+        case 6:
+            return "Disabled";
+        default:
+            return "Unknown";
+    }
+}
+
diff --git a/kernel/src/shell.cpp b/kernel/src/shell.cpp
index a1b1e77e..ab09910a 100644
--- a/kernel/src/shell.cpp
+++ b/kernel/src/shell.cpp
@@ -222,24 +222,6 @@ void echo_command(const char* params){
     k_print_line(params + 5);
 }
 
-const char* str_e820_type(std::size_t type){
-    switch(type){
-        case 1:
-            return "Free";
-        case 2:
-            return "Reserved";
-        case 3:
-        case 4:
-            return "ACPI";
-        case 5:
-            return "Unusable";
-        case 6:
-            return "Disabled";
-        default:
-            return "Unknown";
-    }
-}
-
 void memory_command(const char*){
     if(mmap_failed()){
         k_print_line("The mmap was not correctly loaded from e820");