0d4954fafc
If any of the Zephyr version numbers went beyond 99, the "%2d" printf specifiers would expand to fit and the string would run over the memory on the stack used for os_str[]. Recent GCC versions (remember native_posix and x86_64 use the host compiler) were actually detecting this and correctly issuing a warning (but only if the 3-digit char value would overflow the actual array size!), which was breaking sanitycheck for me on Fedora 28 and Ubuntu 18.04 build hosts. Pretty impresive warning. As it happens this was wasteful anyway; we were spending bytes on the stack (and in rodata to store the constant which, and the cycles needed to copy it into place on the stack where it would be overwritten immediately) when we could just snprintf() directly into the buffer the user gave us. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
147 lines
2.3 KiB
C
147 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2018 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <kernel_structs.h>
|
|
#include <ksched.h>
|
|
#include <cmsis_os2.h>
|
|
|
|
extern u32_t z_tick_get_32(void);
|
|
|
|
/**
|
|
* @brief Get RTOS Kernel Information.
|
|
*/
|
|
osStatus_t osKernelGetInfo(osVersion_t *version, char *id_buf, uint32_t id_size)
|
|
{
|
|
if (version != NULL) {
|
|
version->api = sys_kernel_version_get();
|
|
version->kernel = sys_kernel_version_get();
|
|
}
|
|
|
|
if (id_buf != NULL) {
|
|
snprintf(id_buf, id_size, "Zephyr V%2d.%2d.%2d",
|
|
SYS_KERNEL_VER_MAJOR(version->kernel),
|
|
SYS_KERNEL_VER_MINOR(version->kernel),
|
|
SYS_KERNEL_VER_PATCHLEVEL(version->kernel));
|
|
}
|
|
|
|
return osOK;
|
|
}
|
|
|
|
/**
|
|
* @brief Lock the RTOS Kernel scheduler.
|
|
*/
|
|
int32_t osKernelLock(void)
|
|
{
|
|
int temp = _current->base.sched_locked;
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
k_sched_lock();
|
|
|
|
return temp;
|
|
}
|
|
|
|
/**
|
|
* @brief Unlock the RTOS Kernel scheduler.
|
|
*/
|
|
int32_t osKernelUnlock(void)
|
|
{
|
|
int temp = _current->base.sched_locked;
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
k_sched_unlock();
|
|
|
|
return temp;
|
|
}
|
|
|
|
/**
|
|
* @brief Restore the RTOS Kernel scheduler lock state.
|
|
*/
|
|
int32_t osKernelRestoreLock(int32_t lock)
|
|
{
|
|
_current->base.sched_locked = lock;
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
if (lock < 0) {
|
|
return 1; /* locked */
|
|
} else {
|
|
return 0; /* not locked */
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @brief Get the RTOS kernel tick count.
|
|
*/
|
|
uint32_t osKernelGetTickCount(void)
|
|
{
|
|
return z_tick_get_32();
|
|
}
|
|
|
|
/**
|
|
* @brief Get the RTOS kernel tick frequency.
|
|
*/
|
|
uint32_t osKernelGetTickFreq(void)
|
|
{
|
|
return CONFIG_SYS_CLOCK_TICKS_PER_SEC;
|
|
}
|
|
|
|
/**
|
|
* @brief Get the RTOS kernel system timer count.
|
|
*/
|
|
uint32_t osKernelGetSysTimerCount(void)
|
|
{
|
|
return k_cycle_get_32();
|
|
}
|
|
|
|
/**
|
|
* @brief Get the RTOS kernel system timer frequency.
|
|
*/
|
|
uint32_t osKernelGetSysTimerFreq(void)
|
|
{
|
|
return sys_clock_hw_cycles_per_sec();
|
|
}
|
|
|
|
/**
|
|
* @brief Wait for Timeout (Time Delay).
|
|
*/
|
|
osStatus_t osDelay(uint32_t ticks)
|
|
{
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
k_sleep(__ticks_to_ms(ticks));
|
|
|
|
return osOK;
|
|
}
|
|
|
|
/**
|
|
* @brief Wait until specified time.
|
|
*/
|
|
osStatus_t osDelayUntil(uint32_t ticks)
|
|
{
|
|
u32_t ticks_elapsed;
|
|
|
|
if (k_is_in_isr()) {
|
|
return osErrorISR;
|
|
}
|
|
|
|
ticks_elapsed = osKernelGetTickCount();
|
|
k_sleep(__ticks_to_ms(ticks - ticks_elapsed));
|
|
|
|
return osOK;
|
|
}
|