From 0b88d1dd8d1cda7d4805e14897419854ef5c7e7d Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Tue, 21 Apr 2015 11:39:17 +0000
Subject: [PATCH] Make sched.c for baremetal & xen run purely on top of
 bmk-core

Incidentally, the sched.c implementations are now 100% the same.
---
 platform/baremetal/sched.c | 13 ++++---------
 platform/xen/xen/sched.c   | 17 ++++-------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/platform/baremetal/sched.c b/platform/baremetal/sched.c
index 22105b4..5fcd402 100644
--- a/platform/baremetal/sched.c
+++ b/platform/baremetal/sched.c
@@ -61,11 +61,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <bmk/types.h>
-
-#include <bmk/kernel.h>
-#include <bmk/sched.h>
-
 #include <bmk-core/core.h>
 #include <bmk-core/memalloc.h>
 #include <bmk-core/platform.h>
@@ -88,7 +83,7 @@ struct bmk_thread {
 
 	void *bt_tls[TLS_COUNT];
 
-	int64_t bt_wakeup_time;
+	bmk_time_t bt_wakeup_time;
 
 	int bt_flags;
 	int bt_errno;
@@ -263,10 +258,10 @@ extern const char _tbss_start[], _tbss_end[];
 static int
 allocothertls(struct bmk_thread *thread)
 {
-	const size_t tdatasize = _tdata_end - _tdata_start;
-	const size_t tbsssize = _tbss_end - _tbss_start;
+	const unsigned long tdatasize = _tdata_end - _tdata_start;
+	const unsigned long tbsssize = _tbss_end - _tbss_start;
 	struct bmk_tcb *tcb = &thread->bt_tcb;
-	uint8_t *tlsmem;
+	char *tlsmem;
 
 	tlsmem = bmk_memalloc(tdatasize + tbsssize, 0);
 
diff --git a/platform/xen/xen/sched.c b/platform/xen/xen/sched.c
index 174d3a1..5fcd402 100644
--- a/platform/xen/xen/sched.c
+++ b/platform/xen/xen/sched.c
@@ -61,15 +61,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <mini-os/os.h>
-#include <mini-os/hypervisor.h>
-#include <mini-os/time.h>
-#include <mini-os/mm.h>
-#include <mini-os/types.h>
-#include <mini-os/lib.h>
-#include <mini-os/sched.h>
-#include <mini-os/semaphore.h>
-
 #include <bmk-core/core.h>
 #include <bmk-core/memalloc.h>
 #include <bmk-core/platform.h>
@@ -92,7 +83,7 @@ struct bmk_thread {
 
 	void *bt_tls[TLS_COUNT];
 
-	int64_t bt_wakeup_time;
+	bmk_time_t bt_wakeup_time;
 
 	int bt_flags;
 	int bt_errno;
@@ -267,10 +258,10 @@ extern const char _tbss_start[], _tbss_end[];
 static int
 allocothertls(struct bmk_thread *thread)
 {
-	const size_t tdatasize = _tdata_end - _tdata_start;
-	const size_t tbsssize = _tbss_end - _tbss_start;
+	const unsigned long tdatasize = _tdata_end - _tdata_start;
+	const unsigned long tbsssize = _tbss_end - _tbss_start;
 	struct bmk_tcb *tcb = &thread->bt_tcb;
-	uint8_t *tlsmem;
+	char *tlsmem;
 
 	tlsmem = bmk_memalloc(tdatasize + tbsssize, 0);
 
-- 
2.39.5