From de5af66a96c6b6ac5d2be89e4eaa381fb6b1ef94 Mon Sep 17 00:00:00 2001
From: Baptiste Wicht <baptiste.wicht@gmail.com>
Date: Sun, 6 Apr 2014 17:01:28 +0200
Subject: [PATCH] Renaming

---
 kernel/include/scheduler.hpp     | 8 ++++----
 kernel/include/scheduler_asm.hpp | 4 ++--
 kernel/include/sleep_queue.hpp   | 6 +++---
 kernel/src/scheduler.cpp         | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kernel/include/scheduler.hpp b/kernel/include/scheduler.hpp
index 42af1177..d5f272d9 100644
--- a/kernel/include/scheduler.hpp
+++ b/kernel/include/scheduler.hpp
@@ -18,9 +18,9 @@ namespace scheduler {
 
 constexpr const size_t MAX_PROCESS = 128;
 
-struct sleep_queue_ptr {
-    sleep_queue_ptr* next;
-    sleep_queue_ptr* prev;
+struct queue_ptr {
+    queue_ptr* next;
+    queue_ptr* prev;
     pid_t pid;
 };
 
@@ -40,7 +40,7 @@ scheduler::process_t& get_process(pid_t pid);
 
 void irq_register_tasklet(const tasklet& task);
 
-sleep_queue_ptr* queue_ptr(pid_t pid);
+queue_ptr* sleep_queue_ptr(pid_t pid);
 
 void block_process();
 void unblock_process(pid_t pid);
diff --git a/kernel/include/scheduler_asm.hpp b/kernel/include/scheduler_asm.hpp
index 1f70ecc3..3455e4cf 100644
--- a/kernel/include/scheduler_asm.hpp
+++ b/kernel/include/scheduler_asm.hpp
@@ -5,8 +5,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#ifndef SCHEDULER_H
-#define SCHEDULER_H
+#ifndef SCHEDULER_ASM_H
+#define SCHEDULER_ASM_H
 
 extern "C" {
 
diff --git a/kernel/include/sleep_queue.hpp b/kernel/include/sleep_queue.hpp
index e2eb79f3..26096401 100644
--- a/kernel/include/sleep_queue.hpp
+++ b/kernel/include/sleep_queue.hpp
@@ -13,8 +13,8 @@
 
 struct sleep_queue {
 private:
-    volatile scheduler::sleep_queue_ptr* head = nullptr;
-    volatile scheduler::sleep_queue_ptr* tail = nullptr;
+    volatile scheduler::queue_ptr* head = nullptr;
+    volatile scheduler::queue_ptr* tail = nullptr;
 
 public:
     void wake_up(){
@@ -39,7 +39,7 @@ public:
         //Get the current process information
         auto pid = scheduler::get_pid();
 
-        auto queue_ptr = scheduler::queue_ptr(pid);
+        auto queue_ptr = scheduler::sleep_queue_ptr(pid);
         queue_ptr->pid = pid;
         queue_ptr->next = nullptr;
         queue_ptr->prev = nullptr;
diff --git a/kernel/src/scheduler.cpp b/kernel/src/scheduler.cpp
index c659d848..d7e21f57 100644
--- a/kernel/src/scheduler.cpp
+++ b/kernel/src/scheduler.cpp
@@ -40,7 +40,7 @@ namespace {
 struct process_control_t {
     scheduler::process_t process;
     scheduler::process_state state;
-    scheduler::sleep_queue_ptr queue_ptr;
+    scheduler::queue_ptr sleep_queue_ptr;
     size_t rounds;
     size_t sleep_timeout;
     std::vector<std::vector<std::string>> handles;
@@ -863,11 +863,11 @@ scheduler::process_t& scheduler::get_process(pid_t pid){
     return pcb[pid].process;
 }
 
-scheduler::sleep_queue_ptr* scheduler::queue_ptr(scheduler::pid_t pid){
+scheduler::queue_ptr* scheduler::sleep_queue_ptr(scheduler::pid_t pid){
     thor_assert(is_started(), "The scheduler is not started");
     thor_assert(pid < scheduler::MAX_PROCESS, "pid out of bounds");
 
-    return &pcb[pid].queue_ptr;
+    return &pcb[pid].sleep_queue_ptr;
 }
 
 void scheduler::block_process(){