michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Consolidate (most) microkernel non-public API declarations

Browse source 
Relocates the declarations for most non-public microkernel APIs
into the main include file for such APIs (i.e. minik.h), then
eliminates the per-subsystem include files. (The per-subsystem
files don't serve any significant purpose now that the routines
comprising each microkernel subsystem have been consolidated.
In fact, there wasn't a single file that included one of these
files that didn't already include minik.h!)

Note: The channel APIs have not been consolidated yet, as they
require further cleanup. Also, one mailbox API that is used only
by the mailbox subsystem itself is moved there rather than being
placed in minik.h.

Change-Id: Ic7f1ac8a67bd39b685f70379dffff0d0caf1b290
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
This commit is contained in:
Allan Stephens 2015-05-11 13:26:18 -04:00 • committed by Anas Nashif
commit 067a47558f
37 changed files with 83 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/microkernel/channel/InitChan.c
View file

@ -32,7 +32,6 @@
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kticks.h>
#include <ch_buff.h>
/****************************************************************************/

1
kernel/microkernel/channel/K_ChGAck.c
View file

@ -32,7 +32,6 @@
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>

1
kernel/microkernel/channel/K_ChGReq.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_ChGRpl.c
View file

@ -32,7 +32,6 @@
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kticks.h>
#include <kchan.h>
#include <toolchain.h>
#include <sections.h>

1
kernel/microkernel/channel/K_ChGTmo.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

3
kernel/microkernel/channel/K_ChPAck.c
View file

@ -33,9 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <ksema.h>
#include <kmemp.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_ChPReq.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_ChPRpl.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_ChPTmo.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_ChProc.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_Ch_Mvd.c
View file

@ -35,7 +35,6 @@
#include <microkernel/k_struct.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_Ch_RO.c
View file

@ -35,7 +35,6 @@
#include <microkernel.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_Ch_WO.c
View file

@ -35,7 +35,6 @@
#include <microkernel.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/K_Ch_WR.c
View file

@ -35,7 +35,6 @@
#include <microkernel.h>
#include <kchan.h>
#include <minik.h>
#include <kticks.h>
#include <toolchain.h>
#include <sections.h>
#include <misc/__assert.h>

1
kernel/microkernel/channel/ch_addit.c
View file

@ -33,7 +33,6 @@
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kchan.h>
#include <kticks.h>
#include <string_s.h>
#include <toolchain.h>
#include <sections.h>

1
kernel/microkernel/global.c
View file

@ -33,7 +33,6 @@
#include "minik.h"
#include "nanokernel.h"
#include "nanok.h"
#include "kticks.h" /* WL and timeslice stuff */
#include <toolchain.h>
#include <sections.h>

1
kernel/microkernel/idle.c
View file

@ -38,7 +38,6 @@ task, depending on how the kernel is configured.
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kticks.h>
#include <nanok.h>
#include <nanokernel/cpu.h>
#include <toolchain.h>

44
kernel/microkernel/include/kevent.h
View file

@ -1,44 +0,0 @@
/* kevent.h */
/*
* Copyright (c) 1997-2012, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _KEVENT_H
#define _KEVENT_H
extern const int _k_num_events;
extern void _k_event_signal(struct k_args *A);
extern void _k_event_handler_set(struct k_args *A);
extern void _k_event_test(struct k_args *A);
extern void _k_event_test_timeout(struct k_args *A);
extern void _k_do_event_signal(kevent_t event);
#endif /* _KEVENT_H */

42
kernel/microkernel/include/kfifo.h
View file

@ -1,42 +0,0 @@
/* kfifo.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KFIFO_H
#define KFIFO_H
extern void _k_fifo_enque_reply(struct k_args *A);
extern void _k_fifo_deque_reply(struct k_args *A);
extern void _k_fifo_enque_request(struct k_args *A);
extern void _k_fifo_deque_request(struct k_args *A);
extern void _k_fifo_ioctl(struct k_args *A);
#endif

62
kernel/microkernel/include/kmail.h
View file

@ -1,62 +0,0 @@
/* kmail.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KMAIL_H
#define KMAIL_H
/* includes */
#include <microkernel/k_struct.h>
/* defines */
/*******************************************************************************
*
* ISASYNCMSG - determines if mailbox message is synchronous or asynchronous
*
* Returns a non-zero value if the specified message contains a valid pool ID,
* indicating that it is an asynchronous message.
*/
#define ISASYNCMSG(message) ((message)->tx_block.poolid != 0)
/* externs */
extern void _k_mbox_send_reply(struct k_args *Writer);
extern void _k_mbox_send_request(struct k_args *Writer);
extern void _k_mbox_send_ack(struct k_args *Writer);
extern void _k_mbox_receive_ack(struct k_args *Reader);
extern void _k_mbox_receive_reply(struct k_args *Reader);
extern void _k_mbox_receive_request(struct k_args *Reader);
extern void _k_mbox_receive_data(struct k_args *Starter);
#endif

41
kernel/microkernel/include/kmemp.h
View file

@ -1,41 +0,0 @@
/* kmemp.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KMEMP_H
#define KMEMP_H
extern void _k_mem_pool_block_release(struct k_args *A);
extern void _k_mem_pool_block_get(struct k_args *A);
extern void _k_defrag(struct k_args *A);
extern void _k_mem_pool_block_get_timeout_handle(struct k_args *A);
#endif

40
kernel/microkernel/include/kmmap.h
View file

@ -1,40 +0,0 @@
/* kmmap.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KMMAP_H
#define KMMAP_H
extern void _k_mem_map_alloc(struct k_args *A);
extern void _k_mem_map_alloc_timeout(struct k_args *A);
extern void _k_mem_map_dealloc(struct k_args *A);
#endif

40
kernel/microkernel/include/kres.h
View file

@ -1,40 +0,0 @@
/* kres.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KRES_H
#define KRES_H
extern void _k_mutex_lock_request(struct k_args *A);
extern void _k_mutex_lock_reply(struct k_args *A);
extern void _k_mutex_unlock(struct k_args *A);
#endif

51
kernel/microkernel/include/ksema.h
View file

@ -1,51 +0,0 @@
/* ksema.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KSEMA_H
#define KSEMA_H
extern void _k_sem_signal(struct k_args *A);
extern void _k_sem_reset(struct k_args *A);
extern void _k_sem_group_signal(struct k_args *A);
extern void _k_sem_group_reset(struct k_args *A);
extern void _k_sem_wait_reply(struct k_args *A);
extern void _k_sem_wait_request(struct k_args *A);
extern void _k_sem_inquiry(struct k_args *A);
extern void _k_sem_group_wait_any(struct k_args *A);
extern void _k_sem_group_wait_timeout(struct k_args *A);
extern void _k_sem_group_ready(struct k_args *R);
extern void _k_sem_group_wait(struct k_args *R);
extern void _k_sem_group_wait_request(struct k_args *A);
extern void _k_sem_group_wait_cancel(struct k_args *A);
extern void _k_sem_group_wait_accept(struct k_args *A);
#endif

48
kernel/microkernel/include/ktask.h
View file

@ -1,48 +0,0 @@
/* ktask.h */
/*
* Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KTASK_H
#define KTASK_H
/* includes */
#include <cputype.h>
#include <microkernel/k_struct.h>
extern void start_task(struct k_proc *X, void (*func)(void));
extern void abort_task(struct k_proc *X);
extern void _k_task_op(struct k_args *A);
extern void _k_task_group_op(struct k_args *A);
extern void _k_task_priority_set(struct k_args *A);
extern void _k_task_yield(struct k_args *A);
#endif

53
kernel/microkernel/include/kticks.h
View file

@ -1,53 +0,0 @@
/* kticks.h */
/*
* Copyright (c) 1997-2010, 2014-2015 Wind River Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1) Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2) Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3) Neither the name of Wind River Systems nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _KTICKS_H
#define _KTICKS_H
#include "microkernel/k_types.h"
#include "microkernel/k_struct.h"
extern void enlist_timer(K_TIMER *T);
extern void delist_timer(K_TIMER *T);
extern void enlist_timeout(struct k_args *P);
extern void delist_timeout(K_TIMER *T);
extern void force_timeout(struct k_args *A);
extern void _k_timer_list_update(int ticks);
extern void _k_timer_alloc(struct k_args *P);
extern void _k_timer_dealloc(struct k_args *P);
extern void _k_timer_start(struct k_args *P);
extern void _k_timer_stop(struct k_args *P);
extern void _k_task_sleep(struct k_args *P);
extern void _k_task_wakeup(struct k_args *P);
extern void _k_time_elapse(struct k_args *P);
extern void _k_workload_get(struct k_args *P);
#endif

73
kernel/microkernel/include/minik.h
View file

@ -55,6 +55,8 @@ extern int _k_mem_map_count;
extern int _k_mem_pool_count;
extern int _k_pipe_count;
extern const int _k_num_events;
extern struct k_proc *_k_current_task;
extern uint32_t _k_task_priority_bitmap[];
@ -65,6 +67,77 @@ extern struct nano_stack _k_command_stack;
extern struct nano_lifo _k_server_command_packet_free;
extern struct nano_lifo _k_timer_free;
extern void start_task(struct k_proc *X, void (*func)(void));
extern void abort_task(struct k_proc *X);
extern void _k_task_op(struct k_args *A);
extern void _k_task_group_op(struct k_args *A);
extern void _k_task_priority_set(struct k_args *A);
extern void _k_task_yield(struct k_args *A);
extern void enlist_timer(K_TIMER *T);
extern void delist_timer(K_TIMER *T);
extern void enlist_timeout(struct k_args *P);
extern void delist_timeout(K_TIMER *T);
extern void force_timeout(struct k_args *A);
extern void _k_timer_list_update(int ticks);
extern void _k_timer_alloc(struct k_args *P);
extern void _k_timer_dealloc(struct k_args *P);
extern void _k_timer_start(struct k_args *P);
extern void _k_timer_stop(struct k_args *P);
extern void _k_task_sleep(struct k_args *P);
extern void _k_task_wakeup(struct k_args *P);
extern void _k_time_elapse(struct k_args *P);
extern void _k_workload_get(struct k_args *P);
extern void _k_event_signal(struct k_args *A);
extern void _k_event_handler_set(struct k_args *A);
extern void _k_event_test(struct k_args *A);
extern void _k_event_test_timeout(struct k_args *A);
extern void _k_do_event_signal(kevent_t event);
extern void _k_mutex_lock_request(struct k_args *A);
extern void _k_mutex_lock_reply(struct k_args *A);
extern void _k_mutex_unlock(struct k_args *A);
extern void _k_sem_signal(struct k_args *A);
extern void _k_sem_reset(struct k_args *A);
extern void _k_sem_group_signal(struct k_args *A);
extern void _k_sem_group_reset(struct k_args *A);
extern void _k_sem_wait_reply(struct k_args *A);
extern void _k_sem_wait_request(struct k_args *A);
extern void _k_sem_inquiry(struct k_args *A);
extern void _k_sem_group_wait_any(struct k_args *A);
extern void _k_sem_group_wait_timeout(struct k_args *A);
extern void _k_sem_group_ready(struct k_args *R);
extern void _k_sem_group_wait(struct k_args *R);
extern void _k_sem_group_wait_request(struct k_args *A);
extern void _k_sem_group_wait_cancel(struct k_args *A);
extern void _k_sem_group_wait_accept(struct k_args *A);
extern void _k_fifo_enque_reply(struct k_args *A);
extern void _k_fifo_deque_reply(struct k_args *A);
extern void _k_fifo_enque_request(struct k_args *A);
extern void _k_fifo_deque_request(struct k_args *A);
extern void _k_fifo_ioctl(struct k_args *A);
extern void _k_mbox_send_reply(struct k_args *Writer);
extern void _k_mbox_send_request(struct k_args *Writer);
extern void _k_mbox_send_ack(struct k_args *Writer);
extern void _k_mbox_receive_ack(struct k_args *Reader);
extern void _k_mbox_receive_reply(struct k_args *Reader);
extern void _k_mbox_receive_request(struct k_args *Reader);
extern void _k_mbox_receive_data(struct k_args *Starter);
extern void _k_mem_map_alloc(struct k_args *A);
extern void _k_mem_map_alloc_timeout(struct k_args *A);
extern void _k_mem_map_dealloc(struct k_args *A);
extern void _k_mem_pool_block_release(struct k_args *A);
extern void _k_mem_pool_block_get(struct k_args *A);
extern void _k_defrag(struct k_args *A);
extern void _k_mem_pool_block_get_timeout_handle(struct k_args *A);
extern void _Cput(struct nano_lifo *, void *);
extern void _Cpsh(struct nano_stack *, uint32_t);
extern void *_Cget(struct nano_lifo *);

1
kernel/microkernel/k_event.c
View file

@ -31,7 +31,6 @@
*/
#include "microkernel/k_struct.h"
#include "kevent.h"
#include "minik.h"
#include "microkernel/event.h"
#include <toolchain.h>

13
kernel/microkernel/k_mbox.c
View file

@ -38,12 +38,19 @@
#include <sections.h>
#include <minik.h>
#include <kmail.h>
#include <kticks.h>
#include <ksema.h>
#include <misc/__assert.h>
/*******************************************************************************
*
* ISASYNCMSG - determines if mailbox message is synchronous or asynchronous
*
* Returns a non-zero value if the specified message contains a valid pool ID,
* indicating that it is an asynchronous message.
*/
#define ISASYNCMSG(message) ((message)->tx_block.poolid != 0)
/*******************************************************************************
*
* copy_packet - copy a packet

2
kernel/microkernel/k_mempool.c
View file

@ -32,8 +32,6 @@
#include <microkernel.h>
#include <minik.h>
#include <kticks.h>
#include <kmemp.h>
#include <toolchain.h>
#include <sections.h>

1
kernel/microkernel/k_mutex.c
View file

@ -58,7 +58,6 @@ NOMANUAL
/* includes */
#include <microkernel.h>
#include <kticks.h>
#include <minik.h>
#include <nanok.h>

2
kernel/microkernel/k_sema.c
View file

@ -37,8 +37,6 @@
#include <sections.h>
#include <minik.h>
#include <ksema.h>
#include <kticks.h>
/*******************************************************************************
*

1
kernel/microkernel/k_task.c
View file

@ -39,7 +39,6 @@
#include <minik.h>
#include <nanok.h>
#include <ktask.h>
#include <start_task_arch.h>

1
kernel/microkernel/k_timer.c
View file

@ -36,7 +36,6 @@
#include <sections.h>
#include <minik.h>
#include <kticks.h>
#include <drivers/system_timer.h>
K_TIMER *_k_timer_list_head = NULL;

1
kernel/microkernel/server.c
View file

@ -43,7 +43,6 @@ interfering with each other.
#include <sections.h>
#include <minik.h>
#include <nanok.h>
#include <kevent.h>
#include <microkernel.h>
#include <microkernel/entries.h> /* kernelfunc */
#include <nanokernel.h>

1
kernel/microkernel/task_monitor.c
View file

@ -34,7 +34,6 @@
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kticks.h>
#include <microkernel/ticks.h>
#include <drivers/system_timer.h>
#include <toolchain.h>

2
kernel/microkernel/ticker.c
View file

@ -40,9 +40,7 @@ This module implements the microkernel's tick event handler.
#include <microkernel/k_struct.h>
#include <minik.h>
#include <kticks.h> /* WL stuff */
#include <drivers/system_timer.h>
#include <ktask.h> /* _k_task_yield */
#include <microkernel.h>
#include <microkernel/ticks.h>
#include <toolchain.h>