未验证 提交 3a978d51 编写于 作者: O openharmony_ci 提交者: Gitee

!526 处理M核编译告警

Merge pull request !526 from yinjiaming/yjm-kernel-20220105
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"los_timer.c",
"reset_vector.S",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -38,6 +38,7 @@ kernel_module(module_name) {
"los_interrupt.c",
"los_timer.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"non_secure/los_timer.c",
"non_secure/los_trustzone.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
include_dirs = [
"non_secure",
......
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"los_mpu.c",
"los_timer.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"los_mpu.c",
"los_timer.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -38,6 +38,7 @@ kernel_module(module_name) {
"los_interrupt.c",
"los_timer.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -42,8 +42,6 @@ typedef struct {
UINT32 CALIB;
} CORE_TIM_TYPE;
#define OS_CYCLE_PER_TICK (OS_SYS_CLOCK / LOSCFG_BASE_CORE_TICK_PER_SECOND)
#define CORE_TIM_BASE (0xE000E010UL)
#define SysTick ((CORE_TIM_TYPE *)CORE_TIM_BASE)
......
......@@ -80,7 +80,7 @@ typedef struct {
} MPU_CFG_PARA;
VOID ArchMpuEnable(UINT32 defaultRegionEnable);
VOID ArchMpuDisable();
VOID ArchMpuDisable(VOID);
UINT32 ArchMpuSetRegion(UINT32 regionId, MPU_CFG_PARA *para);
UINT32 ArchMpuDisableRegion(UINT32 regionId);
INT32 ArchMpuUnusedRegionGet(VOID);
......
......@@ -38,6 +38,7 @@ kernel_module(module_name) {
"los_interrupt.c",
"los_timer.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"los_timer.c",
"los_window.S",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_KERNEL_BACKTRACE)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "los_backtrace.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_KERNEL_CPPSUPPORT)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "los_cppsupport.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_BASE_CORE_CPUP)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "los_cpup.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -32,6 +32,7 @@ module_switch = defined(LOSCFG_KERNEL_DYNLINK)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "los_dynlink.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -36,6 +36,7 @@ kernel_module(module_name) {
"los_exc_info.c",
"los_exchook.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"$LITEOSTHIRDPARTY/FatFs/source/ffunicode.c",
"fatfs.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -38,6 +38,7 @@ kernel_module(module_name) {
"$LITEOSTHIRDPARTY/littlefs/lfs_util.c",
"lfs_api.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -41,7 +41,7 @@ struct FileOpInfo g_fsOp[LOSCFG_LFS_MAX_MOUNT_SIZE] = {0};
static LittleFsHandleStruct g_handle[LITTLE_FS_MAX_OPEN_FILES] = {0};
struct dirent g_nameValue;
static pthread_mutex_t g_FslocalMutex = PTHREAD_MUTEX_INITIALIZER;
static const char *g_littlefsMntName[LOSCFG_LFS_MAX_MOUNT_SIZE] = {"/a", "/b", "/c"};
static const char *g_littlefsMntName[LOSCFG_LFS_MAX_MOUNT_SIZE] = {"/a"};
LittleFsHandleStruct *LfsAllocFd(const char *fileName, int *fd)
{
......@@ -573,7 +573,7 @@ int LfsClosedir(DIR *dir)
return ret;
}
int LfsOpen(const char *pathName, int openFlag, int mode)
int LfsOpen(const char *pathName, int openFlag, ...)
{
int fd = INVALID_FD;
int err = INVALID_FD;
......
......@@ -100,7 +100,7 @@ int LfsRmdir(const char *dirName);
DIR *LfsOpendir(const char *dirName);
struct dirent *LfsReaddir(DIR *dir);
int LfsClosedir(DIR *dir);
int LfsOpen(const char *pathName, int openFlag, int mode);
int LfsOpen(const char *pathName, int openFlag, ...);
int LfsRead(int fd, void *buf, unsigned int len);
int LfsWrite(int fd, const void *buf, unsigned int len);
off_t LfsSeek(int fd, off_t offset, int whence);
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_KERNEL_LMK)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "los_lmk.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -25,7 +25,7 @@
# 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.
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_m/liteos.gni")
......@@ -36,6 +36,7 @@ kernel_module(module_name) {
"lms_libc.c",
"los_lms.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -39,9 +39,12 @@
#include "lwip/err.h"
#include "lwip/ip_addr.h"
#include "lwip/icmp.h"
#include "lwip/tcpip.h"
#include "lwip/inet_chksum.h"
#include "los_config.h"
#include <string.h>
#include <time.h>
#include <stdlib.h>
#include "los_debug.h"
#include "los_task.h"
......
......@@ -34,6 +34,7 @@
#include "lwip/priv/sockets_priv.h"
#include "lwip/prot/dhcp.h"
#include "lwip/dhcp.h"
#include "lwip/if_api.h"
#if !LWIP_COMPAT_SOCKETS
#if LWIP_SOCKET
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_KERNEL_PM)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "los_pm.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -105,7 +105,7 @@ STATIC VOID OsPmTickTimerStart(LosPmCB *pm)
tickTimer->timerStop();
realSleepTime = OS_SYS_CYCLE_TO_NS(sleepTime, tickTimer->freq);
realSleepTime = OS_SYS_NS_TO_CYCLE(realSleepTime, OS_SYS_CLOCK);
realSleepTime = OS_SYS_NS_TO_CYCLE(realSleepTime, g_sysClock);
currTime = pm->enterSleepTime + realSleepTime;
pm->enterSleepTime = 0;
......@@ -136,7 +136,7 @@ STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
return FALSE;
}
sleepCycle = OS_SYS_CYCLE_TO_NS(realSleepTime, OS_SYS_CLOCK);
sleepCycle = OS_SYS_CYCLE_TO_NS(realSleepTime, g_sysClock);
sleepCycle = OS_SYS_NS_TO_CYCLE(sleepCycle, tickTimer->freq);
/* The main CPU reduces the frequency */
......
......@@ -309,7 +309,6 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsCmdExec(CmdParsed *cmdParsed)
ret = (cmdHook)(cmdParsed->paramCnt, (const CHAR **)cmdParsed->paramArray);
}
OUT:
for (i = 0; i < cmdParsed->paramCnt; i++) {
if (cmdParsed->paramArray[i] != NULL) {
(VOID)LOS_MemFree(m_aucSysMem0, cmdParsed->paramArray[i]);
......
......@@ -36,6 +36,7 @@ kernel_module(module_name) {
"cnv/trace_cnv.c",
"los_trace.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
include_dirs = [
".",
......
......@@ -68,7 +68,7 @@ UINT32 OsTraceBufInit(UINT32 size)
g_traceRecoder.head = (OfflineHead *)buf;
g_traceRecoder.head->baseInfo.bigLittleEndian = TRACE_BIGLITTLE_WORD;
g_traceRecoder.head->baseInfo.version = TRACE_VERSION(TRACE_MODE_OFFLINE);
g_traceRecoder.head->baseInfo.clockFreq = OS_SYS_CLOCK;
g_traceRecoder.head->baseInfo.clockFreq = g_sysClock;
g_traceRecoder.head->objSize = sizeof(ObjData);
g_traceRecoder.head->frameSize = sizeof(TraceEventFrame);
g_traceRecoder.head->objOffset = sizeof(OfflineHead);
......
......@@ -49,7 +49,7 @@ VOID OsTraceSendHead(VOID)
TraceBaseHeaderInfo head = {
.bigLittleEndian = TRACE_BIGLITTLE_WORD,
.version = TRACE_VERSION(TRACE_MODE_ONLINE),
.clockFreq = OS_SYS_CLOCK,
.clockFreq = g_sysClock,
};
OsTraceDataSend(HEAD, sizeof(TraceBaseHeaderInfo), (UINT8 *)&head);
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_KAL_CMSIS)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "cmsis_liteos2.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -270,7 +270,7 @@ uint32_t osKernelGetSysTimerCount(void)
uint32_t osKernelGetSysTimerFreq(void)
{
return OS_SYS_CLOCK;
return g_sysClock;
}
......
......@@ -33,6 +33,7 @@ module_switch = defined(LOSCFG_LIBC_MUSL)
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [ "malloc.c" ]
configs += [ "$LITEOSTOPDIR:warn_config" ]
if (defined(LOSCFG_LIBC_MUSL_FS)) {
sources += [ "fs.c" ]
......
......@@ -39,6 +39,7 @@ kernel_module(module_name) {
"porting/src/pthread.c",
"porting/src/time.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
if (defined(LOSCFG_LIBC_NEWLIB_FS)) {
sources +=
......
......@@ -33,6 +33,7 @@ import("//third_party/bounds_checking_function/libsec_src.gni")
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = libsec_sources
configs += [ "$LITEOSTOPDIR:warn_config" ]
if (defined(LOSCFG_KERNEL_LMS)) {
if ("$ohos_build_compiler" == "gcc") {
cflags_c = [ "-fsanitize=kernel-address" ]
......
......@@ -36,6 +36,7 @@ kernel_module(module_name) {
"src/errno.c",
"src/libc.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
if (defined(LOSCFG_POSIX_THREAD_API)) {
sources += [
......
......@@ -62,7 +62,7 @@ config POSIX_MQUEUE_API
config POSIX_PIPE_API
bool "Enable POSIX Pipe API"
default y
default n
help
Answer Y to enable LiteOS support POSIX Pipe API.
......
......@@ -79,8 +79,9 @@
#define MQ_USE_MAGIC 0x89abcdef
#define MQ_PRIO_MAX 1
#ifndef FNONBLOCK
#define FNONBLOCK O_NONBLOCK
#endif
#define QUEUE_SPLIT_BIT 16
......
......@@ -267,6 +267,8 @@ void pthread_exit(void *retVal)
LOS_IntRestore(intSave);
free(pthreadData);
(void)LOS_TaskDelete(tcb->taskID);
while (1) {
}
}
int pthread_setname_np(pthread_t thread, const char *name)
......
......@@ -246,8 +246,8 @@ int timer_getoverrun(timer_t timerID)
STATIC VOID OsGetHwTime(struct timespec *hwTime)
{
UINT64 cycle = LOS_SysCycleGet();
UINT64 nowNsec = (cycle / OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND +
(cycle % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK;
UINT64 nowNsec = (cycle / g_sysClock) * OS_SYS_NS_PER_SECOND +
(cycle % g_sysClock) * OS_SYS_NS_PER_SECOND / g_sysClock;
hwTime->tv_sec = nowNsec / OS_SYS_NS_PER_SECOND;
hwTime->tv_nsec = nowNsec % OS_SYS_NS_PER_SECOND;
......@@ -369,7 +369,7 @@ int clock_getres(clockid_t clockID, struct timespec *tp)
case CLOCK_REALTIME:
case CLOCK_MONOTONIC_COARSE:
case CLOCK_REALTIME_COARSE:
tp->tv_nsec = OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK;
tp->tv_nsec = OS_SYS_NS_PER_SECOND / g_sysClock;
tp->tv_sec = 0;
return 0;
case CLOCK_THREAD_CPUTIME_ID:
......
......@@ -45,6 +45,7 @@ kernel_module(module_name) {
"src/mm/los_membox.c",
"src/mm/los_memory.c",
]
configs += [ "$LITEOSTOPDIR:warn_config" ]
}
config("public") {
......
......@@ -54,7 +54,7 @@ extern "C" {
* System clock (unit: HZ)
*/
#ifndef OS_SYS_CLOCK
#error "OS_SYS_CLOCK is system clock rate which should be defined in target_config.h"
#define OS_SYS_CLOCK 1000000
#endif
/**
......@@ -653,9 +653,11 @@ extern UINT8 *m_aucSysMem0;
* @ingroup los_config
* Configuration item to enable pipe device.
*/
#ifndef LOSCFG_POSIX_PIPE_API
#ifndef LOSCFG_PIPE_DEV
#define LOSCFG_POSIX_PIPE_API 0
#endif
#endif
#ifdef __cplusplus
#if __cplusplus
......
......@@ -42,7 +42,7 @@ extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define OS_SCHED_MINI_PERIOD (OS_SYS_CLOCK / LOSCFG_BASE_CORE_TICK_PER_SECOND_MINI)
#define OS_SCHED_MINI_PERIOD (g_sysClock / LOSCFG_BASE_CORE_TICK_PER_SECOND_MINI)
#define OS_TICK_RESPONSE_PRECISION (UINT32)((OS_SCHED_MINI_PERIOD * 75) / 100)
#define OS_SCHED_MAX_RESPONSE_TIME (UINT64)(((UINT64)-1) - 1U)
......
......@@ -105,6 +105,30 @@ extern UINT64 LOS_SysCycleGet(VOID);
*/
#define OS_SYS_MS_PER_SECOND 1000
/**
* @ingroup los_tick
* Ticks per second
*/
extern UINT32 g_ticksPerSec;
/**
* @ingroup los_tick
* Cycles per Second
*/
extern UINT32 g_uwCyclePerSec;
/**
* @ingroup los_tick
* Cycles per Tick
*/
extern UINT32 g_cyclesPerTick;
/**
* @ingroup los_tick
* System Clock
*/
extern UINT32 g_sysClock;
/**
* @ingroup los_tick
* Number of microseconds in one second.
......@@ -115,9 +139,9 @@ extern UINT64 LOS_SysCycleGet(VOID);
#define OS_SYS_NS_PER_US 1000
#define OS_CYCLE_PER_TICK (OS_SYS_CLOCK / LOSCFG_BASE_CORE_TICK_PER_SECOND)
#define OS_CYCLE_PER_TICK (g_sysClock / LOSCFG_BASE_CORE_TICK_PER_SECOND)
#define OS_NS_PER_CYCLE (OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK)
#define OS_NS_PER_CYCLE (OS_SYS_NS_PER_SECOND / g_sysClock)
#define OS_MS_PER_TICK (OS_SYS_MS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND)
......@@ -125,8 +149,8 @@ extern UINT64 LOS_SysCycleGet(VOID);
#define OS_NS_PER_TICK (OS_SYS_NS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND)
#define OS_SYS_CYCLE_TO_NS(cycle, freq) (((cycle) / (freq)) * OS_SYS_NS_PER_SECOND + \
((cycle) % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / (freq))
#define OS_SYS_CYCLE_TO_NS(cycle, freq) ((cycle) / (freq)) * OS_SYS_NS_PER_SECOND + \
((cycle) % (freq) * OS_SYS_NS_PER_SECOND / (freq))
#define OS_SYS_NS_TO_CYCLE(time, freq) (((time) / OS_SYS_NS_PER_SECOND) * (freq) + \
((time) % OS_SYS_NS_PER_SECOND) * (freq) / OS_SYS_NS_PER_SECOND)
......@@ -333,30 +357,6 @@ extern UINT32 LOS_MS2Tick(UINT32 millisec);
*/
extern UINT32 LOS_TickTimerRegister(const ArchTickTimer *timer, const HWI_PROC_FUNC tickHandler);
/**
* @ingroup los_tick
* Ticks per second
*/
extern UINT32 g_ticksPerSec;
/**
* @ingroup los_tick
* Cycles per Second
*/
extern UINT32 g_uwCyclePerSec;
/**
* @ingroup los_tick
* Cycles per Tick
*/
extern UINT32 g_cyclesPerTick;
/**
* @ingroup los_tick
* System Clock
*/
extern UINT32 g_sysClock;
/**
* @ingroup los_tick
* @brief Handle the system tick timeout.
......
......@@ -585,7 +585,7 @@ UINT64 LOS_SchedTickTimeoutNsGet(VOID)
responseTime = 0; /* Tick interrupt already timeout */
}
return OS_SYS_CYCLE_TO_NS(responseTime, OS_SYS_CLOCK);
return OS_SYS_CYCLE_TO_NS(responseTime, g_sysClock);
}
VOID LOS_SchedTickHandler(VOID)
......
......@@ -164,7 +164,7 @@ UINT32 OsSortLinkGetTargetExpireTime(UINT64 currTime, const SortLinkList *target
return 0;
}
return (UINT32)(((targetSortList->responseTime - currTime) * LOSCFG_BASE_CORE_TICK_PER_SECOND) / OS_SYS_CLOCK);
return (UINT32)(((targetSortList->responseTime - currTime) * LOSCFG_BASE_CORE_TICK_PER_SECOND) / g_sysClock);
}
UINT32 OsSortLinkGetNextExpireTime(const SortLinkAttribute *sortLinkHeader)
......
......@@ -289,7 +289,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskCpupInfo(CPUP_INFO_S **cpuLessOneSec,
}
#endif
LITE_OS_SEC_TEXT_MINOR VOID OsPrintAllTskInfoHeader()
LITE_OS_SEC_TEXT_MINOR VOID OsPrintAllTskInfoHeader(VOID)
{
PRINTK("\r\n TID Priority Status StackSize WaterLine StackPoint TopOfStack EventMask SemID");
#if (LOSCFG_BASE_CORE_CPUP == 1)
......@@ -1472,8 +1472,8 @@ VOID LOS_UDelay(UINT64 microseconds)
return;
}
endTime = (microseconds / OS_SYS_US_PER_SECOND) * OS_SYS_CLOCK +
(microseconds % OS_SYS_US_PER_SECOND) * OS_SYS_CLOCK / OS_SYS_US_PER_SECOND;
endTime = (microseconds / OS_SYS_US_PER_SECOND) * g_sysClock +
(microseconds % OS_SYS_US_PER_SECOND) * g_sysClock / OS_SYS_US_PER_SECOND;
endTime = LOS_SysCycleGet() + endTime;
while (LOS_SysCycleGet() < endTime) {
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册