zephyr/lib/cmsis_rtos_v1/cmsis_msgq.c

95 lines
2.0 KiB
C
Raw 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 23:08:21 +08:00
#include <kernel.h>
#include <cmsis_os.h>
/**
* @brief Create and Initialize Message queue.
*/
osMessageQId osMessageCreate(const osMessageQDef_t *queue_def,
osThreadId thread_id)
{
if (queue_def == NULL) {
return NULL;
}
if (k_is_in_isr()) {
return NULL;
}
k_msgq_init(queue_def->msgq, queue_def->pool,
queue_def->item_sz, queue_def->queue_sz);
return (osMessageQId)(queue_def);
}
/**
* @brief Put a message to a Queue.
*/
osStatus osMessagePut(osMessageQId queue_id, uint32_t info, uint32_t millisec)
{
osMessageQDef_t *queue_def = (osMessageQDef_t *)queue_id;
int retval;
if (queue_def == NULL) {
return osErrorParameter;
}
if (millisec == 0U) {
retval = k_msgq_put(queue_def->msgq, (void *)&info, K_NO_WAIT);
} else if (millisec == osWaitForever) {
retval = k_msgq_put(queue_def->msgq, (void *)&info, K_FOREVER);
} else {
retval = k_msgq_put(queue_def->msgq, (void *)&info,
K_MSEC(millisec));
}
if (retval == 0) {
return osOK;
} else if (retval == -EAGAIN) {
return osErrorTimeoutResource;
} else {
return osErrorResource;
}
}
/**
* @brief Get a message or Wait for a Message from a Queue.
*/
osEvent osMessageGet(osMessageQId queue_id, uint32_t millisec)
{
osMessageQDef_t *queue_def = (osMessageQDef_t *)queue_id;
uint32_t info;
osEvent evt = {0};
int retval;
if (queue_def == NULL) {
evt.status = osErrorParameter;
return evt;
}
if (millisec == 0U) {
retval = k_msgq_get(queue_def->msgq, &info, K_NO_WAIT);
} else if (millisec == osWaitForever) {
retval = k_msgq_get(queue_def->msgq, &info, K_FOREVER);
} else {
retval = k_msgq_get(queue_def->msgq, &info, K_MSEC(millisec));
}
if (retval == 0) {
evt.status = osEventMessage;
evt.value.v = info;
} else if (retval == -EAGAIN) {
evt.status = osEventTimeout;
} else if (retval == -ENOMSG) {
evt.status = osOK;
}
evt.def.message_id = queue_id;
return evt;
}