From b12349f2e4f979789e4792e314781fa3df16b51a Mon Sep 17 00:00:00 2001 From: Bahadir Balban Date: Wed, 2 Dec 2009 16:15:47 +0200 Subject: [PATCH] Moved all threading functions to libl4/include/l4lib/thread/* --- conts/libl4/SConscript | 2 +- conts/libl4/SConstruct | 2 +- conts/libl4/include/l4lib/{ => thread}/stack.h | 0 conts/libl4/include/l4lib/{ => thread}/tcb.h | 0 conts/libl4/include/l4lib/{ => thread}/thread.h | 0 conts/libl4/include/l4lib/{ => thread}/utcb-common.h | 8 ++++++++ conts/libl4/include/l4lib/utcb.h | 10 ---------- conts/libl4/src/{ => thread}/stack.c | 2 +- conts/libl4/src/{ => thread}/tcb.c | 2 +- conts/libl4/src/{ => thread}/thread.c | 6 +++--- conts/libl4/src/{ => thread}/utcb-common.c | 2 +- conts/libl4/src/{ => thread}/utcb.c | 2 +- 12 files changed, 17 insertions(+), 19 deletions(-) rename conts/libl4/include/l4lib/{ => thread}/stack.h (100%) rename conts/libl4/include/l4lib/{ => thread}/tcb.h (100%) rename conts/libl4/include/l4lib/{ => thread}/thread.h (100%) rename conts/libl4/include/l4lib/{ => thread}/utcb-common.h (72%) rename conts/libl4/src/{ => thread}/stack.c (98%) rename conts/libl4/src/{ => thread}/tcb.c (97%) rename conts/libl4/src/{ => thread}/thread.c (98%) rename conts/libl4/src/{ => thread}/utcb-common.c (98%) rename conts/libl4/src/{ => thread}/utcb.c (99%) diff --git a/conts/libl4/SConscript b/conts/libl4/SConscript index f2490ba..162b657 100644 --- a/conts/libl4/SConscript +++ b/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') diff --git a/conts/libl4/SConstruct b/conts/libl4/SConstruct index 8356194..63f360f 100644 --- a/conts/libl4/SConstruct +++ b/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') diff --git a/conts/libl4/include/l4lib/stack.h b/conts/libl4/include/l4lib/thread/stack.h similarity index 100% rename from conts/libl4/include/l4lib/stack.h rename to conts/libl4/include/l4lib/thread/stack.h diff --git a/conts/libl4/include/l4lib/tcb.h b/conts/libl4/include/l4lib/thread/tcb.h similarity index 100% rename from conts/libl4/include/l4lib/tcb.h rename to conts/libl4/include/l4lib/thread/tcb.h diff --git a/conts/libl4/include/l4lib/thread.h b/conts/libl4/include/l4lib/thread/thread.h similarity index 100% rename from conts/libl4/include/l4lib/thread.h rename to conts/libl4/include/l4lib/thread/thread.h diff --git a/conts/libl4/include/l4lib/utcb-common.h b/conts/libl4/include/l4lib/thread/utcb-common.h similarity index 72% rename from conts/libl4/include/l4lib/utcb-common.h rename to conts/libl4/include/l4lib/thread/utcb-common.h index 5fd2677..ba7caf7 100644 --- a/conts/libl4/include/l4lib/utcb-common.h +++ b/conts/libl4/include/l4lib/thread/utcb-common.h @@ -7,6 +7,7 @@ #define __UTCB_COMMON_H__ #include +#include 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__ */ diff --git a/conts/libl4/include/l4lib/utcb.h b/conts/libl4/include/l4lib/utcb.h index 682b840..ece82ab 100644 --- a/conts/libl4/include/l4lib/utcb.h +++ b/conts/libl4/include/l4lib/utcb.h @@ -9,14 +9,4 @@ int utcb_init(void); -/* Bora start */ -#include - -/* 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__ */ diff --git a/conts/libl4/src/stack.c b/conts/libl4/src/thread/stack.c similarity index 98% rename from conts/libl4/src/stack.c rename to conts/libl4/src/thread/stack.c index 60b9517..301faf7 100644 --- a/conts/libl4/src/stack.c +++ b/conts/libl4/src/thread/stack.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include /* Extern declarations */ extern struct l4_mutex lib_mutex; diff --git a/conts/libl4/src/tcb.c b/conts/libl4/src/thread/tcb.c similarity index 97% rename from conts/libl4/src/tcb.c rename to conts/libl4/src/thread/tcb.c index e806f12..9cc822b 100644 --- a/conts/libl4/src/tcb.c +++ b/conts/libl4/src/thread/tcb.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include /* Global task list. */ diff --git a/conts/libl4/src/thread.c b/conts/libl4/src/thread/thread.c similarity index 98% rename from conts/libl4/src/thread.c rename to conts/libl4/src/thread/thread.c index 256589d..5578936 100644 --- a/conts/libl4/src/thread.c +++ b/conts/libl4/src/thread/thread.c @@ -4,15 +4,15 @@ * Copyright (C) 2009 B Labs Ltd. */ #include +#include #include #include #include #include #include #include -#include -#include -#include +#include +#include /* Extern declarations */ extern void setup_new_thread(void); diff --git a/conts/libl4/src/utcb-common.c b/conts/libl4/src/thread/utcb-common.c similarity index 98% rename from conts/libl4/src/utcb-common.c rename to conts/libl4/src/thread/utcb-common.c index 7d54253..8991b91 100644 --- a/conts/libl4/src/utcb-common.c +++ b/conts/libl4/src/thread/utcb-common.c @@ -5,7 +5,7 @@ */ #include #include -#include +#include #include /* Globally disjoint utcb virtual region pool */ diff --git a/conts/libl4/src/utcb.c b/conts/libl4/src/thread/utcb.c similarity index 99% rename from conts/libl4/src/utcb.c rename to conts/libl4/src/thread/utcb.c index dfd3f6c..2d21141 100644 --- a/conts/libl4/src/utcb.c +++ b/conts/libl4/src/thread/utcb.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include /* Extern declarations */