zephyr/lib/cmsis_rtos_v1/cmsis_signal.c

165 lines
3.7 KiB
C
Raw Permalink Normal View History

/*
* Copyright (c) 2018 Intel Corporation
*
* SPDX-License-Identifier: Apache-2.0
*/
headers: Refactor kernel and arch headers. 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>
2019-10-24 17:08:21 +02:00
#include <kernel.h>
#include <cmsis_os.h>
#define NSEC_PER_MSEC (NSEC_PER_USEC * USEC_PER_MSEC)
#define MAX_VALID_SIGNAL_VAL ((1 << osFeature_Signals) - 1)
void *k_thread_other_custom_data_get(struct k_thread *thread_id)
{
return thread_id->custom_data;
}
/**
* @brief Set the specified Signal Flags of an active thread.
*/
int32_t osSignalSet(osThreadId thread_id, int32_t signals)
{
int sig, key;
if ((thread_id == NULL) || (!signals) ||
(signals & 0x80000000) || (signals > MAX_VALID_SIGNAL_VAL)) {
return 0x80000000;
}
osThreadDef_t *thread_def =
(osThreadDef_t *)k_thread_other_custom_data_get(
(struct k_thread *)thread_id);
key = irq_lock();
sig = thread_def->signal_results;
thread_def->signal_results |= signals;
irq_unlock(key);
k_poll_signal_raise(thread_def->poll_signal, signals);
return sig;
}
/**
* @brief Clear the specified Signal Flags of an active thread.
*/
int32_t osSignalClear(osThreadId thread_id, int32_t signals)
{
int sig, key;
if (k_is_in_isr() || (thread_id == NULL) || (!signals) ||
(signals & 0x80000000) || (signals > MAX_VALID_SIGNAL_VAL)) {
return 0x80000000;
}
osThreadDef_t *thread_def =
(osThreadDef_t *)k_thread_other_custom_data_get(
(struct k_thread *)thread_id);
key = irq_lock();
sig = thread_def->signal_results;
thread_def->signal_results &= ~(signals);
irq_unlock(key);
return sig;
}
/**
* @brief Wait for one or more Signal Flags to become signalled for the
* current running thread.
*/
osEvent osSignalWait(int32_t signals, uint32_t millisec)
{
int retval, key;
osEvent evt;
uint32_t time_delta_ms, timeout = millisec;
uint64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
if (k_is_in_isr()) {
evt.status = osErrorISR;
return evt;
}
/* Check if signals is within the permitted range */
if ((signals & 0x80000000) || (signals > MAX_VALID_SIGNAL_VAL)) {
evt.status = osErrorValue;
return evt;
}
osThreadDef_t *thread_def = k_thread_custom_data_get();
for (;;) {
time_stamp_start = (uint64_t)k_cycle_get_32();
switch (millisec) {
case 0:
retval = k_poll(thread_def->poll_event, 1, K_NO_WAIT);
break;
case osWaitForever:
retval = k_poll(thread_def->poll_event, 1, K_FOREVER);
break;
default:
retval = k_poll(thread_def->poll_event, 1,
K_MSEC(timeout));
break;
}
switch (retval) {
case 0:
evt.status = osEventSignal;
break;
case -EAGAIN:
if (millisec == 0U) {
evt.status = osOK;
} else {
evt.status = osEventTimeout;
}
return evt;
default:
evt.status = osErrorValue;
return evt;
}
__ASSERT(thread_def->poll_event->state
== K_POLL_STATE_SIGNALED,
"event state not signalled!");
__ASSERT(thread_def->poll_event->signal->signaled == 1,
"event signaled is not 1");
/* Reset the states to facilitate the next trigger */
thread_def->poll_event->signal->signaled = 0;
thread_def->poll_event->state = K_POLL_STATE_NOT_READY;
/* Check if all events we are waiting on have been signalled */
if ((thread_def->signal_results & signals) == signals) {
break;
}
/* If we need to wait on more signals, we need to adjust the
* timeout value accordingly based on the time that has
* already elapsed.
*/
hwclk_cycles_delta = (uint64_t)k_cycle_get_32() - time_stamp_start;
time_delta_ns =
(uint32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
time_delta_ms = (uint32_t)time_delta_ns/NSEC_PER_MSEC;
if (timeout > time_delta_ms) {
timeout -= time_delta_ms;
} else {
timeout = 0U;
}
}
evt.value.signals = thread_def->signal_results;
/* Clear signal flags as the thread is ready now */
key = irq_lock();
thread_def->signal_results &= ~(signals);
irq_unlock(key);
return evt;
}