mirror of
https://github.com/zephyrproject-rtos/zephyr
synced 2025-09-02 23:41:56 +00:00
2d7460482d
This commit refactors kernel and arch headers to establish a boundary
between private and public interface headers.
The refactoring strategy used in this commit is detailed in the issue
This commit introduces the following major changes:
1. Establish a clear boundary between private and public headers by
removing "kernel/include" and "arch/*/include" from the global
include paths. Ideally, only kernel/ and arch/*/ source files should
reference the headers in these directories. If these headers must be
used by a component, these include paths shall be manually added to
the CMakeLists.txt file of the component. This is intended to
discourage applications from including private kernel and arch
headers either knowingly and unknowingly.
- kernel/include/ (PRIVATE)
This directory contains the private headers that provide private
kernel definitions which should not be visible outside the kernel
and arch source code. All public kernel definitions must be added
to an appropriate header located under include/.
- arch/*/include/ (PRIVATE)
This directory contains the private headers that provide private
architecture-specific definitions which should not be visible
outside the arch and kernel source code. All public architecture-
specific definitions must be added to an appropriate header located
under include/arch/*/.
- include/ AND include/sys/ (PUBLIC)
This directory contains the public headers that provide public
kernel definitions which can be referenced by both kernel and
application code.
- include/arch/*/ (PUBLIC)
This directory contains the public headers that provide public
architecture-specific definitions which can be referenced by both
kernel and application code.
2. Split arch_interface.h into "kernel-to-arch interface" and "public
arch interface" divisions.
- kernel/include/kernel_arch_interface.h
* provides private "kernel-to-arch interface" definition.
* includes arch/*/include/kernel_arch_func.h to ensure that the
interface function implementations are always available.
* includes sys/arch_interface.h so that public arch interface
definitions are automatically included when including this file.
- arch/*/include/kernel_arch_func.h
* provides architecture-specific "kernel-to-arch interface"
implementation.
* only the functions that will be used in kernel and arch source
files are defined here.
- include/sys/arch_interface.h
* provides "public arch interface" definition.
* includes include/arch/arch_inlines.h to ensure that the
architecture-specific public inline interface function
implementations are always available.
- include/arch/arch_inlines.h
* includes architecture-specific arch_inlines.h in
include/arch/*/arch_inline.h.
- include/arch/*/arch_inline.h
* provides architecture-specific "public arch interface" inline
function implementation.
* supersedes include/sys/arch_inline.h.
3. Refactor kernel and the existing architecture implementations.
- Remove circular dependency of kernel and arch headers. The
following general rules should be observed:
* Never include any private headers from public headers
* Never include kernel_internal.h in kernel_arch_data.h
* Always include kernel_arch_data.h from kernel_arch_func.h
* Never include kernel.h from kernel_struct.h either directly or
indirectly. Only add the kernel structures that must be referenced
from public arch headers in this file.
- Relocate syscall_handler.h to include/ so it can be used in the
public code. This is necessary because many user-mode public codes
reference the functions defined in this header.
- Relocate kernel_arch_thread.h to include/arch/*/thread.h. This is
necessary to provide architecture-specific thread definition for
'struct k_thread' in kernel.h.
- Remove any private header dependencies from public headers using
the following methods:
* If dependency is not required, simply omit
* If dependency is required,
- Relocate a portion of the required dependencies from the
private header to an appropriate public header OR
- Relocate the required private header to make it public.
This commit supersedes #20047, addresses #19666, and fixes #3056.
Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
139 lines
2.6 KiB
C
139 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2018 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <kernel.h>
|
|
#include <cmsis_os.h>
|
|
#include <string.h>
|
|
|
|
#define ACTIVE 1
|
|
#define NOT_ACTIVE 0
|
|
|
|
static void zephyr_timer_wrapper(struct k_timer *timer);
|
|
|
|
struct timer_obj {
|
|
struct k_timer ztimer;
|
|
os_timer_type type;
|
|
u32_t status;
|
|
void (*callback_function)(void const *argument);
|
|
void *arg;
|
|
};
|
|
|
|
K_MEM_SLAB_DEFINE(cmsis_timer_slab, sizeof(struct timer_obj),
|
|
CONFIG_CMSIS_TIMER_MAX_COUNT, 4);
|
|
|
|
static void zephyr_timer_wrapper(struct k_timer *timer)
|
|
{
|
|
struct timer_obj *cm_timer;
|
|
|
|
cm_timer = CONTAINER_OF(timer, struct timer_obj, ztimer);
|
|
(cm_timer->callback_function)(cm_timer->arg);
|
|
}
|
|
|
|
/**
|
|
* @brief Create a Timer
|
|
*/
|
|
osTimerId osTimerCreate(const osTimerDef_t *timer_def, os_timer_type type,
|
|
void *argument)
|
|
{
|
|
struct timer_obj *timer;
|
|
|
|
if (timer_def == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
if (type != osTimerOnce && type != osTimerPeriodic) {
|
|
return NULL;
|
|
}
|
|
|
|
if (k_mem_slab_alloc(&cmsis_timer_slab, (void **)&timer, K_MSEC(100)) == 0) {
|
|
(void)memset(timer, 0, sizeof(struct timer_obj));
|
|
} else {
|
|
return NULL;
|
|
}
|
|
|
|
timer->callback_function = timer_def->ptimer;
|
|
timer->arg = argument;
|
|
timer->type = type;
|
|
timer->status = NOT_ACTIVE;
|
|
|
|
k_timer_init(&timer->ztimer, zephyr_timer_wrapper, NULL);
|
|
|
|
return (osTimerId)timer;
|
|
}
|
|
|
|
/**
|
|
* @brief Start or restart a Timer
|
|
*/
|
|
osStatus osTimerStart(osTimerId timer_id, uint32_t millisec)
|
|
{
|
|
struct timer_obj *timer = (struct timer_obj *) timer_id;
|
|
|
|
if (timer == NULL) {
|
|
return osErrorParameter;
|
|
}
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
if (timer->type == osTimerOnce) {
|
|
k_timer_start(&timer->ztimer, millisec, K_NO_WAIT);
|
|
} else if (timer->type == osTimerPeriodic) {
|
|
k_timer_start(&timer->ztimer, K_NO_WAIT, millisec);
|
|
}
|
|
|
|
timer->status = ACTIVE;
|
|
return osOK;
|
|
}
|
|
|
|
/**
|
|
* @brief Stop the Timer
|
|
*/
|
|
osStatus osTimerStop(osTimerId timer_id)
|
|
{
|
|
struct timer_obj *timer = (struct timer_obj *) timer_id;
|
|
|
|
if (timer == NULL) {
|
|
return osErrorParameter;
|
|
}
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
if (timer->status == NOT_ACTIVE) {
|
|
return osErrorResource;
|
|
}
|
|
|
|
k_timer_stop(&timer->ztimer);
|
|
timer->status = NOT_ACTIVE;
|
|
return osOK;
|
|
}
|
|
|
|
/**
|
|
* @brief Delete the timer that was created by osTimerCreate
|
|
*/
|
|
osStatus osTimerDelete(osTimerId timer_id)
|
|
{
|
|
struct timer_obj *timer = (struct timer_obj *) timer_id;
|
|
|
|
if (timer == NULL) {
|
|
return osErrorParameter;
|
|
}
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
if (timer->status == ACTIVE) {
|
|
k_timer_stop(&timer->ztimer);
|
|
timer->status = NOT_ACTIVE;
|
|
}
|
|
|
|
k_mem_slab_free(&cmsis_timer_slab, (void *) &timer);
|
|
return osOK;
|
|
}
|