xxq2506
/
xiuos5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove all comile warning of kernel

This commit is contained in:
Wang_Weigen 2021-04-29 16:15:11 +08:00
parent c4280d9488
commit e424932163
9 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/user_api/switch_api/user_api.h
View File

@ -160,7 +160,7 @@ struct statfs {
int statfs(const char *path, struct statfs *buf);
#endif
void Userprintf(const char *fmt, ...);
int Userprintf(const char *fmt, ...);
#define printf Userprintf

4
applications/user_api/switch_api/user_fs.c
View File

@ -21,6 +21,7 @@
#include "user_api.h"
#include <stdarg.h>
#include <stdio.h>
#define stdio 1
#define CONSOLEBUF_SIZE 128
@ -123,7 +124,7 @@ int statfs(const char *path, struct statfs *buf){
return (int)(KSwitch2(KS_USER_STAT_FS,(uintptr_t)path,(uintptr_t)buf));
}
void Userprintf(const char *fmt, ...)
int Userprintf(const char *fmt, ...)
{
if(stdio != NONE)
{
@ -140,5 +141,6 @@ void Userprintf(const char *fmt, ...)
write(stdio, logbuf, length);
va_end(args);
}
return 0;
}

2
arch/arm/cortex-m4/interrupt.c
View File

@ -23,6 +23,8 @@
#include <misc.h>
#include <stm32f4xx.h>
extern void _svcall(uintptr_t* contex);
x_base __attribute__((naked)) DisableLocalInterrupt()
{
asm volatile ("MRS r0, PRIMASK");

8
arch/arm/shared/prepare_ahwstack.c
View File

@ -290,8 +290,8 @@ struct ExceptionInfo
void HwHardFaultException(struct ExceptionInfo *ExceptionInfo)
{
extern long ShowTask(void);
struct ExErrorStackContex* ExceptionStack = &ExceptionInfo->stackframe.ExErrorStackContex;
struct StackRegisterContent* context = &ExceptionInfo->stackframe;
struct ExErrorStackContex* ExceptionStack = (struct ExErrorStackContex*)&ExceptionInfo->stackframe.ExErrorStackContex;
struct StackRegisterContent* context = (struct StackRegisterContent*)&ExceptionInfo->stackframe;
if (ExceptionHook != NONE) {
x_err_t result = ExceptionHook(ExceptionStack);
@ -344,8 +344,8 @@ void UpdateRunningTask(void)
void MemFaultExceptionPrint(struct ExceptionInfo *ExceptionInfo)
{
extern long ShowTask(void);
struct ExErrorStackContex* ExceptionStack = &ExceptionInfo->stackframe.ExErrorStackContex;
struct StackRegisterContent* context = &ExceptionInfo->stackframe;
struct ExErrorStackContex* ExceptionStack = (struct ExErrorStackContex*)&ExceptionInfo->stackframe.ExErrorStackContex;
struct StackRegisterContent* context = (struct StackRegisterContent*)&ExceptionInfo->stackframe;
if (ExceptionHook != NONE) {
x_err_t result = ExceptionHook(ExceptionStack);

2
kernel/include/user_api.h
View File

@ -160,7 +160,7 @@ struct statfs {
int statfs(const char *path, struct statfs *buf);
#endif
void Userprintf(const char *fmt, ...);
int Userprintf(const char *fmt, ...);
#define printf Userprintf

2
kernel/kernel_test/user_api.h
View File

@ -159,7 +159,7 @@ struct statfs {
int statfs(const char *path, struct statfs *buf);
#endif
void UserPrintf(const char *fmt, ...);
int UserPrintf(const char *fmt, ...);
#else
struct utask

10
kernel/memory/byte_manage.c
View File

@ -57,7 +57,7 @@
*/
struct DynamicAllocNode
{
uint32 size; /* the size of dynamicAllocNode */
x_size_t size; /* the size of dynamicAllocNode */
uint32 prev_adj_size; /* the size of the previous adjacent node, (dynamic alloc node or dynamic free node */
};
@ -480,7 +480,7 @@ static void SmallMemInit(struct ByteMemory *byte_memory)
for(offset = 0; offset < item->block_total_count; offset++) {
node = PTR2ALLOCNODE((char*)item->freelist + offset * (SIZEOF_32B + SIZEOF_DYNAMICALLOCNODE_MEM));
node->size =(uint64) ((char*)item->freelist + (offset + 1) * (SIZEOF_32B + SIZEOF_DYNAMICALLOCNODE_MEM));
node->size =(x_size_t) ((char*)item->freelist + (offset + 1) * (SIZEOF_32B + SIZEOF_DYNAMICALLOCNODE_MEM));
node->prev_adj_size = STATIC_BLOCK_MASK;
}
node->size = NONE;
@ -501,7 +501,7 @@ static void SmallMemInit(struct ByteMemory *byte_memory)
for(offset = 0; offset < item->block_total_count; offset++) {
node = PTR2ALLOCNODE((char*)item->freelist + offset * (SIZEOF_64B + SIZEOF_DYNAMICALLOCNODE_MEM));
node->size =(uint64) ((char*)item->freelist + (offset + 1) * (SIZEOF_64B + SIZEOF_DYNAMICALLOCNODE_MEM));
node->size =(x_size_t) ((char*)item->freelist + (offset + 1) * (SIZEOF_64B + SIZEOF_DYNAMICALLOCNODE_MEM));
node->prev_adj_size = STATIC_BLOCK_MASK;
}
node->size = NONE;
@ -527,10 +527,10 @@ static void SmallMemFree(void *pointer)
/* get the allocNode */
node = PTR2ALLOCNODE((char*)pointer-SIZEOF_DYNAMICALLOCNODE_MEM);
StaticSegment = (struct segment*)(uint64)node->size;
StaticSegment = (struct segment*)(x_size_t)node->size;
/* update the statistic information of StaticSegment */
node->size = (uint64)StaticSegment->freelist;
node->size = (x_size_t)StaticSegment->freelist;
StaticSegment->freelist = (uint8 *)node;
StaticSegment->block_free_count++;

2
kernel/thread/console.c
View File

@ -500,9 +500,11 @@ int VsnPrintf(char *buf, int32 size, const char *fmt, va_list args)
width = sizeof(void *) * 2;
flags |= ZEROPAD | CAPITAL;
/* Determine the machine word length */
#ifdef ARCH_CPU_64BIT
if(sizeof(long) == sizeof(long long))
pointer = LonglongToChar(buf, (unsigned long long)va_arg(args, void*), flags, precision, 16, width, 0, pointer, size);
else
#endif
pointer = LongToChar(buf, (unsigned long)va_arg(args, void*), flags, precision, 16, width, 0, pointer, size);
if(pointer >= size) {

4
tool/shell/letter-shell/file_ext/bunzip2.c
View File

@ -274,8 +274,8 @@ static int GetNextBlock(BunZipData_t *bd)
if (ngrp >= groupCount)
return RET_ERROR;
hufGroup = bd->groups + ngrp;
base = hufGroup->base - 1;
limit = hufGroup->limit - 1;
base = (int *)hufGroup->base - 1;
limit = (int *)hufGroup->limit - 1;
continue_this_group: