sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/or1k: Remove FAR from chip folder

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-04-17 20:46:55 +08:00 committed by Petro Karashchenko
parent 0bd9a66305
commit 3c82094156
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/or1k/include/arch.h
View File

@ -106,12 +106,12 @@ struct group_addrenv_s
{ {
/* Level 1 page table entries for each group section */ /* Level 1 page table entries for each group section */
FAR uintptr_t *text[ARCH_TEXT_NSECTS]; uintptr_t *text[ARCH_TEXT_NSECTS];
FAR uintptr_t *data[ARCH_DATA_NSECTS]; uintptr_t *data[ARCH_DATA_NSECTS];
#ifdef CONFIG_BUILD_KERNEL #ifdef CONFIG_BUILD_KERNEL
FAR uintptr_t *heap[ARCH_HEAP_NSECTS]; uintptr_t *heap[ARCH_HEAP_NSECTS];
#ifdef CONFIG_MM_SHM #ifdef CONFIG_MM_SHM
FAR uintptr_t *shm[ARCH_SHM_NSECTS]; uintptr_t *shm[ARCH_SHM_NSECTS];
#endif #endif
/* Initial heap allocation (in bytes). This exists only provide an /* Initial heap allocation (in bytes). This exists only provide an
@ -137,12 +137,12 @@ typedef struct group_addrenv_s group_addrenv_t;
struct save_addrenv_s struct save_addrenv_s
{ {
FAR uint32_t text[ARCH_TEXT_NSECTS]; uint32_t text[ARCH_TEXT_NSECTS];
FAR uint32_t data[ARCH_DATA_NSECTS]; uint32_t data[ARCH_DATA_NSECTS];
#ifdef CONFIG_BUILD_KERNEL #ifdef CONFIG_BUILD_KERNEL
FAR uint32_t heap[ARCH_HEAP_NSECTS]; uint32_t heap[ARCH_HEAP_NSECTS];
#ifdef CONFIG_MM_SHM #ifdef CONFIG_MM_SHM
FAR uint32_t shm[ARCH_SHM_NSECTS]; uint32_t shm[ARCH_SHM_NSECTS];
#endif #endif
#endif #endif
}; };

12
arch/or1k/src/common/up_allocateheap.c
View File

@ -97,9 +97,9 @@
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL #ifdef CONFIG_BUILD_KERNEL
void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) void up_allocate_kheap(void **heap_start, size_t *heap_size)
#else #else
void up_allocate_heap(FAR void **heap_start, size_t *heap_size) void up_allocate_heap(void **heap_start, size_t *heap_size)
#endif #endif
{ {
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP)
@ -117,13 +117,13 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Return the user-space heap settings */ /* Return the user-space heap settings */
board_autoled_on(LED_HEAPALLOCATE); board_autoled_on(LED_HEAPALLOCATE);
*heap_start = (FAR void *)ubase; *heap_start = (void *)ubase;
*heap_size = usize; *heap_size = usize;
#else #else
/* Return the heap settings */ /* Return the heap settings */
*heap_start = (FAR void *)g_idle_topstack; *heap_start = (void *)g_idle_topstack;
*heap_size = CONFIG_RAM_END - *(uint32_t *)heap_start; *heap_size = CONFIG_RAM_END - *(uint32_t *)heap_start;
board_autoled_on(LED_HEAPALLOCATE); board_autoled_on(LED_HEAPALLOCATE);
@ -142,7 +142,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP)
void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) void up_allocate_kheap(void **heap_start, size_t *heap_size)
{ {
/* Get the unaligned size and position of the user-space heap. /* Get the unaligned size and position of the user-space heap.
* This heap begins after the user-space .bss section at an offset * This heap begins after the user-space .bss section at an offset
@ -157,7 +157,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* that was not dedicated to the user heap). * that was not dedicated to the user heap).
*/ */
*heap_start = (FAR void *)USERSPACE->us_bssend; *heap_start = (void *)USERSPACE->us_bssend;
*heap_size = ubase - (uintptr_t)USERSPACE->us_bssend; *heap_size = ubase - (uintptr_t)USERSPACE->us_bssend;
} }
#endif #endif

8
arch/or1k/src/common/up_assert.c
View File

@ -94,7 +94,7 @@ static void or1k_stackdump(uint32_t sp, uint32_t stack_top)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) static void up_taskdump(struct tcb_s *tcb, void *arg)
{ {
/* Dump interesting properties of this task */ /* Dump interesting properties of this task */
@ -167,7 +167,7 @@ static inline void or1k_registerdump(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_USBDUMP #ifdef CONFIG_ARCH_USBDUMP
static int usbtrace_syslog(FAR const char *fmt, ...) static int usbtrace_syslog(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int ret; int ret;
@ -180,7 +180,7 @@ static int usbtrace_syslog(FAR const char *fmt, ...)
return ret; return ret;
} }
static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg) static int assert_tracecallback(struct usbtrace_s *trace, void *arg)
{ {
usbtrace_trprintf(usbtrace_syslog, trace->event, trace->value); usbtrace_trprintf(usbtrace_syslog, trace->event, trace->value);
return 0; return 0;
@ -194,7 +194,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
FAR struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = up_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;

12
arch/or1k/src/common/up_checkstack.c
View File

@ -67,9 +67,9 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size);
static size_t do_stackcheck(uintptr_t alloc, size_t size) static size_t do_stackcheck(uintptr_t alloc, size_t size)
{ {
FAR uintptr_t start; uintptr_t start;
FAR uintptr_t end; uintptr_t end;
FAR uint32_t *ptr; uint32_t *ptr;
size_t mark; size_t mark;
if (size == 0) if (size == 0)
@ -86,7 +86,7 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size)
size = end - start; size = end - start;
for (ptr = (FAR uint32_t *)start, mark = (size >> 2); for (ptr = (uint32_t *)start, mark = (size >> 2);
*ptr == STACK_COLOR && mark > 0; *ptr == STACK_COLOR && mark > 0;
ptr++, mark--); ptr++, mark--);
@ -115,12 +115,12 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size)
* *
****************************************************************************/ ****************************************************************************/
size_t up_check_tcbstack(FAR struct tcb_s *tcb) size_t up_check_tcbstack(struct tcb_s *tcb)
{ {
return do_stackcheck((uintptr_t)tcb->stack_base_ptr, tcb->adj_stack_size); return do_stackcheck((uintptr_t)tcb->stack_base_ptr, tcb->adj_stack_size);
} }
ssize_t up_check_tcbstack_remain(FAR struct tcb_s *tcb) ssize_t up_check_tcbstack_remain(struct tcb_s *tcb)
{ {
return tcb->adj_stack_size - up_check_tcbstack(tcb); return tcb->adj_stack_size - up_check_tcbstack(tcb);
} }

4
arch/or1k/src/common/up_createstack.c
View File

@ -81,7 +81,7 @@
* *
****************************************************************************/ ****************************************************************************/
int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
{ {
#ifdef CONFIG_TLS_ALIGNED #ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the /* The allocated stack size must not exceed the maximum possible for the
@ -201,7 +201,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
void up_stack_color(FAR void *stackbase, size_t nbytes) void up_stack_color(void *stackbase, size_t nbytes)
{ {
uint32_t *stkptr; uint32_t *stkptr;
uintptr_t stkend; uintptr_t stkend;

4
arch/or1k/src/common/up_exit.c
View File

@ -62,9 +62,9 @@
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DUMP_ON_EXIT #ifdef CONFIG_DUMP_ON_EXIT
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) static void _up_dumponexit(struct tcb_s *tcb, void *arg)
{ {
FAR struct filelist *filelist; struct filelist *filelist;
int i; int i;
int j; int j;

6
arch/or1k/src/common/up_internal.h
View File

@ -267,8 +267,8 @@ uint32_t *up_doirq(int irq, uint32_t *regs);
/* Exception Handlers */ /* Exception Handlers */
int up_hardfault(int irq, FAR void *context, FAR void *arg); int up_hardfault(int irq, void *context, void *arg);
int up_memfault(int irq, FAR void *context, FAR void *arg); int up_memfault(int irq, void *context, void *arg);
/* Interrupt acknowledge and dispatch */ /* Interrupt acknowledge and dispatch */
@ -343,7 +343,7 @@ void up_usbuninitialize(void);
/* Debug ********************************************************************/ /* Debug ********************************************************************/
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
void up_stack_color(FAR void *stackbase, size_t nbytes); void up_stack_color(void *stackbase, size_t nbytes);
#endif #endif
#undef EXTERN #undef EXTERN

2
arch/or1k/src/common/up_releasestack.c
View File

@ -71,7 +71,7 @@
* *
****************************************************************************/ ****************************************************************************/
void up_release_stack(FAR struct tcb_s *dtcb, uint8_t ttype) void up_release_stack(struct tcb_s *dtcb, uint8_t ttype)
{ {
/* Is there a stack allocated? */ /* Is there a stack allocated? */

6
arch/or1k/src/common/up_stackframe.c
View File

@ -69,9 +69,9 @@
* *
****************************************************************************/ ****************************************************************************/
FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) void *up_stack_frame(struct tcb_s *tcb, size_t frame_size)
{ {
FAR void *ret; void *ret;
/* Align the frame_size */ /* Align the frame_size */
@ -89,7 +89,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size)
/* Save the adjusted stack values in the struct tcb_s */ /* Save the adjusted stack values in the struct tcb_s */
tcb->stack_base_ptr = (FAR uint8_t *)tcb->stack_base_ptr + frame_size; tcb->stack_base_ptr = (uint8_t *)tcb->stack_base_ptr + frame_size;
tcb->adj_stack_size -= frame_size; tcb->adj_stack_size -= frame_size;
/* And return the pointer to the allocated region */ /* And return the pointer to the allocated region */

2
arch/or1k/src/common/up_task_start.c
View File

@ -61,7 +61,7 @@
* *
****************************************************************************/ ****************************************************************************/
void up_task_start(main_t taskentry, int argc, FAR char *argv[]) void up_task_start(main_t taskentry, int argc, char *argv[])
{ {
/* Let sys_call3() do all of the work */ /* Let sys_call3() do all of the work */