!745 iccarm工具链支持

Merge pull request !745 from wish/tag_iccarm

components/shell/src/cmds/vfs_shellcmd.c

@@ -724,7 +724,7 @@ STATIC INT32 OsWildcardExtractDirectory(CHAR *fullpath, VOID *dst, wildcard_type
 
     if (d == NULL) {
         perror("opendir error");
-        return VFS_ERROR;
+        return (INT32)VFS_ERROR;
     }
 
     while (1) {

kal/cmsis/cmsis_liteos2.c

@@ -788,7 +788,7 @@ osStatus_t osTimerStop(osTimerId_t timer_id)
 uint32_t osTimerIsRunning(osTimerId_t timer_id)
 {
     if (OS_INT_ACTIVE) {
-        return osErrorISR;
+        return (uint32_t)osErrorISR;
     }
     if (timer_id == NULL) {
         return 0;

kal/posix/src/mqueue.c

@@ -163,14 +163,14 @@ STATIC int SaveMqueueName(const CHAR *mqName, struct mqarray *mqueueCB)
     mqueueCB->mq_name = (char *)LOS_MemAlloc(OS_SYS_MEM_ADDR, nameLen + 1);
     if (mqueueCB->mq_name == NULL) {
         errno = ENOMEM;
-        return LOS_NOK;
+        return (int)LOS_NOK;
     }
 
     if (strncpy_s(mqueueCB->mq_name, (nameLen + 1), mqName, nameLen) != EOK) {
         LOS_MemFree(OS_SYS_MEM_ADDR, mqueueCB->mq_name);
         mqueueCB->mq_name = NULL;
         errno = EINVAL;
-        return LOS_NOK;
+        return (int)LOS_NOK;
     }
     mqueueCB->mq_name[nameLen] = '\0';
     return LOS_OK;

kal/posix/src/pipe.c

@@ -215,6 +215,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len)
 {
     INT32 ret;
     INT32 num = PipeDevNumAlloc();
+    struct PipeDev *devTemp = NULL;
     if (num < 0) {
         return -ENODEV;
     }
@@ -228,7 +229,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len)
     (VOID)snprintf_s(dev->devName, PIPE_DEV_NAME_MAX, PIPE_DEV_NAME_MAX - 1, "%s%d", PIPE_DEV_PATH, num);
     (VOID)memcpy_s(devName, len, dev->devName, strlen(dev->devName));
 
-    struct PipeDev *devTemp = PipeDevFind(dev->devName);
+    devTemp = PipeDevFind(dev->devName);
     if (devTemp != NULL) {
         ret = -EEXIST;
         goto ERROR;

kal/posix/src/pthread.c

@@ -504,6 +504,8 @@ int pthread_detach(pthread_t thread)
 void pthread_exit(void *retVal)
 {
     UINT32 intSave;
+    LosTaskCB *tcb = NULL;
+    PthreadData *pthreadData = NULL;
 
     pthread_t thread = pthread_self();
     if (!IsPthread(thread)) {
@@ -511,9 +513,9 @@ void pthread_exit(void *retVal)
         goto EXIT;
     }
 
-    LosTaskCB *tcb = OS_TCB_FROM_TID((UINT32)thread);
+    tcb = OS_TCB_FROM_TID((UINT32)thread);
     tcb->joinRetval = (UINTPTR)retVal;
-    PthreadData *pthreadData = (PthreadData *)(UINTPTR)tcb->arg;
+    pthreadData = (PthreadData *)(UINTPTR)tcb->arg;
     if (pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL) != 0) {
         PRINT_ERR("%s: %d failed\n", __FUNCTION__, __LINE__);
     }

kernel/src/mm/los_memory.c

@@ -1901,14 +1901,12 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
         if (taskID >= LOSCFG_BASE_CORE_TSK_LIMIT) {
             MEM_UNLOCK(pool, intSave);
             LOS_Panic("Task ID %u in pre node is invalid!\n", taskID);
-            return;
         }
 
         taskCB = OS_TCB_FROM_TID(taskID);
         if ((taskCB->taskStatus & OS_TASK_STATUS_UNUSED) || (taskCB->taskEntry == NULL)) {
             MEM_UNLOCK(pool, intSave);
             LOS_Panic("\r\nTask ID %u in pre node is not created!\n", taskID);
-            return;
         }
     } else {
         PRINTK("The prev node is free\n");

utils/los_compiler.h

@@ -34,7 +34,7 @@
 
 /* for IAR Compiler */
 #ifdef __ICCARM__
-#include"iccarm_builtin.h"
+#include "iccarm_builtin.h"
 #endif
 
 #ifdef __cplusplus

utils/los_debug.c

@@ -87,7 +87,7 @@ VOID OsDoExcHook(EXC_TYPE excType)
 INT32 OsLogLevelCheck(INT32 level)
 {
     if (level > PRINT_LEVEL) {
-        return LOS_NOK;
+        return (INT32)LOS_NOK;
     }
 
     if ((level != LOG_COMMON_LEVEL) && ((level > LOG_EMG_LEVEL) && (level <= LOG_DEBUG_LEVEL))) {