diff --git a/arch/platform/cooja/sys/cooja_mt.c b/arch/platform/cooja/sys/cooja_mt.c index 3ccc5c169..ca0d79303 100644 --- a/arch/platform/cooja/sys/cooja_mt.c +++ b/arch/platform/cooja/sys/cooja_mt.c @@ -46,18 +46,6 @@ static struct cooja_mt_thread *current; -/*--------------------------------------------------------------------------*/ -void -cooja_mt_init(void) -{ - cooja_mtarch_init(); -} -/*--------------------------------------------------------------------------*/ -void -cooja_mt_remove(void) -{ - cooja_mtarch_remove(); -} /*--------------------------------------------------------------------------*/ void cooja_mt_start(struct cooja_mt_thread *thread, void (* function)(void *), void *data) @@ -82,14 +70,6 @@ cooja_mt_exec(struct cooja_mt_thread *thread) } /*--------------------------------------------------------------------------*/ void -cooja_mt_exit(void) -{ - current->state = MT_STATE_EXITED; - current = NULL; - cooja_mtarch_yield(); -} -/*--------------------------------------------------------------------------*/ -void cooja_mt_yield(void) { current->state = MT_STATE_READY; diff --git a/arch/platform/cooja/sys/cooja_mt.h b/arch/platform/cooja/sys/cooja_mt.h index 4707b1fff..f9138c6dd 100644 --- a/arch/platform/cooja/sys/cooja_mt.h +++ b/arch/platform/cooja/sys/cooja_mt.h @@ -49,25 +49,6 @@ */ struct cooja_mtarch_thread; -/** - * Initialize the architecture specific support functions for the - * multi-thread library. - * - * This function is implemented by the architecture specific functions - * for the multi-thread library and is called by the mt_init() - * function as part of the initialization of the library. The - * mtarch_init() function can be used for, e.g., starting preemtion - * timers or other architecture specific mechanisms required for the - * operation of the library. - */ -void cooja_mtarch_init(void); - -/** - * Uninstall library and clean up. - * - */ -void cooja_mtarch_remove(void); - /** * Setup the stack frame for a thread that is being started. * @@ -128,19 +109,6 @@ struct cooja_mt_thread { */ #define MT_OK 1 -/** - * Initializes the multithreading library. - * - */ -void cooja_mt_init(void); - -/** - * Uninstalls library and cleans up. - * - */ -void cooja_mt_remove(void); - - /** * Starts a multithreading thread. * @@ -201,51 +169,6 @@ void cooja_mt_exec(struct cooja_mt_thread *thread); */ void cooja_mt_yield(void); -/** - * Post an event to another process. - * - * This function is called by a running thread and will emit a signal - * to another Contiki process. This will cause the currently executing - * thread to yield. - * - * \param p The process receiving the signal, or PROCESS_BROADCAST - * for a broadcast event. - * - * \param ev The event to be posted. - * - * \param data A pointer to a message that is to be delivered together - * with the signal. - * - */ -/*void mt_post(struct process *p, process_event_t ev, process_data_t data);*/ - -/** - * Block and wait for an event to occur. - * - * This function can be called by a running thread in order to block - * and wait for an event. The function returns when an event has - * occured. The event number and the associated data are placed in the - * variables pointed to by the function arguments. - * - * \param ev A pointer to a process_event_t variable. The variable - * will be filled with the number event that woke the thread. - * - * \param data A pointer to a process_data_t variable. The variable - * will be filled with the data associated with the event that woke - * the thread. - * - */ -/*void mt_wait(process_event_t *ev, process_data_t *data);*/ - -/** - * Exit a thread. - * - * This function is called from within an executing thread in order to - * exit the thread. The function never returns. - * - */ -void cooja_mt_exit(void); - /** @} */ /** @} */ #endif /* MT_H_ */ diff --git a/arch/platform/cooja/sys/cooja_mtarch.c b/arch/platform/cooja/sys/cooja_mtarch.c index 8d73ad088..4a1f78360 100644 --- a/arch/platform/cooja/sys/cooja_mtarch.c +++ b/arch/platform/cooja/sys/cooja_mtarch.c @@ -72,11 +72,7 @@ struct frame { unsigned long retaddr2; unsigned long data; }; -/*--------------------------------------------------------------------------*/ -void -cooja_mtarch_init(void) -{ -} + /*--------------------------------------------------------------------------*/ void cooja_mtarch_start(struct cooja_mtarch_thread *t, @@ -187,35 +183,8 @@ cooja_mtarch_exec(struct cooja_mtarch_thread *t) } /*--------------------------------------------------------------------------*/ void -cooja_mtarch_remove(void) -{ -} -/*--------------------------------------------------------------------------*/ -void cooja_mtarch_yield(void) { cooja_sw(); } /*--------------------------------------------------------------------------*/ -void -cooja_mtarch_pstop(void) -{ -} -/*--------------------------------------------------------------------------*/ -void -cooja_mtarch_pstart(void) -{ -} -/*--------------------------------------------------------------------------*/ -int -cooja_mtarch_stack_usage(struct cooja_mt_thread *t) -{ - int i; - for(i = 0; i < COOJA_MTARCH_STACKSIZE; ++i) { - if(t->thread.stack[i] != i) { - return COOJA_MTARCH_STACKSIZE - i; - } - } - return -1; -} -/*--------------------------------------------------------------------------*/ diff --git a/arch/platform/cooja/sys/cooja_mtarch.h b/arch/platform/cooja/sys/cooja_mtarch.h index 084962e81..2a16c0ae4 100644 --- a/arch/platform/cooja/sys/cooja_mtarch.h +++ b/arch/platform/cooja/sys/cooja_mtarch.h @@ -46,7 +46,4 @@ struct cooja_mtarch_thread { struct cooja_mt_thread; -int cooja_mtarch_stack_usage(struct cooja_mt_thread *t); - #endif /* COOJA_MTARCH_H_ */ -