From 499ca6c243b05da176a2d4bd9a2317f0b28afc7f Mon Sep 17 00:00:00 2001
From: Alex AUVOLAT <alexis211@gmail.com>
Date: Sat, 19 May 2012 11:45:49 +0200
Subject: Introducing FWIK, the userland C++ framework. Far from complete.

---
 src/kernel/lib/sched.c   | 26 --------------------------
 src/kernel/lib/sched.cpp | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 src/kernel/lib/sched.c
 create mode 100644 src/kernel/lib/sched.cpp

(limited to 'src/kernel/lib')

diff --git a/src/kernel/lib/sched.c b/src/kernel/lib/sched.c
deleted file mode 100644
index 29ea8a8..0000000
--- a/src/kernel/lib/sched.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <sched.h>
-
-/*	Internal use only. This function is atomic, meaning it cannot be interrupted by a system task switch. */
-static uint32_t atomic_exchange(uint32_t* ptr, uint32_t newval) {
-	uint32_t r;
-	asm volatile("xchg (%%ecx), %%eax" : "=a"(r) : "c"(ptr), "a"(newval));
-	return r;
-}
-
-int mutex_lock(uint32_t* mutex) {
-	while (atomic_exchange(mutex, MUTEX_LOCKED) == MUTEX_LOCKED) {
-		schedule();
-	}
-	return 0;
-}
-
-int mutex_lockE(uint32_t* mutex) {
-	if (atomic_exchange(mutex, MUTEX_LOCKED) == MUTEX_LOCKED) {
-		return 0;
-	}
-	return 1;
-}
-
-void mutex_unlock(uint32_t* mutex) {
-	*mutex = MUTEX_UNLOCKED;
-}
diff --git a/src/kernel/lib/sched.cpp b/src/kernel/lib/sched.cpp
new file mode 100644
index 0000000..06900d1
--- /dev/null
+++ b/src/kernel/lib/sched.cpp
@@ -0,0 +1,27 @@
+#include <sched.h>
+#include <task/task.h>
+
+/*	Internal use only. This function is atomic, meaning it cannot be interrupted by a system task switch. */
+static uint32_t atomic_exchange(uint32_t* ptr, uint32_t newval) {
+	uint32_t r;
+	asm volatile("xchg (%%ecx), %%eax" : "=a"(r) : "c"(ptr), "a"(newval));
+	return r;
+}
+
+int mutex_lock(uint32_t* mutex) {
+	while (atomic_exchange(mutex, MUTEX_LOCKED) == MUTEX_LOCKED) {
+		schedule();
+	}
+	return 0;
+}
+
+int mutex_lockE(uint32_t* mutex) {
+	if (atomic_exchange(mutex, MUTEX_LOCKED) == MUTEX_LOCKED) {
+		return 0;
+	}
+	return 1;
+}
+
+void mutex_unlock(uint32_t* mutex) {
+	*mutex = MUTEX_UNLOCKED;
+}
-- 
cgit v1.2.3