Kill <bmk/sched.h>

Since we don't have a platform-specific scheduler anymore, everything
should just use <bmk-core/sched.h>

diff --git a/platform/baremetal/arch/i386/machdep.c b/platform/baremetal/arch/i386/machdep.c
index e8948643d1485ab930d759c613b1b44c09c3fcf3..86855b9a6300824332fa8e7c07f1fb4b51261dae 100644 (file)
--- a/platform/baremetal/arch/i386/machdep.c
+++ b/platform/baremetal/arch/i386/machdep.c
@@ -25,7 +25,6 @@
 
 #include <bmk/types.h>
 #include <bmk/kernel.h>
-#include <bmk/sched.h>
 
 #include <bmk-core/sched.h>
 

diff --git a/platform/baremetal/include/arch/i386/md.h b/platform/baremetal/include/arch/i386/md.h
index 35c3acb170da85149b1382e0aac918636b5c163d..ac0bdfc099536df53d96d6acd1df60c05d28f7c7 100644 (file)
--- a/platform/baremetal/include/arch/i386/md.h
+++ b/platform/baremetal/include/arch/i386/md.h
@@ -6,6 +6,12 @@
 #define ENTRY(x)        .text; .globl x; .type x,@function; x:
 #define END(x)          .size x, . - x
 
+#define PAGE_SHIFT 12
+#define PAGE_SIZE (1<<PAGE_SHIFT)
+
+#define BMK_THREAD_STACK_PAGE_ORDER 4
+#define BMK_THREAD_STACKSIZE ((1<<BMK_THREAD_STACK_PAGE_ORDER) * PAGE_SIZE)
+
 #ifndef _LOCORE
 struct region_descriptor;
 void bmk_cpu_lidt(struct region_descriptor *);

diff --git a/platform/baremetal/include/bmk/kernel.h b/platform/baremetal/include/bmk/kernel.h
index 211a720674ebada031ee45f797700b1fd0b4d4ed..4fe87fe70cf11487a2713a6fa0df6030127b10a5 100644 (file)
--- a/platform/baremetal/include/bmk/kernel.h
+++ b/platform/baremetal/include/bmk/kernel.h
@@ -6,10 +6,6 @@
 
 extern unsigned long bmk_memsize, bmk_membase;
 
-#define PAGE_SHIFT 12
-#define PAGE_SIZE (1<<PAGE_SHIFT)
-#define STACK_SIZE 0x2000
-
 #define round_page(x) (((x) + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1))
 #define trunc_page(x) ((x) & ~(PAGE_SIZE-1))
 

diff --git a/platform/baremetal/include/bmk/sched.h b/platform/baremetal/include/bmk/sched.h
deleted file mode 100644 (file)
index a281dff..0000000
--- a/platform/baremetal/include/bmk/sched.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <bmk-core/types.h>
-#include <bmk-core/sched.h>
-
-#define BMK_THREAD_STACK_PAGE_ORDER 4
-#define BMK_THREAD_STACKSIZE ((1<<BMK_THREAD_STACK_PAGE_ORDER) * PAGE_SIZE)
-
-bmk_time_t bmk_cpu_clock_now(void);

diff --git a/platform/baremetal/intr.c b/platform/baremetal/intr.c
index 7a07614f074fe840a780c5400b2bf2e4359c4f70..6900cd4a36e1c557f05bc616060dbcae7f69d60b 100644 (file)
--- a/platform/baremetal/intr.c
+++ b/platform/baremetal/intr.c
@@ -24,11 +24,11 @@
  */
 
 #include <bmk/kernel.h>
-#include <bmk/sched.h>
 
 #include <bmk-core/memalloc.h>
 #include <bmk-core/printf.h>
 #include <bmk-core/queue.h>
+#include <bmk-core/sched.h>
 
 #define LIBRUMPUSER
 #include "rumpuser_int.h"

diff --git a/platform/baremetal/kernel.c b/platform/baremetal/kernel.c
index c1c6428c779a77ca188a679dd2240de50f8090ed..06fd650d0fee8fbefe035f0cd13c4abb491a5dd5 100644 (file)
--- a/platform/baremetal/kernel.c
+++ b/platform/baremetal/kernel.c
@@ -26,7 +26,6 @@
 #include <bmk/types.h>
 #include <bmk/multiboot.h>
 #include <bmk/kernel.h>
-#include <bmk/sched.h>
 #include <bmk/app.h>
 
 #include <bmk-core/core.h>
@@ -35,6 +34,7 @@
 #include <bmk-core/platform.h>
 #include <bmk-core/printf.h>
 #include <bmk-core/queue.h>
+#include <bmk-core/sched.h>
 
 unsigned long bmk_membase;
 unsigned long bmk_memsize;

diff --git a/platform/baremetal/multiboot.c b/platform/baremetal/multiboot.c
index 2eac45dbbec8083a4d0fecb160c2c5148e3f2b02..9f5d84e7d5b5aa3917eac88fdc2a118827ee2b6d 100644 (file)
--- a/platform/baremetal/multiboot.c
+++ b/platform/baremetal/multiboot.c
@@ -26,7 +26,6 @@
 #include <bmk/types.h>
 #include <bmk/multiboot.h>
 #include <bmk/kernel.h>
-#include <bmk/sched.h>
 
 #include <bmk-core/core.h>
 #include <bmk-core/printf.h>

diff --git a/platform/baremetal/rumpuser.c b/platform/baremetal/rumpuser.c
index 3bc6d4c693ee206b97b63119a13a14bb5a7aaac8..b28e5a641484ca1317655023f33d4dfab7b42faf 100644 (file)
--- a/platform/baremetal/rumpuser.c
+++ b/platform/baremetal/rumpuser.c
@@ -25,7 +25,6 @@
 
 #include <bmk/types.h>
 #include <bmk/kernel.h>
-#include <bmk/sched.h>
 
 #include <bmk-core/core.h>
 #include <bmk-core/printf.h>