Moved all threading functions to libl4/include/l4lib/thread/*

conts/libl4/SConscript

@@ -55,7 +55,7 @@ def create_symlinks(arch):
         os.system(cmd)
 
 #create_symlinks(arch)
-objects = env.StaticObject(Glob('src/*.c') + Glob('src/' + arch + '/*.[cS]'))
+objects = env.StaticObject(Glob('src/*.c') + Glob('src/thread/*.c') + Glob('src/' + arch + '/*.[cS]'))
 library = env.StaticLibrary('l4', objects)
 
 Return('library')

conts/libl4/SConstruct

@@ -30,7 +30,7 @@ env = Environment(CC = config.user_toolchain + 'gcc',
 
 #  TODO:  There are errors in this code that -Werror gives problems with.
 
-objects = env.StaticObject(Glob('src/*.c') + Glob('src/' + arch + '/*.[cS]'))
+objects = env.StaticObject(Glob('src/*.c') + Glob('src/thread/*.c') + Glob('src/' + arch + '/*.[cS]'))
 library = env.StaticLibrary('l4', objects)
 
 #Return('library')

conts/libl4/include/l4lib/thread/utcb-common.h

@@ -7,6 +7,7 @@
 #define __UTCB_COMMON_H__
 
 #include <l4/lib/list.h>
+#include <l4lib/thread/tcb.h>
 
 struct l4lib_utcb_desc {
 	struct link list;
@@ -22,4 +23,11 @@ int utcb_delete_slot(struct l4lib_utcb_desc *desc, unsigned long address);
 struct l4lib_utcb_desc *utcb_new_desc(void);
 int utcb_delete_desc(struct l4lib_utcb_desc *desc);
 
+
+/* Checks if l4_set_stack_params is called. */
+#define IS_UTCB_SETUP()	(lib_utcb_range_size)
+
+unsigned long get_utcb_addr(struct l4lib_tcb *task);
+int delete_utcb_addr(struct l4lib_tcb *task);
+
 #endif /* __UTCB_COMMON_H__ */

conts/libl4/include/l4lib/utcb.h

@@ -9,14 +9,4 @@
 
 int utcb_init(void);
 
-/* Bora start */
-#include <l4lib/tcb.h>
-
-/* Checks if l4_set_stack_params is called. */
-#define IS_UTCB_SETUP()	(lib_utcb_range_size)
-
-unsigned long get_utcb_addr(struct l4lib_tcb *task);
-int delete_utcb_addr(struct l4lib_tcb *task);
-/* Bora end */
-
 #endif /* __UTCB_H__ */

conts/libl4/src/thread/stack.c

@@ -7,7 +7,7 @@
 #include <l4/api/errno.h>
 #include <l4lib/addr.h>
 #include <l4lib/mutex.h>
-#include <l4lib/stack.h>
+#include <l4lib/thread/stack.h>
 
 /* Extern declarations */
 extern struct l4_mutex lib_mutex;

conts/libl4/src/thread/tcb.c

@@ -7,7 +7,7 @@
 #include <malloc/malloc.h>
 #include <l4/api/errno.h>
 #include <l4/api/thread.h>
-#include <l4lib/tcb.h>
+#include <l4lib/thread/tcb.h>
 #include <l4/macros.h>
 
 /* Global task list. */

conts/libl4/src/thread/thread.c

@@ -4,15 +4,15 @@
  * Copyright (C) 2009 B Labs Ltd.
  */
 #include <stdio.h>
+#include <malloc/malloc.h>
 #include <l4lib/arch/syscalls.h>
 #include <l4lib/arch/syslib.h>
 #include <l4lib/exregs.h>
 #include <l4lib/mutex.h>
 #include <l4/api/thread.h>
 #include <l4/api/errno.h>
-#include <malloc/malloc.h>
+#include <l4lib/thread/utcb-common.h>
-#include <l4lib/utcb.h>
+#include <l4lib/thread/stack.h>
-#include <l4lib/stack.h>
 
 /* Extern declarations */
 extern void setup_new_thread(void);

conts/libl4/src/thread/utcb-common.c

@@ -5,7 +5,7 @@
  */
 #include <stdio.h>
 #include <l4lib/addr.h>
-#include <l4lib/utcb-common.h>
+#include <l4lib/thread/utcb-common.h>
 #include <malloc/malloc.h>
 
 /* Globally disjoint utcb virtual region pool */

conts/libl4/src/thread/utcb.c

@@ -9,7 +9,7 @@
 #include <l4lib/arch/syscalls.h>
 #include <l4lib/exregs.h>
 #include <l4lib/idpool.h>
-#include <l4lib/utcb-common.h>
+#include <l4lib/thread/utcb-common.h>
 #include <l4lib/utcb.h>
 
 /* Extern declarations */