From 1d178fcdc75b461af04f8c36b9261c0dac21d06c Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Tue, 12 Oct 2021 21:26:55 +0800 Subject: [PATCH 01/30] [kernel][mem] Multiple instances of small memory allocation algorithm --- components/finsh/msh.c | 12 +- include/rtdef.h | 44 +++- include/rtthread.h | 18 ++ src/Kconfig | 72 ++++-- src/SConscript | 9 +- src/mem.c | 540 +++++++++++++++++++---------------------- src/object.c | 11 + 7 files changed, 385 insertions(+), 321 deletions(-) diff --git a/components/finsh/msh.c b/components/finsh/msh.c index 727f343a689..47ee1efa591 100644 --- a/components/finsh/msh.c +++ b/components/finsh/msh.c @@ -71,14 +71,12 @@ MSH_CMD_EXPORT_ALIAS(cmd_ps, ps, List threads in the system.); #ifdef RT_USING_HEAP int cmd_free(int argc, char **argv) { - extern void list_mem(void); - extern void list_memheap(void); + rt_uint32_t total = 0, used = 0, max_used = 0; -#ifdef RT_USING_MEMHEAP_AS_HEAP - list_memheap(); -#else /* RT_USING_MEMHEAP_AS_HEAP */ - list_mem(); -#endif + rt_memory_info(&total, &used, &max_used); + rt_kprintf("total : %d\n", total); + rt_kprintf("used : %d\n", used); + rt_kprintf("maximum : %d\n", max_used); return 0; } MSH_CMD_EXPORT_ALIAS(cmd_free, free, Show the memory usage in the system.); diff --git a/include/rtdef.h b/include/rtdef.h index 74db37555ae..60e14fb9693 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -431,7 +431,9 @@ enum rt_object_class_type RT_Object_Class_Device = 0x09, /**< The object is a device. */ RT_Object_Class_Timer = 0x0a, /**< The object is a timer. */ RT_Object_Class_Module = 0x0b, /**< The object is a module. */ - RT_Object_Class_Unknown = 0x0c, /**< The object is unknown. */ + RT_Object_Class_Mem = 0x0c, /**< The object is a small memory. */ + RT_Object_Class_Slab = 0x0d, /**< The object is a slab memory. */ + RT_Object_Class_Unknown = 0x0e, /**< The object is unknown. */ RT_Object_Class_Static = 0x80 /**< The object is a static object. */ }; @@ -822,6 +824,46 @@ typedef struct rt_messagequeue *rt_mq_t; * heap & partition */ +#ifdef RT_USING_SMALL_MEM + /** + * memory item on the small mem + */ +struct rt_mem_item +{ + rt_uint16_t magic; /**< magic */ + rt_uint16_t used; /**< used flag */ +#ifdef ARCH_CPU_64BIT + rt_uint32_t resv; +#endif /* ARCH_CPU_64BIT */ + rt_size_t next; /**< next free item */ + rt_size_t prev; /**< prev free item */ +#ifdef RT_USING_MEMTRACE +#ifdef ARCH_CPU_64BIT + rt_uint8_t thread[8]; /**< thread name */ +#else + rt_uint8_t thread[4]; /**< thread name */ +#endif /* ARCH_CPU_64BIT */ +#endif /* RT_USING_MEMTRACE */ +}; + +/** + * Base structure of small memory object + */ + +struct rt_mem +{ + struct rt_object parent; /**< inherit from rt_object */ + struct rt_semaphore heap_sem; + rt_uint8_t *heap_ptr; /**< pointer to the heap */ + struct rt_mem_item *heap_end; + struct rt_mem_item *lfree; + rt_size_t mem_size_aligned; /**< aligned memory size */ + rt_size_t used_mem; + rt_size_t max_mem; + rt_size_t total; +}; +#endif + #ifdef RT_USING_MEMHEAP /** * memory item on the heap diff --git a/include/rtthread.h b/include/rtthread.h index 536ecd6db0a..156e018601a 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -283,6 +283,24 @@ void rt_free_sethook(void (*hook)(void *ptr)); #endif +#ifdef RT_USING_SMALL_MEM +/** + * small memory object interface + */ +rt_err_t rt_mem_init(struct rt_mem *m, + const char *name, + void *begin_addr, + rt_size_t size); +rt_err_t rt_mem_detach(struct rt_mem *m); +void *rt_mem_alloc(struct rt_mem *m, rt_size_t size); +void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize); +void rt_mem_free(struct rt_mem *m, void *rmem); +void rt_mem_info(struct rt_mem *m, + rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used); +#endif + #ifdef RT_USING_MEMHEAP /** * memory heap object interface diff --git a/src/Kconfig b/src/Kconfig index 8647d356988..e7419952990 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -284,36 +284,67 @@ menu "Memory Management" help Using static memory fixed partition + config RT_USING_SMALL_MEM + bool "Using Small Memory Algorithm" + default n + help + Using Small Memory Algorithm + + config RT_USING_SLAB + bool "Using SLAB Memory Algorithm" + default n + help + The slab allocator of RT-Thread is a memory allocation algorithm + optimizedfor embedded systems based on the slab allocator + implemented by Matthew Dillon, founder of dragonfly BSD. + The original slab algorithm is an efficient kernel memory + allocation algorithm introduced by Jeff bonwick for + Solaris Operating System. + menuconfig RT_USING_MEMHEAP - bool "Using memory heap object" + bool "Using memheap Memory Algorithm" default n if RT_USING_MEMHEAP - - if RT_USING_MEMHEAP_AS_HEAP - config RT_USING_MEMHEAP_AUTO_BINDING - bool "Use all of memheap objects as heap" - default y - endif + choice + prompt "Memheap memory allocation mode" + default RT_MEMHEAP_FAST_MODE + + config RT_MEMHEAP_FAST_MODE + bool "fast mode" + help + Speed priority mode. + As long as the memory block size meets the requirements, the search ends immediately. + + config RT_MEMHEAP_BSET_MODE + bool "best mode" + help + Best size first. + The search does not end until the memory block of the most appropriate size is found + endchoice endif choice - prompt "Dynamic Memory Management" - default RT_USING_SMALL_MEM - - config RT_USING_NOHEAP - bool "Disable Heap" + prompt "System Heap Memory Management" + default RT_USING_SMALL_MEM_AS_HEAP - config RT_USING_SMALL_MEM + config RT_USING_SMALL_MEM_AS_HEAP bool "Small Memory Algorithm" + select RT_USING_SMALL_MEM - config RT_USING_SLAB - bool "SLAB Algorithm for large memory" - - if RT_USING_MEMHEAP config RT_USING_MEMHEAP_AS_HEAP bool "Use memheap objects as heap" - endif + select RT_USING_MEMHEAP + + if RT_USING_MEMHEAP_AS_HEAP + config RT_USING_MEMHEAP_AUTO_BINDING + bool "Use all of memheap objects as heap" + default y + endif + + config RT_USING_SLAB_AS_HEAP + bool "SLAB Algorithm for large memory" + select RT_USING_SLAB config RT_USING_USERHEAP bool "Use user heap" @@ -322,10 +353,11 @@ menu "Memory Management" rt_malloc(), rt_malloc_sethook() rt_free(), rt_free_sethook() rt_calloc(), rt_realloc() + rt_memory_info() rt_system_heap_init() - And if FinSH is used at the same time, please implement list_mem() - + config RT_USING_NOHEAP + bool "Disable Heap" endchoice config RT_USING_MEMTRACE diff --git a/src/SConscript b/src/SConscript index 68523978d64..3f014551f00 100644 --- a/src/SConscript +++ b/src/SConscript @@ -6,10 +6,10 @@ src = Glob('*.c') CPPPATH = [RTT_ROOT + '/include'] -if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SMALL_MEM') == False: +if GetDepend('RT_USING_SMALL_MEM') == False: SrcRemove(src, ['mem.c']) -if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SLAB') == False: +if GetDepend('RT_USING_SLAB') == False: SrcRemove(src, ['slab.c']) if GetDepend('RT_USING_MEMPOOL') == False: @@ -17,11 +17,6 @@ if GetDepend('RT_USING_MEMPOOL') == False: if GetDepend('RT_USING_MEMHEAP') == False: SrcRemove(src, ['memheap.c']) - if GetDepend('RT_USING_MEMHEAP_AS_HEAP'): - SrcRemove(src, ['mem.c']) - -if GetDepend('RT_USING_USERHEAP'): - SrcRemove(src, ['mem.c', 'slab.c']) if GetDepend('RT_USING_SIGNALS') == False: SrcRemove(src, ['signal.c']) diff --git a/src/mem.c b/src/mem.c index 3c0816748ec..70835aa8802 100644 --- a/src/mem.c +++ b/src/mem.c @@ -50,73 +50,8 @@ #include #include -#ifndef RT_USING_MEMHEAP_AS_HEAP - -#define RT_MEM_STATS - -#if defined (RT_USING_HEAP) && defined (RT_USING_SMALL_MEM) -#ifdef RT_USING_HOOK -static void (*rt_malloc_hook)(void *ptr, rt_size_t size); -static void (*rt_free_hook)(void *ptr); - -/** - * @addtogroup Hook - */ - -/**@{*/ - -/** - * @brief This function will set a hook function, which will be invoked when a memory - * block is allocated from heap memory. - * - * @param hook the hook function. - */ -void rt_malloc_sethook(void (*hook)(void *ptr, rt_size_t size)) -{ - rt_malloc_hook = hook; -} - -/** - * @brief This function will set a hook function, which will be invoked when a memory - * block is released to heap memory. - * - * @param hook the hook function - */ -void rt_free_sethook(void (*hook)(void *ptr)) -{ - rt_free_hook = hook; -} - -/**@}*/ - -#endif /* RT_USING_HOOK */ - +#if defined (RT_USING_SMALL_MEM) #define HEAP_MAGIC 0x1ea0 -struct heap_mem -{ - /* magic and used flag */ - rt_uint16_t magic; - rt_uint16_t used; -#ifdef ARCH_CPU_64BIT - rt_uint32_t resv; -#endif /* ARCH_CPU_64BIT */ - - rt_size_t next, prev; - -#ifdef RT_USING_MEMTRACE -#ifdef ARCH_CPU_64BIT - rt_uint8_t thread[8]; -#else - rt_uint8_t thread[4]; /* thread name */ -#endif /* ARCH_CPU_64BIT */ -#endif /* RT_USING_MEMTRACE */ -}; - -/** pointer to the heap: for alignment, heap_ptr is now a pointer instead of an array */ -static rt_uint8_t *heap_ptr; - -/** the last entry, always unused! */ -static struct heap_mem *heap_end; #ifdef ARCH_CPU_64BIT #define MIN_SIZE 24 @@ -125,19 +60,10 @@ static struct heap_mem *heap_end; #endif /* ARCH_CPU_64BIT */ #define MIN_SIZE_ALIGNED RT_ALIGN(MIN_SIZE, RT_ALIGN_SIZE) -#define SIZEOF_STRUCT_MEM RT_ALIGN(sizeof(struct heap_mem), RT_ALIGN_SIZE) - -static struct heap_mem *lfree; /* pointer to the lowest free block */ - -static struct rt_semaphore heap_sem; -static rt_size_t mem_size_aligned; - -#ifdef RT_MEM_STATS -static rt_size_t used_mem, max_mem; -#endif /* RT_MEM_STATS */ +#define SIZEOF_STRUCT_MEM RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE) #ifdef RT_USING_MEMTRACE -rt_inline void rt_mem_setname(struct heap_mem *mem, const char *name) +rt_inline void rt_mem_setname(struct rt_mem_item *mem, const char *name) { int index; for (index = 0; index < sizeof(mem->thread); index ++) @@ -153,86 +79,97 @@ rt_inline void rt_mem_setname(struct heap_mem *mem, const char *name) } #endif /* RT_USING_MEMTRACE */ -static void plug_holes(struct heap_mem *mem) +static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) { - struct heap_mem *nmem; - struct heap_mem *pmem; + struct rt_mem_item *nmem; + struct rt_mem_item *pmem; - RT_ASSERT((rt_uint8_t *)mem >= heap_ptr); - RT_ASSERT((rt_uint8_t *)mem < (rt_uint8_t *)heap_end); + RT_ASSERT((rt_uint8_t *)mem >= m->heap_ptr); + RT_ASSERT((rt_uint8_t *)mem < (rt_uint8_t *)m->heap_end); RT_ASSERT(mem->used == 0); /* plug hole forward */ - nmem = (struct heap_mem *)&heap_ptr[mem->next]; + nmem = (struct rt_mem_item *)&m->heap_ptr[mem->next]; if (mem != nmem && nmem->used == 0 && - (rt_uint8_t *)nmem != (rt_uint8_t *)heap_end) + (rt_uint8_t *)nmem != (rt_uint8_t *)m->heap_end) { - /* if mem->next is unused and not end of heap_ptr, + /* if mem->next is unused and not end of m->heap_ptr, * combine mem and mem->next */ - if (lfree == nmem) + if (m->lfree == nmem) { - lfree = mem; + m->lfree = mem; } mem->next = nmem->next; - ((struct heap_mem *)&heap_ptr[nmem->next])->prev = (rt_uint8_t *)mem - heap_ptr; + ((struct rt_mem_item *)&m->heap_ptr[nmem->next])->prev = (rt_uint8_t *)mem - m->heap_ptr; } /* plug hole backward */ - pmem = (struct heap_mem *)&heap_ptr[mem->prev]; + pmem = (struct rt_mem_item *)&m->heap_ptr[mem->prev]; if (pmem != mem && pmem->used == 0) { /* if mem->prev is unused, combine mem and mem->prev */ - if (lfree == mem) + if (m->lfree == mem) { - lfree = pmem; + m->lfree = pmem; } pmem->next = mem->next; - ((struct heap_mem *)&heap_ptr[mem->next])->prev = (rt_uint8_t *)pmem - heap_ptr; + ((struct rt_mem_item *)&m->heap_ptr[mem->next])->prev = (rt_uint8_t *)pmem - m->heap_ptr; } } /** - * @brief This function will initialize system heap memory. + * @brief This function will initialize small memory management algorithm. + * + * @param m the small memory management object. * - * @param begin_addr the beginning address of system heap memory. + * @param begin_addr the beginning address of memory. * - * @param end_addr the end address of system heap memory. + * @param end_addr the end address of memory. + * + * @return RT_EOK */ -void rt_system_heap_init(void *begin_addr, void *end_addr) +rt_err_t rt_mem_init(struct rt_mem *m, + const char *name, + void *begin_addr, + rt_size_t size) { - struct heap_mem *mem; + struct rt_mem_item *mem; + rt_ubase_t begin_align = RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); - rt_ubase_t end_align = RT_ALIGN_DOWN((rt_ubase_t)end_addr, RT_ALIGN_SIZE); + rt_ubase_t end_align = RT_ALIGN_DOWN((rt_ubase_t)begin_addr + size, RT_ALIGN_SIZE); - RT_DEBUG_NOT_IN_INTERRUPT; + RT_ASSERT(m != RT_NULL); /* alignment addr */ if ((end_align > (2 * SIZEOF_STRUCT_MEM)) && ((end_align - 2 * SIZEOF_STRUCT_MEM) >= begin_align)) { /* calculate the aligned memory size */ - mem_size_aligned = end_align - begin_align - 2 * SIZEOF_STRUCT_MEM; + m->mem_size_aligned = end_align - begin_align - 2 * SIZEOF_STRUCT_MEM; } else { rt_kprintf("mem init, error begin address 0x%x, and end address 0x%x\n", - (rt_ubase_t)begin_addr, (rt_ubase_t)end_addr); + (rt_ubase_t)begin_addr, (rt_ubase_t)begin_addr + size); - return; + return -RT_EINVAL; } + /* initialize pool object */ + rt_object_init(&(m->parent), RT_Object_Class_Mem, name); + /* point to begin address of heap */ - heap_ptr = (rt_uint8_t *)begin_align; + m->heap_ptr = (rt_uint8_t *)begin_align; RT_DEBUG_LOG(RT_DEBUG_MEM, ("mem init, heap begin address 0x%x, size %d\n", - (rt_ubase_t)heap_ptr, mem_size_aligned)); + (rt_ubase_t)m->heap_ptr, m->mem_size_aligned)); /* initialize the start of the heap */ - mem = (struct heap_mem *)heap_ptr; + mem = (struct rt_mem_item *)m->heap_ptr; mem->magic = HEAP_MAGIC; - mem->next = mem_size_aligned + SIZEOF_STRUCT_MEM; + mem->next = m->mem_size_aligned + SIZEOF_STRUCT_MEM; mem->prev = 0; mem->used = 0; #ifdef RT_USING_MEMTRACE @@ -240,20 +177,43 @@ void rt_system_heap_init(void *begin_addr, void *end_addr) #endif /* RT_USING_MEMTRACE */ /* initialize the end of the heap */ - heap_end = (struct heap_mem *)&heap_ptr[mem->next]; - heap_end->magic = HEAP_MAGIC; - heap_end->used = 1; - heap_end->next = mem_size_aligned + SIZEOF_STRUCT_MEM; - heap_end->prev = mem_size_aligned + SIZEOF_STRUCT_MEM; + m->heap_end = (struct rt_mem_item *)&m->heap_ptr[mem->next]; + m->heap_end->magic = HEAP_MAGIC; + m->heap_end->used = 1; + m->heap_end->next = m->mem_size_aligned + SIZEOF_STRUCT_MEM; + m->heap_end->prev = m->mem_size_aligned + SIZEOF_STRUCT_MEM; #ifdef RT_USING_MEMTRACE - rt_mem_setname(heap_end, "INIT"); + rt_mem_setname(m->heap_end, "INIT"); #endif /* RT_USING_MEMTRACE */ - rt_sem_init(&heap_sem, "heap", 1, RT_IPC_FLAG_PRIO); + rt_sem_init(&m->heap_sem, "heap", 1, RT_IPC_FLAG_PRIO); /* initialize the lowest-free pointer to the start of the heap */ - lfree = (struct heap_mem *)heap_ptr; + m->lfree = (struct rt_mem_item *)m->heap_ptr; + + return RT_EOK; } +RTM_EXPORT(rt_mem_init); + +/** + * @brief This function will remove a small mem from the system. + * + * @param m the small memory management object. + * + * @return RT_EOK + */ +rt_err_t rt_mem_detach(struct rt_mem *m) +{ + RT_ASSERT(m != RT_NULL); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_is_systemobject(&m->parent)); + + rt_sem_detach(&m->heap_sem); + rt_object_detach(&(m->parent)); + + return RT_EOK; +} +RTM_EXPORT(rt_mem_detach); /** * @addtogroup MM @@ -264,19 +224,23 @@ void rt_system_heap_init(void *begin_addr, void *end_addr) /** * @brief Allocate a block of memory with a minimum of 'size' bytes. * + * @param m the small memory management object. + * * @param size is the minimum size of the requested block in bytes. * * @return the pointer to allocated memory or NULL if no free memory was found. */ -void *rt_malloc(rt_size_t size) +void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) { rt_size_t ptr, ptr2; - struct heap_mem *mem, *mem2; + struct rt_mem_item *mem, *mem2; if (size == 0) return RT_NULL; - RT_DEBUG_NOT_IN_INTERRUPT; + RT_ASSERT(m != RT_NULL); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_is_systemobject(&m->parent)); if (size != RT_ALIGN(size, RT_ALIGN_SIZE)) RT_DEBUG_LOG(RT_DEBUG_MEM, ("malloc size %d, but align to %d\n", @@ -287,7 +251,7 @@ void *rt_malloc(rt_size_t size) /* alignment size */ size = RT_ALIGN(size, RT_ALIGN_SIZE); - if (size > mem_size_aligned) + if (size > m->mem_size_aligned) { RT_DEBUG_LOG(RT_DEBUG_MEM, ("no memory\n")); @@ -299,13 +263,13 @@ void *rt_malloc(rt_size_t size) size = MIN_SIZE_ALIGNED; /* take memory semaphore */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); - for (ptr = (rt_uint8_t *)lfree - heap_ptr; - ptr < mem_size_aligned - size; - ptr = ((struct heap_mem *)&heap_ptr[ptr])->next) + for (ptr = (rt_uint8_t *)m->lfree - m->heap_ptr; + ptr < m->mem_size_aligned - size; + ptr = ((struct rt_mem_item *)&m->heap_ptr[ptr])->next) { - mem = (struct heap_mem *)&heap_ptr[ptr]; + mem = (struct rt_mem_item *)&m->heap_ptr[ptr]; if ((!mem->used) && (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) { @@ -315,12 +279,12 @@ void *rt_malloc(rt_size_t size) if (mem->next - (ptr + SIZEOF_STRUCT_MEM) >= (size + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED)) { - /* (in addition to the above, we test if another struct heap_mem (SIZEOF_STRUCT_MEM) containing + /* (in addition to the above, we test if another struct rt_mem_item (SIZEOF_STRUCT_MEM) containing * at least MIN_SIZE_ALIGNED of data also fits in the 'user data space' of 'mem') * -> split large block, create empty remainder, * remainder must be large enough to contain MIN_SIZE_ALIGNED data: if * mem->next - (ptr + (2*SIZEOF_STRUCT_MEM)) == size, - * struct heap_mem would fit in but no data between mem2 and mem2->next + * struct rt_mem_item would fit in but no data between mem2 and mem2->next * @todo we could leave out MIN_SIZE_ALIGNED. We would create an empty * region that couldn't hold data, but when mem->next gets freed, * the 2 regions would be combined, resulting in more free memory @@ -328,7 +292,7 @@ void *rt_malloc(rt_size_t size) ptr2 = ptr + SIZEOF_STRUCT_MEM + size; /* create mem2 struct */ - mem2 = (struct heap_mem *)&heap_ptr[ptr2]; + mem2 = (struct rt_mem_item *)&m->heap_ptr[ptr2]; mem2->magic = HEAP_MAGIC; mem2->used = 0; mem2->next = mem->next; @@ -341,15 +305,13 @@ void *rt_malloc(rt_size_t size) mem->next = ptr2; mem->used = 1; - if (mem2->next != mem_size_aligned + SIZEOF_STRUCT_MEM) + if (mem2->next != m->mem_size_aligned + SIZEOF_STRUCT_MEM) { - ((struct heap_mem *)&heap_ptr[mem2->next])->prev = ptr2; + ((struct rt_mem_item *)&m->heap_ptr[mem2->next])->prev = ptr2; } -#ifdef RT_MEM_STATS - used_mem += (size + SIZEOF_STRUCT_MEM); - if (max_mem < used_mem) - max_mem = used_mem; -#endif /* RT_MEM_STATS */ + m->used_mem += (size + SIZEOF_STRUCT_MEM); + if (m->max_mem < m->used_mem) + m->max_mem = m->used_mem; } else { @@ -361,11 +323,9 @@ void *rt_malloc(rt_size_t size) * will always be used at this point! */ mem->used = 1; -#ifdef RT_MEM_STATS - used_mem += mem->next - ((rt_uint8_t *)mem - heap_ptr); - if (max_mem < used_mem) - max_mem = used_mem; -#endif /* RT_MEM_STATS */ + m->used_mem += mem->next - ((rt_uint8_t *)mem - m->heap_ptr); + if (m->max_mem < m->used_mem) + m->max_mem = m->used_mem; } /* set memory block magic */ mem->magic = HEAP_MAGIC; @@ -376,60 +336,64 @@ void *rt_malloc(rt_size_t size) rt_mem_setname(mem, "NONE"); #endif /* RT_USING_MEMTRACE */ - if (mem == lfree) + if (mem == m->lfree) { /* Find next free block after mem and update lowest free pointer */ - while (lfree->used && lfree != heap_end) - lfree = (struct heap_mem *)&heap_ptr[lfree->next]; + while (m->lfree->used && m->lfree != m->heap_end) + m->lfree = (struct rt_mem_item *)&m->heap_ptr[m->lfree->next]; - RT_ASSERT(((lfree == heap_end) || (!lfree->used))); + RT_ASSERT(((m->lfree == m->heap_end) || (!m->lfree->used))); } - rt_sem_release(&heap_sem); - RT_ASSERT((rt_ubase_t)mem + SIZEOF_STRUCT_MEM + size <= (rt_ubase_t)heap_end); + rt_sem_release(&m->heap_sem); + RT_ASSERT((rt_ubase_t)mem + SIZEOF_STRUCT_MEM + size <= (rt_ubase_t)m->heap_end); RT_ASSERT((rt_ubase_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM) % RT_ALIGN_SIZE == 0); RT_ASSERT((((rt_ubase_t)mem) & (RT_ALIGN_SIZE - 1)) == 0); RT_DEBUG_LOG(RT_DEBUG_MEM, ("allocate memory at 0x%x, size: %d\n", (rt_ubase_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM), - (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - heap_ptr)))); - - RT_OBJECT_HOOK_CALL(rt_malloc_hook, - (((void *)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM)), size)); + (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - m->heap_ptr)))); /* return the memory data except mem struct */ return (rt_uint8_t *)mem + SIZEOF_STRUCT_MEM; } } - rt_sem_release(&heap_sem); + rt_sem_release(&m->heap_sem); return RT_NULL; } -RTM_EXPORT(rt_malloc); +RTM_EXPORT(rt_mem_alloc); /** * @brief This function will change the size of previously allocated memory block. * - * @param rmem is the pointer to memory allocated by rt_malloc. + * @param m the small memory management object. + * + * @param rmem is the pointer to memory allocated by rt_mem_alloc. * * @param newsize is the required new size. * * @return the changed memory block address. */ -void *rt_realloc(void *rmem, rt_size_t newsize) +void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) { rt_size_t size; rt_size_t ptr, ptr2; - struct heap_mem *mem, *mem2; + struct rt_mem_item *mem, *mem2; void *nmem; - RT_DEBUG_NOT_IN_INTERRUPT; + RT_ASSERT(m != RT_NULL); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_is_systemobject(&m->parent)); + RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); + RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && + (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); /* alignment size */ newsize = RT_ALIGN(newsize, RT_ALIGN_SIZE); - if (newsize > mem_size_aligned) + if (newsize > m->mem_size_aligned) { RT_DEBUG_LOG(RT_DEBUG_MEM, ("realloc: out of memory\n")); @@ -437,46 +401,43 @@ void *rt_realloc(void *rmem, rt_size_t newsize) } else if (newsize == 0) { - rt_free(rmem); + rt_mem_free(m, rmem); return RT_NULL; } /* allocate a new memory block */ if (rmem == RT_NULL) - return rt_malloc(newsize); + return rt_mem_alloc(m, newsize); - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); - if ((rt_uint8_t *)rmem < (rt_uint8_t *)heap_ptr || - (rt_uint8_t *)rmem >= (rt_uint8_t *)heap_end) + if ((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_ptr || + (rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_end) { /* illegal memory */ - rt_sem_release(&heap_sem); + rt_sem_release(&m->heap_sem); return rmem; } - mem = (struct heap_mem *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); + mem = (struct rt_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); - ptr = (rt_uint8_t *)mem - heap_ptr; + ptr = (rt_uint8_t *)mem - m->heap_ptr; size = mem->next - ptr - SIZEOF_STRUCT_MEM; if (size == newsize) { /* the size is the same as */ - rt_sem_release(&heap_sem); - + rt_sem_release(&m->heap_sem); return rmem; } if (newsize + SIZEOF_STRUCT_MEM + MIN_SIZE < size) { /* split memory block */ -#ifdef RT_MEM_STATS - used_mem -= (size - newsize); -#endif /* RT_MEM_STATS */ + m->used_mem -= (size - newsize); ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize; - mem2 = (struct heap_mem *)&heap_ptr[ptr2]; + mem2 = (struct rt_mem_item *)&m->heap_ptr[ptr2]; mem2->magic = HEAP_MAGIC; mem2->used = 0; mem2->next = mem->next; @@ -485,105 +446,76 @@ void *rt_realloc(void *rmem, rt_size_t newsize) rt_mem_setname(mem2, " "); #endif /* RT_USING_MEMTRACE */ mem->next = ptr2; - if (mem2->next != mem_size_aligned + SIZEOF_STRUCT_MEM) + if (mem2->next != m->mem_size_aligned + SIZEOF_STRUCT_MEM) { - ((struct heap_mem *)&heap_ptr[mem2->next])->prev = ptr2; + ((struct rt_mem_item *)&m->heap_ptr[mem2->next])->prev = ptr2; } - if (mem2 < lfree) + if (mem2 < m->lfree) { /* the splited struct is now the lowest */ - lfree = mem2; + m->lfree = mem2; } - plug_holes(mem2); + plug_holes(m, mem2); - rt_sem_release(&heap_sem); + rt_sem_release(&m->heap_sem); return rmem; } - rt_sem_release(&heap_sem); + rt_sem_release(&m->heap_sem); /* expand memory */ - nmem = rt_malloc(newsize); + nmem = rt_mem_alloc(m, newsize); if (nmem != RT_NULL) /* check memory */ { rt_memcpy(nmem, rmem, size < newsize ? size : newsize); - rt_free(rmem); + rt_mem_free(m, rmem); } return nmem; } -RTM_EXPORT(rt_realloc); - -/** - * @brief This function will contiguously allocate enough space for count objects - * that are size bytes of memory each and returns a pointer to the allocated - * memory. - * - * @note The allocated memory is filled with bytes of value zero. - * - * @param count is the number of objects to allocate. - * - * @param size is the size of one object to allocate. - * - * @return pointer to allocated memory / NULL pointer if there is an error. - */ -void *rt_calloc(rt_size_t count, rt_size_t size) -{ - void *p; - - /* allocate 'count' objects of size 'size' */ - p = rt_malloc(count * size); - - /* zero the memory */ - if (p) - rt_memset(p, 0, count * size); - - return p; -} -RTM_EXPORT(rt_calloc); +RTM_EXPORT(rt_mem_realloc); /** * @brief This function will release the previously allocated memory block by - * rt_malloc. The released memory block is taken back to system heap. + * rt_mem_alloc. The released memory block is taken back to system heap. * * @param rmem the address of memory which will be released. */ -void rt_free(void *rmem) +void rt_mem_free(struct rt_mem *m, void *rmem) { - struct heap_mem *mem; + struct rt_mem_item *mem; if (rmem == RT_NULL) return; - RT_DEBUG_NOT_IN_INTERRUPT; - + RT_ASSERT(m != RT_NULL); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_is_systemobject(&m->parent)); RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); - RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)heap_ptr && - (rt_uint8_t *)rmem < (rt_uint8_t *)heap_end); - - RT_OBJECT_HOOK_CALL(rt_free_hook, (rmem)); + RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && + (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); - if ((rt_uint8_t *)rmem < (rt_uint8_t *)heap_ptr || - (rt_uint8_t *)rmem >= (rt_uint8_t *)heap_end) + if ((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_ptr || + (rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_end) { RT_DEBUG_LOG(RT_DEBUG_MEM, ("illegal memory\n")); return; } - /* Get the corresponding struct heap_mem ... */ - mem = (struct heap_mem *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); + /* Get the corresponding struct rt_mem_item ... */ + mem = (struct rt_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); RT_DEBUG_LOG(RT_DEBUG_MEM, ("release memory 0x%x, size: %d\n", (rt_ubase_t)rmem, - (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - heap_ptr)))); + (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - m->heap_ptr)))); /* protect the heap from concurrent access */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); /* ... which has to be in a used state ... */ if (!mem->used || mem->magic != HEAP_MAGIC) @@ -600,80 +532,99 @@ void rt_free(void *rmem) rt_mem_setname(mem, " "); #endif /* RT_USING_MEMTRACE */ - if (mem < lfree) + if (mem < m->lfree) { /* the newly freed struct is now the lowest */ - lfree = mem; + m->lfree = mem; } -#ifdef RT_MEM_STATS - used_mem -= (mem->next - ((rt_uint8_t *)mem - heap_ptr)); -#endif /* RT_MEM_STATS */ + m->used_mem -= (mem->next - ((rt_uint8_t *)mem - m->heap_ptr)); /* finally, see if prev or next are free also */ - plug_holes(mem); - rt_sem_release(&heap_sem); + plug_holes(m, mem); + rt_sem_release(&m->heap_sem); } -RTM_EXPORT(rt_free); +RTM_EXPORT(rt_mem_free); -#ifdef RT_MEM_STATS /** * @brief This function will caculate the total memory, the used memory, and * the max used memory. * +* @param m the small memory management object. +* * @param total is a pointer to get the total size of the memory. * * @param used is a pointer to get the size of memory used. * * @param max_used is a pointer to get the maximum memory used. */ -void rt_memory_info(rt_uint32_t *total, - rt_uint32_t *used, - rt_uint32_t *max_used) +void rt_mem_info(struct rt_mem *m, + rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used) { + RT_ASSERT(m != RT_NULL); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_is_systemobject(&m->parent)); + if (total != RT_NULL) - *total = mem_size_aligned; + *total = m->mem_size_aligned; if (used != RT_NULL) - *used = used_mem; + *used = m->used_mem; if (max_used != RT_NULL) - *max_used = max_mem; + *max_used = m->max_mem; } +RTM_EXPORT(rt_mem_info); #ifdef RT_USING_FINSH #include -void list_mem(void) -{ - rt_kprintf("total memory: %d\n", mem_size_aligned); - rt_kprintf("used memory : %d\n", used_mem); - rt_kprintf("maximum allocated memory: %d\n", max_mem); -} -FINSH_FUNCTION_EXPORT(list_mem, list memory usage information) - #ifdef RT_USING_MEMTRACE -int memcheck(void) +int memcheck(int argc, char *argv[]) { int position; rt_ubase_t level; - struct heap_mem *mem; + struct rt_mem_item *mem; + struct rt_mem *m; + struct rt_object_information *information; + struct rt_list_node *node; + struct rt_object *object; + char *name; + + name = argc > 1 ? argv[1] : RT_NULL; level = rt_hw_interrupt_disable(); - for (mem = (struct heap_mem *)heap_ptr; mem != heap_end; mem = (struct heap_mem *)&heap_ptr[mem->next]) + /* get mem object */ + information = rt_object_get_information(RT_Object_Class_Mem); + for (node = information->object_list.next; + node != &(information->object_list); + node = node->next) { - position = (rt_ubase_t)mem - (rt_ubase_t)heap_ptr; - if (position < 0) goto __exit; - if (position > (int)mem_size_aligned) goto __exit; - if (mem->magic != HEAP_MAGIC) goto __exit; - if (mem->used != 0 && mem->used != 1) goto __exit; + object = rt_list_entry(node, struct rt_object, list); + /* find the specified object */ + if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0) + continue; + /* mem object */ + m = (struct rt_mem *)object; + /* check mem */ + for (mem = (struct rt_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_mem_item *)&m->heap_ptr[mem->next]) + { + position = (rt_ubase_t)mem - (rt_ubase_t)m->heap_ptr; + if (position < 0) goto __exit; + if (position > (int)m->mem_size_aligned) goto __exit; + if (mem->magic != HEAP_MAGIC) goto __exit; + if (mem->used != 0 && mem->used != 1) goto __exit; + } } rt_hw_interrupt_enable(level); return 0; __exit: rt_kprintf("Memory block wrong:\n"); + rt_kprintf(" name: %s\n", m->parent.name); rt_kprintf("address: 0x%08x\n", mem); rt_kprintf(" magic: 0x%04x\n", mem->magic); rt_kprintf(" used: %d\n", mem->used); - rt_kprintf(" size: %d\n", mem->next - position - SIZEOF_STRUCT_MEM); + rt_kprintf(" size: %d\n", mem->next - position - SIZEOF_STRUCT_MEM); rt_hw_interrupt_enable(level); return 0; @@ -682,47 +633,64 @@ MSH_CMD_EXPORT(memcheck, check memory data); int memtrace(int argc, char **argv) { - struct heap_mem *mem; + struct rt_mem_item *mem; + struct rt_mem *m; + struct rt_object_information *information; + struct rt_list_node *node; + struct rt_object *object; + char *name; + + name = argc > 1 ? argv[1] : RT_NULL; + /* get mem object */ + information = rt_object_get_information(RT_Object_Class_Mem); + for (node = information->object_list.next; + node != &(information->object_list); + node = node->next) + { + object = rt_list_entry(node, struct rt_object, list); + /* find the specified object */ + if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0) + continue; + /* mem object */ + m = (struct rt_mem *)object; + /* show memory information */ + rt_kprintf("\nmemory heap address:\n"); + rt_kprintf("name : %s\n", m->parent.name); + rt_kprintf("total : 0x%d\n", m->mem_size_aligned); + rt_kprintf("used : 0x%d\n", m->used_mem); + rt_kprintf("max_used: 0x%d\n", m->max_mem); + rt_kprintf("heap_ptr: 0x%08x\n", m->heap_ptr); + rt_kprintf("lfree : 0x%08x\n", m->lfree); + rt_kprintf("heap_end: 0x%08x\n", m->heap_end); + rt_kprintf("\n--memory item information --\n"); + for (mem = (struct rt_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_mem_item *)&m->heap_ptr[mem->next]) + { + int position = (rt_ubase_t)mem - (rt_ubase_t)m->heap_ptr; + int size; - list_mem(); + rt_kprintf("[0x%08x - ", mem); - rt_kprintf("\nmemory heap address:\n"); - rt_kprintf("heap_ptr: 0x%08x\n", heap_ptr); - rt_kprintf("lfree : 0x%08x\n", lfree); - rt_kprintf("heap_end: 0x%08x\n", heap_end); + size = mem->next - position - SIZEOF_STRUCT_MEM; + if (size < 1024) + rt_kprintf("%5d", size); + else if (size < 1024 * 1024) + rt_kprintf("%4dK", size / 1024); + else + rt_kprintf("%4dM", size / (1024 * 1024)); - rt_kprintf("\n--memory item information --\n"); - for (mem = (struct heap_mem *)heap_ptr; mem != heap_end; mem = (struct heap_mem *)&heap_ptr[mem->next]) - { - int position = (rt_ubase_t)mem - (rt_ubase_t)heap_ptr; - int size; - - rt_kprintf("[0x%08x - ", mem); - - size = mem->next - position - SIZEOF_STRUCT_MEM; - if (size < 1024) - rt_kprintf("%5d", size); - else if (size < 1024 * 1024) - rt_kprintf("%4dK", size / 1024); - else - rt_kprintf("%4dM", size / (1024 * 1024)); - - rt_kprintf("] %c%c%c%c", mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]); - if (mem->magic != HEAP_MAGIC) - rt_kprintf(": ***\n"); - else - rt_kprintf("\n"); + rt_kprintf("] %c%c%c%c", mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]); + if (mem->magic != HEAP_MAGIC) + rt_kprintf(": ***\n"); + else + rt_kprintf("\n"); + } } - return 0; } MSH_CMD_EXPORT(memtrace, dump memory trace information); #endif /* RT_USING_MEMTRACE */ #endif /* RT_USING_FINSH */ -#endif /* defined (RT_USING_HEAP) && defined (RT_USING_SMALL_MEM) */ +#endif /* defined (RT_USING_SMALL_MEM) */ /**@}*/ - -#endif /* RT_MEM_STATS */ -#endif /* RT_USING_MEMHEAP_AS_HEAP */ diff --git a/src/object.c b/src/object.c index 66d5775bd76..6d273021160 100644 --- a/src/object.c +++ b/src/object.c @@ -55,6 +55,12 @@ enum rt_object_info_type RT_Object_Info_Timer, /**< The object is a timer. */ #ifdef RT_USING_MODULE RT_Object_Info_Module, /**< The object is a module. */ +#endif +#ifdef RT_USING_SMALL_MEM + RT_Object_Info_Mem, /**< The object is a small memory. */ +#endif +#ifdef RT_USING_SLAB + RT_Object_Info_Slab, /**< The object is a slab memory. */ #endif RT_Object_Info_Unknown, /**< The object is unknown. */ }; @@ -104,6 +110,11 @@ static struct rt_object_information _object_container[RT_Object_Info_Unknown] = /* initialize object container - module */ {RT_Object_Class_Module, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Module), sizeof(struct rt_dlmodule)}, #endif +#ifdef RT_USING_SMALL_MEM + /* initialize object container - small memory */ + {RT_Object_Class_Mem, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Mem), sizeof(struct rt_mem)}, +#endif +#endif }; #ifdef RT_USING_HOOK From 33d5ca8e334e0e78a975588eec3ce950a2cb75f6 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 17:08:52 +0800 Subject: [PATCH 02/30] [kernel][mem] Change small memory management algorithm memory header flag --- include/rtdef.h | 8 ++-- include/rtthread.h | 2 +- src/mem.c | 94 +++++++++++++++++++++------------------------- 3 files changed, 46 insertions(+), 58 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index 60e14fb9693..3d51af3b6ff 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -830,8 +830,7 @@ typedef struct rt_messagequeue *rt_mq_t; */ struct rt_mem_item { - rt_uint16_t magic; /**< magic */ - rt_uint16_t used; /**< used flag */ + rt_ubase_t pool_ptr; /**< small memory object addr */ #ifdef ARCH_CPU_64BIT rt_uint32_t resv; #endif /* ARCH_CPU_64BIT */ @@ -858,9 +857,8 @@ struct rt_mem struct rt_mem_item *heap_end; struct rt_mem_item *lfree; rt_size_t mem_size_aligned; /**< aligned memory size */ - rt_size_t used_mem; - rt_size_t max_mem; - rt_size_t total; + rt_size_t used_mem; /**< size used */ + rt_size_t max_mem; /**< maximum allocated size */ }; #endif diff --git a/include/rtthread.h b/include/rtthread.h index 156e018601a..b0f1bbd516e 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -294,7 +294,7 @@ rt_err_t rt_mem_init(struct rt_mem *m, rt_err_t rt_mem_detach(struct rt_mem *m); void *rt_mem_alloc(struct rt_mem *m, rt_size_t size); void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize); -void rt_mem_free(struct rt_mem *m, void *rmem); +void rt_mem_free(void *rmem); void rt_mem_info(struct rt_mem *m, rt_uint32_t *total, rt_uint32_t *used, diff --git a/src/mem.c b/src/mem.c index 70835aa8802..0ada464deb3 100644 --- a/src/mem.c +++ b/src/mem.c @@ -59,6 +59,14 @@ #define MIN_SIZE 12 #endif /* ARCH_CPU_64BIT */ +#define MEM_MASK 0xfffffffe +#define MEM_USED() ((((rt_base_t)(m)) & MEM_MASK) | 0x1) +#define MEM_FREED() ((((rt_base_t)(m)) & MEM_MASK) | 0x0) +#define MEM_ISUSED(_mem) \ + (((rt_base_t)(((struct rt_mem_item *)(_mem))->pool_ptr)) & (~MEM_MASK)) +#define MEM_POOL(_mem) \ + ((struct rt_mem *)(((rt_base_t)(((struct rt_mem_item *)(_mem))->pool_ptr)) & (MEM_MASK))) + #define MIN_SIZE_ALIGNED RT_ALIGN(MIN_SIZE, RT_ALIGN_SIZE) #define SIZEOF_STRUCT_MEM RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE) @@ -86,12 +94,10 @@ static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) RT_ASSERT((rt_uint8_t *)mem >= m->heap_ptr); RT_ASSERT((rt_uint8_t *)mem < (rt_uint8_t *)m->heap_end); - RT_ASSERT(mem->used == 0); /* plug hole forward */ nmem = (struct rt_mem_item *)&m->heap_ptr[mem->next]; - if (mem != nmem && - nmem->used == 0 && + if (mem != nmem && !MEM_ISUSED(nmem) && (rt_uint8_t *)nmem != (rt_uint8_t *)m->heap_end) { /* if mem->next is unused and not end of m->heap_ptr, @@ -101,19 +107,21 @@ static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) { m->lfree = mem; } + nmem->pool_ptr = 0; mem->next = nmem->next; ((struct rt_mem_item *)&m->heap_ptr[nmem->next])->prev = (rt_uint8_t *)mem - m->heap_ptr; } /* plug hole backward */ pmem = (struct rt_mem_item *)&m->heap_ptr[mem->prev]; - if (pmem != mem && pmem->used == 0) + if (pmem != mem && !MEM_ISUSED(pmem)) { /* if mem->prev is unused, combine mem and mem->prev */ if (m->lfree == mem) { m->lfree = pmem; } + mem->pool_ptr = 0; pmem->next = mem->next; ((struct rt_mem_item *)&m->heap_ptr[mem->next])->prev = (rt_uint8_t *)pmem - m->heap_ptr; } @@ -123,10 +131,12 @@ static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) * @brief This function will initialize small memory management algorithm. * * @param m the small memory management object. + * + * @param name is the name of the small memory management object. * * @param begin_addr the beginning address of memory. * - * @param end_addr the end address of memory. + * @param size is the size of the memory. * * @return RT_EOK */ @@ -157,7 +167,7 @@ rt_err_t rt_mem_init(struct rt_mem *m, return -RT_EINVAL; } - /* initialize pool object */ + /* initialize small memory object */ rt_object_init(&(m->parent), RT_Object_Class_Mem, name); /* point to begin address of heap */ @@ -168,18 +178,16 @@ rt_err_t rt_mem_init(struct rt_mem *m, /* initialize the start of the heap */ mem = (struct rt_mem_item *)m->heap_ptr; - mem->magic = HEAP_MAGIC; + mem->pool_ptr = MEM_FREED(); mem->next = m->mem_size_aligned + SIZEOF_STRUCT_MEM; mem->prev = 0; - mem->used = 0; #ifdef RT_USING_MEMTRACE rt_mem_setname(mem, "INIT"); #endif /* RT_USING_MEMTRACE */ /* initialize the end of the heap */ m->heap_end = (struct rt_mem_item *)&m->heap_ptr[mem->next]; - m->heap_end->magic = HEAP_MAGIC; - m->heap_end->used = 1; + m->heap_end->pool_ptr = MEM_USED(); m->heap_end->next = m->mem_size_aligned + SIZEOF_STRUCT_MEM; m->heap_end->prev = m->mem_size_aligned + SIZEOF_STRUCT_MEM; #ifdef RT_USING_MEMTRACE @@ -271,7 +279,7 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) { mem = (struct rt_mem_item *)&m->heap_ptr[ptr]; - if ((!mem->used) && (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) + if ((!MEM_ISUSED(mem)) && (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) { /* mem is not used and at least perfect fit is possible: * mem->next - (ptr + SIZEOF_STRUCT_MEM) gives us the 'user data size' of mem */ @@ -293,8 +301,7 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) /* create mem2 struct */ mem2 = (struct rt_mem_item *)&m->heap_ptr[ptr2]; - mem2->magic = HEAP_MAGIC; - mem2->used = 0; + mem2->pool_ptr = MEM_FREED(); mem2->next = mem->next; mem2->prev = ptr; #ifdef RT_USING_MEMTRACE @@ -303,7 +310,6 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) /* and insert it between mem and mem->next */ mem->next = ptr2; - mem->used = 1; if (mem2->next != m->mem_size_aligned + SIZEOF_STRUCT_MEM) { @@ -322,13 +328,12 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) * also can't move mem->next directly behind mem, since mem->next * will always be used at this point! */ - mem->used = 1; m->used_mem += mem->next - ((rt_uint8_t *)mem - m->heap_ptr); if (m->max_mem < m->used_mem) m->max_mem = m->used_mem; } - /* set memory block magic */ - mem->magic = HEAP_MAGIC; + /* set small memory object */ + mem->pool_ptr = MEM_USED(); #ifdef RT_USING_MEMTRACE if (rt_thread_self()) rt_mem_setname(mem, rt_thread_self()->name); @@ -339,10 +344,10 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) if (mem == m->lfree) { /* Find next free block after mem and update lowest free pointer */ - while (m->lfree->used && m->lfree != m->heap_end) + while (MEM_ISUSED(m->lfree) && m->lfree != m->heap_end) m->lfree = (struct rt_mem_item *)&m->heap_ptr[m->lfree->next]; - RT_ASSERT(((m->lfree == m->heap_end) || (!m->lfree->used))); + RT_ASSERT(((m->lfree == m->heap_end) || (!MEM_ISUSED(m->lfree)))); } rt_sem_release(&m->heap_sem); @@ -401,7 +406,7 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) } else if (newsize == 0) { - rt_mem_free(m, rmem); + rt_mem_free(rmem); return RT_NULL; } @@ -438,8 +443,7 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize; mem2 = (struct rt_mem_item *)&m->heap_ptr[ptr2]; - mem2->magic = HEAP_MAGIC; - mem2->used = 0; + mem2->pool_ptr = MEM_FREED(); mem2->next = mem->next; mem2->prev = ptr; #ifdef RT_USING_MEMTRACE @@ -470,7 +474,7 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) if (nmem != RT_NULL) /* check memory */ { rt_memcpy(nmem, rmem, size < newsize ? size : newsize); - rt_mem_free(m, rmem); + rt_mem_free(rmem); } return nmem; @@ -483,27 +487,15 @@ RTM_EXPORT(rt_mem_realloc); * * @param rmem the address of memory which will be released. */ -void rt_mem_free(struct rt_mem *m, void *rmem) +void rt_mem_free(void *rmem) { struct rt_mem_item *mem; + struct rt_mem *m; if (rmem == RT_NULL) return; - RT_ASSERT(m != RT_NULL); - RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); - RT_ASSERT(rt_object_is_systemobject(&m->parent)); RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); - RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && - (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); - - if ((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_ptr || - (rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_end) - { - RT_DEBUG_LOG(RT_DEBUG_MEM, ("illegal memory\n")); - - return; - } /* Get the corresponding struct rt_mem_item ... */ mem = (struct rt_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); @@ -513,21 +505,21 @@ void rt_mem_free(struct rt_mem *m, void *rmem) (rt_ubase_t)rmem, (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - m->heap_ptr)))); + /* ... which has to be in a used state ... */ + m = MEM_POOL(mem); + RT_ASSERT(m != RT_NULL); + RT_ASSERT(MEM_ISUSED(mem)); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_is_systemobject(&m->parent)); + RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && + (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); + RT_ASSERT(MEM_POOL(mem->next) == m); /* protect the heap from concurrent access */ rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); - /* ... which has to be in a used state ... */ - if (!mem->used || mem->magic != HEAP_MAGIC) - { - rt_kprintf("to free a bad data block:\n"); - rt_kprintf("mem: 0x%08x, used flag: %d, magic code: 0x%04x\n", mem, mem->used, mem->magic); - } - RT_ASSERT(mem->used); - RT_ASSERT(mem->magic == HEAP_MAGIC); /* ... and is now unused. */ - mem->used = 0; - mem->magic = HEAP_MAGIC; + mem->pool_ptr = MEM_FREED(); #ifdef RT_USING_MEMTRACE rt_mem_setname(mem, " "); #endif /* RT_USING_MEMTRACE */ @@ -611,8 +603,7 @@ int memcheck(int argc, char *argv[]) position = (rt_ubase_t)mem - (rt_ubase_t)m->heap_ptr; if (position < 0) goto __exit; if (position > (int)m->mem_size_aligned) goto __exit; - if (mem->magic != HEAP_MAGIC) goto __exit; - if (mem->used != 0 && mem->used != 1) goto __exit; + if (MEM_POOL(mem) != m) goto __exit; } } rt_hw_interrupt_enable(level); @@ -622,8 +613,7 @@ int memcheck(int argc, char *argv[]) rt_kprintf("Memory block wrong:\n"); rt_kprintf(" name: %s\n", m->parent.name); rt_kprintf("address: 0x%08x\n", mem); - rt_kprintf(" magic: 0x%04x\n", mem->magic); - rt_kprintf(" used: %d\n", mem->used); + rt_kprintf(" pool: 0x%04x\n", mem->pool_ptr); rt_kprintf(" size: %d\n", mem->next - position - SIZEOF_STRUCT_MEM); rt_hw_interrupt_enable(level); @@ -679,7 +669,7 @@ int memtrace(int argc, char **argv) rt_kprintf("%4dM", size / (1024 * 1024)); rt_kprintf("] %c%c%c%c", mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]); - if (mem->magic != HEAP_MAGIC) + if (MEM_POOL(mem) != m) rt_kprintf(": ***\n"); else rt_kprintf("\n"); From 0c97fc21ae6d06735d0ceb7981183aff1ac38ccd Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 18:13:24 +0800 Subject: [PATCH 03/30] [kernel][mem] Fix assertion problem --- src/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mem.c b/src/mem.c index 0ada464deb3..7120ca4115c 100644 --- a/src/mem.c +++ b/src/mem.c @@ -513,7 +513,7 @@ void rt_mem_free(void *rmem) RT_ASSERT(rt_object_is_systemobject(&m->parent)); RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); - RT_ASSERT(MEM_POOL(mem->next) == m); + RT_ASSERT(MEM_POOL(&m->heap_ptr[mem->next]) == m); /* protect the heap from concurrent access */ rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); From 6a23b2f92b6dd56ca1bb7dfd3af7cb608ba45553 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 20:48:39 +0800 Subject: [PATCH 04/30] [kernel][slab] Multiple instances of slab memory management algorithm --- include/rtdef.h | 73 +++++++ include/rtthread.h | 20 ++ src/object.c | 3 + src/slab.c | 489 +++++++++++++++++---------------------------- 4 files changed, 284 insertions(+), 301 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index 3d51af3b6ff..c9d86f9bd22 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -903,6 +903,79 @@ struct rt_memheap }; #endif +#ifdef RT_USING_SLAB +/** + * Base structure of slab memory object + */ + +/* + * The IN-BAND zone header is placed at the beginning of each zone. + */ +struct rt_slab_zone +{ + rt_uint32_t z_magic; /**< magic number for sanity check */ + rt_uint32_t z_nfree; /**< total free chunks / ualloc space in zone */ + rt_uint32_t z_nmax; /**< maximum free chunks */ + struct rt_slab_zone *z_next; /**< zoneary[] link if z_nfree non-zero */ + rt_uint8_t *z_baseptr; /**< pointer to start of chunk array */ + + rt_uint32_t z_uindex; /**< current initial allocation index */ + rt_uint32_t z_chunksize; /**< chunk size for validation */ + + rt_uint32_t z_zoneindex; /**< zone index */ + struct rt_slab_chunk *z_freechunk; /**< free chunk list */ +}; + +/* + * Chunk structure for free elements + */ +struct rt_slab_chunk +{ + struct rt_slab_chunk *c_next; +}; + +struct rt_slab_memusage +{ + rt_uint32_t type: 2 ; /**< page type */ + rt_uint32_t size: 30; /**< pages allocated or offset from zone */ +}; + +/* + * slab page allocator + */ +struct rt_slab_page +{ + struct rt_slab_page *next; /**< next valid page */ + rt_size_t page; /**< number of page */ + + /* dummy */ + char dummy[RT_MM_PAGE_SIZE - (sizeof(struct rt_slab_page *) + sizeof(rt_size_t))]; +}; + +#define RT_SLAB_NZONES 72 /* number of zones */ + +/* + * slab object + */ +struct rt_slab +{ + struct rt_object parent; /**< inherit from rt_object */ + struct rt_semaphore heap_sem; + rt_ubase_t heap_start; /**< memory start address */ + rt_ubase_t heap_end; /**< memory end address */ + struct rt_slab_memusage *memusage; + struct rt_slab_zone *zone_array[RT_SLAB_NZONES]; /* linked list of zones NFree > 0 */ + struct rt_slab_zone *zone_free; /* whole zones that have become free */ + rt_uint32_t zone_free_cnt; + rt_uint32_t zone_size; + rt_uint32_t zone_limit; + rt_uint32_t zone_page_cnt; + struct rt_slab_page *page_list; + rt_size_t used_mem; + rt_size_t max_mem; +}; +#endif + #ifdef RT_USING_MEMPOOL /** * Base structure of Memory pool object diff --git a/include/rtthread.h b/include/rtthread.h index b0f1bbd516e..8e70506bab9 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -313,6 +313,26 @@ rt_err_t rt_memheap_detach(struct rt_memheap *heap); void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size); void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize); void rt_memheap_free(void *ptr); +void rt_memheap_info(struct rt_memheap *heap, + rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used); +#endif + +#ifdef RT_USING_SLAB +/** + * slab object interface + */ +rt_err_t rt_slab_init(struct rt_slab *slab, const char *name, + void *begin_addr, rt_size_t size); +rt_err_t rt_slab_detach(struct rt_slab *slab); +void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages); +void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages); +void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size); +void *rt_slab_realloc(struct rt_slab *slab, void *ptr, rt_size_t size); +void rt_slab_free(struct rt_slab *slab, void *ptr); +void rt_slab_info(struct rt_slab *slab, rt_uint32_t *total, + rt_uint32_t *used, rt_uint32_t *max_used); #endif /**@}*/ diff --git a/src/object.c b/src/object.c index 6d273021160..2a2f688dc31 100644 --- a/src/object.c +++ b/src/object.c @@ -114,6 +114,9 @@ static struct rt_object_information _object_container[RT_Object_Info_Unknown] = /* initialize object container - small memory */ {RT_Object_Class_Mem, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Mem), sizeof(struct rt_mem)}, #endif +#ifdef RT_USING_SLAB + /* initialize object container - slab memory */ + {RT_Object_Class_Slab, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Slab), sizeof(struct rt_slab)}, #endif }; diff --git a/src/slab.c b/src/slab.c index 8e0ce7bc837..e9811f9c152 100644 --- a/src/slab.c +++ b/src/slab.c @@ -55,52 +55,7 @@ #include #include -#define RT_MEM_STATS - -#if defined (RT_USING_HEAP) && defined (RT_USING_SLAB) -/* some statistical variable */ -#ifdef RT_MEM_STATS -static rt_size_t used_mem, max_mem; -#endif /* RT_MEM_STATS */ - -#ifdef RT_USING_HOOK -static void (*rt_malloc_hook)(void *ptr, rt_size_t size); -static void (*rt_free_hook)(void *ptr); - -/** - * @addtogroup Hook - */ - -/**@{*/ - -/** - * @brief This function will set a hook function, which will be invoked when a memory - * block is allocated from heap memory. - * - * @param hook the hook function. - */ -void rt_malloc_sethook(void (*hook)(void *ptr, rt_size_t size)) -{ - rt_malloc_hook = hook; -} -RTM_EXPORT(rt_malloc_sethook); - -/** - * @brief This function will set a hook function, which will be invoked when a memory - * block is released to heap memory. - * - * @param hook the hook function - */ -void rt_free_sethook(void (*hook)(void *ptr)) -{ - rt_free_hook = hook; -} -RTM_EXPORT(rt_free_sethook); - -/**@}*/ - -#endif /* RT_USING_HOOK */ - +#if defined (RT_USING_SLAB) /* * slab allocator implementation * @@ -155,48 +110,12 @@ RTM_EXPORT(rt_free_sethook); * + ability to allocate arbitrarily large chunks of memory */ -/* - * Chunk structure for free elements - */ -typedef struct slab_chunk -{ - struct slab_chunk *c_next; -} slab_chunk; - -/* - * The IN-BAND zone header is placed at the beginning of each zone. - */ -typedef struct slab_zone -{ - rt_int32_t z_magic; /* magic number for sanity check */ - rt_int32_t z_nfree; /* total free chunks / ualloc space in zone */ - rt_int32_t z_nmax; /* maximum free chunks */ - - struct slab_zone *z_next; /* zoneary[] link if z_nfree non-zero */ - rt_uint8_t *z_baseptr; /* pointer to start of chunk array */ - - rt_int32_t z_uindex; /* current initial allocation index */ - rt_int32_t z_chunksize; /* chunk size for validation */ - - rt_int32_t z_zoneindex; /* zone index */ - slab_chunk *z_freechunk; /* free chunk list */ -} slab_zone; - #define ZALLOC_SLAB_MAGIC 0x51ab51ab #define ZALLOC_ZONE_LIMIT (16 * 1024) /* max slab-managed alloc */ #define ZALLOC_MIN_ZONE_SIZE (32 * 1024) /* minimum zone size */ #define ZALLOC_MAX_ZONE_SIZE (128 * 1024) /* maximum zone size */ -#define NZONES 72 /* number of zones */ #define ZONE_RELEASE_THRESH 2 /* threshold number of zones */ -static slab_zone *zone_array[NZONES]; /* linked list of zones NFree > 0 */ -static slab_zone *zone_free; /* whole zones that have become free */ - -static int zone_free_cnt; -static int zone_size; -static int zone_limit; -static int zone_page_cnt; - /* * Misc constants. Note that allocations that are exact multiples of * RT_MM_PAGE_SIZE, or exceed the zone limit, fall through to the kmem module. @@ -210,45 +129,28 @@ static int zone_page_cnt; #define PAGE_TYPE_FREE 0x00 #define PAGE_TYPE_SMALL 0x01 #define PAGE_TYPE_LARGE 0x02 -struct memusage -{ - rt_uint32_t type: 2 ; /* page type */ - rt_uint32_t size: 30; /* pages allocated or offset from zone */ -}; -static struct memusage *memusage = RT_NULL; -#define btokup(addr) \ - (&memusage[((rt_ubase_t)(addr) - heap_start) >> RT_MM_PAGE_BITS]) -static rt_ubase_t heap_start, heap_end; - -/* page allocator */ -struct rt_page_head -{ - struct rt_page_head *next; /* next valid page */ - rt_size_t page; /* number of page */ - - /* dummy */ - char dummy[RT_MM_PAGE_SIZE - (sizeof(struct rt_page_head *) + sizeof(rt_size_t))]; -}; -static struct rt_page_head *rt_page_list; -static struct rt_semaphore heap_sem; +#define btokup(addr) \ + (&slab->memusage[((rt_ubase_t)(addr) - slab->heap_start) >> RT_MM_PAGE_BITS]) /** * @brief Alloc memory size by page. * + * @param slab the slab memory management object. + * * @param npages the number of pages. */ -void *rt_page_alloc(rt_size_t npages) +void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages) { - struct rt_page_head *b, *n; - struct rt_page_head **prev; + struct rt_slab_page *b, *n; + struct rt_slab_page **prev; if (npages == 0) return RT_NULL; /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); - for (prev = &rt_page_list; (b = *prev) != RT_NULL; prev = &(b->next)) + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); + for (prev = &slab->page_list; (b = *prev) != RT_NULL; prev = &(b->next)) { if (b->page > npages) { @@ -269,7 +171,7 @@ void *rt_page_alloc(rt_size_t npages) } /* unlock heap */ - rt_sem_release(&heap_sem); + rt_sem_release(&slab->heap_sem); return b; } @@ -277,25 +179,27 @@ void *rt_page_alloc(rt_size_t npages) /** * @brief Free memory by page. * + * @param slab the slab memory management object. + * * @param addr is the head address of first page. * * @param npages is the number of pages. */ -void rt_page_free(void *addr, rt_size_t npages) +void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) { - struct rt_page_head *b, *n; - struct rt_page_head **prev; + struct rt_slab_page *b, *n; + struct rt_slab_page **prev; RT_ASSERT(addr != RT_NULL); RT_ASSERT((rt_ubase_t)addr % RT_MM_PAGE_SIZE == 0); RT_ASSERT(npages != 0); - n = (struct rt_page_head *)addr; + n = (struct rt_slab_page *)addr; /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); - for (prev = &rt_page_list; (b = *prev) != RT_NULL; prev = &(b->next)) + for (prev = &slab->page_list; (b = *prev) != RT_NULL; prev = &(b->next)) { RT_ASSERT(b->page > 0); RT_ASSERT(b > n || b + b->page <= n); @@ -330,80 +234,112 @@ void rt_page_free(void *addr, rt_size_t npages) _return: /* unlock heap */ - rt_sem_release(&heap_sem); + rt_sem_release(&slab->heap_sem); } /* * Initialize the page allocator */ -static void rt_page_init(void *addr, rt_size_t npages) +static void rt_page_init(struct rt_slab *slab, void *addr, rt_size_t npages) { RT_ASSERT(addr != RT_NULL); RT_ASSERT(npages != 0); - rt_page_list = RT_NULL; - rt_page_free(addr, npages); + slab->page_list = RT_NULL; + rt_slab_page_free(slab, addr, npages); } /** - * @brief This function will init system heap. + * @brief This function will init slab memory management algorithm * + * @param slab the slab memory management object. + * + * @param name is the name of the slab memory management object. + * * @param begin_addr the beginning address of system page. * - * @param end_addr the end address of system page. + * @param size is the size of the memory. + * + * @return RT_EOK */ -void rt_system_heap_init(void *begin_addr, void *end_addr) +rt_err_t rt_slab_init(struct rt_slab *slab, const char *name, + void *begin_addr, rt_size_t size) { rt_uint32_t limsize, npages; - RT_DEBUG_NOT_IN_INTERRUPT; - + RT_ASSERT(slab != RT_NULL); + rt_memset(slab, 0, sizeof(*slab)); /* align begin and end addr to page */ - heap_start = RT_ALIGN((rt_ubase_t)begin_addr, RT_MM_PAGE_SIZE); - heap_end = RT_ALIGN_DOWN((rt_ubase_t)end_addr, RT_MM_PAGE_SIZE); + slab->heap_start = RT_ALIGN((rt_ubase_t)begin_addr, RT_MM_PAGE_SIZE); + slab->heap_end = RT_ALIGN_DOWN((rt_ubase_t)begin_addr + size, RT_MM_PAGE_SIZE); - if (heap_start >= heap_end) + if (slab->heap_start >= slab->heap_end) { - rt_kprintf("rt_system_heap_init, wrong address[0x%x - 0x%x]\n", - (rt_ubase_t)begin_addr, (rt_ubase_t)end_addr); + rt_kprintf("slab init errr. wrong address[0x%x - 0x%x]\n", + (rt_ubase_t)begin_addr, (rt_ubase_t)begin_addr + size); - return; + return -RT_EINVAL; } - limsize = heap_end - heap_start; + /* initialize slab memory object */ + rt_object_init(&(slab->parent), RT_Object_Class_Slab, name); + + limsize = slab->heap_end - slab->heap_start; npages = limsize / RT_MM_PAGE_SIZE; /* initialize heap semaphore */ - rt_sem_init(&heap_sem, "heap", 1, RT_IPC_FLAG_PRIO); + rt_sem_init(&slab->heap_sem, "heap", 1, RT_IPC_FLAG_PRIO); RT_DEBUG_LOG(RT_DEBUG_SLAB, ("heap[0x%x - 0x%x], size 0x%x, 0x%x pages\n", - heap_start, heap_end, limsize, npages)); + slab->heap_start, slab->heap_end, limsize, npages)); /* init pages */ - rt_page_init((void *)heap_start, npages); + rt_page_init(slab, (void *)slab->heap_start, npages); /* calculate zone size */ - zone_size = ZALLOC_MIN_ZONE_SIZE; - while (zone_size < ZALLOC_MAX_ZONE_SIZE && (zone_size << 1) < (limsize / 1024)) - zone_size <<= 1; + slab->zone_size = ZALLOC_MIN_ZONE_SIZE; + while (slab->zone_size < ZALLOC_MAX_ZONE_SIZE && (slab->zone_size << 1) < (limsize / 1024)) + slab->zone_size <<= 1; - zone_limit = zone_size / 4; - if (zone_limit > ZALLOC_ZONE_LIMIT) - zone_limit = ZALLOC_ZONE_LIMIT; + slab->zone_limit = slab->zone_size / 4; + if (slab->zone_limit > ZALLOC_ZONE_LIMIT) + slab->zone_limit = ZALLOC_ZONE_LIMIT; - zone_page_cnt = zone_size / RT_MM_PAGE_SIZE; + slab->zone_page_cnt = slab->zone_size / RT_MM_PAGE_SIZE; RT_DEBUG_LOG(RT_DEBUG_SLAB, ("zone size 0x%x, zone page count 0x%x\n", - zone_size, zone_page_cnt)); + slab->zone_size, slab->zone_page_cnt)); - /* allocate memusage array */ - limsize = npages * sizeof(struct memusage); + /* allocate slab->memusage array */ + limsize = npages * sizeof(struct rt_slab_memusage); limsize = RT_ALIGN(limsize, RT_MM_PAGE_SIZE); - memusage = rt_page_alloc(limsize / RT_MM_PAGE_SIZE); + slab->memusage = rt_slab_page_alloc(slab, limsize / RT_MM_PAGE_SIZE); + + RT_DEBUG_LOG(RT_DEBUG_SLAB, ("slab->memusage 0x%x, size 0x%x\n", + (rt_ubase_t)slab->memusage, limsize)); + return RT_EOK; +} +RTM_EXPORT(rt_slab_init); + +/** + * @brief This function will remove a slab object from the system. + * + * @param slab the slab memory management object. + * + * @return RT_EOK + */ +rt_err_t rt_slab_detach(struct rt_slab *slab) +{ + RT_ASSERT(slab != RT_NULL); + RT_ASSERT(rt_object_get_type(&slab->parent) == RT_Object_Class_Slab); + RT_ASSERT(rt_object_is_systemobject(&slab->parent)); - RT_DEBUG_LOG(RT_DEBUG_SLAB, ("memusage 0x%x, size 0x%x\n", - (rt_ubase_t)memusage, limsize)); + rt_sem_detach(&slab->heap_sem); + rt_object_detach(&(slab->parent)); + + return RT_EOK; } +RTM_EXPORT(rt_slab_detach); /* * Calculate the zone index for the allocation request size and set the @@ -476,22 +412,24 @@ rt_inline int zoneindex(rt_size_t *bytes) /**@{*/ /** - * @brief This function will allocate a block from system heap memory. + * @brief This function will allocate a block from slab object. * * @note the RT_NULL is returned if * - the nbytes is less than zero. * - there is no nbytes sized memory valid in system. * + * @param slab the slab memory management object. + * * @param size is the size of memory to be allocated. * * @return the allocated memory. */ -void *rt_malloc(rt_size_t size) +void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) { - slab_zone *z; + struct rt_slab_zone *z; rt_int32_t zi; - slab_chunk *chunk; - struct memusage *kup; + struct rt_slab_chunk *chunk; + struct rt_slab_memusage *kup; /* zero size, return RT_NULL */ if (size == 0) @@ -501,11 +439,11 @@ void *rt_malloc(rt_size_t size) * Handle large allocations directly. There should not be very many of * these so performance is not a big issue. */ - if (size >= zone_limit) + if (size >= slab->zone_limit) { size = RT_ALIGN(size, RT_MM_PAGE_SIZE); - chunk = rt_page_alloc(size >> RT_MM_PAGE_BITS); + chunk = rt_slab_page_alloc(slab, size >> RT_MM_PAGE_BITS); if (chunk == RT_NULL) return RT_NULL; @@ -515,24 +453,22 @@ void *rt_malloc(rt_size_t size) kup->size = size >> RT_MM_PAGE_BITS; RT_DEBUG_LOG(RT_DEBUG_SLAB, - ("malloc a large memory 0x%x, page cnt %d, kup %d\n", + ("alloc a large memory 0x%x, page cnt %d, kup %d\n", size, size >> RT_MM_PAGE_BITS, - ((rt_ubase_t)chunk - heap_start) >> RT_MM_PAGE_BITS)); + ((rt_ubase_t)chunk - slab->heap_start) >> RT_MM_PAGE_BITS)); /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); - -#ifdef RT_MEM_STATS - used_mem += size; - if (used_mem > max_mem) - max_mem = used_mem; -#endif /* RT_MEM_STATS */ + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); + /* mem stat */ + slab->used_mem += size; + if (slab->used_mem > slab->max_mem) + slab->max_mem = slab->used_mem; goto done; } /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); /* * Attempt to allocate out of an existing zone. First try the free list, @@ -543,18 +479,18 @@ void *rt_malloc(rt_size_t size) * Note: zoneindex() will panic of size is too large. */ zi = zoneindex(&size); - RT_ASSERT(zi < NZONES); + RT_ASSERT(zi < RT_SLAB_NZONES); - RT_DEBUG_LOG(RT_DEBUG_SLAB, ("try to malloc 0x%x on zone: %d\n", size, zi)); + RT_DEBUG_LOG(RT_DEBUG_SLAB, ("try to alloc 0x%x on zone: %d\n", size, zi)); - if ((z = zone_array[zi]) != RT_NULL) + if ((z = slab->zone_array[zi]) != RT_NULL) { RT_ASSERT(z->z_nfree > 0); /* Remove us from the zone_array[] when we become full */ if (--z->z_nfree == 0) { - zone_array[zi] = z->z_next; + slab->zone_array[zi] = z->z_next; z->z_next = RT_NULL; } @@ -567,7 +503,7 @@ void *rt_malloc(rt_size_t size) if (z->z_uindex + 1 != z->z_nmax) { z->z_uindex = z->z_uindex + 1; - chunk = (slab_chunk *)(z->z_baseptr + z->z_uindex * size); + chunk = (struct rt_slab_chunk *)(z->z_baseptr + z->z_uindex * size); } else { @@ -577,12 +513,10 @@ void *rt_malloc(rt_size_t size) /* remove this chunk from list */ z->z_freechunk = z->z_freechunk->c_next; } - -#ifdef RT_MEM_STATS - used_mem += z->z_chunksize; - if (used_mem > max_mem) - max_mem = used_mem; -#endif /* RT_MEM_STATS */ + /* mem stats */ + slab->used_mem += z->z_chunksize; + if (slab->used_mem > slab->max_mem) + slab->max_mem = slab->used_mem; goto done; } @@ -596,21 +530,21 @@ void *rt_malloc(rt_size_t size) * adjusting the base offset below. */ { - rt_int32_t off; + rt_uint32_t off; - if ((z = zone_free) != RT_NULL) + if ((z = slab->zone_free) != RT_NULL) { /* remove zone from free zone list */ - zone_free = z->z_next; - -- zone_free_cnt; + slab->zone_free = z->z_next; + -- slab->zone_free_cnt; } else { /* unlock heap, since page allocator will think about lock */ - rt_sem_release(&heap_sem); + rt_sem_release(&slab->heap_sem); /* allocate a zone from page */ - z = rt_page_alloc(zone_size / RT_MM_PAGE_SIZE); + z = rt_slab_page_alloc(slab, slab->zone_size / RT_MM_PAGE_SIZE); if (z == RT_NULL) { chunk = RT_NULL; @@ -618,13 +552,13 @@ void *rt_malloc(rt_size_t size) } /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); RT_DEBUG_LOG(RT_DEBUG_SLAB, ("alloc a new zone: 0x%x\n", (rt_ubase_t)z)); /* set message usage */ - for (off = 0, kup = btokup(z); off < zone_page_cnt; off ++) + for (off = 0, kup = btokup(z); off < slab->zone_page_cnt; off ++) { kup->type = PAGE_TYPE_SMALL; kup->size = off; @@ -634,10 +568,10 @@ void *rt_malloc(rt_size_t size) } /* clear to zero */ - rt_memset(z, 0, sizeof(slab_zone)); + rt_memset(z, 0, sizeof(struct rt_slab_zone)); /* offset of slab zone struct in zone */ - off = sizeof(slab_zone); + off = sizeof(struct rt_slab_zone); /* * Guarentee power-of-2 alignment for power-of-2-sized chunks. @@ -650,55 +584,54 @@ void *rt_malloc(rt_size_t size) z->z_magic = ZALLOC_SLAB_MAGIC; z->z_zoneindex = zi; - z->z_nmax = (zone_size - off) / size; + z->z_nmax = (slab->zone_size - off) / size; z->z_nfree = z->z_nmax - 1; z->z_baseptr = (rt_uint8_t *)z + off; z->z_uindex = 0; z->z_chunksize = size; - chunk = (slab_chunk *)(z->z_baseptr + z->z_uindex * size); + chunk = (struct rt_slab_chunk *)(z->z_baseptr + z->z_uindex * size); /* link to zone array */ - z->z_next = zone_array[zi]; - zone_array[zi] = z; - -#ifdef RT_MEM_STATS - used_mem += z->z_chunksize; - if (used_mem > max_mem) - max_mem = used_mem; -#endif /* RT_MEM_STATS */ + z->z_next = slab->zone_array[zi]; + slab->zone_array[zi] = z; + /* mem stats */ + slab->used_mem += z->z_chunksize; + if (slab->used_mem > slab->max_mem) + slab->max_mem = slab->used_mem; } done: - rt_sem_release(&heap_sem); - RT_OBJECT_HOOK_CALL(rt_malloc_hook, ((char *)chunk, size)); + rt_sem_release(&slab->heap_sem); __exit: return chunk; } -RTM_EXPORT(rt_malloc); +RTM_EXPORT(rt_slab_alloc); /** * @brief This function will change the size of previously allocated memory block. * + * @param slab the slab memory management object. + * * @param ptr is the previously allocated memory block. * * @param size is the new size of memory block. * * @return the allocated memory. */ -void *rt_realloc(void *ptr, rt_size_t size) +void *rt_slab_realloc(struct rt_slab *slab, void *ptr, rt_size_t size) { void *nptr; - slab_zone *z; - struct memusage *kup; + struct rt_slab_zone *z; + struct rt_slab_memusage *kup; if (ptr == RT_NULL) - return rt_malloc(size); + return rt_slab_alloc(slab, size); + if (size == 0) { - rt_free(ptr); - + rt_slab_free(slab, ptr); return RT_NULL; } @@ -712,16 +645,16 @@ void *rt_realloc(void *ptr, rt_size_t size) rt_size_t osize; osize = kup->size << RT_MM_PAGE_BITS; - if ((nptr = rt_malloc(size)) == RT_NULL) + if ((nptr = rt_slab_alloc(slab, size)) == RT_NULL) return RT_NULL; rt_memcpy(nptr, ptr, size > osize ? osize : size); - rt_free(ptr); + rt_slab_free(slab, ptr); return nptr; } else if (kup->type == PAGE_TYPE_SMALL) { - z = (slab_zone *)(((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK) - + z = (struct rt_slab_zone *)(((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK) - kup->size * RT_MM_PAGE_SIZE); RT_ASSERT(z->z_magic == ZALLOC_SLAB_MAGIC); @@ -734,66 +667,36 @@ void *rt_realloc(void *ptr, rt_size_t size) * already adjusted the request size to the appropriate chunk size, which * should optimize our bcopy(). Then copy and return the new pointer. */ - if ((nptr = rt_malloc(size)) == RT_NULL) + if ((nptr = rt_slab_alloc(slab, size)) == RT_NULL) return RT_NULL; rt_memcpy(nptr, ptr, size > z->z_chunksize ? z->z_chunksize : size); - rt_free(ptr); + rt_slab_free(slab, ptr); return nptr; } return RT_NULL; } -RTM_EXPORT(rt_realloc); +RTM_EXPORT(rt_slab_realloc); /** - * @brief This function will contiguously allocate enough space for count objects - * that are size bytes of memory each and returns a pointer to the allocated - * memory. - * - * @note The allocated memory is filled with bytes of value zero. - * - * @param count is the number of objects to allocate. - * - * @param size is the size of the objects to allocate. - * - * @return pointer to allocated memory / NULL pointer if there is an error. - */ -void *rt_calloc(rt_size_t count, rt_size_t size) -{ - void *p; - - /* allocate 'count' objects of size 'size' */ - p = rt_malloc(count * size); - - /* zero the memory */ - if (p) - rt_memset(p, 0, count * size); - - return p; -} -RTM_EXPORT(rt_calloc); - -/** - * @brief This function will release the previous allocated memory block by rt_malloc. + * @brief This function will release the previous allocated memory block by rt_slab_alloc. * * @note The released memory block is taken back to system heap. - * + * * @param ptr is the address of memory which will be released */ -void rt_free(void *ptr) +void rt_slab_free(struct rt_slab *slab, void *ptr) { - slab_zone *z; - slab_chunk *chunk; - struct memusage *kup; + struct rt_slab_zone *z; + struct rt_slab_chunk *chunk; + struct rt_slab_memusage *kup; /* free a RT_NULL pointer */ if (ptr == RT_NULL) return ; - RT_OBJECT_HOOK_CALL(rt_free_hook, (ptr)); - /* get memory usage */ #if RT_DEBUG_SLAB { @@ -802,7 +705,7 @@ void rt_free(void *ptr) ("free a memory 0x%x and align to 0x%x, kup index %d\n", (rt_ubase_t)ptr, (rt_ubase_t)addr, - ((rt_ubase_t)(addr) - heap_start) >> RT_MM_PAGE_BITS)); + ((rt_ubase_t)(addr) - slab->heap_start) >> RT_MM_PAGE_BITS)); } #endif /* RT_DEBUG_SLAB */ @@ -813,41 +716,37 @@ void rt_free(void *ptr) rt_ubase_t size; /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); /* clear page counter */ size = kup->size; kup->size = 0; - -#ifdef RT_MEM_STATS - used_mem -= size * RT_MM_PAGE_SIZE; -#endif /* RT_MEM_STATS */ - rt_sem_release(&heap_sem); + /* mem stats */ + slab->used_mem -= size * RT_MM_PAGE_SIZE; + rt_sem_release(&slab->heap_sem); RT_DEBUG_LOG(RT_DEBUG_SLAB, ("free large memory block 0x%x, page count %d\n", (rt_ubase_t)ptr, size)); /* free this page */ - rt_page_free(ptr, size); + rt_slab_page_free(slab, ptr, size); return; } /* lock heap */ - rt_sem_take(&heap_sem, RT_WAITING_FOREVER); + rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); /* zone case. get out zone. */ - z = (slab_zone *)(((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK) - + z = (struct rt_slab_zone *)(((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK) - kup->size * RT_MM_PAGE_SIZE); RT_ASSERT(z->z_magic == ZALLOC_SLAB_MAGIC); - chunk = (slab_chunk *)ptr; + chunk = (struct rt_slab_chunk *)ptr; chunk->c_next = z->z_freechunk; z->z_freechunk = chunk; - -#ifdef RT_MEM_STATS - used_mem -= z->z_chunksize; -#endif /* RT_MEM_STATS */ + /* mem stats */ + slab->used_mem -= z->z_chunksize; /* * Bump the number of free chunks. If it becomes non-zero the zone @@ -855,8 +754,8 @@ void rt_free(void *ptr) */ if (z->z_nfree++ == 0) { - z->z_next = zone_array[z->z_zoneindex]; - zone_array[z->z_zoneindex] = z; + z->z_next = slab->zone_array[z->z_zoneindex]; + slab->zone_array[z->z_zoneindex] = z; } /* @@ -866,15 +765,15 @@ void rt_free(void *ptr) * with kernel_map here. Hysteresis will be performed at malloc() time. */ if (z->z_nfree == z->z_nmax && - (z->z_next || zone_array[z->z_zoneindex] != z)) + (z->z_next || slab->zone_array[z->z_zoneindex] != z)) { - slab_zone **pz; + struct rt_slab_zone **pz; RT_DEBUG_LOG(RT_DEBUG_SLAB, ("free zone 0x%x\n", (rt_ubase_t)z, z->z_zoneindex)); /* remove zone from zone array list */ - for (pz = &zone_array[z->z_zoneindex]; z != *pz; pz = &(*pz)->z_next) + for (pz = &slab->zone_array[z->z_zoneindex]; z != *pz; pz = &(*pz)->z_next) ; *pz = z->z_next; @@ -882,22 +781,22 @@ void rt_free(void *ptr) z->z_magic = -1; /* insert to free zone list */ - z->z_next = zone_free; - zone_free = z; + z->z_next = slab->zone_free; + slab->zone_free = z; - ++ zone_free_cnt; + ++ slab->zone_free_cnt; /* release zone to page allocator */ - if (zone_free_cnt > ZONE_RELEASE_THRESH) + if (slab->zone_free_cnt > ZONE_RELEASE_THRESH) { - register rt_base_t i; + register rt_uint32_t i; - z = zone_free; - zone_free = z->z_next; - -- zone_free_cnt; + z = slab->zone_free; + slab->zone_free = z->z_next; + -- slab->zone_free_cnt; /* set message usage */ - for (i = 0, kup = btokup(z); i < zone_page_cnt; i ++) + for (i = 0, kup = btokup(z); i < slab->zone_page_cnt; i ++) { kup->type = PAGE_TYPE_FREE; kup->size = 0; @@ -905,57 +804,45 @@ void rt_free(void *ptr) } /* unlock heap */ - rt_sem_release(&heap_sem); + rt_sem_release(&slab->heap_sem); /* release pages */ - rt_page_free(z, zone_size / RT_MM_PAGE_SIZE); + rt_slab_page_free(slab, z, slab->zone_size / RT_MM_PAGE_SIZE); return; } } /* unlock heap */ - rt_sem_release(&heap_sem); + rt_sem_release(&slab->heap_sem); } -RTM_EXPORT(rt_free); +RTM_EXPORT(rt_slab_free); -#ifdef RT_MEM_STATS /** * @brief This function will caculate the total memory, the used memory, and * the max used memory. * +* @param slab the slab memory management object. +* * @param total is a pointer to get the total size of the memory. * * @param used is a pointer to get the size of memory used. * * @param max_used is a pointer to get the maximum memory used. */ -void rt_memory_info(rt_uint32_t *total, - rt_uint32_t *used, - rt_uint32_t *max_used) +void rt_slab_info(struct rt_slab *slab, + rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used) { if (total != RT_NULL) - *total = heap_end - heap_start; + *total = slab->heap_end - slab->heap_start; if (used != RT_NULL) - *used = used_mem; + *used = slab->used_mem; if (max_used != RT_NULL) - *max_used = max_mem; + *max_used = slab->max_mem; } - -#ifdef RT_USING_FINSH -#include - -void list_mem(void) -{ - rt_kprintf("total memory: %d\n", heap_end - heap_start); - rt_kprintf("used memory : %d\n", used_mem); - rt_kprintf("maximum allocated memory: %d\n", max_mem); -} -FINSH_FUNCTION_EXPORT(list_mem, list memory usage information) -#endif /* RT_USING_FINSH */ -#endif /* RT_MEM_STATS */ - /**@}*/ -#endif /* defined (RT_USING_HEAP) && defined (RT_USING_SLAB) */ +#endif /* defined (RT_USING_SLAB) */ From 0ea1a8ce812ec378a42fb0fcdce286a807204880 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 20:50:46 +0800 Subject: [PATCH 05/30] [kernel][memheap] Remove rt_malloc/rt_free/rt_realloc and other related memory interfaces --- src/memheap.c | 480 ++++++-------------------------------------------- 1 file changed, 52 insertions(+), 428 deletions(-) diff --git a/src/memheap.c b/src/memheap.c index e96b402bcf6..1388ea68bad 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -38,58 +38,6 @@ #define MEMITEM_SIZE(item) ((rt_ubase_t)item->next - (rt_ubase_t)item - RT_MEMHEAP_SIZE) #define MEMITEM(ptr) (struct rt_memheap_item*)((rt_uint8_t*)ptr - RT_MEMHEAP_SIZE) -#ifdef RT_USING_MEMTRACE -/** - * @brief This function will set a new name for memheap. - * - * @param item is a pointer point to a memheap object. - * - * @param name is the new name to be set. - */ -rt_inline void rt_memheap_setname(struct rt_memheap_item *item, const char *name) -{ - int index; - rt_uint8_t *ptr; - - ptr = (rt_uint8_t *) & (item->next_free); - for (index = 0; index < sizeof(void *); index ++) - { - if (name[index] == '\0') break; - ptr[index] = name[index]; - } - if (name[index] == '\0') ptr[index] = '\0'; - else - { - ptr = (rt_uint8_t *) & (item->prev_free); - for (index = 0; index < sizeof(void *) && (index + sizeof(void *)) < RT_NAME_MAX; index ++) - { - if (name[sizeof(void *) + index] == '\0') break; - ptr[index] = name[sizeof(void *) + index]; - } - - if (name[sizeof(void *) + index] == '\0') ptr[index] = '\0'; - } -} - -/** - * @brief This function will set a new name for memheap. - * - * @param ptr is a pointer point to a memheap object. - * - * @param name is the new name to be set. - */ -void rt_mem_set_tag(void *ptr, const char *name) -{ - struct rt_memheap_item *item; - - if (ptr && name) - { - item = MEMITEM(ptr); - rt_memheap_setname(item, name); - } -} -#endif /* RT_USING_MEMTRACE */ - /** * @brief This function initializes a piece of memory called memheap. * @@ -727,417 +675,93 @@ void rt_memheap_free(void *ptr) } RTM_EXPORT(rt_memheap_free); -#ifdef RT_USING_FINSH -static void _memheap_dump_tag(struct rt_memheap_item *item) -{ - rt_uint8_t name[2 * sizeof(void *)]; - rt_uint8_t *ptr; - - ptr = (rt_uint8_t *) & (item->next_free); - rt_memcpy(name, ptr, sizeof(void *)); - ptr = (rt_uint8_t *) & (item->prev_free); - rt_memcpy(&name[sizeof(void *)], ptr, sizeof(void *)); - - rt_kprintf("%.*s", 2 * sizeof(void *), name); -} -/** - * @brief This function will print the memheap infomation. - * - * @param heap is the pointer to the memheap to get information. - * - * @return 0 - */ -int rt_memheap_dump(struct rt_memheap *heap) -{ - struct rt_memheap_item *item, *end; - - if (heap == RT_NULL) return 0; - RT_ASSERT(rt_object_get_type(&heap->parent) == RT_Object_Class_MemHeap); - - rt_kprintf("\n[%.*s] [0x%08x - 0x%08x]->\n", RT_NAME_MAX, heap->parent.name, - (rt_ubase_t)heap->start_addr, (rt_ubase_t)heap->start_addr + heap->pool_size); - rt_kprintf("------------------------------\n"); - - /* lock memheap */ - rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); - item = heap->block_list; - - end = (struct rt_memheap_item *)((rt_uint8_t *)heap->start_addr + heap->pool_size - RT_MEMHEAP_SIZE); - - /* for each memory block */ - while ((rt_ubase_t)item < ((rt_ubase_t)end)) - { - if (RT_MEMHEAP_IS_USED(item) && ((item->magic & RT_MEMHEAP_MASK) != RT_MEMHEAP_MAGIC)) - rt_kprintf("0x%08x", item + 1); - - if (item->magic == (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED)) - { - rt_kprintf("0x%08x: %-8d ", item + 1, MEMITEM_SIZE(item)); - _memheap_dump_tag(item); - rt_kprintf("\n"); - } - else - { - rt_kprintf("0x%08x: %-8d \n", item + 1, MEMITEM_SIZE(item)); - } - - item = item->next; - } - rt_sem_release(&(heap->lock)); - - return 0; -} - -int memheaptrace(void) -{ - int count = rt_object_get_length(RT_Object_Class_MemHeap); - struct rt_memheap **heaps; - - if (count > 0) - { - int index; -#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) - extern int list_memheap(void); -#endif - - heaps = (struct rt_memheap **)rt_malloc(sizeof(struct rt_memheap *) * count); - if (heaps == RT_NULL) return 0; -#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) - list_memheap(); -#endif - rt_kprintf("memheap header size: %d\n", RT_MEMHEAP_SIZE); - count = rt_object_get_pointers(RT_Object_Class_MemHeap, (rt_object_t *)heaps, count); - for (index = 0; index < count; index++) - { - rt_memheap_dump(heaps[index]); - } - - rt_free(heaps); - } - - return 0; -} -MSH_CMD_EXPORT(memheaptrace, dump memory trace information); -#endif /* RT_USING_FINSH */ - -#ifdef RT_USING_MEMHEAP_AS_HEAP -static struct rt_memheap _heap; - -/** - * @brief This function initializes a heap for system. - * - * @param begin_addr is the start address of the memory. - * - * @param end_addr is the end address of the memory. - */ -void rt_system_heap_init(void *begin_addr, void *end_addr) -{ - RT_ASSERT((rt_size_t)end_addr > (rt_size_t)begin_addr); - - rt_size_t begin_align = RT_ALIGN((rt_size_t)begin_addr, RT_ALIGN_SIZE); - rt_size_t end_align = RT_ALIGN_DOWN((rt_size_t)end_addr, RT_ALIGN_SIZE); - - /* initialize a default heap in the system */ - rt_memheap_init(&_heap, - "heap", - (void *)begin_align, - end_align - begin_align); -} - -/** - * @brief Allocate a block of memory with a minimum of 'size' bytes. - * - * @param size is the minimum size of the requested block in bytes. - */ -void *rt_malloc(rt_size_t size) -{ - void *ptr; - - /* zero size, return RT_NULL */ - if (size == 0) - return RT_NULL; - - /* try to allocate in system heap */ - ptr = rt_memheap_alloc(&_heap, size); -#ifdef RT_USING_MEMHEAP_AUTO_BINDING - if (ptr == RT_NULL) - { - struct rt_object *object; - struct rt_list_node *node; - struct rt_memheap *heap; - struct rt_object_information *information; - - /* try to allocate on other memory heap */ - information = rt_object_get_information(RT_Object_Class_MemHeap); - RT_ASSERT(information != RT_NULL); - for (node = information->object_list.next; - node != &(information->object_list); - node = node->next) - { - object = rt_list_entry(node, struct rt_object, list); - heap = (struct rt_memheap *)object; - - RT_ASSERT(heap); - RT_ASSERT(rt_object_get_type(&heap->parent) == RT_Object_Class_MemHeap); - - /* not allocate in the default system heap */ - if (heap == &_heap) - continue; - - ptr = rt_memheap_alloc(heap, size); - if (ptr != RT_NULL) - break; - } - } -#endif /* RT_USING_MEMHEAP_AUTO_BINDING */ - -#ifdef RT_USING_MEMTRACE - if (ptr == RT_NULL) - { - RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("malloc[%d] => NULL", size)); - } - else - { - struct rt_memheap_item *item = MEMITEM(ptr); - if (rt_thread_self()) - rt_memheap_setname(item, rt_thread_self()->name); - else - rt_memheap_setname(item, ""); - - RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("malloc => 0x%08x : %d", ptr, size)); - } -#endif /* RT_USING_MEMTRACE */ - - return ptr; -} -RTM_EXPORT(rt_malloc); - -/** - * @brief This function will release the previously allocated memory block by - * rt_malloc. The released memory block is taken back to system heap. - * - * @param rmem the address of memory which will be released. - */ -void rt_free(void *rmem) -{ - rt_memheap_free(rmem); -} -RTM_EXPORT(rt_free); - -/** - * @brief This function will change the size of previously allocated memory block. - * - * @param rmem is the pointer to memory allocated by rt_malloc. - * - * @param newsize is the required new size. - * - * @return the changed memory block address. - */ -void *rt_realloc(void *rmem, rt_size_t newsize) -{ - void *new_ptr; - struct rt_memheap_item *header_ptr; - - if (rmem == RT_NULL) - return rt_malloc(newsize); - - if (newsize == 0) - { - rt_free(rmem); - return RT_NULL; - } - - /* get old memory item */ - header_ptr = (struct rt_memheap_item *) - ((rt_uint8_t *)rmem - RT_MEMHEAP_SIZE); - - new_ptr = rt_memheap_realloc(header_ptr->pool_ptr, rmem, newsize); - if (new_ptr == RT_NULL && newsize != 0) - { - /* allocate memory block from other memheap */ - new_ptr = rt_malloc(newsize); - if (new_ptr != RT_NULL && rmem != RT_NULL) - { - rt_size_t oldsize; - - /* get the size of old memory block */ - oldsize = MEMITEM_SIZE(header_ptr); - if (newsize > oldsize) - rt_memcpy(new_ptr, rmem, oldsize); - else - rt_memcpy(new_ptr, rmem, newsize); - - rt_free(rmem); - } - } - -#ifdef RT_USING_MEMTRACE - if (new_ptr == RT_NULL) - { - RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("realloc[%d] => NULL", newsize)); - } - else - { - struct rt_memheap_item *item = MEMITEM(new_ptr); - if (rt_thread_self()) - rt_memheap_setname(item, rt_thread_self()->name); - else - rt_memheap_setname(item, ""); - - RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("realloc => 0x%08x : %d", - new_ptr, newsize)); - } -#endif /* RT_USING_MEMTRACE */ - - return new_ptr; -} -RTM_EXPORT(rt_realloc); - -/** - * @brief This function will contiguously allocate enough space for count objects - * that are size bytes of memory each and returns a pointer to the allocated - * memory. - * - * @note The allocated memory is filled with bytes of value zero. - * - * @param count is the number of objects to allocate. - * - * @param size is the size of one object to allocate. - * - * @return pointer to allocated memory pointer. - */ -void *rt_calloc(rt_size_t count, rt_size_t size) -{ - void *ptr; - rt_size_t total_size; - - total_size = count * size; - ptr = rt_malloc(total_size); - if (ptr != RT_NULL) - { - /* clean memory */ - rt_memset(ptr, 0, total_size); - } - -#ifdef RT_USING_MEMTRACE - if (ptr == RT_NULL) - { - RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("calloc[%d x %d] => NULL", - count, size)); - } - else - { - RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("calloc => 0x%08x : %d", - ptr, count * size)); - } -#endif /* RT_USING_MEMTRACE */ - - return ptr; -} -RTM_EXPORT(rt_calloc); - /** * @brief This function will caculate the total memory, the used memory, and * the max used memory. * +* @param heap is a pointer to the memheap object, which will reallocate +* memory from the block +* * @param total is a pointer to get the total size of the memory. * * @param used is a pointer to get the size of memory used. * * @param max_used is a pointer to get the maximum memory used. */ -void rt_memory_info(rt_uint32_t *total, - rt_uint32_t *used, - rt_uint32_t *max_used) +void rt_memheap_info(struct rt_memheap *heap, + rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used) { if (total != RT_NULL) - *total = _heap.pool_size; + *total = heap->pool_size; if (used != RT_NULL) - *used = _heap.pool_size - _heap.available_size; + *used = heap->pool_size - heap->available_size; if (max_used != RT_NULL) - *max_used = _heap.max_used_size; + *max_used = heap->max_used_size; } -#endif /* RT_USING_MEMHEAP_AS_HEAP */ - #ifdef RT_USING_MEMTRACE - -/** - * @brief This function will print the used memheap infomation. - * - * @param mh is a pointer of the memheap object. - */ -void dump_used_memheap(struct rt_memheap *mh) -{ - struct rt_memheap_item *header_ptr; - rt_uint32_t block_size; - - rt_kprintf("\nmemory heap address:\n"); - rt_kprintf("heap_ptr: 0x%08x\n", mh->start_addr); - rt_kprintf("free : 0x%08x\n", mh->available_size); - rt_kprintf("max_used: 0x%08x\n", mh->max_used_size); - rt_kprintf("size : 0x%08x\n", mh->pool_size); - - rt_kprintf("\n--memory used information --\n"); - - header_ptr = mh->block_list; - while (header_ptr->next != mh->block_list) - { - if ((header_ptr->magic & RT_MEMHEAP_MASK) != RT_MEMHEAP_MAGIC) - { - rt_kprintf("[0x%08x - incorrect magic: 0x%08x\n", header_ptr, header_ptr->magic); - break; - } - - /* get current memory block size */ - block_size = MEMITEM_SIZE(header_ptr); - if (block_size < 0) - break; - - if (RT_MEMHEAP_IS_USED(header_ptr)) - { - /* dump information */ - rt_kprintf("[0x%08x - %d - %c%c%c%c] used\n", header_ptr, block_size, - header_ptr->owner_thread_name[0], header_ptr->owner_thread_name[1], - header_ptr->owner_thread_name[2], header_ptr->owner_thread_name[3]); - } - else - { - /* dump information */ - rt_kprintf("[0x%08x - %d - %c%c%c%c] free\n", header_ptr, block_size, - header_ptr->owner_thread_name[0], header_ptr->owner_thread_name[1], - header_ptr->owner_thread_name[2], header_ptr->owner_thread_name[3]); - } - - /* move to next used memory block */ - header_ptr = header_ptr->next; - } -} - -void memtrace_heap() +int memheaptrace(int argc, char *argv[]) { struct rt_object_information *info; struct rt_list_node *list; struct rt_memheap *mh; struct rt_list_node *node; + char *name; + name = argc > 1 ? argv[1] : RT_NULL; info = rt_object_get_information(RT_Object_Class_MemHeap); list = &info->object_list; - for (node = list->next; node != list; node = node->next) { + struct rt_memheap_item *header_ptr; + rt_uint32_t block_size; + mh = (struct rt_memheap *)rt_list_entry(node, struct rt_object, list); - dump_used_memheap(mh); + /* find the specified object */ + if (name != RT_NULL && rt_strncmp(name, mh->parent.name, RT_NAME_MAX) != 0) + continue; + /* memheap dump */ + rt_kprintf("\nmemory heap address:\n"); + rt_kprintf("name : %s\n", mh->parent.name); + rt_kprintf("heap_ptr: 0x%08x\n", mh->start_addr); + rt_kprintf("free : 0x%08x\n", mh->available_size); + rt_kprintf("max_used: 0x%08x\n", mh->max_used_size); + rt_kprintf("size : 0x%08x\n", mh->pool_size); + rt_kprintf("\n--memory used information --\n"); + /* memheap item */ + for (header_ptr = mh->block_list; + header_ptr->next != mh->block_list; + header_ptr = header_ptr->next) + { + if ((header_ptr->magic & RT_MEMHEAP_MASK) != RT_MEMHEAP_MAGIC) + { + rt_kprintf("[0x%08x - incorrect magic: 0x%08x\n", + header_ptr, header_ptr->magic); + break; + } + /* get current memory block size */ + block_size = MEMITEM_SIZE(header_ptr); + if (block_size < 0) + break; + rt_kprintf("[0x%08x - %d - %c%c%c%c] %s\n", + header_ptr, block_size, + header_ptr->owner_thread_name[0], + header_ptr->owner_thread_name[1], + header_ptr->owner_thread_name[2], + header_ptr->owner_thread_name[3], + RT_MEMHEAP_IS_USED(header_ptr) ? "used" : "free"); + } } + return 0; } #ifdef RT_USING_FINSH #include -MSH_CMD_EXPORT(memtrace_heap, dump memory trace for heap); +MSH_CMD_EXPORT(memheaptrace, dump memory trace for memheap); #endif /* RT_USING_FINSH */ - #endif /* RT_USING_MEMTRACE */ - #endif /* RT_USING_MEMHEAP */ From b7ab74ce8a1b2af958380ce6fa10aa8c491916ef Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 20:51:38 +0800 Subject: [PATCH 06/30] [kernel][mem] Clean up memory space of small memory management objects --- src/mem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mem.c b/src/mem.c index 7120ca4115c..fbc3d45af88 100644 --- a/src/mem.c +++ b/src/mem.c @@ -152,6 +152,7 @@ rt_err_t rt_mem_init(struct rt_mem *m, RT_ASSERT(m != RT_NULL); + rt_memset(m, 0, sizeof(*m)); /* alignment addr */ if ((end_align > (2 * SIZEOF_STRUCT_MEM)) && ((end_align - 2 * SIZEOF_STRUCT_MEM) >= begin_align)) From 3f2ee415df3ec2578d67e9dba924cd0cf68b858e Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 21:07:27 +0800 Subject: [PATCH 07/30] [kernel][kservice] Add memory application interface and thread protection interface --- src/kservice.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 282 insertions(+), 1 deletion(-) diff --git a/src/kservice.c b/src/kservice.c index 8b959cbd68c..9e5b7a53535 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1276,7 +1276,288 @@ RT_WEAK int rt_kprintf(const char *fmt, ...) RTM_EXPORT(rt_kprintf); #endif /* RT_USING_CONSOLE */ -#ifdef RT_USING_HEAP +#if defined(RT_USING_HEAP) && !defined(RT_USING_USERHEAP) +#ifdef RT_USING_HOOK +static void (*rt_malloc_hook)(void *ptr, rt_size_t size); +static void (*rt_free_hook)(void *ptr); + +/** + * @addtogroup Hook + */ + +/**@{*/ + +/** + * @brief This function will set a hook function, which will be invoked when a memory + * block is allocated from heap memory. + * + * @param hook the hook function. + */ +void rt_malloc_sethook(void (*hook)(void *ptr, rt_size_t size)) +{ + rt_malloc_hook = hook; +} + +/** + * @brief This function will set a hook function, which will be invoked when a memory + * block is released to heap memory. + * + * @param hook the hook function + */ +void rt_free_sethook(void (*hook)(void *ptr)) +{ + rt_free_hook = hook; +} + +/**@}*/ + +#endif /* RT_USING_HOOK */ + +#if defined(RT_USING_HEAP_ISR) +volatile static rt_base_t _lock; +#elif defined(RT_USING_MUTEX) +static struct rt_mutex _lock; +#endif + +rt_inline void _heap_lock_init(void) +{ +#if defined(RT_USING_HEAP_ISR) + _lock = 0; +#elif defined(RT_USING_MUTEX) + rt_mutex_init(&_lock, "heap", RT_IPC_FLAG_PRIO); +#endif +} + +rt_inline rt_base_t _heap_lock(void) +{ +#if defined(RT_USING_HEAP_ISR) + return rt_hw_interrupt_disable(); +#elif defined(RT_USING_MUTEX) + if (rt_thread_self()) + return rt_mutex_take(&_lock, RT_WAITING_FOREVER); + else + return RT_EOK; +#else + rt_enter_critical(); + return RT_EOK; +#endif +} + +rt_inline void _heap_unlock(rt_base_t level) +{ +#if defined(RT_USING_HEAP_ISR) + rt_hw_interrupt_enable(level); +#elif defined(RT_USING_MUTEX) + RT_ASSERT(level == RT_EOK); + if (rt_thread_self()) + rt_mutex_release(&_lock); +#else + rt_exit_critical(); +#endif +} + +#if defined(RT_USING_SMALL_MEM_AS_HEAP) +static struct rt_mem system_heap; +#define _MEM_INIT rt_mem_init +#define _MEM_MALLOC rt_mem_alloc +#define _MEM_REALLOC rt_mem_realloc +#define _MEM_FREE(_obj, _ptr) rt_mem_free(_ptr) +#define _MEM_INFO rt_mem_info +#elif defined(RT_USING_MEMHEAP_AS_HEAP) +static struct rt_memheap system_heap; +#define _MEM_INIT rt_memheap_init +#define _MEM_MALLOC rt_memheap_alloc +#define _MEM_REALLOC rt_memheap_realloc +#define _MEM_FREE(_obj, _ptr) rt_memheap_free(_ptr) +#define _MEM_INFO rt_memheap_info +#elif defined(RT_USING_SLAB_AS_HEAP) +static struct rt_slab system_heap; +#define _MEM_INIT rt_slab_init +#define _MEM_MALLOC rt_slab_alloc +#define _MEM_REALLOC rt_slab_realloc +#define _MEM_FREE rt_slab_free +#define _MEM_INFO rt_slab_info +#else +#define _MEM_INIT(...) -RT_ERROR; +#define _MEM_MALLOC(...) RT_NULL +#define _MEM_REALLOC(...) RT_NULL +#define _MEM_FREE(...) +#define _MEM_INFO(...) +#endif + +/** + * @brief This function will init system heap. + * + * @param begin_addr the beginning address of system page. + * + * @param end_addr the end address of system page. + */ +RT_WEAK void rt_system_heap_init(void *begin_addr, void *end_addr) +{ + rt_ubase_t begin_align = RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); + rt_ubase_t end_align = RT_ALIGN_DOWN((rt_ubase_t)end_addr, RT_ALIGN_SIZE); + rt_err_t err; + + RT_ASSERT(end_align > begin_align); + + /* Initialize system memory heap */ + err = _MEM_INIT(&system_heap, "heap", begin_addr, end_align - begin_align); + RT_ASSERT(err == RT_EOK); + /* Initialize multi thread contention lock */ + _heap_lock_init(); +} + +/** + * @brief Allocate a block of memory with a minimum of 'size' bytes. + * + * @param size is the minimum size of the requested block in bytes. + * + * @return the pointer to allocated memory or NULL if no free memory was found. + */ +RT_WEAK void *rt_malloc(rt_size_t size) +{ + rt_base_t level; + void *ptr; + + /* Enter critical zone */ + level = _heap_lock(); + /* allocate memory block from system heap */ + ptr = _MEM_MALLOC(&system_heap, size); +#if defined(RT_USING_MEMHEAP_AS_HEAP) && defined(RT_USING_MEMHEAP_AUTO_BINDING) + if (ptr == RT_NULL) + { + struct rt_object *object; + struct rt_list_node *node; + struct rt_object_information *information; + + /* try to allocate on other memory heap */ + information = rt_object_get_information(rt_object_get_type(&system_heap.parent)); + RT_ASSERT(information != RT_NULL); + for (node = information->object_list.next; + node != &(information->object_list); + node = node->next) + { + object = rt_list_entry(node, struct rt_object, list); + /* not allocate in the default system heap */ + if (object == &system_heap.parent) + continue; + + ptr = _MEM_MALLOC((void *)object, size); + if (ptr != RT_NULL) + break; + } + } +#endif /* RT_USING_MEMHEAP_AUTO_BINDING */ + /* Exit critical zone */ + _heap_unlock(level); + /* call 'rt_malloc' hook */ + RT_OBJECT_HOOK_CALL(rt_malloc_hook, (ptr, size)); + return ptr; +} +RTM_EXPORT(rt_malloc); + +/** + * @brief This function will change the size of previously allocated memory block. + * + * @param rmem is the pointer to memory allocated by rt_malloc. + * + * @param newsize is the required new size. + * + * @return the changed memory block address. + */ +RT_WEAK void *rt_realloc(void *rmem, rt_size_t newsize) +{ + rt_base_t level; + void *nptr; + + /* Enter critical zone */ + level = _heap_lock(); + /* Change the size of previously allocated memory block */ + nptr = _MEM_REALLOC(&system_heap, rmem, newsize); + /* Exit critical zone */ + _heap_unlock(level); + return nptr; +} +RTM_EXPORT(rt_realloc); + +/** + * @brief This function will contiguously allocate enough space for count objects + * that are size bytes of memory each and returns a pointer to the allocated + * memory. + * + * @note The allocated memory is filled with bytes of value zero. + * + * @param count is the number of objects to allocate. + * + * @param size is the size of one object to allocate. + * + * @return pointer to allocated memory / NULL pointer if there is an error. + */ +RT_WEAK void *rt_calloc(rt_size_t count, rt_size_t size) +{ + void *p; + + /* allocate 'count' objects of size 'size' */ + p = rt_malloc(count * size); + /* zero the memory */ + if (p) + { + rt_memset(p, 0, count * size); + } + return p; +} +RTM_EXPORT(rt_calloc); + +/** + * @brief This function will release the previously allocated memory block by + * rt_malloc. The released memory block is taken back to system heap. + * + * @param rmem the address of memory which will be released. + */ +RT_WEAK void rt_free(void *rmem) +{ + rt_base_t level; + + /* call 'rt_free' hook */ + RT_OBJECT_HOOK_CALL(rt_free_hook, (rmem)); + /* Enter critical zone */ + level = _heap_lock(); + _MEM_FREE(&system_heap, rmem); + /* Exit critical zone */ + _heap_unlock(level); +} +RTM_EXPORT(rt_free); + +/** +* @brief This function will caculate the total memory, the used memory, and +* the max used memory. +* +* @param total is a pointer to get the total size of the memory. +* +* @param used is a pointer to get the size of memory used. +* +* @param max_used is a pointer to get the maximum memory used. +*/ +RT_WEAK void rt_memory_info(rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used) +{ + _MEM_INFO(&system_heap, total, used, max_used); +} +RTM_EXPORT(rt_memory_info); + +#if defined(RT_USING_SLAB) && defined(RT_USING_SLAB_AS_HEAP) +void *rt_page_alloc(rt_size_t npages) +{ + rt_slab_page_alloc(&system_heap, npages); +} + +void rt_page_free(void *addr, rt_size_t npages) +{ + rt_slab_page_free(&system_heap, addr, npages); +} +#endif + /** * This function allocates a memory block, which address is aligned to the * specified alignment size. From 080830c7f6f0a1eabf11cfb250b856eda4176f04 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 21:19:47 +0800 Subject: [PATCH 08/30] [kernel][kservice] Fix function return value problem --- src/kservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kservice.c b/src/kservice.c index 9e5b7a53535..760c526ed68 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1549,7 +1549,7 @@ RTM_EXPORT(rt_memory_info); #if defined(RT_USING_SLAB) && defined(RT_USING_SLAB_AS_HEAP) void *rt_page_alloc(rt_size_t npages) { - rt_slab_page_alloc(&system_heap, npages); + return rt_slab_page_alloc(&system_heap, npages); } void rt_page_free(void *addr, rt_size_t npages) From 66f1b04459b6127012a096a5a674d7baf00bfe2b Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 21:21:36 +0800 Subject: [PATCH 09/30] [kernel][memheap] Optimize memheaptrace print --- src/memheap.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/memheap.c b/src/memheap.c index 1388ea68bad..e267dd0b649 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -747,13 +747,20 @@ int memheaptrace(int argc, char *argv[]) block_size = MEMITEM_SIZE(header_ptr); if (block_size < 0) break; - rt_kprintf("[0x%08x - %d - %c%c%c%c] %s\n", - header_ptr, block_size, - header_ptr->owner_thread_name[0], - header_ptr->owner_thread_name[1], - header_ptr->owner_thread_name[2], - header_ptr->owner_thread_name[3], - RT_MEMHEAP_IS_USED(header_ptr) ? "used" : "free"); + + rt_kprintf("[0x%08x - ", header_ptr); + if (block_size < 1024) + rt_kprintf("%5d", block_size); + else if (block_size < 1024 * 1024) + rt_kprintf("%4dK", block_size / 1024); + else + rt_kprintf("%4dM", block_size / (1024 * 1024)); + /* dump thread name */ + rt_kprintf("] %c%c%c%c", + header_ptr->owner_thread_name[0], + header_ptr->owner_thread_name[1], + header_ptr->owner_thread_name[2], + header_ptr->owner_thread_name[3]); } } return 0; From a836d35dc674cd38f72009cfda5b4172e874689d Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Wed, 13 Oct 2021 21:42:08 +0800 Subject: [PATCH 10/30] [kernel][memheap] Support best mode --- src/memheap.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/memheap.c b/src/memheap.c index e267dd0b649..0717ea0d5f6 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -655,11 +655,23 @@ void rt_memheap_free(void *ptr) if (insert_header) { + struct rt_memheap_item *n = heap->free_list->next_free;; +#if defined(RT_MEMHEAP_BSET_MODE) + rt_uint32_t blk_size = MEMITEM_SIZE(header_ptr); + for (;n != heap->free_list; n = n->next_free) + { + rt_uint32_t m = MEMITEM_SIZE(n); + if (blk_size <= m) + { + break; + } + } +#endif /* no left merge, insert to free list */ - header_ptr->next_free = heap->free_list->next_free; - header_ptr->prev_free = heap->free_list; - heap->free_list->next_free->prev_free = header_ptr; - heap->free_list->next_free = header_ptr; + header_ptr->next_free = n; + header_ptr->prev_free = n->prev_free; + n->prev_free->next_free = header_ptr; + n->prev_free = header_ptr; RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("insert to free list: next_free 0x%08x, prev_free 0x%08x\n", @@ -756,7 +768,7 @@ int memheaptrace(int argc, char *argv[]) else rt_kprintf("%4dM", block_size / (1024 * 1024)); /* dump thread name */ - rt_kprintf("] %c%c%c%c", + rt_kprintf("] %c%c%c%c\n", header_ptr->owner_thread_name[0], header_ptr->owner_thread_name[1], header_ptr->owner_thread_name[2], From 1cbfb8a5bc8239b67f10c5f92dfb260781c8854f Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Thu, 14 Oct 2021 10:44:05 +0800 Subject: [PATCH 11/30] [kernel][memory] Remove semaphore lock --- include/rtdef.h | 2 -- include/rtthread.h | 2 +- src/kservice.c | 24 +++++++++++++++++++- src/mem.c | 23 ------------------- src/slab.c | 56 +++++----------------------------------------- 5 files changed, 29 insertions(+), 78 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index c9d86f9bd22..f533bfe7c06 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -852,7 +852,6 @@ struct rt_mem_item struct rt_mem { struct rt_object parent; /**< inherit from rt_object */ - struct rt_semaphore heap_sem; rt_uint8_t *heap_ptr; /**< pointer to the heap */ struct rt_mem_item *heap_end; struct rt_mem_item *lfree; @@ -960,7 +959,6 @@ struct rt_slab_page struct rt_slab { struct rt_object parent; /**< inherit from rt_object */ - struct rt_semaphore heap_sem; rt_ubase_t heap_start; /**< memory start address */ rt_ubase_t heap_end; /**< memory end address */ struct rt_slab_memusage *memusage; diff --git a/include/rtthread.h b/include/rtthread.h index 8e70506bab9..c908914928b 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -271,7 +271,7 @@ void rt_memory_info(rt_uint32_t *total, rt_uint32_t *used, rt_uint32_t *max_used); -#ifdef RT_USING_SLAB +#if defined(RT_USING_SLAB) && defined(RT_USING_SLAB_AS_HEAP) void *rt_page_alloc(rt_size_t npages); void rt_page_free(void *addr, rt_size_t npages); #endif diff --git a/src/kservice.c b/src/kservice.c index 760c526ed68..f6a91adb700 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1542,19 +1542,41 @@ RT_WEAK void rt_memory_info(rt_uint32_t *total, rt_uint32_t *used, rt_uint32_t *max_used) { + rt_base_t level; + + /* Enter critical zone */ + level = _heap_lock(); _MEM_INFO(&system_heap, total, used, max_used); + /* Exit critical zone */ + _heap_unlock(level); } RTM_EXPORT(rt_memory_info); #if defined(RT_USING_SLAB) && defined(RT_USING_SLAB_AS_HEAP) void *rt_page_alloc(rt_size_t npages) { - return rt_slab_page_alloc(&system_heap, npages); + rt_base_t level; + void *ptr; + + /* Enter critical zone */ + level = _heap_lock(); + /* alloc page */ + ptr = rt_slab_page_alloc(&system_heap, npages); + /* Exit critical zone */ + _heap_unlock(level); + return ptr; } void rt_page_free(void *addr, rt_size_t npages) { + rt_base_t level; + + /* Enter critical zone */ + level = _heap_lock(); + /* free page */ rt_slab_page_free(&system_heap, addr, npages); + /* Exit critical zone */ + _heap_unlock(level); } #endif diff --git a/src/mem.c b/src/mem.c index fbc3d45af88..25af6865b1b 100644 --- a/src/mem.c +++ b/src/mem.c @@ -195,8 +195,6 @@ rt_err_t rt_mem_init(struct rt_mem *m, rt_mem_setname(m->heap_end, "INIT"); #endif /* RT_USING_MEMTRACE */ - rt_sem_init(&m->heap_sem, "heap", 1, RT_IPC_FLAG_PRIO); - /* initialize the lowest-free pointer to the start of the heap */ m->lfree = (struct rt_mem_item *)m->heap_ptr; @@ -217,7 +215,6 @@ rt_err_t rt_mem_detach(struct rt_mem *m) RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); RT_ASSERT(rt_object_is_systemobject(&m->parent)); - rt_sem_detach(&m->heap_sem); rt_object_detach(&(m->parent)); return RT_EOK; @@ -271,9 +268,6 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) if (size < MIN_SIZE_ALIGNED) size = MIN_SIZE_ALIGNED; - /* take memory semaphore */ - rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); - for (ptr = (rt_uint8_t *)m->lfree - m->heap_ptr; ptr < m->mem_size_aligned - size; ptr = ((struct rt_mem_item *)&m->heap_ptr[ptr])->next) @@ -350,8 +344,6 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) RT_ASSERT(((m->lfree == m->heap_end) || (!MEM_ISUSED(m->lfree)))); } - - rt_sem_release(&m->heap_sem); RT_ASSERT((rt_ubase_t)mem + SIZEOF_STRUCT_MEM + size <= (rt_ubase_t)m->heap_end); RT_ASSERT((rt_ubase_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM) % RT_ALIGN_SIZE == 0); RT_ASSERT((((rt_ubase_t)mem) & (RT_ALIGN_SIZE - 1)) == 0); @@ -366,8 +358,6 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) } } - rt_sem_release(&m->heap_sem); - return RT_NULL; } RTM_EXPORT(rt_mem_alloc); @@ -415,14 +405,9 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) if (rmem == RT_NULL) return rt_mem_alloc(m, newsize); - rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); - if ((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_ptr || (rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_end) { - /* illegal memory */ - rt_sem_release(&m->heap_sem); - return rmem; } @@ -433,7 +418,6 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) if (size == newsize) { /* the size is the same as */ - rt_sem_release(&m->heap_sem); return rmem; } @@ -464,11 +448,8 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) plug_holes(m, mem2); - rt_sem_release(&m->heap_sem); - return rmem; } - rt_sem_release(&m->heap_sem); /* expand memory */ nmem = rt_mem_alloc(m, newsize); @@ -516,9 +497,6 @@ void rt_mem_free(void *rmem) (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); RT_ASSERT(MEM_POOL(&m->heap_ptr[mem->next]) == m); - /* protect the heap from concurrent access */ - rt_sem_take(&m->heap_sem, RT_WAITING_FOREVER); - /* ... and is now unused. */ mem->pool_ptr = MEM_FREED(); #ifdef RT_USING_MEMTRACE @@ -535,7 +513,6 @@ void rt_mem_free(void *rmem) /* finally, see if prev or next are free also */ plug_holes(m, mem); - rt_sem_release(&m->heap_sem); } RTM_EXPORT(rt_mem_free); diff --git a/src/slab.c b/src/slab.c index e9811f9c152..9b211ebffdc 100644 --- a/src/slab.c +++ b/src/slab.c @@ -148,8 +148,6 @@ void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages) if (npages == 0) return RT_NULL; - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); for (prev = &slab->page_list; (b = *prev) != RT_NULL; prev = &(b->next)) { if (b->page > npages) @@ -170,9 +168,6 @@ void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages) } } - /* unlock heap */ - rt_sem_release(&slab->heap_sem); - return b; } @@ -196,9 +191,6 @@ void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) n = (struct rt_slab_page *)addr; - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); - for (prev = &slab->page_list; (b = *prev) != RT_NULL; prev = &(b->next)) { RT_ASSERT(b->page > 0); @@ -211,8 +203,7 @@ void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) b->page += b->next->page; b->next = b->next->next; } - - goto _return; + return; } if (b == n + npages) @@ -220,8 +211,7 @@ void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) n->page = b->page + npages; n->next = b->next; *prev = n; - - goto _return; + return; } if (b > n + npages) @@ -231,10 +221,6 @@ void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) n->page = npages; n->next = b; *prev = n; - -_return: - /* unlock heap */ - rt_sem_release(&slab->heap_sem); } /* @@ -287,9 +273,6 @@ rt_err_t rt_slab_init(struct rt_slab *slab, const char *name, limsize = slab->heap_end - slab->heap_start; npages = limsize / RT_MM_PAGE_SIZE; - /* initialize heap semaphore */ - rt_sem_init(&slab->heap_sem, "heap", 1, RT_IPC_FLAG_PRIO); - RT_DEBUG_LOG(RT_DEBUG_SLAB, ("heap[0x%x - 0x%x], size 0x%x, 0x%x pages\n", slab->heap_start, slab->heap_end, limsize, npages)); @@ -334,7 +317,6 @@ rt_err_t rt_slab_detach(struct rt_slab *slab) RT_ASSERT(rt_object_get_type(&slab->parent) == RT_Object_Class_Slab); RT_ASSERT(rt_object_is_systemobject(&slab->parent)); - rt_sem_detach(&slab->heap_sem); rt_object_detach(&(slab->parent)); return RT_EOK; @@ -457,19 +439,13 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) size, size >> RT_MM_PAGE_BITS, ((rt_ubase_t)chunk - slab->heap_start) >> RT_MM_PAGE_BITS)); - - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); /* mem stat */ slab->used_mem += size; if (slab->used_mem > slab->max_mem) slab->max_mem = slab->used_mem; - goto done; + return chunk; } - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); - /* * Attempt to allocate out of an existing zone. First try the free list, * then allocate out of unallocated space. If we find a good zone move @@ -518,7 +494,7 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) if (slab->used_mem > slab->max_mem) slab->max_mem = slab->used_mem; - goto done; + return chunk; } /* @@ -540,20 +516,13 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) } else { - /* unlock heap, since page allocator will think about lock */ - rt_sem_release(&slab->heap_sem); - /* allocate a zone from page */ z = rt_slab_page_alloc(slab, slab->zone_size / RT_MM_PAGE_SIZE); if (z == RT_NULL) { - chunk = RT_NULL; - goto __exit; + return RT_NULL; } - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); - RT_DEBUG_LOG(RT_DEBUG_SLAB, ("alloc a new zone: 0x%x\n", (rt_ubase_t)z)); @@ -601,10 +570,6 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) slab->max_mem = slab->used_mem; } -done: - rt_sem_release(&slab->heap_sem); - -__exit: return chunk; } RTM_EXPORT(rt_slab_alloc); @@ -715,14 +680,11 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) { rt_ubase_t size; - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); /* clear page counter */ size = kup->size; kup->size = 0; /* mem stats */ slab->used_mem -= size * RT_MM_PAGE_SIZE; - rt_sem_release(&slab->heap_sem); RT_DEBUG_LOG(RT_DEBUG_SLAB, ("free large memory block 0x%x, page count %d\n", @@ -734,9 +696,6 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) return; } - /* lock heap */ - rt_sem_take(&slab->heap_sem, RT_WAITING_FOREVER); - /* zone case. get out zone. */ z = (struct rt_slab_zone *)(((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK) - kup->size * RT_MM_PAGE_SIZE); @@ -803,17 +762,12 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) kup ++; } - /* unlock heap */ - rt_sem_release(&slab->heap_sem); - /* release pages */ rt_slab_page_free(slab, z, slab->zone_size / RT_MM_PAGE_SIZE); return; } } - /* unlock heap */ - rt_sem_release(&slab->heap_sem); } RTM_EXPORT(rt_slab_free); From a4807398f0e5f2a002ee3e18a8f044789855806d Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Thu, 14 Oct 2021 10:57:48 +0800 Subject: [PATCH 12/30] [kernel][memheap] Add locked flag --- include/rtdef.h | 1 + src/memheap.c | 113 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 82 insertions(+), 32 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index f533bfe7c06..7a2ff7e60ac 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -899,6 +899,7 @@ struct rt_memheap struct rt_memheap_item free_header; /**< free block list header */ struct rt_semaphore lock; /**< semaphore lock */ + rt_bool_t locked; /**< External lock mark */ }; #endif diff --git a/src/memheap.c b/src/memheap.c index 0717ea0d5f6..1ef93610ab3 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -130,6 +130,7 @@ rt_err_t rt_memheap_init(struct rt_memheap *memheap, /* initialize semaphore lock */ rt_sem_init(&(memheap->lock), name, 1, RT_IPC_FLAG_PRIO); + memheap->locked = RT_FALSE; RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("memory heap: start addr 0x%08x, size %d, free list header 0x%08x\n", @@ -192,12 +193,15 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size) free_size = 0; /* lock memheap */ - result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); - if (result != RT_EOK) + if (heap->locked == RT_FALSE) { - rt_set_errno(result); + result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); + if (result != RT_EOK) + { + rt_set_errno(result); - return RT_NULL; + return RT_NULL; + } } /* get the first free memory block */ @@ -302,8 +306,11 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size) rt_memcpy(header_ptr->owner_thread_name, "NONE", sizeof(header_ptr->owner_thread_name)); #endif /* RT_USING_MEMTRACE */ - /* release lock */ - rt_sem_release(&(heap->lock)); + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } /* Return a memory address to the caller. */ RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, @@ -315,8 +322,11 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size) return (void *)((rt_uint8_t *)header_ptr + RT_MEMHEAP_SIZE); } - /* release lock */ - rt_sem_release(&(heap->lock)); + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } } RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("allocate memory: failed\n")); @@ -375,12 +385,15 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize) /* Fix the crash problem after opening Oz optimization on ac6 */ volatile struct rt_memheap_item *next_ptr; - /* lock memheap */ - result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); - if (result != RT_EOK) + if (heap->locked == RT_FALSE) { - rt_set_errno(result); - return RT_NULL; + /* lock memheap */ + result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); + if (result != RT_EOK) + { + rt_set_errno(result); + return RT_NULL; + } } next_ptr = header_ptr->next; @@ -456,16 +469,21 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize) RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("new ptr: next_free 0x%08x, prev_free 0x%08x", next_ptr->next_free, next_ptr->prev_free)); - - /* release lock */ - rt_sem_release(&(heap->lock)); + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } return ptr; } } - /* release lock */ - rt_sem_release(&(heap->lock)); + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } /* re-allocate a memory block */ new_ptr = (void *)rt_memheap_alloc(heap, newsize); @@ -482,13 +500,16 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize) if (newsize + RT_MEMHEAP_SIZE + RT_MEMHEAP_MINIALLOC >= oldsize) return ptr; - /* lock memheap */ - result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); - if (result != RT_EOK) + if (heap->locked == RT_FALSE) { - rt_set_errno(result); + /* lock memheap */ + result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); + if (result != RT_EOK) + { + rt_set_errno(result); - return RT_NULL; + return RT_NULL; + } } /* split the block. */ @@ -550,8 +571,11 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize) /* increment the available byte count. */ heap->available_size = heap->available_size + MEMITEM_SIZE(new_ptr); - /* release lock */ - rt_sem_release(&(heap->lock)); + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } /* return the old memory block */ return ptr; @@ -599,13 +623,16 @@ void rt_memheap_free(void *ptr) RT_ASSERT(heap); RT_ASSERT(rt_object_get_type(&heap->parent) == RT_Object_Class_MemHeap); - /* lock memheap */ - result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); - if (result != RT_EOK) + if (heap->locked == RT_FALSE) { - rt_set_errno(result); + /* lock memheap */ + result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); + if (result != RT_EOK) + { + rt_set_errno(result); - return ; + return ; + } } /* Mark the memory as available. */ @@ -682,8 +709,11 @@ void rt_memheap_free(void *ptr) rt_memset(header_ptr->owner_thread_name, ' ', sizeof(header_ptr->owner_thread_name)); #endif /* RT_USING_MEMTRACE */ - /* release lock */ - rt_sem_release(&(heap->lock)); + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } } RTM_EXPORT(rt_memheap_free); @@ -705,6 +735,19 @@ void rt_memheap_info(struct rt_memheap *heap, rt_uint32_t *used, rt_uint32_t *max_used) { + rt_err_t result; + + if (heap->locked == RT_FALSE) + { + /* lock memheap */ + result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER); + if (result != RT_EOK) + { + rt_set_errno(result); + return; + } + } + if (total != RT_NULL) *total = heap->pool_size; @@ -713,6 +756,12 @@ void rt_memheap_info(struct rt_memheap *heap, if (max_used != RT_NULL) *max_used = heap->max_used_size; + + if (heap->locked == RT_FALSE) + { + /* release lock */ + rt_sem_release(&(heap->lock)); + } } #ifdef RT_USING_MEMTRACE From 5182c76280a935fd7fc61b740680b3bcb4d967ef Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Thu, 14 Oct 2021 11:33:59 +0800 Subject: [PATCH 13/30] [kernel][memory] Support malloc memory in interrupt --- src/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Kconfig b/src/Kconfig index e7419952990..2bc37cf451d 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -374,6 +374,12 @@ menu "Memory Management" to check memory block to find which thread has wrongly modified memory. + config RT_USING_HEAP_ISR + bool "Using heap in ISR" + default n + help + When this option is enabled, the critical zone will be protected with disable interrupt. + config RT_USING_HEAP bool default n if RT_USING_NOHEAP From 26961908dec33b84e54b362d3e345c365d9f32b5 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Fri, 15 Oct 2021 16:50:51 +0800 Subject: [PATCH 14/30] [kernel][memheap] Add 'memheapcheck' cmd --- src/memheap.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/src/memheap.c b/src/memheap.c index 1ef93610ab3..8b7c4159861 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -608,14 +608,15 @@ void rt_memheap_free(void *ptr) ptr, header_ptr)); /* check magic */ - if (header_ptr->magic != (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED)) + if (header_ptr->magic != (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED) || + (header_ptr->next->magic & RT_MEMHEAP_MASK) != RT_MEMHEAP_MAGIC) { RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("bad magic:0x%08x @ memheap\n", header_ptr->magic)); + RT_ASSERT(header_ptr->magic == (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED)); + /* check whether this block of memory has been over-written. */ + RT_ASSERT((header_ptr->next->magic & RT_MEMHEAP_MASK) == RT_MEMHEAP_MAGIC); } - RT_ASSERT(header_ptr->magic == (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED)); - /* check whether this block of memory has been over-written. */ - RT_ASSERT((header_ptr->next->magic & RT_MEMHEAP_MASK) == RT_MEMHEAP_MAGIC); /* get pool ptr */ heap = header_ptr->pool_ptr; @@ -765,6 +766,77 @@ void rt_memheap_info(struct rt_memheap *heap, } #ifdef RT_USING_MEMTRACE +int memheapcheck(int argc, char *argv[]) +{ + struct rt_object_information *info; + struct rt_list_node *list; + struct rt_memheap *heap; + struct rt_list_node *node; + struct rt_memheap_item *item; + struct rt_memheap_item *last = RT_NULL; + rt_bool_t has_bad = RT_FALSE; + rt_base_t level; + char *name; + + name = argc > 1 ? argv[1] : RT_NULL; + level = rt_hw_interrupt_disable(); + info = rt_object_get_information(RT_Object_Class_MemHeap); + list = &info->object_list; + for (node = list->next; node != list; node = node->next) + { + struct rt_memheap_item *header_ptr; + rt_uint32_t block_size; + + heap = (struct rt_memheap *)rt_list_entry(node, struct rt_object, list); + /* find the specified object */ + if (name != RT_NULL && rt_strncmp(name, heap->parent.name, RT_NAME_MAX) != 0) + continue; + /* check memheap */ + for (item = heap->block_list; item->next != heap->block_list; item = item->next) + { + /* check magic */ + if (!((item->magic & (RT_MEMHEAP_MAGIC | RT_MEMHEAP_FREED)) == (RT_MEMHEAP_MAGIC | RT_MEMHEAP_FREED) || + (item->magic & (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED)) == (RT_MEMHEAP_MAGIC | RT_MEMHEAP_USED))) + { + has_bad = RT_TRUE; + break; + } + /* check pool_ptr */ + if (heap != item->pool_ptr) + { + has_bad = RT_TRUE; + break; + } + /* check next and prev */ + if (!((rt_uint32_t)item->next <= (rt_uint32_t)((rt_uint32_t)heap->start_addr + heap->pool_size) && + (rt_uint32_t)item->prev >= (rt_uint32_t)heap->start_addr) && + (rt_uint32_t)item->next == RT_ALIGN((rt_uint32_t)item->next, RT_ALIGN_SIZE) && + (rt_uint32_t)item->prev == RT_ALIGN((rt_uint32_t)item->prev, RT_ALIGN_SIZE)) + { + has_bad = RT_TRUE; + break; + } + /* check item */ + if (item->next == item->next->prev) + { + has_bad = RT_TRUE; + break; + } + /* move to next used memory block */ + last = item; + } + } + rt_hw_interrupt_enable(level); + if (has_bad) + { + rt_kprintf("Memory block wrong:\n"); + rt_kprintf("name: %s\n", heap->parent.name); + rt_kprintf("item: 0x%08x\n", item); + } + return 0; +} +MSH_CMD_EXPORT(memheapcheck, check memory for memheap); + int memheaptrace(int argc, char *argv[]) { struct rt_object_information *info; From 7e6b22e11d644e9bbe1e91046963b268bc2c3994 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Fri, 15 Oct 2021 16:56:15 +0800 Subject: [PATCH 15/30] [kernel][mem] Fix failure to request full memory --- src/mem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mem.c b/src/mem.c index 25af6865b1b..6acc0c46958 100644 --- a/src/mem.c +++ b/src/mem.c @@ -66,6 +66,9 @@ (((rt_base_t)(((struct rt_mem_item *)(_mem))->pool_ptr)) & (~MEM_MASK)) #define MEM_POOL(_mem) \ ((struct rt_mem *)(((rt_base_t)(((struct rt_mem_item *)(_mem))->pool_ptr)) & (MEM_MASK))) +#define MEM_SIZE(_heap, _mem) \ + (((struct rt_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ + (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE)) #define MIN_SIZE_ALIGNED RT_ALIGN(MIN_SIZE, RT_ALIGN_SIZE) #define SIZEOF_STRUCT_MEM RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE) @@ -269,7 +272,7 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) size = MIN_SIZE_ALIGNED; for (ptr = (rt_uint8_t *)m->lfree - m->heap_ptr; - ptr < m->mem_size_aligned - size; + ptr <= m->mem_size_aligned - size; ptr = ((struct rt_mem_item *)&m->heap_ptr[ptr])->next) { mem = (struct rt_mem_item *)&m->heap_ptr[ptr]; @@ -633,12 +636,9 @@ int memtrace(int argc, char **argv) rt_kprintf("\n--memory item information --\n"); for (mem = (struct rt_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_mem_item *)&m->heap_ptr[mem->next]) { - int position = (rt_ubase_t)mem - (rt_ubase_t)m->heap_ptr; - int size; + int size = MEM_SIZE(m, mem); rt_kprintf("[0x%08x - ", mem); - - size = mem->next - position - SIZEOF_STRUCT_MEM; if (size < 1024) rt_kprintf("%5d", size); else if (size < 1024 * 1024) From a034475368577f896d6079d6f89dd70c4c6db8a8 Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Mon, 18 Oct 2021 11:29:03 +0800 Subject: [PATCH 16/30] [kernel][memheap] Fix compilation warning --- src/memheap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/memheap.c b/src/memheap.c index 8b7c4159861..21658161f04 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -784,9 +784,6 @@ int memheapcheck(int argc, char *argv[]) list = &info->object_list; for (node = list->next; node != list; node = node->next) { - struct rt_memheap_item *header_ptr; - rt_uint32_t block_size; - heap = (struct rt_memheap *)rt_list_entry(node, struct rt_object, list); /* find the specified object */ if (name != RT_NULL && rt_strncmp(name, heap->parent.name, RT_NAME_MAX) != 0) From 7a998c75d953ec060cde84b0f801151cc7c45cee Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Mon, 18 Oct 2021 11:30:13 +0800 Subject: [PATCH 17/30] [kernel][mem] Fix mem realloc ASSERT --- src/mem.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/mem.c b/src/mem.c index 6acc0c46958..eaa26e5a64d 100644 --- a/src/mem.c +++ b/src/mem.c @@ -386,9 +386,6 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) RT_ASSERT(m != RT_NULL); RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); RT_ASSERT(rt_object_is_systemobject(&m->parent)); - RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); - RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && - (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); /* alignment size */ newsize = RT_ALIGN(newsize, RT_ALIGN_SIZE); @@ -408,14 +405,13 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) if (rmem == RT_NULL) return rt_mem_alloc(m, newsize); - if ((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_ptr || - (rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_end) - { - return rmem; - } + RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); + RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr); + RT_ASSERT((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); mem = (struct rt_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); + /* current memory block size */ ptr = (rt_uint8_t *)mem - m->heap_ptr; size = mem->next - ptr - SIZEOF_STRUCT_MEM; if (size == newsize) From 8e51c2fba17a57aa164a41862f072baf6dece1ad Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Mon, 18 Oct 2021 17:14:10 +0800 Subject: [PATCH 18/30] [examples][testcases] Add small mem testcase --- examples/utest/testcases/kernel/Kconfig | 5 + examples/utest/testcases/kernel/SConscript | 3 + examples/utest/testcases/kernel/mem_tc.c | 571 +++++++++++++++++++++ 3 files changed, 579 insertions(+) create mode 100644 examples/utest/testcases/kernel/mem_tc.c diff --git a/examples/utest/testcases/kernel/Kconfig b/examples/utest/testcases/kernel/Kconfig index 08c3022b77d..eab2770a442 100644 --- a/examples/utest/testcases/kernel/Kconfig +++ b/examples/utest/testcases/kernel/Kconfig @@ -5,6 +5,11 @@ config UTEST_MEMHEAP_TC default y depends on RT_USING_MEMHEAP +config UTEST_SMALL_MEM_TC + bool "mem test" + default y + depends on RT_USING_SMALL_MEM + config UTEST_IRQ_TC bool "IRQ test" default n diff --git a/examples/utest/testcases/kernel/SConscript b/examples/utest/testcases/kernel/SConscript index 0d2645427be..962c226dd79 100644 --- a/examples/utest/testcases/kernel/SConscript +++ b/examples/utest/testcases/kernel/SConscript @@ -8,6 +8,9 @@ src = Split(''' if GetDepend(['UTEST_MEMHEAP_TC']): src += ['memheap_tc.c'] +if GetDepend(['UTEST_SMALL_MEM_TC']): + src += ['mem_tc.c'] + if GetDepend(['UTEST_IRQ_TC']): src += ['irq_tc.c'] diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c new file mode 100644 index 00000000000..42c84b70e6c --- /dev/null +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -0,0 +1,571 @@ +/* + * Copyright (c) 2006-2019, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-10-14 tyx the first version + */ + +#include +#include +#include "utest.h" + +#define MEM_SIZE(_heap, _mem) \ + (((struct rt_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ + (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE)) + +#define TEST_MEM_SIZE 1024 * 1024 + +static rt_size_t max_block(struct rt_mem *heap) +{ + struct rt_mem_item *mem; + rt_size_t max = 0, size; + + for (mem = (struct rt_mem_item *)heap->heap_ptr; + mem != heap->heap_end; + mem = (struct rt_mem_item *)&heap->heap_ptr[mem->next]) + { + if (((rt_ubase_t)mem->pool_ptr & 0x1) == 0) + { + size = MEM_SIZE(heap, mem); + if (size > max) + { + max = size; + } + } + } + return max; +} + +static int _mem_cmp(void *ptr, rt_uint8_t v, rt_size_t size) +{ + while (size-- != 0) + { + if (*(rt_uint8_t *)ptr != v) + return *(rt_uint8_t *)ptr - v; + } + return 0; +} + +struct mem_test_context +{ + void *ptr; + rt_size_t size; + rt_uint8_t magic; +}; + +static void mem_functional_test(void) +{ + rt_size_t buf_size, total_size; + rt_uint8_t *begin, *buf; + struct rt_mem *heap; + rt_uint8_t magic = __LINE__; + + /* Prepare test memory */ + buf = rt_malloc(TEST_MEM_SIZE); + uassert_not_null(buf); + uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); + heap = (struct rt_mem *)buf; + begin = (rt_uint8_t *)&heap[1]; + buf_size = buf + TEST_MEM_SIZE - begin; + rt_memset(buf, 0xAA, TEST_MEM_SIZE); + // small heap init + rt_mem_init(heap, "mem_tc", begin, buf_size); + // get total size + total_size = max_block(heap); + uassert_int_not_equal(total_size, 0); + /* + * Allocate all memory at a time and test whether + * the memory allocation release function is effective + */ + { + struct mem_test_context ctx; + ctx.magic = magic++; + ctx.size = max_block(heap); + ctx.ptr = rt_mem_alloc(heap, ctx.size); + uassert_not_null(ctx.ptr); + rt_memset(ctx.ptr, ctx.magic, ctx.size); + uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); + rt_mem_free(ctx.ptr); + uassert_int_equal(max_block(heap), total_size); + } + /* + * Apply for memory release sequentially and + * test whether memory block merging is effective + */ + { + rt_size_t i, max_free = 0; + struct mem_test_context ctx[3]; + // alloc mem + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + ctx[i].magic = magic++; + ctx[i].size = max_block(heap) / (sizeof(ctx) / sizeof(ctx[0]) - i); + ctx[i].ptr = rt_mem_alloc(heap, ctx[i].size); + uassert_not_null(ctx[i].ptr); + rt_memset(ctx[i].ptr, ctx[i].magic, ctx[i].size); + } + // All memory has been applied. The remaining memory should be 0 + uassert_int_equal(max_block(heap), 0); + // Verify that the memory data is correct + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); + } + // Sequential memory release + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); + rt_mem_free(ctx[i].ptr); + max_free += ctx[i].size; + uassert_true(max_block(heap) >= max_free); + } + // Check whether the memory is fully merged + uassert_int_equal(max_block(heap), total_size); + } + /* + * Apply for memory release at an interval to + * test whether memory block merging is effective + */ + { + rt_size_t i, max_free = 0; + struct mem_test_context ctx[3]; + // alloc mem + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + ctx[i].magic = magic++; + ctx[i].size = max_block(heap) / (sizeof(ctx) / sizeof(ctx[0]) - i); + ctx[i].ptr = rt_mem_alloc(heap, ctx[i].size); + uassert_not_null(ctx[i].ptr); + rt_memset(ctx[i].ptr, ctx[i].magic, ctx[i].size); + } + // All memory has been applied. The remaining memory should be 0 + uassert_int_equal(max_block(heap), 0); + // Verify that the memory data is correct + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); + } + // Release even address + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + if (i % 2 == 0) + { + uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); + rt_mem_free(ctx[i].ptr); + uassert_true(max_block(heap) >= ctx[0].size); + } + } + // Release odd addresses and merge memory blocks + for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) + { + if (i % 2 != 0) + { + uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); + rt_mem_free(ctx[i].ptr); + max_free += ctx[i - 1].size + ctx[i + 1].size; + uassert_true(max_block(heap) >= max_free); + } + } + // Check whether the memory is fully merged + uassert_int_equal(max_block(heap), total_size); + } + // mem realloc test,Small - > Large + { + // Request a piece of memory for subsequent reallocation operations + struct mem_test_context ctx[3]; + ctx[0].magic = magic++; + ctx[0].size = max_block(heap) / 3; + ctx[0].ptr = rt_mem_alloc(heap, ctx[0].size); + uassert_not_null(ctx[0].ptr); + rt_memset(ctx[0].ptr, ctx[0].magic, ctx[0].size); + // Apply for a small piece of memory and split the continuous memory + ctx[1].magic = magic++; + ctx[1].size = RT_ALIGN_SIZE; + ctx[1].ptr = rt_mem_alloc(heap, ctx[1].size); + uassert_not_null(ctx[1].ptr); + rt_memset(ctx[1].ptr, ctx[1].magic, ctx[1].size); + // Check whether the maximum memory block is larger than the first piece of memory + uassert_true(max_block(heap) > ctx[0].size); + // Reallocate the first piece of memory + ctx[2].magic = magic++; + ctx[2].size = max_block(heap); + ctx[2].ptr = rt_mem_realloc(heap, ctx[0].ptr, ctx[2].size); + uassert_not_null(ctx[2].ptr); + uassert_int_not_equal(ctx[0].ptr, ctx[2].ptr); + uassert_int_equal(_mem_cmp(ctx[2].ptr, ctx[0].magic, ctx[0].size), 0); + rt_memset(ctx[2].ptr, ctx[2].magic, ctx[2].size); + // Free the second piece of memory + uassert_int_equal(_mem_cmp(ctx[1].ptr, ctx[1].magic, ctx[1].size), 0); + rt_mem_free(ctx[1].ptr); + // Free reallocated memory + uassert_int_equal(_mem_cmp(ctx[2].ptr, ctx[2].magic, ctx[2].size), 0); + rt_mem_free(ctx[2].ptr); + // Check memory integrity + uassert_int_equal(max_block(heap), total_size); + } + // mem realloc test,Large - > Small + { + rt_size_t max_free; + struct mem_test_context ctx; + // alloc a piece of memory + ctx.magic = magic++; + ctx.size = max_block(heap) / 2; + ctx.ptr = rt_mem_alloc(heap, ctx.size); + uassert_not_null(ctx.ptr); + rt_memset(ctx.ptr, ctx.magic, ctx.size); + uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); + // Get remaining memory + max_free = max_block(heap); + // Change memory size + ctx.size = ctx.size / 2; + uassert_int_equal((rt_ubase_t)rt_mem_realloc(heap, ctx.ptr, ctx.size), (rt_ubase_t)ctx.ptr); + // Get remaining size + uassert_true(max_block(heap) > max_free); + // Free memory + uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); + rt_mem_free(ctx.ptr); + // Check memory integrity + uassert_int_equal(max_block(heap), total_size); + } + // mem realloc test,equal + { + rt_size_t max_free; + struct mem_test_context ctx; + // alloc a piece of memory + ctx.magic = magic++; + ctx.size = max_block(heap) / 2; + ctx.ptr = rt_mem_alloc(heap, ctx.size); + uassert_not_null(ctx.ptr); + rt_memset(ctx.ptr, ctx.magic, ctx.size); + uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); + // Get remaining memory + max_free = max_block(heap); + // Do not change memory size + uassert_int_equal((rt_ubase_t)rt_mem_realloc(heap, ctx.ptr, ctx.size), (rt_ubase_t)ctx.ptr); + // Get remaining size + uassert_true(max_block(heap) == max_free); + // Free memory + uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); + rt_mem_free(ctx.ptr); + // Check memory integrity + uassert_int_equal(max_block(heap), total_size); + } + // small heap deinit + rt_mem_detach(heap); + /* release test resources */ + rt_free(buf); +} + +struct mem_alloc_context +{ + rt_list_t node; + rt_size_t size; + rt_uint8_t magic; +}; + +struct mem_alloc_head +{ + rt_list_t list; + rt_size_t count; + rt_tick_t start; + rt_tick_t end; + rt_tick_t interval; +}; + +#define MEM_RANG_ALLOC_BLK_MIN 2 +#define MEM_RANG_ALLOC_BLK_MAX 5 +#define MEM_RANG_ALLOC_TEST_TIME 10 + +static void mem_alloc_test(void) +{ + struct mem_alloc_head head; + rt_uint8_t *begin, *buf; + struct rt_mem *heap; + rt_size_t buf_size, total_size, size; + struct mem_alloc_context *ctx; + + /* init */ + rt_list_init(&head.list); + head.count = 0; + head.start = rt_tick_get(); + head.end = rt_tick_get() + rt_tick_from_millisecond(MEM_RANG_ALLOC_TEST_TIME * 1000); + head.interval = (head.end - head.start) / 20; + buf = rt_malloc(TEST_MEM_SIZE); + uassert_not_null(buf); + uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); + heap = (struct rt_mem *)buf; + begin = (rt_uint8_t *)&heap[1]; + buf_size = buf + TEST_MEM_SIZE - begin; + rt_memset(buf, 0xAA, TEST_MEM_SIZE); + rt_mem_init(heap, "mem_tc", begin, buf_size); + total_size = max_block(heap); + uassert_int_not_equal(total_size, 0); + // test run + while (head.end - head.start < RT_TICK_MAX / 2) + { + if (rt_tick_get() - head.start >= head.interval) + { + head.start = rt_tick_get(); + rt_kprintf("#"); + } + // %60 probability to perform alloc operation + if (rand() % 10 >= 4) + { + size = rand() % MEM_RANG_ALLOC_BLK_MAX + MEM_RANG_ALLOC_BLK_MIN; + size *= sizeof(struct mem_alloc_context); + ctx = rt_mem_alloc(heap, size); + if (ctx == RT_NULL) + { + if (head.count == 0) + { + break; + } + size = head.count / 2; + while (size != head.count) + { + ctx = rt_list_first_entry(&head.list, struct mem_alloc_context, node); + rt_list_remove(&ctx->node); + if (ctx->size > sizeof(*ctx)) + { + if (_mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)) != 0) + { + uassert_true(0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_free(ctx); + head.count --; + } + continue; + } + if (RT_ALIGN((rt_ubase_t)ctx, RT_ALIGN_SIZE) != (rt_ubase_t)ctx) + { + uassert_int_equal(RT_ALIGN((rt_ubase_t)ctx, RT_ALIGN_SIZE), (rt_ubase_t)ctx); + } + rt_memset(ctx, 0, size); + rt_list_init(&ctx->node); + ctx->size = size; + ctx->magic = rand() & 0xff; + if (ctx->size > sizeof(*ctx)) + { + rt_memset(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + } + rt_list_insert_after(&head.list, &ctx->node); + head.count += 1; + } + else + { + if (!rt_list_isempty(&head.list)) + { + ctx = rt_list_first_entry(&head.list, struct mem_alloc_context, node); + rt_list_remove(&ctx->node); + if (ctx->size > sizeof(*ctx)) + { + if (_mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)) != 0) + { + uassert_true(0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_free(ctx); + head.count --; + } + } + } + while (!rt_list_isempty(&head.list)) + { + ctx = rt_list_first_entry(&head.list, struct mem_alloc_context, node); + rt_list_remove(&ctx->node); + if (ctx->size > sizeof(*ctx)) + { + if (_mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)) != 0) + { + uassert_true(0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_free(ctx); + head.count --; + } + uassert_int_equal(head.count, 0); + uassert_int_equal(max_block(heap), total_size); + // small heap deinit + rt_mem_detach(heap); + /* release test resources */ + rt_free(buf); +} + +#define MEM_RANG_REALLOC_BLK_MIN 0 +#define MEM_RANG_REALLOC_BLK_MAX 5 +#define MEM_RANG_REALLOC_TEST_TIME 10 + +struct mem_realloc_context +{ + rt_size_t size; + rt_uint8_t magic; +}; + +struct mem_realloc_head +{ + struct mem_realloc_context **ctx_tab; + rt_size_t count; + rt_tick_t start; + rt_tick_t end; + rt_tick_t interval; +}; + +static void mem_realloc_test(void) +{ + struct mem_realloc_head head; + rt_uint8_t *begin, *buf; + struct rt_mem *heap; + rt_size_t buf_size, total_size, size, idx; + struct mem_realloc_context *ctx; + int res; + + size = RT_ALIGN(sizeof(struct mem_realloc_context), RT_ALIGN_SIZE) + RT_ALIGN_SIZE; + size = TEST_MEM_SIZE / size; + /* init */ + head.ctx_tab = RT_NULL; + head.count = size; + head.start = rt_tick_get(); + head.end = rt_tick_get() + rt_tick_from_millisecond(MEM_RANG_ALLOC_TEST_TIME * 1000); + head.interval = (head.end - head.start) / 20; + buf = rt_malloc(TEST_MEM_SIZE); + uassert_not_null(buf); + uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); + heap = (struct rt_mem *)buf; + begin = (rt_uint8_t *)&heap[1]; + buf_size = buf + TEST_MEM_SIZE - begin; + rt_memset(buf, 0xAA, TEST_MEM_SIZE); + rt_mem_init(heap, "mem_tc", begin, buf_size); + total_size = max_block(heap); + uassert_int_not_equal(total_size, 0); + /* init ctx tab */ + size = head.count * sizeof(struct mem_realloc_context *); + head.ctx_tab = rt_mem_alloc(heap, size); + uassert_not_null(head.ctx_tab); + rt_memset(head.ctx_tab, 0, size); + // test run + while (head.end - head.start < RT_TICK_MAX / 2) + { + if (rt_tick_get() - head.start >= head.interval) + { + head.start = rt_tick_get(); + rt_kprintf("#"); + } + size = rand() % MEM_RANG_ALLOC_BLK_MAX + MEM_RANG_ALLOC_BLK_MIN; + size *= sizeof(struct mem_realloc_context); + idx = rand() % head.count; + ctx = rt_mem_realloc(heap, head.ctx_tab[idx], size); + if (ctx == RT_NULL) + { + if (size == 0) + { + if (head.ctx_tab[idx]) + { + head.ctx_tab[idx] = RT_NULL; + } + } + else + { + for (idx = 0; idx < head.count; idx++) + { + ctx = head.ctx_tab[idx]; + if (rand() % 2 && ctx) + { + if (ctx->size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + if (res != 0) + { + uassert_int_equal(res, 0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_mem_realloc(heap, ctx, 0); + head.ctx_tab[idx] = RT_NULL; + } + } + } + continue; + } + /* check mem */ + if (head.ctx_tab[idx] != RT_NULL) + { + res = 0; + if (ctx->size < size) + { + if (ctx->size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + } + } + else + { + if (size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, size - sizeof(*ctx)); + } + } + if (res != 0) + { + uassert_int_equal(res, 0); + } + } + /* init mem */ + ctx->magic = rand() & 0xff; + ctx->size = size; + if (ctx->size > sizeof(*ctx)) + { + rt_memset(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + } + head.ctx_tab[idx] = ctx; + } + // free all mem + for (idx = 0; idx < head.count; idx++) + { + ctx = head.ctx_tab[idx]; + if (ctx == RT_NULL) + { + continue; + } + if (ctx->size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + if (res != 0) + { + uassert_int_equal(res, 0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_mem_realloc(heap, ctx, 0); + head.ctx_tab[idx] = RT_NULL; + } + uassert_int_not_equal(max_block(heap), total_size); + // small heap deinit + rt_mem_detach(heap); + /* release test resources */ + rt_free(buf); +} + +static rt_err_t utest_tc_init(void) +{ + return RT_EOK; +} + +static rt_err_t utest_tc_cleanup(void) +{ + return RT_EOK; +} + +static void testcase(void) +{ + UTEST_UNIT_RUN(mem_functional_test); + UTEST_UNIT_RUN(mem_alloc_test); + UTEST_UNIT_RUN(mem_realloc_test); +} +UTEST_TC_EXPORT(testcase, "testcases.kernel.mem_tc", utest_tc_init, utest_tc_cleanup, 10); From dd0d1fa79915aa2d03236d183a3cf6dec8e9a9aa Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Tue, 19 Oct 2021 15:04:30 +0800 Subject: [PATCH 19/30] [examples][mem_tc] Modify test memory size --- examples/utest/testcases/kernel/mem_tc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c index 42c84b70e6c..8c272b30b61 100644 --- a/examples/utest/testcases/kernel/mem_tc.c +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -16,7 +16,7 @@ (((struct rt_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE)) -#define TEST_MEM_SIZE 1024 * 1024 +#define TEST_MEM_SIZE 1024 static rt_size_t max_block(struct rt_mem *heap) { From 57beae93d664dcbe3dd560bbda97a60a1a19afbe Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Mon, 25 Oct 2021 17:28:44 +0800 Subject: [PATCH 20/30] [examples][testcases] Add slab memory management algorithm test case --- examples/utest/testcases/kernel/Kconfig | 5 + examples/utest/testcases/kernel/SConscript | 3 + examples/utest/testcases/kernel/slab_tc.c | 329 +++++++++++++++++++++ 3 files changed, 337 insertions(+) create mode 100644 examples/utest/testcases/kernel/slab_tc.c diff --git a/examples/utest/testcases/kernel/Kconfig b/examples/utest/testcases/kernel/Kconfig index eab2770a442..0faa3622fbb 100644 --- a/examples/utest/testcases/kernel/Kconfig +++ b/examples/utest/testcases/kernel/Kconfig @@ -10,6 +10,11 @@ config UTEST_SMALL_MEM_TC default y depends on RT_USING_SMALL_MEM +config UTEST_SLAB_TC + bool "slab test" + default n + depends on RT_USING_SLAB + config UTEST_IRQ_TC bool "IRQ test" default n diff --git a/examples/utest/testcases/kernel/SConscript b/examples/utest/testcases/kernel/SConscript index 962c226dd79..ab98c6065bc 100644 --- a/examples/utest/testcases/kernel/SConscript +++ b/examples/utest/testcases/kernel/SConscript @@ -11,6 +11,9 @@ if GetDepend(['UTEST_MEMHEAP_TC']): if GetDepend(['UTEST_SMALL_MEM_TC']): src += ['mem_tc.c'] +if GetDepend(['UTEST_SLAB_TC']): + src += ['slab_tc.c'] + if GetDepend(['UTEST_IRQ_TC']): src += ['irq_tc.c'] diff --git a/examples/utest/testcases/kernel/slab_tc.c b/examples/utest/testcases/kernel/slab_tc.c new file mode 100644 index 00000000000..3fafa1f7abb --- /dev/null +++ b/examples/utest/testcases/kernel/slab_tc.c @@ -0,0 +1,329 @@ +/* + * Copyright (c) 2006-2019, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-10-14 tyx the first version + */ + +#include +#include +#include "utest.h" + +#define TEST_SLAB_SIZE 1024 * 1024 + +static int _mem_cmp(void *ptr, rt_uint8_t v, rt_size_t size) +{ + while (size-- != 0) + { + if (*(rt_uint8_t *)ptr != v) + return *(rt_uint8_t *)ptr - v; + } + return 0; +} + +struct slab_alloc_context +{ + rt_list_t node; + rt_size_t size; + rt_uint8_t magic; +}; + +struct slab_alloc_head +{ + rt_list_t list; + rt_size_t count; + rt_tick_t start; + rt_tick_t end; + rt_tick_t interval; +}; + +#define SLAB_RANG_ALLOC_BLK_MIN 2 +#define SLAB_RANG_ALLOC_BLK_MAX 5 +#define SLAB_RANG_ALLOC_TEST_TIME 10 + +static void slab_alloc_test(void) +{ + struct slab_alloc_head head; + rt_uint8_t *begin, *buf; + struct rt_slab *heap; + rt_size_t buf_size, size; + struct slab_alloc_context *ctx; + + /* init */ + rt_list_init(&head.list); + head.count = 0; + head.start = rt_tick_get(); + head.end = rt_tick_get() + rt_tick_from_millisecond(SLAB_RANG_ALLOC_TEST_TIME * 1000); + head.interval = (head.end - head.start) / 20; + buf = rt_malloc(TEST_SLAB_SIZE); + uassert_not_null(buf); + uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); + heap = (struct rt_slab *)buf; + begin = (rt_uint8_t *)&heap[1]; + buf_size = buf + TEST_SLAB_SIZE - begin; + rt_memset(buf, 0xAA, TEST_SLAB_SIZE); + rt_slab_init(heap, "slab_tc", begin, buf_size); + // test run + while (head.end - head.start < RT_TICK_MAX / 2) + { + if (rt_tick_get() - head.start >= head.interval) + { + head.start = rt_tick_get(); + rt_kprintf("#"); + } + // %60 probability to perform alloc operation + if (rand() % 10 >= 4) + { + size = rand() % SLAB_RANG_ALLOC_BLK_MAX + SLAB_RANG_ALLOC_BLK_MIN; + size *= sizeof(struct slab_alloc_context); + ctx = rt_slab_alloc(heap, size); + if (ctx == RT_NULL) + { + if (head.count == 0) + { + break; + } + size = head.count / 2; + while (size != head.count) + { + ctx = rt_list_first_entry(&head.list, struct slab_alloc_context, node); + rt_list_remove(&ctx->node); + if (ctx->size > sizeof(*ctx)) + { + if (_mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)) != 0) + { + uassert_true(0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_slab_free(heap, ctx); + head.count --; + } + continue; + } + //if (RT_ALIGN((rt_ubase_t)ctx, RT_ALIGN_SIZE) != (rt_ubase_t)ctx) + //{ + // uassert_int_equal(RT_ALIGN((rt_ubase_t)ctx, RT_ALIGN_SIZE), (rt_ubase_t)ctx); + //} + rt_memset(ctx, 0, size); + rt_list_init(&ctx->node); + ctx->size = size; + ctx->magic = rand() & 0xff; + if (ctx->size > sizeof(*ctx)) + { + rt_memset(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + } + rt_list_insert_after(&head.list, &ctx->node); + head.count += 1; + } + else + { + if (!rt_list_isempty(&head.list)) + { + ctx = rt_list_first_entry(&head.list, struct slab_alloc_context, node); + rt_list_remove(&ctx->node); + if (ctx->size > sizeof(*ctx)) + { + if (_mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)) != 0) + { + uassert_true(0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_slab_free(heap, ctx); + head.count --; + } + } + } + while (!rt_list_isempty(&head.list)) + { + ctx = rt_list_first_entry(&head.list, struct slab_alloc_context, node); + rt_list_remove(&ctx->node); + if (ctx->size > sizeof(*ctx)) + { + if (_mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)) != 0) + { + uassert_true(0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_slab_free(heap, ctx); + head.count --; + } + uassert_int_equal(head.count, 0); + // slab heap deinit + rt_slab_detach(heap); + /* release test resources */ + rt_free(buf); +} + +#define SLAB_RANG_REALLOC_BLK_MIN 0 +#define SLAB_RANG_REALLOC_BLK_MAX 5 +#define SLAB_RANG_REALLOC_TEST_TIME 10 + +struct slab_realloc_context +{ + rt_size_t size; + rt_uint8_t magic; +}; + +struct slab_realloc_head +{ + struct slab_realloc_context **ctx_tab; + rt_size_t count; + rt_tick_t start; + rt_tick_t end; + rt_tick_t interval; +}; + +static void slab_realloc_test(void) +{ + struct slab_realloc_head head; + rt_uint8_t *begin, *buf; + struct rt_slab *heap; + rt_size_t buf_size, size, idx; + struct slab_realloc_context *ctx; + int res; + + size = RT_ALIGN(sizeof(struct slab_realloc_context), RT_ALIGN_SIZE) + RT_ALIGN_SIZE; + size = TEST_SLAB_SIZE / size; + /* init */ + head.ctx_tab = RT_NULL; + head.count = size; + head.start = rt_tick_get(); + head.end = rt_tick_get() + rt_tick_from_millisecond(SLAB_RANG_ALLOC_TEST_TIME * 1000); + head.interval = (head.end - head.start) / 20; + buf = rt_malloc(TEST_SLAB_SIZE); + uassert_not_null(buf); + uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); + heap = (struct rt_slab *)buf; + begin = (rt_uint8_t *)&heap[1]; + buf_size = buf + TEST_SLAB_SIZE - begin; + rt_memset(buf, 0xAA, TEST_SLAB_SIZE); + rt_slab_init(heap, "slab_tc", begin, buf_size); + /* init ctx tab */ + size = head.count * sizeof(struct slab_realloc_context *); + head.ctx_tab = rt_slab_alloc(heap, size); + uassert_not_null(head.ctx_tab); + rt_memset(head.ctx_tab, 0, size); + // test run + while (head.end - head.start < RT_TICK_MAX / 2) + { + if (rt_tick_get() - head.start >= head.interval) + { + head.start = rt_tick_get(); + rt_kprintf("#"); + } + size = rand() % SLAB_RANG_ALLOC_BLK_MAX + SLAB_RANG_ALLOC_BLK_MIN; + size *= sizeof(struct slab_realloc_context); + idx = rand() % head.count; + ctx = rt_slab_realloc(heap, head.ctx_tab[idx], size); + if (ctx == RT_NULL) + { + if (size == 0) + { + if (head.ctx_tab[idx]) + { + head.ctx_tab[idx] = RT_NULL; + } + } + else + { + for (idx = 0; idx < head.count; idx++) + { + ctx = head.ctx_tab[idx]; + if (rand() % 2 && ctx) + { + if (ctx->size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + if (res != 0) + { + uassert_int_equal(res, 0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_slab_realloc(heap, ctx, 0); + head.ctx_tab[idx] = RT_NULL; + } + } + } + continue; + } + /* check slab */ + if (head.ctx_tab[idx] != RT_NULL) + { + res = 0; + if (ctx->size < size) + { + if (ctx->size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + } + } + else + { + if (size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, size - sizeof(*ctx)); + } + } + if (res != 0) + { + uassert_int_equal(res, 0); + } + } + /* init slab */ + ctx->magic = rand() & 0xff; + ctx->size = size; + if (ctx->size > sizeof(*ctx)) + { + rt_memset(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + } + head.ctx_tab[idx] = ctx; + } + // free all slab + for (idx = 0; idx < head.count; idx++) + { + ctx = head.ctx_tab[idx]; + if (ctx == RT_NULL) + { + continue; + } + if (ctx->size > sizeof(*ctx)) + { + res = _mem_cmp(&ctx[1], ctx->magic, ctx->size - sizeof(*ctx)); + if (res != 0) + { + uassert_int_equal(res, 0); + } + } + rt_memset(ctx, 0xAA, ctx->size); + rt_slab_realloc(heap, ctx, 0); + head.ctx_tab[idx] = RT_NULL; + } + // slab heap deinit + rt_slab_detach(heap); + /* release test resources */ + rt_free(buf); +} + +static rt_err_t utest_tc_init(void) +{ + return RT_EOK; +} + +static rt_err_t utest_tc_cleanup(void) +{ + return RT_EOK; +} + +static void testcase(void) +{ + UTEST_UNIT_RUN(slab_alloc_test); + UTEST_UNIT_RUN(slab_realloc_test); +} +UTEST_TC_EXPORT(testcase, "testcases.kernel.slab_tc", utest_tc_init, utest_tc_cleanup, 10); From 6b17fec9f53288dfe2e1dad1dc73d0764d5db56b Mon Sep 17 00:00:00 2001 From: enkiller <462747508@qq.com> Date: Mon, 25 Oct 2021 17:30:29 +0800 Subject: [PATCH 21/30] [examples][testcases] fix small memory management algorithm test case --- examples/utest/testcases/kernel/mem_tc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c index 8c272b30b61..779059c6499 100644 --- a/examples/utest/testcases/kernel/mem_tc.c +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -336,7 +336,7 @@ static void mem_alloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_free(ctx); + rt_mem_free(ctx); head.count --; } continue; @@ -370,7 +370,7 @@ static void mem_alloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_free(ctx); + rt_mem_free(ctx); head.count --; } } @@ -387,7 +387,7 @@ static void mem_alloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_free(ctx); + rt_mem_free(ctx); head.count --; } uassert_int_equal(head.count, 0); From 8796c07e344a392948d3c8fae91389cb17857772 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Tue, 7 Dec 2021 12:02:22 +0800 Subject: [PATCH 22/30] [kernel][memory] Adjusting memory allocation algorithm object definition and interface --- include/rtdef.h | 128 +++--------------- include/rtthread.h | 32 ++--- src/kservice.c | 114 +++++++++------- src/mem.c | 327 +++++++++++++++++++++++---------------------- src/memheap.c | 97 +++++++++++++- src/object.c | 15 +-- src/slab.c | 222 ++++++++++++++++++------------ 7 files changed, 500 insertions(+), 435 deletions(-) diff --git a/include/rtdef.h b/include/rtdef.h index 7a2ff7e60ac..b45b304aa8b 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -431,8 +431,7 @@ enum rt_object_class_type RT_Object_Class_Device = 0x09, /**< The object is a device. */ RT_Object_Class_Timer = 0x0a, /**< The object is a timer. */ RT_Object_Class_Module = 0x0b, /**< The object is a module. */ - RT_Object_Class_Mem = 0x0c, /**< The object is a small memory. */ - RT_Object_Class_Slab = 0x0d, /**< The object is a slab memory. */ + RT_Object_Class_Memory = 0x0c, /**< The object is a memory. */ RT_Object_Class_Unknown = 0x0e, /**< The object is unknown. */ RT_Object_Class_Static = 0x80 /**< The object is a static object. */ }; @@ -819,46 +818,33 @@ typedef struct rt_messagequeue *rt_mq_t; /**@{*/ +#ifdef RT_USING_HEAP /* - * memory management - * heap & partition + * memory structure */ - -#ifdef RT_USING_SMALL_MEM - /** - * memory item on the small mem - */ -struct rt_mem_item +struct rt_memory { - rt_ubase_t pool_ptr; /**< small memory object addr */ -#ifdef ARCH_CPU_64BIT - rt_uint32_t resv; -#endif /* ARCH_CPU_64BIT */ - rt_size_t next; /**< next free item */ - rt_size_t prev; /**< prev free item */ -#ifdef RT_USING_MEMTRACE -#ifdef ARCH_CPU_64BIT - rt_uint8_t thread[8]; /**< thread name */ -#else - rt_uint8_t thread[4]; /**< thread name */ -#endif /* ARCH_CPU_64BIT */ -#endif /* RT_USING_MEMTRACE */ + struct rt_object parent; /**< inherit from rt_object */ + const char * algorithm; /**< Memory management algorithm name */ + rt_ubase_t address; /**< memory start address */ + rt_size_t total; /**< memory size */ + rt_size_t used; /**< size used */ + rt_size_t max; /**< maximum usage */ }; +typedef struct rt_memory *rt_mem_t; +#endif -/** - * Base structure of small memory object +/* + * memory management + * heap & partition */ -struct rt_mem -{ - struct rt_object parent; /**< inherit from rt_object */ - rt_uint8_t *heap_ptr; /**< pointer to the heap */ - struct rt_mem_item *heap_end; - struct rt_mem_item *lfree; - rt_size_t mem_size_aligned; /**< aligned memory size */ - rt_size_t used_mem; /**< size used */ - rt_size_t max_mem; /**< maximum allocated size */ -}; +#ifdef RT_USING_SMALL_MEM +typedef rt_mem_t rt_smem_t; +#endif + +#ifdef RT_USING_SLAB +typedef rt_mem_t rt_slab_t; #endif #ifdef RT_USING_MEMHEAP @@ -903,78 +889,6 @@ struct rt_memheap }; #endif -#ifdef RT_USING_SLAB -/** - * Base structure of slab memory object - */ - -/* - * The IN-BAND zone header is placed at the beginning of each zone. - */ -struct rt_slab_zone -{ - rt_uint32_t z_magic; /**< magic number for sanity check */ - rt_uint32_t z_nfree; /**< total free chunks / ualloc space in zone */ - rt_uint32_t z_nmax; /**< maximum free chunks */ - struct rt_slab_zone *z_next; /**< zoneary[] link if z_nfree non-zero */ - rt_uint8_t *z_baseptr; /**< pointer to start of chunk array */ - - rt_uint32_t z_uindex; /**< current initial allocation index */ - rt_uint32_t z_chunksize; /**< chunk size for validation */ - - rt_uint32_t z_zoneindex; /**< zone index */ - struct rt_slab_chunk *z_freechunk; /**< free chunk list */ -}; - -/* - * Chunk structure for free elements - */ -struct rt_slab_chunk -{ - struct rt_slab_chunk *c_next; -}; - -struct rt_slab_memusage -{ - rt_uint32_t type: 2 ; /**< page type */ - rt_uint32_t size: 30; /**< pages allocated or offset from zone */ -}; - -/* - * slab page allocator - */ -struct rt_slab_page -{ - struct rt_slab_page *next; /**< next valid page */ - rt_size_t page; /**< number of page */ - - /* dummy */ - char dummy[RT_MM_PAGE_SIZE - (sizeof(struct rt_slab_page *) + sizeof(rt_size_t))]; -}; - -#define RT_SLAB_NZONES 72 /* number of zones */ - -/* - * slab object - */ -struct rt_slab -{ - struct rt_object parent; /**< inherit from rt_object */ - rt_ubase_t heap_start; /**< memory start address */ - rt_ubase_t heap_end; /**< memory end address */ - struct rt_slab_memusage *memusage; - struct rt_slab_zone *zone_array[RT_SLAB_NZONES]; /* linked list of zones NFree > 0 */ - struct rt_slab_zone *zone_free; /* whole zones that have become free */ - rt_uint32_t zone_free_cnt; - rt_uint32_t zone_size; - rt_uint32_t zone_limit; - rt_uint32_t zone_page_cnt; - struct rt_slab_page *page_list; - rt_size_t used_mem; - rt_size_t max_mem; -}; -#endif - #ifdef RT_USING_MEMPOOL /** * Base structure of Memory pool object diff --git a/include/rtthread.h b/include/rtthread.h index c908914928b..1c78cbde432 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -287,18 +287,13 @@ void rt_free_sethook(void (*hook)(void *ptr)); /** * small memory object interface */ -rt_err_t rt_mem_init(struct rt_mem *m, - const char *name, +rt_smem_t rt_smem_init(const char *name, void *begin_addr, rt_size_t size); -rt_err_t rt_mem_detach(struct rt_mem *m); -void *rt_mem_alloc(struct rt_mem *m, rt_size_t size); -void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize); -void rt_mem_free(void *rmem); -void rt_mem_info(struct rt_mem *m, - rt_uint32_t *total, - rt_uint32_t *used, - rt_uint32_t *max_used); +rt_err_t rt_smem_detach(rt_smem_t m); +void *rt_smem_alloc(rt_smem_t m, rt_size_t size); +void *rt_smem_realloc(rt_smem_t m, void *rmem, rt_size_t newsize); +void rt_smem_free(void *rmem); #endif #ifdef RT_USING_MEMHEAP @@ -323,16 +318,13 @@ void rt_memheap_info(struct rt_memheap *heap, /** * slab object interface */ -rt_err_t rt_slab_init(struct rt_slab *slab, const char *name, - void *begin_addr, rt_size_t size); -rt_err_t rt_slab_detach(struct rt_slab *slab); -void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages); -void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages); -void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size); -void *rt_slab_realloc(struct rt_slab *slab, void *ptr, rt_size_t size); -void rt_slab_free(struct rt_slab *slab, void *ptr); -void rt_slab_info(struct rt_slab *slab, rt_uint32_t *total, - rt_uint32_t *used, rt_uint32_t *max_used); +rt_slab_t rt_slab_init(const char *name, void *begin_addr, rt_size_t size); +rt_err_t rt_slab_detach(rt_slab_t m); +void *rt_slab_page_alloc(rt_slab_t m, rt_size_t npages); +void rt_slab_page_free(rt_slab_t m, void *addr, rt_size_t npages); +void *rt_slab_alloc(rt_slab_t m, rt_size_t size); +void *rt_slab_realloc(rt_slab_t m, void *ptr, rt_size_t size); +void rt_slab_free(rt_slab_t m, void *ptr); #endif /**@}*/ diff --git a/src/kservice.c b/src/kservice.c index f6a91adb700..f09ff721157 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1357,28 +1357,65 @@ rt_inline void _heap_unlock(rt_base_t level) } #if defined(RT_USING_SMALL_MEM_AS_HEAP) -static struct rt_mem system_heap; -#define _MEM_INIT rt_mem_init -#define _MEM_MALLOC rt_mem_alloc -#define _MEM_REALLOC rt_mem_realloc -#define _MEM_FREE(_obj, _ptr) rt_mem_free(_ptr) -#define _MEM_INFO rt_mem_info +static rt_smem_t system_heap; +rt_inline void _smem_info(rt_uint32_t *total, + rt_uint32_t *used, rt_uint32_t *max_used) +{ + if (total) + *total = system_heap->total; + if (used) + *used = system_heap->used; + if (max_used) + *max_used = system_heap->max; +} +#define _MEM_INIT(_name, _start, _size) \ + system_heap = rt_smem_init(_name, _start, _size) +#define _MEM_MALLOC(_size) \ + rt_smem_alloc(system_heap, _size) +#define _MEM_REALLOC(_ptr, _newsize)\ + rt_smem_realloc(system_heap, _ptr, _newsize) +#define _MEM_FREE(_ptr) \ + rt_smem_free(_ptr) +#define _MEM_INFO(_total, _used, _max) \ + _smem_info(_total, _used, _max) #elif defined(RT_USING_MEMHEAP_AS_HEAP) static struct rt_memheap system_heap; -#define _MEM_INIT rt_memheap_init -#define _MEM_MALLOC rt_memheap_alloc -#define _MEM_REALLOC rt_memheap_realloc -#define _MEM_FREE(_obj, _ptr) rt_memheap_free(_ptr) -#define _MEM_INFO rt_memheap_info +void *_memheap_alloc(struct rt_memheap *heap, rt_size_t size); +void _memheap_free(void *rmem); +void *_memheap_realloc(struct rt_memheap *heap, void *rmem, rt_size_t newsize); +#define _MEM_INIT(_name, _start, _size) \ + rt_memheap_init(&system_heap, _name, _start, _size) +#define _MEM_MALLOC(_size) \ + _memheap_alloc(&system_heap, _size) +#define _MEM_REALLOC(_ptr, _newsize) \ + _memheap_realloc(&system_heap, _ptr, _newsize) +#define _MEM_FREE(_ptr) \ + _memheap_free(_ptr) +#define _MEM_INFO(_total, _used, _max) \ + rt_memheap_info(&system_heap, _total, _used, _max) #elif defined(RT_USING_SLAB_AS_HEAP) -static struct rt_slab system_heap; -#define _MEM_INIT rt_slab_init -#define _MEM_MALLOC rt_slab_alloc -#define _MEM_REALLOC rt_slab_realloc -#define _MEM_FREE rt_slab_free -#define _MEM_INFO rt_slab_info +static rt_slab_t system_heap; +rt_inline void _slab_info(rt_uint32_t *total, + rt_uint32_t *used, rt_uint32_t *max_used) +{ + if (total) + *total = system_heap->total; + if (used) + *used = system_heap->used; + if (max_used) + *max_used = system_heap->max; +} +#define _MEM_INIT(_name, _start, _size) \ + system_heap = rt_slab_init(_name, _start, _size) +#define _MEM_MALLOC(_size) \ + rt_slab_alloc(system_heap, _size) +#define _MEM_REALLOC(_ptr, _newsize) \ + rt_slab_realloc(system_heap, _ptr, _newsize) +#define _MEM_FREE(_ptr) \ + rt_slab_free(system_heap, _ptr) +#define _MEM_INFO _slab_info #else -#define _MEM_INIT(...) -RT_ERROR; +#define _MEM_INIT(...) #define _MEM_MALLOC(...) RT_NULL #define _MEM_REALLOC(...) RT_NULL #define _MEM_FREE(...) @@ -1396,13 +1433,11 @@ RT_WEAK void rt_system_heap_init(void *begin_addr, void *end_addr) { rt_ubase_t begin_align = RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); rt_ubase_t end_align = RT_ALIGN_DOWN((rt_ubase_t)end_addr, RT_ALIGN_SIZE); - rt_err_t err; RT_ASSERT(end_align > begin_align); /* Initialize system memory heap */ - err = _MEM_INIT(&system_heap, "heap", begin_addr, end_align - begin_align); - RT_ASSERT(err == RT_EOK); + _MEM_INIT("heap", begin_addr, end_align - begin_align); /* Initialize multi thread contention lock */ _heap_lock_init(); } @@ -1422,32 +1457,7 @@ RT_WEAK void *rt_malloc(rt_size_t size) /* Enter critical zone */ level = _heap_lock(); /* allocate memory block from system heap */ - ptr = _MEM_MALLOC(&system_heap, size); -#if defined(RT_USING_MEMHEAP_AS_HEAP) && defined(RT_USING_MEMHEAP_AUTO_BINDING) - if (ptr == RT_NULL) - { - struct rt_object *object; - struct rt_list_node *node; - struct rt_object_information *information; - - /* try to allocate on other memory heap */ - information = rt_object_get_information(rt_object_get_type(&system_heap.parent)); - RT_ASSERT(information != RT_NULL); - for (node = information->object_list.next; - node != &(information->object_list); - node = node->next) - { - object = rt_list_entry(node, struct rt_object, list); - /* not allocate in the default system heap */ - if (object == &system_heap.parent) - continue; - - ptr = _MEM_MALLOC((void *)object, size); - if (ptr != RT_NULL) - break; - } - } -#endif /* RT_USING_MEMHEAP_AUTO_BINDING */ + ptr = _MEM_MALLOC(size); /* Exit critical zone */ _heap_unlock(level); /* call 'rt_malloc' hook */ @@ -1473,7 +1483,7 @@ RT_WEAK void *rt_realloc(void *rmem, rt_size_t newsize) /* Enter critical zone */ level = _heap_lock(); /* Change the size of previously allocated memory block */ - nptr = _MEM_REALLOC(&system_heap, rmem, newsize); + nptr = _MEM_REALLOC(rmem, newsize); /* Exit critical zone */ _heap_unlock(level); return nptr; @@ -1522,7 +1532,7 @@ RT_WEAK void rt_free(void *rmem) RT_OBJECT_HOOK_CALL(rt_free_hook, (rmem)); /* Enter critical zone */ level = _heap_lock(); - _MEM_FREE(&system_heap, rmem); + _MEM_FREE(rmem); /* Exit critical zone */ _heap_unlock(level); } @@ -1546,7 +1556,7 @@ RT_WEAK void rt_memory_info(rt_uint32_t *total, /* Enter critical zone */ level = _heap_lock(); - _MEM_INFO(&system_heap, total, used, max_used); + _MEM_INFO(total, used, max_used); /* Exit critical zone */ _heap_unlock(level); } @@ -1561,7 +1571,7 @@ void *rt_page_alloc(rt_size_t npages) /* Enter critical zone */ level = _heap_lock(); /* alloc page */ - ptr = rt_slab_page_alloc(&system_heap, npages); + ptr = rt_slab_page_alloc(system_heap, npages); /* Exit critical zone */ _heap_unlock(level); return ptr; @@ -1574,7 +1584,7 @@ void rt_page_free(void *addr, rt_size_t npages) /* Enter critical zone */ level = _heap_lock(); /* free page */ - rt_slab_page_free(&system_heap, addr, npages); + rt_slab_page_free(system_heap, addr, npages); /* Exit critical zone */ _heap_unlock(level); } diff --git a/src/mem.c b/src/mem.c index eaa26e5a64d..3b4d7bfbe53 100644 --- a/src/mem.c +++ b/src/mem.c @@ -51,6 +51,38 @@ #include #if defined (RT_USING_SMALL_MEM) + /** + * memory item on the small mem + */ +struct rt_small_mem_item +{ + rt_ubase_t pool_ptr; /**< small memory object addr */ +#ifdef ARCH_CPU_64BIT + rt_uint32_t resv; +#endif /* ARCH_CPU_64BIT */ + rt_size_t next; /**< next free item */ + rt_size_t prev; /**< prev free item */ +#ifdef RT_USING_MEMTRACE +#ifdef ARCH_CPU_64BIT + rt_uint8_t thread[8]; /**< thread name */ +#else + rt_uint8_t thread[4]; /**< thread name */ +#endif /* ARCH_CPU_64BIT */ +#endif /* RT_USING_MEMTRACE */ +}; + +/** + * Base structure of small memory object + */ +struct rt_small_mem +{ + struct rt_memory parent; /**< inherit from rt_memory */ + rt_uint8_t *heap_ptr; /**< pointer to the heap */ + struct rt_small_mem_item *heap_end; + struct rt_small_mem_item *lfree; + rt_size_t mem_size_aligned; /**< aligned memory size */ +}; + #define HEAP_MAGIC 0x1ea0 #ifdef ARCH_CPU_64BIT @@ -60,21 +92,21 @@ #endif /* ARCH_CPU_64BIT */ #define MEM_MASK 0xfffffffe -#define MEM_USED() ((((rt_base_t)(m)) & MEM_MASK) | 0x1) -#define MEM_FREED() ((((rt_base_t)(m)) & MEM_MASK) | 0x0) +#define MEM_USED() ((((rt_base_t)(small_mem)) & MEM_MASK) | 0x1) +#define MEM_FREED() ((((rt_base_t)(small_mem)) & MEM_MASK) | 0x0) #define MEM_ISUSED(_mem) \ - (((rt_base_t)(((struct rt_mem_item *)(_mem))->pool_ptr)) & (~MEM_MASK)) + (((rt_base_t)(((struct rt_small_mem_item *)(_mem))->pool_ptr)) & (~MEM_MASK)) #define MEM_POOL(_mem) \ - ((struct rt_mem *)(((rt_base_t)(((struct rt_mem_item *)(_mem))->pool_ptr)) & (MEM_MASK))) + ((struct rt_small_mem *)(((rt_base_t)(((struct rt_small_mem_item *)(_mem))->pool_ptr)) & (MEM_MASK))) #define MEM_SIZE(_heap, _mem) \ - (((struct rt_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ - (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE)) + (((struct rt_small_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ + (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_small_mem_item), RT_ALIGN_SIZE)) #define MIN_SIZE_ALIGNED RT_ALIGN(MIN_SIZE, RT_ALIGN_SIZE) -#define SIZEOF_STRUCT_MEM RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE) +#define SIZEOF_STRUCT_MEM RT_ALIGN(sizeof(struct rt_small_mem_item), RT_ALIGN_SIZE) #ifdef RT_USING_MEMTRACE -rt_inline void rt_mem_setname(struct rt_mem_item *mem, const char *name) +rt_inline void rt_smem_setname(struct rt_small_mem_item *mem, const char *name) { int index; for (index = 0; index < sizeof(mem->thread); index ++) @@ -90,16 +122,16 @@ rt_inline void rt_mem_setname(struct rt_mem_item *mem, const char *name) } #endif /* RT_USING_MEMTRACE */ -static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) +static void plug_holes(struct rt_small_mem *m, struct rt_small_mem_item *mem) { - struct rt_mem_item *nmem; - struct rt_mem_item *pmem; + struct rt_small_mem_item *nmem; + struct rt_small_mem_item *pmem; RT_ASSERT((rt_uint8_t *)mem >= m->heap_ptr); RT_ASSERT((rt_uint8_t *)mem < (rt_uint8_t *)m->heap_end); /* plug hole forward */ - nmem = (struct rt_mem_item *)&m->heap_ptr[mem->next]; + nmem = (struct rt_small_mem_item *)&m->heap_ptr[mem->next]; if (mem != nmem && !MEM_ISUSED(nmem) && (rt_uint8_t *)nmem != (rt_uint8_t *)m->heap_end) { @@ -112,11 +144,11 @@ static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) } nmem->pool_ptr = 0; mem->next = nmem->next; - ((struct rt_mem_item *)&m->heap_ptr[nmem->next])->prev = (rt_uint8_t *)mem - m->heap_ptr; + ((struct rt_small_mem_item *)&m->heap_ptr[nmem->next])->prev = (rt_uint8_t *)mem - m->heap_ptr; } /* plug hole backward */ - pmem = (struct rt_mem_item *)&m->heap_ptr[mem->prev]; + pmem = (struct rt_small_mem_item *)&m->heap_ptr[mem->prev]; if (pmem != mem && !MEM_ISUSED(pmem)) { /* if mem->prev is unused, combine mem and mem->prev */ @@ -126,7 +158,7 @@ static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) } mem->pool_ptr = 0; pmem->next = mem->next; - ((struct rt_mem_item *)&m->heap_ptr[mem->next])->prev = (rt_uint8_t *)pmem - m->heap_ptr; + ((struct rt_small_mem_item *)&m->heap_ptr[mem->next])->prev = (rt_uint8_t *)pmem - m->heap_ptr; } } @@ -141,69 +173,74 @@ static void plug_holes(struct rt_mem *m, struct rt_mem_item *mem) * * @param size is the size of the memory. * - * @return RT_EOK + * @return Return a pointer to the memory object. When the return value is RT_NULL, it means the init failed. */ -rt_err_t rt_mem_init(struct rt_mem *m, - const char *name, +rt_smem_t rt_smem_init(const char *name, void *begin_addr, rt_size_t size) { - struct rt_mem_item *mem; + struct rt_small_mem_item *mem; + struct rt_small_mem *small_mem; + rt_ubase_t start_addr, begin_align, end_align, mem_size; - rt_ubase_t begin_align = RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); - rt_ubase_t end_align = RT_ALIGN_DOWN((rt_ubase_t)begin_addr + size, RT_ALIGN_SIZE); + small_mem = (struct rt_small_mem *)RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); + start_addr = (rt_ubase_t)small_mem + sizeof(*small_mem); + begin_align = RT_ALIGN((rt_ubase_t)start_addr, RT_ALIGN_SIZE); + end_align = RT_ALIGN_DOWN((rt_ubase_t)begin_addr + size, RT_ALIGN_SIZE); - RT_ASSERT(m != RT_NULL); - - rt_memset(m, 0, sizeof(*m)); /* alignment addr */ if ((end_align > (2 * SIZEOF_STRUCT_MEM)) && - ((end_align - 2 * SIZEOF_STRUCT_MEM) >= begin_align)) + ((end_align - 2 * SIZEOF_STRUCT_MEM) >= start_addr)) { /* calculate the aligned memory size */ - m->mem_size_aligned = end_align - begin_align - 2 * SIZEOF_STRUCT_MEM; + mem_size = end_align - begin_align - 2 * SIZEOF_STRUCT_MEM; } else { rt_kprintf("mem init, error begin address 0x%x, and end address 0x%x\n", (rt_ubase_t)begin_addr, (rt_ubase_t)begin_addr + size); - return -RT_EINVAL; + return RT_NULL; } + rt_memset(small_mem, 0, sizeof(*small_mem)); /* initialize small memory object */ - rt_object_init(&(m->parent), RT_Object_Class_Mem, name); + rt_object_init(&(small_mem->parent.parent), RT_Object_Class_Memory, name); + small_mem->parent.algorithm = "small"; + small_mem->parent.address = begin_align; + small_mem->parent.total = mem_size; + small_mem->mem_size_aligned = mem_size; /* point to begin address of heap */ - m->heap_ptr = (rt_uint8_t *)begin_align; + small_mem->heap_ptr = (rt_uint8_t *)begin_align; RT_DEBUG_LOG(RT_DEBUG_MEM, ("mem init, heap begin address 0x%x, size %d\n", - (rt_ubase_t)m->heap_ptr, m->mem_size_aligned)); + (rt_ubase_t)small_mem->heap_ptr, small_mem->mem_size_aligned)); /* initialize the start of the heap */ - mem = (struct rt_mem_item *)m->heap_ptr; + mem = (struct rt_small_mem_item *)small_mem->heap_ptr; mem->pool_ptr = MEM_FREED(); - mem->next = m->mem_size_aligned + SIZEOF_STRUCT_MEM; + mem->next = small_mem->mem_size_aligned + SIZEOF_STRUCT_MEM; mem->prev = 0; #ifdef RT_USING_MEMTRACE - rt_mem_setname(mem, "INIT"); + rt_smem_setname(mem, "INIT"); #endif /* RT_USING_MEMTRACE */ /* initialize the end of the heap */ - m->heap_end = (struct rt_mem_item *)&m->heap_ptr[mem->next]; - m->heap_end->pool_ptr = MEM_USED(); - m->heap_end->next = m->mem_size_aligned + SIZEOF_STRUCT_MEM; - m->heap_end->prev = m->mem_size_aligned + SIZEOF_STRUCT_MEM; + small_mem->heap_end = (struct rt_small_mem_item *)&small_mem->heap_ptr[mem->next]; + small_mem->heap_end->pool_ptr = MEM_USED(); + small_mem->heap_end->next = small_mem->mem_size_aligned + SIZEOF_STRUCT_MEM; + small_mem->heap_end->prev = small_mem->mem_size_aligned + SIZEOF_STRUCT_MEM; #ifdef RT_USING_MEMTRACE - rt_mem_setname(m->heap_end, "INIT"); + rt_smem_setname(small_mem->heap_end, "INIT"); #endif /* RT_USING_MEMTRACE */ /* initialize the lowest-free pointer to the start of the heap */ - m->lfree = (struct rt_mem_item *)m->heap_ptr; + small_mem->lfree = (struct rt_small_mem_item *)small_mem->heap_ptr; - return RT_EOK; + return &small_mem->parent; } -RTM_EXPORT(rt_mem_init); +RTM_EXPORT(rt_smem_init); /** * @brief This function will remove a small mem from the system. @@ -212,17 +249,17 @@ RTM_EXPORT(rt_mem_init); * * @return RT_EOK */ -rt_err_t rt_mem_detach(struct rt_mem *m) +rt_err_t rt_smem_detach(rt_smem_t m) { RT_ASSERT(m != RT_NULL); - RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Memory); RT_ASSERT(rt_object_is_systemobject(&m->parent)); rt_object_detach(&(m->parent)); return RT_EOK; } -RTM_EXPORT(rt_mem_detach); +RTM_EXPORT(rt_smem_detach); /** * @addtogroup MM @@ -239,16 +276,17 @@ RTM_EXPORT(rt_mem_detach); * * @return the pointer to allocated memory or NULL if no free memory was found. */ -void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) +void *rt_smem_alloc(rt_smem_t m, rt_size_t size) { rt_size_t ptr, ptr2; - struct rt_mem_item *mem, *mem2; + struct rt_small_mem_item *mem, *mem2; + struct rt_small_mem *small_mem; if (size == 0) return RT_NULL; RT_ASSERT(m != RT_NULL); - RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Memory); RT_ASSERT(rt_object_is_systemobject(&m->parent)); if (size != RT_ALIGN(size, RT_ALIGN_SIZE)) @@ -257,10 +295,11 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) else RT_DEBUG_LOG(RT_DEBUG_MEM, ("malloc size %d\n", size)); + small_mem = (struct rt_small_mem *)m; /* alignment size */ size = RT_ALIGN(size, RT_ALIGN_SIZE); - if (size > m->mem_size_aligned) + if (size > small_mem->mem_size_aligned) { RT_DEBUG_LOG(RT_DEBUG_MEM, ("no memory\n")); @@ -271,11 +310,11 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) if (size < MIN_SIZE_ALIGNED) size = MIN_SIZE_ALIGNED; - for (ptr = (rt_uint8_t *)m->lfree - m->heap_ptr; - ptr <= m->mem_size_aligned - size; - ptr = ((struct rt_mem_item *)&m->heap_ptr[ptr])->next) + for (ptr = (rt_uint8_t *)small_mem->lfree - small_mem->heap_ptr; + ptr <= small_mem->mem_size_aligned - size; + ptr = ((struct rt_small_mem_item *)&small_mem->heap_ptr[ptr])->next) { - mem = (struct rt_mem_item *)&m->heap_ptr[ptr]; + mem = (struct rt_small_mem_item *)&small_mem->heap_ptr[ptr]; if ((!MEM_ISUSED(mem)) && (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) { @@ -285,12 +324,12 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) if (mem->next - (ptr + SIZEOF_STRUCT_MEM) >= (size + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED)) { - /* (in addition to the above, we test if another struct rt_mem_item (SIZEOF_STRUCT_MEM) containing + /* (in addition to the above, we test if another struct rt_small_mem_item (SIZEOF_STRUCT_MEM) containing * at least MIN_SIZE_ALIGNED of data also fits in the 'user data space' of 'mem') * -> split large block, create empty remainder, * remainder must be large enough to contain MIN_SIZE_ALIGNED data: if * mem->next - (ptr + (2*SIZEOF_STRUCT_MEM)) == size, - * struct rt_mem_item would fit in but no data between mem2 and mem2->next + * struct rt_small_mem_item would fit in but no data between mem2 and mem2->next * @todo we could leave out MIN_SIZE_ALIGNED. We would create an empty * region that couldn't hold data, but when mem->next gets freed, * the 2 regions would be combined, resulting in more free memory @@ -298,24 +337,24 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) ptr2 = ptr + SIZEOF_STRUCT_MEM + size; /* create mem2 struct */ - mem2 = (struct rt_mem_item *)&m->heap_ptr[ptr2]; + mem2 = (struct rt_small_mem_item *)&small_mem->heap_ptr[ptr2]; mem2->pool_ptr = MEM_FREED(); mem2->next = mem->next; mem2->prev = ptr; #ifdef RT_USING_MEMTRACE - rt_mem_setname(mem2, " "); + rt_smem_setname(mem2, " "); #endif /* RT_USING_MEMTRACE */ /* and insert it between mem and mem->next */ mem->next = ptr2; - if (mem2->next != m->mem_size_aligned + SIZEOF_STRUCT_MEM) + if (mem2->next != small_mem->mem_size_aligned + SIZEOF_STRUCT_MEM) { - ((struct rt_mem_item *)&m->heap_ptr[mem2->next])->prev = ptr2; + ((struct rt_small_mem_item *)&small_mem->heap_ptr[mem2->next])->prev = ptr2; } - m->used_mem += (size + SIZEOF_STRUCT_MEM); - if (m->max_mem < m->used_mem) - m->max_mem = m->used_mem; + small_mem->parent.used += (size + SIZEOF_STRUCT_MEM); + if (small_mem->parent.max < small_mem->parent.used) + small_mem->parent.max = small_mem->parent.used; } else { @@ -326,35 +365,35 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) * also can't move mem->next directly behind mem, since mem->next * will always be used at this point! */ - m->used_mem += mem->next - ((rt_uint8_t *)mem - m->heap_ptr); - if (m->max_mem < m->used_mem) - m->max_mem = m->used_mem; + small_mem->parent.used += mem->next - ((rt_uint8_t *)mem - small_mem->heap_ptr); + if (small_mem->parent.max < small_mem->parent.used) + small_mem->parent.max = small_mem->parent.used; } /* set small memory object */ mem->pool_ptr = MEM_USED(); #ifdef RT_USING_MEMTRACE if (rt_thread_self()) - rt_mem_setname(mem, rt_thread_self()->name); + rt_smem_setname(mem, rt_thread_self()->name); else - rt_mem_setname(mem, "NONE"); + rt_smem_setname(mem, "NONE"); #endif /* RT_USING_MEMTRACE */ - if (mem == m->lfree) + if (mem == small_mem->lfree) { /* Find next free block after mem and update lowest free pointer */ - while (MEM_ISUSED(m->lfree) && m->lfree != m->heap_end) - m->lfree = (struct rt_mem_item *)&m->heap_ptr[m->lfree->next]; + while (MEM_ISUSED(small_mem->lfree) && small_mem->lfree != small_mem->heap_end) + small_mem->lfree = (struct rt_small_mem_item *)&small_mem->heap_ptr[small_mem->lfree->next]; - RT_ASSERT(((m->lfree == m->heap_end) || (!MEM_ISUSED(m->lfree)))); + RT_ASSERT(((small_mem->lfree == small_mem->heap_end) || (!MEM_ISUSED(small_mem->lfree)))); } - RT_ASSERT((rt_ubase_t)mem + SIZEOF_STRUCT_MEM + size <= (rt_ubase_t)m->heap_end); + RT_ASSERT((rt_ubase_t)mem + SIZEOF_STRUCT_MEM + size <= (rt_ubase_t)small_mem->heap_end); RT_ASSERT((rt_ubase_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM) % RT_ALIGN_SIZE == 0); RT_ASSERT((((rt_ubase_t)mem) & (RT_ALIGN_SIZE - 1)) == 0); RT_DEBUG_LOG(RT_DEBUG_MEM, ("allocate memory at 0x%x, size: %d\n", (rt_ubase_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM), - (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - m->heap_ptr)))); + (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - small_mem->heap_ptr)))); /* return the memory data except mem struct */ return (rt_uint8_t *)mem + SIZEOF_STRUCT_MEM; @@ -363,7 +402,7 @@ void *rt_mem_alloc(struct rt_mem *m, rt_size_t size) return RT_NULL; } -RTM_EXPORT(rt_mem_alloc); +RTM_EXPORT(rt_smem_alloc); /** * @brief This function will change the size of previously allocated memory block. @@ -376,20 +415,22 @@ RTM_EXPORT(rt_mem_alloc); * * @return the changed memory block address. */ -void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) +void *rt_smem_realloc(rt_smem_t m, void *rmem, rt_size_t newsize) { rt_size_t size; rt_size_t ptr, ptr2; - struct rt_mem_item *mem, *mem2; + struct rt_small_mem_item *mem, *mem2; + struct rt_small_mem *small_mem; void *nmem; RT_ASSERT(m != RT_NULL); - RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); + RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Memory); RT_ASSERT(rt_object_is_systemobject(&m->parent)); + small_mem = (struct rt_small_mem *)m; /* alignment size */ newsize = RT_ALIGN(newsize, RT_ALIGN_SIZE); - if (newsize > m->mem_size_aligned) + if (newsize > small_mem->mem_size_aligned) { RT_DEBUG_LOG(RT_DEBUG_MEM, ("realloc: out of memory\n")); @@ -397,22 +438,22 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) } else if (newsize == 0) { - rt_mem_free(rmem); + rt_smem_free(rmem); return RT_NULL; } /* allocate a new memory block */ if (rmem == RT_NULL) - return rt_mem_alloc(m, newsize); + return rt_smem_alloc(&small_mem->parent, newsize); RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); - RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr); - RT_ASSERT((rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); + RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)small_mem->heap_ptr); + RT_ASSERT((rt_uint8_t *)rmem < (rt_uint8_t *)small_mem->heap_end); - mem = (struct rt_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); + mem = (struct rt_small_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); /* current memory block size */ - ptr = (rt_uint8_t *)mem - m->heap_ptr; + ptr = (rt_uint8_t *)mem - small_mem->heap_ptr; size = mem->next - ptr - SIZEOF_STRUCT_MEM; if (size == newsize) { @@ -423,44 +464,44 @@ void *rt_mem_realloc(struct rt_mem *m, void *rmem, rt_size_t newsize) if (newsize + SIZEOF_STRUCT_MEM + MIN_SIZE < size) { /* split memory block */ - m->used_mem -= (size - newsize); + small_mem->parent.used -= (size - newsize); ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize; - mem2 = (struct rt_mem_item *)&m->heap_ptr[ptr2]; + mem2 = (struct rt_small_mem_item *)&small_mem->heap_ptr[ptr2]; mem2->pool_ptr = MEM_FREED(); mem2->next = mem->next; mem2->prev = ptr; #ifdef RT_USING_MEMTRACE - rt_mem_setname(mem2, " "); + rt_smem_setname(mem2, " "); #endif /* RT_USING_MEMTRACE */ mem->next = ptr2; - if (mem2->next != m->mem_size_aligned + SIZEOF_STRUCT_MEM) + if (mem2->next != small_mem->mem_size_aligned + SIZEOF_STRUCT_MEM) { - ((struct rt_mem_item *)&m->heap_ptr[mem2->next])->prev = ptr2; + ((struct rt_small_mem_item *)&small_mem->heap_ptr[mem2->next])->prev = ptr2; } - if (mem2 < m->lfree) + if (mem2 < small_mem->lfree) { /* the splited struct is now the lowest */ - m->lfree = mem2; + small_mem->lfree = mem2; } - plug_holes(m, mem2); + plug_holes(small_mem, mem2); return rmem; } /* expand memory */ - nmem = rt_mem_alloc(m, newsize); + nmem = rt_smem_alloc(&small_mem->parent, newsize); if (nmem != RT_NULL) /* check memory */ { rt_memcpy(nmem, rmem, size < newsize ? size : newsize); - rt_mem_free(rmem); + rt_smem_free(rmem); } return nmem; } -RTM_EXPORT(rt_mem_realloc); +RTM_EXPORT(rt_smem_realloc); /** * @brief This function will release the previously allocated memory block by @@ -468,82 +509,52 @@ RTM_EXPORT(rt_mem_realloc); * * @param rmem the address of memory which will be released. */ -void rt_mem_free(void *rmem) +void rt_smem_free(void *rmem) { - struct rt_mem_item *mem; - struct rt_mem *m; + struct rt_small_mem_item *mem; + struct rt_small_mem *small_mem; if (rmem == RT_NULL) return; RT_ASSERT((((rt_ubase_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); - /* Get the corresponding struct rt_mem_item ... */ - mem = (struct rt_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); + /* Get the corresponding struct rt_small_mem_item ... */ + mem = (struct rt_small_mem_item *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM); RT_DEBUG_LOG(RT_DEBUG_MEM, ("release memory 0x%x, size: %d\n", (rt_ubase_t)rmem, - (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - m->heap_ptr)))); + (rt_ubase_t)(mem->next - ((rt_uint8_t *)mem - small_mem->heap_ptr)))); /* ... which has to be in a used state ... */ - m = MEM_POOL(mem); - RT_ASSERT(m != RT_NULL); + small_mem = MEM_POOL(mem); + RT_ASSERT(small_mem != RT_NULL); RT_ASSERT(MEM_ISUSED(mem)); - RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); - RT_ASSERT(rt_object_is_systemobject(&m->parent)); - RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)m->heap_ptr && - (rt_uint8_t *)rmem < (rt_uint8_t *)m->heap_end); - RT_ASSERT(MEM_POOL(&m->heap_ptr[mem->next]) == m); + RT_ASSERT(rt_object_get_type(&small_mem->parent.parent) == RT_Object_Class_Memory); + RT_ASSERT(rt_object_is_systemobject(&small_mem->parent.parent)); + RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)small_mem->heap_ptr && + (rt_uint8_t *)rmem < (rt_uint8_t *)small_mem->heap_end); + RT_ASSERT(MEM_POOL(&small_mem->heap_ptr[mem->next]) == small_mem); /* ... and is now unused. */ mem->pool_ptr = MEM_FREED(); #ifdef RT_USING_MEMTRACE - rt_mem_setname(mem, " "); + rt_smem_setname(mem, " "); #endif /* RT_USING_MEMTRACE */ - if (mem < m->lfree) + if (mem < small_mem->lfree) { /* the newly freed struct is now the lowest */ - m->lfree = mem; + small_mem->lfree = mem; } - m->used_mem -= (mem->next - ((rt_uint8_t *)mem - m->heap_ptr)); + small_mem->parent.used -= (mem->next - ((rt_uint8_t *)mem - small_mem->heap_ptr)); /* finally, see if prev or next are free also */ - plug_holes(m, mem); -} -RTM_EXPORT(rt_mem_free); - -/** -* @brief This function will caculate the total memory, the used memory, and -* the max used memory. -* -* @param m the small memory management object. -* -* @param total is a pointer to get the total size of the memory. -* -* @param used is a pointer to get the size of memory used. -* -* @param max_used is a pointer to get the maximum memory used. -*/ -void rt_mem_info(struct rt_mem *m, - rt_uint32_t *total, - rt_uint32_t *used, - rt_uint32_t *max_used) -{ - RT_ASSERT(m != RT_NULL); - RT_ASSERT(rt_object_get_type(&m->parent) == RT_Object_Class_Mem); - RT_ASSERT(rt_object_is_systemobject(&m->parent)); - - if (total != RT_NULL) - *total = m->mem_size_aligned; - if (used != RT_NULL) - *used = m->used_mem; - if (max_used != RT_NULL) - *max_used = m->max_mem; + plug_holes(small_mem, mem); } -RTM_EXPORT(rt_mem_info); +RTM_EXPORT(rt_smem_free); #ifdef RT_USING_FINSH #include @@ -553,8 +564,8 @@ int memcheck(int argc, char *argv[]) { int position; rt_ubase_t level; - struct rt_mem_item *mem; - struct rt_mem *m; + struct rt_small_mem_item *mem; + struct rt_small_mem *m; struct rt_object_information *information; struct rt_list_node *node; struct rt_object *object; @@ -563,7 +574,7 @@ int memcheck(int argc, char *argv[]) name = argc > 1 ? argv[1] : RT_NULL; level = rt_hw_interrupt_disable(); /* get mem object */ - information = rt_object_get_information(RT_Object_Class_Mem); + information = rt_object_get_information(RT_Object_Class_Memory); for (node = information->object_list.next; node != &(information->object_list); node = node->next) @@ -573,9 +584,9 @@ int memcheck(int argc, char *argv[]) if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0) continue; /* mem object */ - m = (struct rt_mem *)object; + m = (struct rt_small_mem *)object; /* check mem */ - for (mem = (struct rt_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_mem_item *)&m->heap_ptr[mem->next]) + for (mem = (struct rt_small_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_small_mem_item *)&m->heap_ptr[mem->next]) { position = (rt_ubase_t)mem - (rt_ubase_t)m->heap_ptr; if (position < 0) goto __exit; @@ -588,7 +599,7 @@ int memcheck(int argc, char *argv[]) return 0; __exit: rt_kprintf("Memory block wrong:\n"); - rt_kprintf(" name: %s\n", m->parent.name); + rt_kprintf(" name: %s\n", m->parent.parent.name); rt_kprintf("address: 0x%08x\n", mem); rt_kprintf(" pool: 0x%04x\n", mem->pool_ptr); rt_kprintf(" size: %d\n", mem->next - position - SIZEOF_STRUCT_MEM); @@ -600,8 +611,8 @@ MSH_CMD_EXPORT(memcheck, check memory data); int memtrace(int argc, char **argv) { - struct rt_mem_item *mem; - struct rt_mem *m; + struct rt_small_mem_item *mem; + struct rt_small_mem *m; struct rt_object_information *information; struct rt_list_node *node; struct rt_object *object; @@ -609,7 +620,7 @@ int memtrace(int argc, char **argv) name = argc > 1 ? argv[1] : RT_NULL; /* get mem object */ - information = rt_object_get_information(RT_Object_Class_Mem); + information = rt_object_get_information(RT_Object_Class_Memory); for (node = information->object_list.next; node != &(information->object_list); node = node->next) @@ -619,18 +630,18 @@ int memtrace(int argc, char **argv) if (name != RT_NULL && rt_strncmp(name, object->name, RT_NAME_MAX) != 0) continue; /* mem object */ - m = (struct rt_mem *)object; + m = (struct rt_small_mem *)object; /* show memory information */ rt_kprintf("\nmemory heap address:\n"); - rt_kprintf("name : %s\n", m->parent.name); - rt_kprintf("total : 0x%d\n", m->mem_size_aligned); - rt_kprintf("used : 0x%d\n", m->used_mem); - rt_kprintf("max_used: 0x%d\n", m->max_mem); + rt_kprintf("name : %s\n", m->parent.parent.name); + rt_kprintf("total : 0x%d\n", m->parent.total); + rt_kprintf("used : 0x%d\n", m->parent.used); + rt_kprintf("max_used: 0x%d\n", m->parent.max); rt_kprintf("heap_ptr: 0x%08x\n", m->heap_ptr); rt_kprintf("lfree : 0x%08x\n", m->lfree); rt_kprintf("heap_end: 0x%08x\n", m->heap_end); rt_kprintf("\n--memory item information --\n"); - for (mem = (struct rt_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_mem_item *)&m->heap_ptr[mem->next]) + for (mem = (struct rt_small_mem_item *)m->heap_ptr; mem != m->heap_end; mem = (struct rt_small_mem_item *)&m->heap_ptr[mem->next]) { int size = MEM_SIZE(m, mem); diff --git a/src/memheap.c b/src/memheap.c index 21658161f04..46ab3c0714f 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -765,6 +765,100 @@ void rt_memheap_info(struct rt_memheap *heap, } } +#ifdef RT_USING_MEMHEAP_AS_HEAP +/* + * rt_malloc port function +*/ +void *_memheap_alloc(struct rt_memheap *heap, rt_size_t size) +{ + void *ptr; + + /* try to allocate in system heap */ + ptr = rt_memheap_alloc(heap, size); +#ifdef RT_USING_MEMHEAP_AUTO_BINDING + if (ptr == RT_NULL) + { + struct rt_object *object; + struct rt_list_node *node; + struct rt_memheap *_heap; + struct rt_object_information *information; + + /* try to allocate on other memory heap */ + information = rt_object_get_information(RT_Object_Class_MemHeap); + RT_ASSERT(information != RT_NULL); + for (node = information->object_list.next; + node != &(information->object_list); + node = node->next) + { + object = rt_list_entry(node, struct rt_object, list); + _heap = (struct rt_memheap *)object; + + /* not allocate in the default system heap */ + if (heap == _heap) + continue; + + ptr = rt_memheap_alloc(_heap, size); + if (ptr != RT_NULL) + break; + } + } +#endif /* RT_USING_MEMHEAP_AUTO_BINDING */ + return ptr; +} + +/* + * rt_free port function +*/ +void _memheap_free(void *rmem) +{ + rt_memheap_free(rmem); +} + +/* + * rt_realloc port function +*/ +void *_memheap_realloc(struct rt_memheap *heap, void *rmem, rt_size_t newsize) +{ + void *new_ptr; + struct rt_memheap_item *header_ptr; + + if (rmem == RT_NULL) + return _memheap_alloc(heap, newsize); + + if (newsize == 0) + { + _memheap_free(rmem); + return RT_NULL; + } + + /* get old memory item */ + header_ptr = (struct rt_memheap_item *) + ((rt_uint8_t *)rmem - RT_MEMHEAP_SIZE); + + new_ptr = rt_memheap_realloc(header_ptr->pool_ptr, rmem, newsize); + if (new_ptr == RT_NULL && newsize != 0) + { + /* allocate memory block from other memheap */ + new_ptr = _memheap_alloc(heap, newsize); + if (new_ptr != RT_NULL && rmem != RT_NULL) + { + rt_size_t oldsize; + + /* get the size of old memory block */ + oldsize = MEMITEM_SIZE(header_ptr); + if (newsize > oldsize) + rt_memcpy(new_ptr, rmem, oldsize); + else + rt_memcpy(new_ptr, rmem, newsize); + + _memheap_free(rmem); + } + } + + return new_ptr; +} +#endif + #ifdef RT_USING_MEMTRACE int memheapcheck(int argc, char *argv[]) { @@ -773,7 +867,6 @@ int memheapcheck(int argc, char *argv[]) struct rt_memheap *heap; struct rt_list_node *node; struct rt_memheap_item *item; - struct rt_memheap_item *last = RT_NULL; rt_bool_t has_bad = RT_FALSE; rt_base_t level; char *name; @@ -819,8 +912,6 @@ int memheapcheck(int argc, char *argv[]) has_bad = RT_TRUE; break; } - /* move to next used memory block */ - last = item; } } rt_hw_interrupt_enable(level); diff --git a/src/object.c b/src/object.c index 2a2f688dc31..76534f4566e 100644 --- a/src/object.c +++ b/src/object.c @@ -56,11 +56,8 @@ enum rt_object_info_type #ifdef RT_USING_MODULE RT_Object_Info_Module, /**< The object is a module. */ #endif -#ifdef RT_USING_SMALL_MEM - RT_Object_Info_Mem, /**< The object is a small memory. */ -#endif -#ifdef RT_USING_SLAB - RT_Object_Info_Slab, /**< The object is a slab memory. */ +#ifdef RT_USING_HEAP + RT_Object_Info_Memory, /**< The object is a memory. */ #endif RT_Object_Info_Unknown, /**< The object is unknown. */ }; @@ -110,13 +107,9 @@ static struct rt_object_information _object_container[RT_Object_Info_Unknown] = /* initialize object container - module */ {RT_Object_Class_Module, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Module), sizeof(struct rt_dlmodule)}, #endif -#ifdef RT_USING_SMALL_MEM +#ifdef RT_USING_HEAP /* initialize object container - small memory */ - {RT_Object_Class_Mem, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Mem), sizeof(struct rt_mem)}, -#endif -#ifdef RT_USING_SLAB - /* initialize object container - slab memory */ - {RT_Object_Class_Slab, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Slab), sizeof(struct rt_slab)}, + {RT_Object_Class_Memory, _OBJ_CONTAINER_LIST_INIT(RT_Object_Info_Memory), sizeof(struct rt_memory)}, #endif }; diff --git a/src/slab.c b/src/slab.c index 9b211ebffdc..4f5d7856938 100644 --- a/src/slab.c +++ b/src/slab.c @@ -133,6 +133,74 @@ #define btokup(addr) \ (&slab->memusage[((rt_ubase_t)(addr) - slab->heap_start) >> RT_MM_PAGE_BITS]) +/** + * Base structure of slab memory object + */ + +/* + * The IN-BAND zone header is placed at the beginning of each zone. + */ +struct rt_slab_zone +{ + rt_uint32_t z_magic; /**< magic number for sanity check */ + rt_uint32_t z_nfree; /**< total free chunks / ualloc space in zone */ + rt_uint32_t z_nmax; /**< maximum free chunks */ + struct rt_slab_zone *z_next; /**< zoneary[] link if z_nfree non-zero */ + rt_uint8_t *z_baseptr; /**< pointer to start of chunk array */ + + rt_uint32_t z_uindex; /**< current initial allocation index */ + rt_uint32_t z_chunksize; /**< chunk size for validation */ + + rt_uint32_t z_zoneindex; /**< zone index */ + struct rt_slab_chunk *z_freechunk; /**< free chunk list */ +}; + +/* + * Chunk structure for free elements + */ +struct rt_slab_chunk +{ + struct rt_slab_chunk *c_next; +}; + +struct rt_slab_memusage +{ + rt_uint32_t type: 2 ; /**< page type */ + rt_uint32_t size: 30; /**< pages allocated or offset from zone */ +}; + +/* + * slab page allocator + */ +struct rt_slab_page +{ + struct rt_slab_page *next; /**< next valid page */ + rt_size_t page; /**< number of page */ + + /* dummy */ + char dummy[RT_MM_PAGE_SIZE - (sizeof(struct rt_slab_page *) + sizeof(rt_size_t))]; +}; + +#define RT_SLAB_NZONES 72 /* number of zones */ + +/* + * slab object + */ +struct rt_slab +{ + struct rt_memory parent; /**< inherit from rt_memory */ + rt_ubase_t heap_start; /**< memory start address */ + rt_ubase_t heap_end; /**< memory end address */ + struct rt_slab_memusage *memusage; + struct rt_slab_zone *zone_array[RT_SLAB_NZONES]; /* linked list of zones NFree > 0 */ + struct rt_slab_zone *zone_free; /* whole zones that have become free */ + rt_uint32_t zone_free_cnt; + rt_uint32_t zone_size; + rt_uint32_t zone_limit; + rt_uint32_t zone_page_cnt; + struct rt_slab_page *page_list; +}; + /** * @brief Alloc memory size by page. * @@ -140,10 +208,11 @@ * * @param npages the number of pages. */ -void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages) +void *rt_slab_page_alloc(rt_slab_t m, rt_size_t npages) { struct rt_slab_page *b, *n; struct rt_slab_page **prev; + struct rt_slab *slab = (struct rt_slab *)m; if (npages == 0) return RT_NULL; @@ -180,10 +249,11 @@ void *rt_slab_page_alloc(struct rt_slab *slab, rt_size_t npages) * * @param npages is the number of pages. */ -void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) +void rt_slab_page_free(rt_slab_t m, void *addr, rt_size_t npages) { struct rt_slab_page *b, *n; struct rt_slab_page **prev; + struct rt_slab *slab = (struct rt_slab *)m; RT_ASSERT(addr != RT_NULL); RT_ASSERT((rt_ubase_t)addr % RT_MM_PAGE_SIZE == 0); @@ -226,13 +296,13 @@ void rt_slab_page_free(struct rt_slab *slab, void *addr, rt_size_t npages) /* * Initialize the page allocator */ -static void rt_page_init(struct rt_slab *slab, void *addr, rt_size_t npages) +static void rt_slab_page_init(struct rt_slab *slab, void *addr, rt_size_t npages) { RT_ASSERT(addr != RT_NULL); RT_ASSERT(npages != 0); slab->page_list = RT_NULL; - rt_slab_page_free(slab, addr, npages); + rt_slab_page_free((rt_slab_t)(&slab->parent), addr, npages); } /** @@ -246,38 +316,44 @@ static void rt_page_init(struct rt_slab *slab, void *addr, rt_size_t npages) * * @param size is the size of the memory. * - * @return RT_EOK + * @return Return a pointer to the slab memory object. */ -rt_err_t rt_slab_init(struct rt_slab *slab, const char *name, - void *begin_addr, rt_size_t size) +rt_slab_t rt_slab_init(const char *name, void *begin_addr, rt_size_t size) { rt_uint32_t limsize, npages; + rt_ubase_t start_addr, begin_align, end_align; + struct rt_slab *slab; - RT_ASSERT(slab != RT_NULL); - rt_memset(slab, 0, sizeof(*slab)); + slab = (struct rt_slab *)RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); + start_addr = (rt_ubase_t)slab + sizeof(*slab); /* align begin and end addr to page */ - slab->heap_start = RT_ALIGN((rt_ubase_t)begin_addr, RT_MM_PAGE_SIZE); - slab->heap_end = RT_ALIGN_DOWN((rt_ubase_t)begin_addr + size, RT_MM_PAGE_SIZE); - - if (slab->heap_start >= slab->heap_end) + begin_align = RT_ALIGN((rt_ubase_t)start_addr, RT_MM_PAGE_SIZE); + end_align = RT_ALIGN_DOWN((rt_ubase_t)begin_addr + size, RT_MM_PAGE_SIZE); + if (begin_align >= end_align) { rt_kprintf("slab init errr. wrong address[0x%x - 0x%x]\n", (rt_ubase_t)begin_addr, (rt_ubase_t)begin_addr + size); - - return -RT_EINVAL; + return RT_NULL; } - /* initialize slab memory object */ - rt_object_init(&(slab->parent), RT_Object_Class_Slab, name); - - limsize = slab->heap_end - slab->heap_start; + limsize = end_align - begin_align; npages = limsize / RT_MM_PAGE_SIZE; - RT_DEBUG_LOG(RT_DEBUG_SLAB, ("heap[0x%x - 0x%x], size 0x%x, 0x%x pages\n", - slab->heap_start, slab->heap_end, limsize, npages)); + begin_align, end_align, limsize, npages)); + + rt_memset(slab, 0, sizeof(*slab)); + /* initialize slab memory object */ + rt_object_init(&(slab->parent.parent), RT_Object_Class_Memory, name); + slab->parent.algorithm = "slab"; + slab->parent.address = begin_align; + slab->parent.total = limsize; + slab->parent.used = 0; + slab->parent.max = 0; + slab->heap_start = begin_align; + slab->heap_end = end_align; /* init pages */ - rt_page_init(slab, (void *)slab->heap_start, npages); + rt_slab_page_init(slab, (void *)slab->heap_start, npages); /* calculate zone size */ slab->zone_size = ZALLOC_MIN_ZONE_SIZE; @@ -296,28 +372,30 @@ rt_err_t rt_slab_init(struct rt_slab *slab, const char *name, /* allocate slab->memusage array */ limsize = npages * sizeof(struct rt_slab_memusage); limsize = RT_ALIGN(limsize, RT_MM_PAGE_SIZE); - slab->memusage = rt_slab_page_alloc(slab, limsize / RT_MM_PAGE_SIZE); + slab->memusage = rt_slab_page_alloc((rt_slab_t)(&slab->parent), limsize / RT_MM_PAGE_SIZE); RT_DEBUG_LOG(RT_DEBUG_SLAB, ("slab->memusage 0x%x, size 0x%x\n", (rt_ubase_t)slab->memusage, limsize)); - return RT_EOK; + return &slab->parent; } RTM_EXPORT(rt_slab_init); /** * @brief This function will remove a slab object from the system. * - * @param slab the slab memory management object. + * @param m the slab memory management object. * * @return RT_EOK */ -rt_err_t rt_slab_detach(struct rt_slab *slab) +rt_err_t rt_slab_detach(rt_slab_t m) { + struct rt_slab *slab = (struct rt_slab *)m; + RT_ASSERT(slab != RT_NULL); - RT_ASSERT(rt_object_get_type(&slab->parent) == RT_Object_Class_Slab); - RT_ASSERT(rt_object_is_systemobject(&slab->parent)); + RT_ASSERT(rt_object_get_type(&slab->parent.parent) == RT_Object_Class_Memory); + RT_ASSERT(rt_object_is_systemobject(&slab->parent.parent)); - rt_object_detach(&(slab->parent)); + rt_object_detach(&(slab->parent.parent)); return RT_EOK; } @@ -400,18 +478,19 @@ rt_inline int zoneindex(rt_size_t *bytes) * - the nbytes is less than zero. * - there is no nbytes sized memory valid in system. * - * @param slab the slab memory management object. + * @param m the slab memory management object. * * @param size is the size of memory to be allocated. * * @return the allocated memory. */ -void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) +void *rt_slab_alloc(rt_slab_t m, rt_size_t size) { struct rt_slab_zone *z; rt_int32_t zi; struct rt_slab_chunk *chunk; struct rt_slab_memusage *kup; + struct rt_slab *slab = (struct rt_slab *)m; /* zero size, return RT_NULL */ if (size == 0) @@ -425,7 +504,7 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) { size = RT_ALIGN(size, RT_MM_PAGE_SIZE); - chunk = rt_slab_page_alloc(slab, size >> RT_MM_PAGE_BITS); + chunk = rt_slab_page_alloc(m, size >> RT_MM_PAGE_BITS); if (chunk == RT_NULL) return RT_NULL; @@ -440,9 +519,9 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) size >> RT_MM_PAGE_BITS, ((rt_ubase_t)chunk - slab->heap_start) >> RT_MM_PAGE_BITS)); /* mem stat */ - slab->used_mem += size; - if (slab->used_mem > slab->max_mem) - slab->max_mem = slab->used_mem; + slab->parent.used += size; + if (slab->parent.used > slab->parent.max) + slab->parent.max = slab->parent.used; return chunk; } @@ -490,9 +569,9 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) z->z_freechunk = z->z_freechunk->c_next; } /* mem stats */ - slab->used_mem += z->z_chunksize; - if (slab->used_mem > slab->max_mem) - slab->max_mem = slab->used_mem; + slab->parent.used += z->z_chunksize; + if (slab->parent.used > slab->parent.max) + slab->parent.max = slab->parent.used; return chunk; } @@ -517,7 +596,7 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) else { /* allocate a zone from page */ - z = rt_slab_page_alloc(slab, slab->zone_size / RT_MM_PAGE_SIZE); + z = rt_slab_page_alloc(m, slab->zone_size / RT_MM_PAGE_SIZE); if (z == RT_NULL) { return RT_NULL; @@ -565,9 +644,9 @@ void *rt_slab_alloc(struct rt_slab *slab, rt_size_t size) z->z_next = slab->zone_array[zi]; slab->zone_array[zi] = z; /* mem stats */ - slab->used_mem += z->z_chunksize; - if (slab->used_mem > slab->max_mem) - slab->max_mem = slab->used_mem; + slab->parent.used += z->z_chunksize; + if (slab->parent.used > slab->parent.max) + slab->parent.max = slab->parent.used; } return chunk; @@ -577,7 +656,7 @@ RTM_EXPORT(rt_slab_alloc); /** * @brief This function will change the size of previously allocated memory block. * - * @param slab the slab memory management object. + * @param m the slab memory management object. * * @param ptr is the previously allocated memory block. * @@ -585,18 +664,19 @@ RTM_EXPORT(rt_slab_alloc); * * @return the allocated memory. */ -void *rt_slab_realloc(struct rt_slab *slab, void *ptr, rt_size_t size) +void *rt_slab_realloc(rt_slab_t m, void *ptr, rt_size_t size) { void *nptr; struct rt_slab_zone *z; struct rt_slab_memusage *kup; + struct rt_slab *slab = (struct rt_slab *)m; if (ptr == RT_NULL) - return rt_slab_alloc(slab, size); + return rt_slab_alloc(m, size); if (size == 0) { - rt_slab_free(slab, ptr); + rt_slab_free(m, ptr); return RT_NULL; } @@ -610,10 +690,10 @@ void *rt_slab_realloc(struct rt_slab *slab, void *ptr, rt_size_t size) rt_size_t osize; osize = kup->size << RT_MM_PAGE_BITS; - if ((nptr = rt_slab_alloc(slab, size)) == RT_NULL) + if ((nptr = rt_slab_alloc(m, size)) == RT_NULL) return RT_NULL; rt_memcpy(nptr, ptr, size > osize ? osize : size); - rt_slab_free(slab, ptr); + rt_slab_free(m, ptr); return nptr; } @@ -632,11 +712,11 @@ void *rt_slab_realloc(struct rt_slab *slab, void *ptr, rt_size_t size) * already adjusted the request size to the appropriate chunk size, which * should optimize our bcopy(). Then copy and return the new pointer. */ - if ((nptr = rt_slab_alloc(slab, size)) == RT_NULL) + if ((nptr = rt_slab_alloc(m, size)) == RT_NULL) return RT_NULL; rt_memcpy(nptr, ptr, size > z->z_chunksize ? z->z_chunksize : size); - rt_slab_free(slab, ptr); + rt_slab_free(m, ptr); return nptr; } @@ -649,14 +729,16 @@ RTM_EXPORT(rt_slab_realloc); * @brief This function will release the previous allocated memory block by rt_slab_alloc. * * @note The released memory block is taken back to system heap. - * + * + * @param m the slab memory management object. * @param ptr is the address of memory which will be released */ -void rt_slab_free(struct rt_slab *slab, void *ptr) +void rt_slab_free(rt_slab_t m, void *ptr) { struct rt_slab_zone *z; struct rt_slab_chunk *chunk; struct rt_slab_memusage *kup; + struct rt_slab *slab = (struct rt_slab *)m; /* free a RT_NULL pointer */ if (ptr == RT_NULL) @@ -684,14 +766,14 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) size = kup->size; kup->size = 0; /* mem stats */ - slab->used_mem -= size * RT_MM_PAGE_SIZE; + slab->parent.used -= size * RT_MM_PAGE_SIZE; RT_DEBUG_LOG(RT_DEBUG_SLAB, ("free large memory block 0x%x, page count %d\n", (rt_ubase_t)ptr, size)); /* free this page */ - rt_slab_page_free(slab, ptr, size); + rt_slab_page_free(m, ptr, size); return; } @@ -705,7 +787,7 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) chunk->c_next = z->z_freechunk; z->z_freechunk = chunk; /* mem stats */ - slab->used_mem -= z->z_chunksize; + slab->parent.used -= z->z_chunksize; /* * Bump the number of free chunks. If it becomes non-zero the zone @@ -763,7 +845,7 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) } /* release pages */ - rt_slab_page_free(slab, z, slab->zone_size / RT_MM_PAGE_SIZE); + rt_slab_page_free(m, z, slab->zone_size / RT_MM_PAGE_SIZE); return; } @@ -771,32 +853,4 @@ void rt_slab_free(struct rt_slab *slab, void *ptr) } RTM_EXPORT(rt_slab_free); -/** -* @brief This function will caculate the total memory, the used memory, and -* the max used memory. -* -* @param slab the slab memory management object. -* -* @param total is a pointer to get the total size of the memory. -* -* @param used is a pointer to get the size of memory used. -* -* @param max_used is a pointer to get the maximum memory used. -*/ -void rt_slab_info(struct rt_slab *slab, - rt_uint32_t *total, - rt_uint32_t *used, - rt_uint32_t *max_used) -{ - if (total != RT_NULL) - *total = slab->heap_end - slab->heap_start; - - if (used != RT_NULL) - *used = slab->used_mem; - - if (max_used != RT_NULL) - *max_used = slab->max_mem; -} -/**@}*/ - #endif /* defined (RT_USING_SLAB) */ From 6cd894ca4ece8fee92306b071dd118c796c8eae3 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Tue, 7 Dec 2021 15:00:08 +0800 Subject: [PATCH 23/30] [kernel][memory] Fix compilation warning --- src/kservice.c | 2 -- src/memheap.c | 2 +- src/slab.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/kservice.c b/src/kservice.c index f09ff721157..5d4311507dc 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1314,7 +1314,6 @@ void rt_free_sethook(void (*hook)(void *ptr)) #endif /* RT_USING_HOOK */ #if defined(RT_USING_HEAP_ISR) -volatile static rt_base_t _lock; #elif defined(RT_USING_MUTEX) static struct rt_mutex _lock; #endif @@ -1322,7 +1321,6 @@ static struct rt_mutex _lock; rt_inline void _heap_lock_init(void) { #if defined(RT_USING_HEAP_ISR) - _lock = 0; #elif defined(RT_USING_MUTEX) rt_mutex_init(&_lock, "heap", RT_IPC_FLAG_PRIO); #endif diff --git a/src/memheap.c b/src/memheap.c index 46ab3c0714f..77606c19c7d 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -939,7 +939,7 @@ int memheaptrace(int argc, char *argv[]) for (node = list->next; node != list; node = node->next) { struct rt_memheap_item *header_ptr; - rt_uint32_t block_size; + long block_size; mh = (struct rt_memheap *)rt_list_entry(node, struct rt_object, list); /* find the specified object */ diff --git a/src/slab.c b/src/slab.c index 4f5d7856938..8b7e5ccddcd 100644 --- a/src/slab.c +++ b/src/slab.c @@ -819,7 +819,7 @@ void rt_slab_free(rt_slab_t m, void *ptr) *pz = z->z_next; /* reset zone */ - z->z_magic = -1; + z->z_magic = RT_UINT32_MAX; /* insert to free zone list */ z->z_next = slab->zone_free; From 50796300171d034f948bf2c713f9a596c68bf13d Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Tue, 7 Dec 2021 15:49:40 +0800 Subject: [PATCH 24/30] [examples][utest] Fix mem test case --- examples/utest/testcases/kernel/mem_tc.c | 213 ++++++++++++----------- 1 file changed, 115 insertions(+), 98 deletions(-) diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c index 779059c6499..98e23d75307 100644 --- a/examples/utest/testcases/kernel/mem_tc.c +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -12,20 +12,46 @@ #include #include "utest.h" +struct rt_small_mem_item +{ + rt_ubase_t pool_ptr; /**< small memory object addr */ +#ifdef ARCH_CPU_64BIT + rt_uint32_t resv; +#endif /* ARCH_CPU_64BIT */ + rt_size_t next; /**< next free item */ + rt_size_t prev; /**< prev free item */ +#ifdef RT_USING_MEMTRACE +#ifdef ARCH_CPU_64BIT + rt_uint8_t thread[8]; /**< thread name */ +#else + rt_uint8_t thread[4]; /**< thread name */ +#endif /* ARCH_CPU_64BIT */ +#endif /* RT_USING_MEMTRACE */ +}; + +struct rt_small_mem +{ + struct rt_memory parent; /**< inherit from rt_memory */ + rt_uint8_t *heap_ptr; /**< pointer to the heap */ + struct rt_small_mem_item *heap_end; + struct rt_small_mem_item *lfree; + rt_size_t mem_size_aligned; /**< aligned memory size */ +}; + #define MEM_SIZE(_heap, _mem) \ - (((struct rt_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ - (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_mem_item), RT_ALIGN_SIZE)) + (((struct rt_small_mem_item *)(_mem))->next - ((rt_ubase_t)(_mem) - \ + (rt_ubase_t)((_heap)->heap_ptr)) - RT_ALIGN(sizeof(struct rt_small_mem_item), RT_ALIGN_SIZE)) #define TEST_MEM_SIZE 1024 -static rt_size_t max_block(struct rt_mem *heap) +static rt_size_t max_block(struct rt_small_mem *heap) { - struct rt_mem_item *mem; + struct rt_small_mem_item *mem; rt_size_t max = 0, size; - for (mem = (struct rt_mem_item *)heap->heap_ptr; + for (mem = (struct rt_small_mem_item *)heap->heap_ptr; mem != heap->heap_end; - mem = (struct rt_mem_item *)&heap->heap_ptr[mem->next]) + mem = (struct rt_small_mem_item *)&heap->heap_ptr[mem->next]) { if (((rt_ubase_t)mem->pool_ptr & 0x1) == 0) { @@ -58,22 +84,19 @@ struct mem_test_context static void mem_functional_test(void) { - rt_size_t buf_size, total_size; - rt_uint8_t *begin, *buf; - struct rt_mem *heap; + rt_size_t total_size; + rt_uint8_t *buf; + struct rt_small_mem *heap; rt_uint8_t magic = __LINE__; /* Prepare test memory */ buf = rt_malloc(TEST_MEM_SIZE); uassert_not_null(buf); uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); - heap = (struct rt_mem *)buf; - begin = (rt_uint8_t *)&heap[1]; - buf_size = buf + TEST_MEM_SIZE - begin; rt_memset(buf, 0xAA, TEST_MEM_SIZE); - // small heap init - rt_mem_init(heap, "mem_tc", begin, buf_size); - // get total size + /* small heap init */ + heap = (struct rt_small_mem *)rt_smem_init("mem_tc", buf, TEST_MEM_SIZE); + /* get total size */ total_size = max_block(heap); uassert_int_not_equal(total_size, 0); /* @@ -84,11 +107,11 @@ static void mem_functional_test(void) struct mem_test_context ctx; ctx.magic = magic++; ctx.size = max_block(heap); - ctx.ptr = rt_mem_alloc(heap, ctx.size); + ctx.ptr = rt_smem_alloc(&heap->parent, ctx.size); uassert_not_null(ctx.ptr); rt_memset(ctx.ptr, ctx.magic, ctx.size); uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); - rt_mem_free(ctx.ptr); + rt_smem_free(ctx.ptr); uassert_int_equal(max_block(heap), total_size); } /* @@ -98,31 +121,31 @@ static void mem_functional_test(void) { rt_size_t i, max_free = 0; struct mem_test_context ctx[3]; - // alloc mem + /* alloc mem */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { ctx[i].magic = magic++; ctx[i].size = max_block(heap) / (sizeof(ctx) / sizeof(ctx[0]) - i); - ctx[i].ptr = rt_mem_alloc(heap, ctx[i].size); + ctx[i].ptr = rt_smem_alloc(&heap->parent, ctx[i].size); uassert_not_null(ctx[i].ptr); rt_memset(ctx[i].ptr, ctx[i].magic, ctx[i].size); } - // All memory has been applied. The remaining memory should be 0 + /* All memory has been applied. The remaining memory should be 0 */ uassert_int_equal(max_block(heap), 0); - // Verify that the memory data is correct + /* Verify that the memory data is correct */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); } - // Sequential memory release + /* Sequential memory release */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); - rt_mem_free(ctx[i].ptr); + rt_smem_free(ctx[i].ptr); max_free += ctx[i].size; uassert_true(max_block(heap) >= max_free); } - // Check whether the memory is fully merged + /* Check whether the memory is fully merged */ uassert_int_equal(max_block(heap), total_size); } /* @@ -132,129 +155,129 @@ static void mem_functional_test(void) { rt_size_t i, max_free = 0; struct mem_test_context ctx[3]; - // alloc mem + /* alloc mem */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { ctx[i].magic = magic++; ctx[i].size = max_block(heap) / (sizeof(ctx) / sizeof(ctx[0]) - i); - ctx[i].ptr = rt_mem_alloc(heap, ctx[i].size); + ctx[i].ptr = rt_smem_alloc(&heap->parent, ctx[i].size); uassert_not_null(ctx[i].ptr); rt_memset(ctx[i].ptr, ctx[i].magic, ctx[i].size); } - // All memory has been applied. The remaining memory should be 0 + /* All memory has been applied. The remaining memory should be 0 */ uassert_int_equal(max_block(heap), 0); - // Verify that the memory data is correct + /* Verify that the memory data is correct */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); } - // Release even address + /* Release even address */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { if (i % 2 == 0) { uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); - rt_mem_free(ctx[i].ptr); + rt_smem_free(ctx[i].ptr); uassert_true(max_block(heap) >= ctx[0].size); } } - // Release odd addresses and merge memory blocks + /* Release odd addresses and merge memory blocks */ for (i = 0; i < sizeof(ctx) / sizeof(ctx[0]); i++) { if (i % 2 != 0) { uassert_int_equal(_mem_cmp(ctx[i].ptr, ctx[i].magic, ctx[i].size), 0); - rt_mem_free(ctx[i].ptr); + rt_smem_free(ctx[i].ptr); max_free += ctx[i - 1].size + ctx[i + 1].size; uassert_true(max_block(heap) >= max_free); } } - // Check whether the memory is fully merged + /* Check whether the memory is fully merged */ uassert_int_equal(max_block(heap), total_size); } - // mem realloc test,Small - > Large + /* mem realloc test,Small - > Large */ { - // Request a piece of memory for subsequent reallocation operations + /* Request a piece of memory for subsequent reallocation operations */ struct mem_test_context ctx[3]; ctx[0].magic = magic++; ctx[0].size = max_block(heap) / 3; - ctx[0].ptr = rt_mem_alloc(heap, ctx[0].size); + ctx[0].ptr = rt_smem_alloc(&heap->parent, ctx[0].size); uassert_not_null(ctx[0].ptr); rt_memset(ctx[0].ptr, ctx[0].magic, ctx[0].size); - // Apply for a small piece of memory and split the continuous memory + /* Apply for a small piece of memory and split the continuous memory */ ctx[1].magic = magic++; ctx[1].size = RT_ALIGN_SIZE; - ctx[1].ptr = rt_mem_alloc(heap, ctx[1].size); + ctx[1].ptr = rt_smem_alloc(&heap->parent, ctx[1].size); uassert_not_null(ctx[1].ptr); rt_memset(ctx[1].ptr, ctx[1].magic, ctx[1].size); - // Check whether the maximum memory block is larger than the first piece of memory + /* Check whether the maximum memory block is larger than the first piece of memory */ uassert_true(max_block(heap) > ctx[0].size); - // Reallocate the first piece of memory + /* Reallocate the first piece of memory */ ctx[2].magic = magic++; ctx[2].size = max_block(heap); - ctx[2].ptr = rt_mem_realloc(heap, ctx[0].ptr, ctx[2].size); + ctx[2].ptr = rt_smem_realloc(&heap->parent, ctx[0].ptr, ctx[2].size); uassert_not_null(ctx[2].ptr); uassert_int_not_equal(ctx[0].ptr, ctx[2].ptr); uassert_int_equal(_mem_cmp(ctx[2].ptr, ctx[0].magic, ctx[0].size), 0); rt_memset(ctx[2].ptr, ctx[2].magic, ctx[2].size); - // Free the second piece of memory + /* Free the second piece of memory */ uassert_int_equal(_mem_cmp(ctx[1].ptr, ctx[1].magic, ctx[1].size), 0); - rt_mem_free(ctx[1].ptr); - // Free reallocated memory + rt_smem_free(ctx[1].ptr); + /* Free reallocated memory */ uassert_int_equal(_mem_cmp(ctx[2].ptr, ctx[2].magic, ctx[2].size), 0); - rt_mem_free(ctx[2].ptr); - // Check memory integrity + rt_smem_free(ctx[2].ptr); + /* Check memory integrity */ uassert_int_equal(max_block(heap), total_size); } - // mem realloc test,Large - > Small + /* mem realloc test,Large - > Small */ { rt_size_t max_free; struct mem_test_context ctx; - // alloc a piece of memory + /* alloc a piece of memory */ ctx.magic = magic++; ctx.size = max_block(heap) / 2; - ctx.ptr = rt_mem_alloc(heap, ctx.size); + ctx.ptr = rt_smem_alloc(&heap->parent, ctx.size); uassert_not_null(ctx.ptr); rt_memset(ctx.ptr, ctx.magic, ctx.size); uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); - // Get remaining memory + /* Get remaining memory */ max_free = max_block(heap); - // Change memory size + /* Change memory size */ ctx.size = ctx.size / 2; - uassert_int_equal((rt_ubase_t)rt_mem_realloc(heap, ctx.ptr, ctx.size), (rt_ubase_t)ctx.ptr); - // Get remaining size + uassert_int_equal((rt_ubase_t)rt_smem_realloc(&heap->parent, ctx.ptr, ctx.size), (rt_ubase_t)ctx.ptr); + /* Get remaining size */ uassert_true(max_block(heap) > max_free); - // Free memory + /* Free memory */ uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); - rt_mem_free(ctx.ptr); - // Check memory integrity + rt_smem_free(ctx.ptr); + /* Check memory integrity */ uassert_int_equal(max_block(heap), total_size); } - // mem realloc test,equal + /* mem realloc test,equal */ { rt_size_t max_free; struct mem_test_context ctx; - // alloc a piece of memory + /* alloc a piece of memory */ ctx.magic = magic++; ctx.size = max_block(heap) / 2; - ctx.ptr = rt_mem_alloc(heap, ctx.size); + ctx.ptr = rt_smem_alloc(&heap->parent, ctx.size); uassert_not_null(ctx.ptr); rt_memset(ctx.ptr, ctx.magic, ctx.size); uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); - // Get remaining memory + /* Get remaining memory */ max_free = max_block(heap); - // Do not change memory size - uassert_int_equal((rt_ubase_t)rt_mem_realloc(heap, ctx.ptr, ctx.size), (rt_ubase_t)ctx.ptr); - // Get remaining size + /* Do not change memory size */ + uassert_int_equal((rt_ubase_t)rt_smem_realloc(&heap->parent, ctx.ptr, ctx.size), (rt_ubase_t)ctx.ptr); + /* Get remaining size */ uassert_true(max_block(heap) == max_free); - // Free memory + /* Free memory */ uassert_int_equal(_mem_cmp(ctx.ptr, ctx.magic, ctx.size), 0); - rt_mem_free(ctx.ptr); - // Check memory integrity + rt_smem_free(ctx.ptr); + /* Check memory integrity */ uassert_int_equal(max_block(heap), total_size); } - // small heap deinit - rt_mem_detach(heap); + /* small heap deinit */ + rt_smem_detach(&heap->parent); /* release test resources */ rt_free(buf); } @@ -282,9 +305,9 @@ struct mem_alloc_head static void mem_alloc_test(void) { struct mem_alloc_head head; - rt_uint8_t *begin, *buf; - struct rt_mem *heap; - rt_size_t buf_size, total_size, size; + rt_uint8_t *buf; + struct rt_small_mem *heap; + rt_size_t total_size, size; struct mem_alloc_context *ctx; /* init */ @@ -296,14 +319,11 @@ static void mem_alloc_test(void) buf = rt_malloc(TEST_MEM_SIZE); uassert_not_null(buf); uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); - heap = (struct rt_mem *)buf; - begin = (rt_uint8_t *)&heap[1]; - buf_size = buf + TEST_MEM_SIZE - begin; rt_memset(buf, 0xAA, TEST_MEM_SIZE); - rt_mem_init(heap, "mem_tc", begin, buf_size); + heap = (struct rt_small_mem *)rt_smem_init("mem_tc", buf, TEST_MEM_SIZE); total_size = max_block(heap); uassert_int_not_equal(total_size, 0); - // test run + /* test run */ while (head.end - head.start < RT_TICK_MAX / 2) { if (rt_tick_get() - head.start >= head.interval) @@ -311,12 +331,12 @@ static void mem_alloc_test(void) head.start = rt_tick_get(); rt_kprintf("#"); } - // %60 probability to perform alloc operation + /* %60 probability to perform alloc operation */ if (rand() % 10 >= 4) { size = rand() % MEM_RANG_ALLOC_BLK_MAX + MEM_RANG_ALLOC_BLK_MIN; size *= sizeof(struct mem_alloc_context); - ctx = rt_mem_alloc(heap, size); + ctx = rt_smem_alloc(&heap->parent, size); if (ctx == RT_NULL) { if (head.count == 0) @@ -336,7 +356,7 @@ static void mem_alloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_mem_free(ctx); + rt_smem_free(ctx); head.count --; } continue; @@ -370,7 +390,7 @@ static void mem_alloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_mem_free(ctx); + rt_smem_free(ctx); head.count --; } } @@ -387,13 +407,13 @@ static void mem_alloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_mem_free(ctx); + rt_smem_free(ctx); head.count --; } uassert_int_equal(head.count, 0); uassert_int_equal(max_block(heap), total_size); - // small heap deinit - rt_mem_detach(heap); + /* small heap deinit */ + rt_smem_detach(&heap->parent); /* release test resources */ rt_free(buf); } @@ -420,9 +440,9 @@ struct mem_realloc_head static void mem_realloc_test(void) { struct mem_realloc_head head; - rt_uint8_t *begin, *buf; - struct rt_mem *heap; - rt_size_t buf_size, total_size, size, idx; + rt_uint8_t *buf; + struct rt_small_mem *heap; + rt_size_t total_size, size, idx; struct mem_realloc_context *ctx; int res; @@ -437,19 +457,16 @@ static void mem_realloc_test(void) buf = rt_malloc(TEST_MEM_SIZE); uassert_not_null(buf); uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); - heap = (struct rt_mem *)buf; - begin = (rt_uint8_t *)&heap[1]; - buf_size = buf + TEST_MEM_SIZE - begin; rt_memset(buf, 0xAA, TEST_MEM_SIZE); - rt_mem_init(heap, "mem_tc", begin, buf_size); + heap = (struct rt_small_mem *)rt_smem_init("mem_tc", buf, TEST_MEM_SIZE); total_size = max_block(heap); uassert_int_not_equal(total_size, 0); /* init ctx tab */ size = head.count * sizeof(struct mem_realloc_context *); - head.ctx_tab = rt_mem_alloc(heap, size); + head.ctx_tab = rt_smem_alloc(&heap->parent, size); uassert_not_null(head.ctx_tab); rt_memset(head.ctx_tab, 0, size); - // test run + /* test run */ while (head.end - head.start < RT_TICK_MAX / 2) { if (rt_tick_get() - head.start >= head.interval) @@ -460,7 +477,7 @@ static void mem_realloc_test(void) size = rand() % MEM_RANG_ALLOC_BLK_MAX + MEM_RANG_ALLOC_BLK_MIN; size *= sizeof(struct mem_realloc_context); idx = rand() % head.count; - ctx = rt_mem_realloc(heap, head.ctx_tab[idx], size); + ctx = rt_smem_realloc(&heap->parent, head.ctx_tab[idx], size); if (ctx == RT_NULL) { if (size == 0) @@ -486,7 +503,7 @@ static void mem_realloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_mem_realloc(heap, ctx, 0); + rt_smem_realloc(&heap->parent, ctx, 0); head.ctx_tab[idx] = RT_NULL; } } @@ -525,7 +542,7 @@ static void mem_realloc_test(void) } head.ctx_tab[idx] = ctx; } - // free all mem + /* free all mem */ for (idx = 0; idx < head.count; idx++) { ctx = head.ctx_tab[idx]; @@ -542,12 +559,12 @@ static void mem_realloc_test(void) } } rt_memset(ctx, 0xAA, ctx->size); - rt_mem_realloc(heap, ctx, 0); + rt_smem_realloc(&heap->parent, ctx, 0); head.ctx_tab[idx] = RT_NULL; } uassert_int_not_equal(max_block(heap), total_size); - // small heap deinit - rt_mem_detach(heap); + /* small heap deinit */ + rt_smem_detach(&heap->parent); /* release test resources */ rt_free(buf); } From c1a0361c033ad908053ad62bd434f18f2d92d072 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Tue, 7 Dec 2021 15:50:18 +0800 Subject: [PATCH 25/30] [examples][utest] fix slab test case --- examples/utest/testcases/kernel/slab_tc.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/examples/utest/testcases/kernel/slab_tc.c b/examples/utest/testcases/kernel/slab_tc.c index 3fafa1f7abb..a7288e1b896 100644 --- a/examples/utest/testcases/kernel/slab_tc.c +++ b/examples/utest/testcases/kernel/slab_tc.c @@ -47,9 +47,9 @@ struct slab_alloc_head static void slab_alloc_test(void) { struct slab_alloc_head head; - rt_uint8_t *begin, *buf; - struct rt_slab *heap; - rt_size_t buf_size, size; + rt_uint8_t *buf; + rt_slab_t heap; + rt_size_t size; struct slab_alloc_context *ctx; /* init */ @@ -61,11 +61,8 @@ static void slab_alloc_test(void) buf = rt_malloc(TEST_SLAB_SIZE); uassert_not_null(buf); uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); - heap = (struct rt_slab *)buf; - begin = (rt_uint8_t *)&heap[1]; - buf_size = buf + TEST_SLAB_SIZE - begin; rt_memset(buf, 0xAA, TEST_SLAB_SIZE); - rt_slab_init(heap, "slab_tc", begin, buf_size); + heap = rt_slab_init("slab_tc", buf, TEST_SLAB_SIZE); // test run while (head.end - head.start < RT_TICK_MAX / 2) { @@ -182,9 +179,9 @@ struct slab_realloc_head static void slab_realloc_test(void) { struct slab_realloc_head head; - rt_uint8_t *begin, *buf; - struct rt_slab *heap; - rt_size_t buf_size, size, idx; + rt_uint8_t *buf; + rt_slab_t heap; + rt_size_t size, idx; struct slab_realloc_context *ctx; int res; @@ -199,11 +196,8 @@ static void slab_realloc_test(void) buf = rt_malloc(TEST_SLAB_SIZE); uassert_not_null(buf); uassert_int_equal(RT_ALIGN((rt_ubase_t)buf, RT_ALIGN_SIZE), (rt_ubase_t)buf); - heap = (struct rt_slab *)buf; - begin = (rt_uint8_t *)&heap[1]; - buf_size = buf + TEST_SLAB_SIZE - begin; rt_memset(buf, 0xAA, TEST_SLAB_SIZE); - rt_slab_init(heap, "slab_tc", begin, buf_size); + heap = rt_slab_init("slab_tc", buf, TEST_SLAB_SIZE); /* init ctx tab */ size = head.count * sizeof(struct slab_realloc_context *); head.ctx_tab = rt_slab_alloc(heap, size); From 7d658a922a7a2b21ac876b290179be46ba0a3492 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Wed, 8 Dec 2021 11:04:58 +0800 Subject: [PATCH 26/30] [utest][testcases] Shorten test time --- examples/utest/testcases/kernel/mem_tc.c | 2 +- examples/utest/testcases/kernel/slab_tc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c index 98e23d75307..fb38e62e328 100644 --- a/examples/utest/testcases/kernel/mem_tc.c +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -300,7 +300,7 @@ struct mem_alloc_head #define MEM_RANG_ALLOC_BLK_MIN 2 #define MEM_RANG_ALLOC_BLK_MAX 5 -#define MEM_RANG_ALLOC_TEST_TIME 10 +#define MEM_RANG_ALLOC_TEST_TIME 5 static void mem_alloc_test(void) { diff --git a/examples/utest/testcases/kernel/slab_tc.c b/examples/utest/testcases/kernel/slab_tc.c index a7288e1b896..4c5a6b93d04 100644 --- a/examples/utest/testcases/kernel/slab_tc.c +++ b/examples/utest/testcases/kernel/slab_tc.c @@ -42,7 +42,7 @@ struct slab_alloc_head #define SLAB_RANG_ALLOC_BLK_MIN 2 #define SLAB_RANG_ALLOC_BLK_MAX 5 -#define SLAB_RANG_ALLOC_TEST_TIME 10 +#define SLAB_RANG_ALLOC_TEST_TIME 5 static void slab_alloc_test(void) { From a155079701a413a779669a1daab0a31d9fdefd25 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Wed, 8 Dec 2021 11:08:36 +0800 Subject: [PATCH 27/30] [kernel][memory] Formatting code --- src/mem.c | 8 ++++---- src/memheap.c | 2 +- src/slab.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mem.c b/src/mem.c index 3b4d7bfbe53..f1e1eeba550 100644 --- a/src/mem.c +++ b/src/mem.c @@ -166,13 +166,13 @@ static void plug_holes(struct rt_small_mem *m, struct rt_small_mem_item *mem) * @brief This function will initialize small memory management algorithm. * * @param m the small memory management object. - * + * * @param name is the name of the small memory management object. * * @param begin_addr the beginning address of memory. * * @param size is the size of the memory. - * + * * @return Return a pointer to the memory object. When the return value is RT_NULL, it means the init failed. */ rt_smem_t rt_smem_init(const char *name, @@ -271,7 +271,7 @@ RTM_EXPORT(rt_smem_detach); * @brief Allocate a block of memory with a minimum of 'size' bytes. * * @param m the small memory management object. - * + * * @param size is the minimum size of the requested block in bytes. * * @return the pointer to allocated memory or NULL if no free memory was found. @@ -408,7 +408,7 @@ RTM_EXPORT(rt_smem_alloc); * @brief This function will change the size of previously allocated memory block. * * @param m the small memory management object. - * + * * @param rmem is the pointer to memory allocated by rt_mem_alloc. * * @param newsize is the required new size. diff --git a/src/memheap.c b/src/memheap.c index 77606c19c7d..62b42f73ed0 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -724,7 +724,7 @@ RTM_EXPORT(rt_memheap_free); * * @param heap is a pointer to the memheap object, which will reallocate * memory from the block -* +* * @param total is a pointer to get the total size of the memory. * * @param used is a pointer to get the size of memory used. diff --git a/src/slab.c b/src/slab.c index 8b7e5ccddcd..f48179afafc 100644 --- a/src/slab.c +++ b/src/slab.c @@ -169,7 +169,7 @@ struct rt_slab_memusage rt_uint32_t size: 30; /**< pages allocated or offset from zone */ }; -/* +/* * slab page allocator */ struct rt_slab_page @@ -205,7 +205,7 @@ struct rt_slab * @brief Alloc memory size by page. * * @param slab the slab memory management object. - * + * * @param npages the number of pages. */ void *rt_slab_page_alloc(rt_slab_t m, rt_size_t npages) @@ -244,7 +244,7 @@ void *rt_slab_page_alloc(rt_slab_t m, rt_size_t npages) * @brief Free memory by page. * * @param slab the slab memory management object. - * + * * @param addr is the head address of first page. * * @param npages is the number of pages. @@ -309,13 +309,13 @@ static void rt_slab_page_init(struct rt_slab *slab, void *addr, rt_size_t npages * @brief This function will init slab memory management algorithm * * @param slab the slab memory management object. - * + * * @param name is the name of the slab memory management object. - * + * * @param begin_addr the beginning address of system page. * * @param size is the size of the memory. - * + * * @return Return a pointer to the slab memory object. */ rt_slab_t rt_slab_init(const char *name, void *begin_addr, rt_size_t size) @@ -479,7 +479,7 @@ rt_inline int zoneindex(rt_size_t *bytes) * - there is no nbytes sized memory valid in system. * * @param m the slab memory management object. - * + * * @param size is the size of memory to be allocated. * * @return the allocated memory. @@ -657,7 +657,7 @@ RTM_EXPORT(rt_slab_alloc); * @brief This function will change the size of previously allocated memory block. * * @param m the slab memory management object. - * + * * @param ptr is the previously allocated memory block. * * @param size is the new size of memory block. From dea0f11f5b3c45840c18917dda0c94b6724def45 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Mon, 13 Dec 2021 11:59:39 +0800 Subject: [PATCH 28/30] [examples][utest] Adjust test run time --- examples/utest/testcases/kernel/mem_tc.c | 4 ++-- examples/utest/testcases/kernel/slab_tc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c index fb38e62e328..c14e8dfbbde 100644 --- a/examples/utest/testcases/kernel/mem_tc.c +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -420,7 +420,7 @@ static void mem_alloc_test(void) #define MEM_RANG_REALLOC_BLK_MIN 0 #define MEM_RANG_REALLOC_BLK_MAX 5 -#define MEM_RANG_REALLOC_TEST_TIME 10 +#define MEM_RANG_REALLOC_TEST_TIME 5 struct mem_realloc_context { @@ -585,4 +585,4 @@ static void testcase(void) UTEST_UNIT_RUN(mem_alloc_test); UTEST_UNIT_RUN(mem_realloc_test); } -UTEST_TC_EXPORT(testcase, "testcases.kernel.mem_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "testcases.kernel.mem_tc", utest_tc_init, utest_tc_cleanup, 20); diff --git a/examples/utest/testcases/kernel/slab_tc.c b/examples/utest/testcases/kernel/slab_tc.c index 4c5a6b93d04..b273870cca2 100644 --- a/examples/utest/testcases/kernel/slab_tc.c +++ b/examples/utest/testcases/kernel/slab_tc.c @@ -159,7 +159,7 @@ static void slab_alloc_test(void) #define SLAB_RANG_REALLOC_BLK_MIN 0 #define SLAB_RANG_REALLOC_BLK_MAX 5 -#define SLAB_RANG_REALLOC_TEST_TIME 10 +#define SLAB_RANG_REALLOC_TEST_TIME 5 struct slab_realloc_context { @@ -320,4 +320,4 @@ static void testcase(void) UTEST_UNIT_RUN(slab_alloc_test); UTEST_UNIT_RUN(slab_realloc_test); } -UTEST_TC_EXPORT(testcase, "testcases.kernel.slab_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "testcases.kernel.slab_tc", utest_tc_init, utest_tc_cleanup, 20); From d2d22c61e95538d3b71a69d309f27a7f983cc540 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Mon, 13 Dec 2021 17:44:00 +0800 Subject: [PATCH 29/30] [examples][utest] Formatting code --- examples/utest/testcases/kernel/mem_tc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/utest/testcases/kernel/mem_tc.c b/examples/utest/testcases/kernel/mem_tc.c index c14e8dfbbde..028876dfa9f 100644 --- a/examples/utest/testcases/kernel/mem_tc.c +++ b/examples/utest/testcases/kernel/mem_tc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2019, RT-Thread Development Team + * Copyright (c) 2006-2021, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -99,7 +99,7 @@ static void mem_functional_test(void) /* get total size */ total_size = max_block(heap); uassert_int_not_equal(total_size, 0); - /* + /* * Allocate all memory at a time and test whether * the memory allocation release function is effective */ @@ -114,7 +114,7 @@ static void mem_functional_test(void) rt_smem_free(ctx.ptr); uassert_int_equal(max_block(heap), total_size); } - /* + /* * Apply for memory release sequentially and * test whether memory block merging is effective */ From a8bc66f5954983f9fc82b23faae96ffde2361436 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Tue, 7 Dec 2021 16:48:21 +0800 Subject: [PATCH 30/30] [bsp] update all rtconfig.h --- bsp/CME_M7/.config | 779 +++ bsp/CME_M7/Kconfig | 28 + bsp/CME_M7/project.uvproj | 474 +- bsp/CME_M7/rtconfig.h | 354 +- bsp/Vango_V85xx/.config | 54 +- bsp/Vango_V85xx/project.uvprojx | 229 +- bsp/Vango_V85xx/rtconfig.h | 13 +- bsp/acm32f0x0-nucleo/.config | 787 +++ bsp/acm32f0x0-nucleo/drivers/Kconfig | 1 + bsp/acm32f0x0-nucleo/project.ewp | 80 +- bsp/acm32f0x0-nucleo/project.uvprojx | 139 +- bsp/acm32f0x0-nucleo/rtconfig.h | 112 +- bsp/acm32f4xx-nucleo/.config | 810 +++ bsp/acm32f4xx-nucleo/project.uvprojx | 134 +- bsp/acm32f4xx-nucleo/rtconfig.h | 103 +- bsp/allwinner_tina/.config | 58 +- bsp/allwinner_tina/rtconfig.h | 16 +- bsp/amebaz/.config | 54 +- bsp/amebaz/project.ewp | 89 +- bsp/amebaz/rtconfig.h | 13 +- bsp/apm32/apm32f103xe-minibroard/.config | 468 +- .../apm32f103xe-minibroard/board/Kconfig | 3 - .../apm32f103xe-minibroard/project.uvprojx | 99 +- bsp/apm32/apm32f103xe-minibroard/rtconfig.h | 123 +- bsp/apollo2/.config | 709 +++ bsp/apollo2/Kconfig | 34 + bsp/apollo2/project.uvprojx | 485 +- bsp/apollo2/rtconfig.h | 233 +- bsp/asm9260t/.config | 60 +- bsp/asm9260t/project.ewp | 98 +- bsp/asm9260t/project.uvproj | 157 +- bsp/asm9260t/rtconfig.h | 18 +- bsp/at32/at32f403a-start/.config | 55 +- bsp/at32/at32f403a-start/project.ewp | 75 +- bsp/at32/at32f403a-start/project.uvproj | 110 +- bsp/at32/at32f403a-start/project.uvprojx | 98 +- bsp/at32/at32f403a-start/rtconfig.h | 16 +- bsp/at32/at32f407-start/.config | 55 +- bsp/at32/at32f407-start/project.ewp | 73 +- bsp/at32/at32f407-start/project.uvproj | 118 +- bsp/at32/at32f407-start/project.uvprojx | 118 +- bsp/at32/at32f407-start/rtconfig.h | 16 +- bsp/at91sam9260/.config | 54 +- bsp/at91sam9260/project.uvproj | 157 +- bsp/at91sam9260/rtconfig.h | 13 +- bsp/at91sam9g45/.config | 491 +- bsp/at91sam9g45/Kconfig | 37 + bsp/at91sam9g45/drivers/Kconfig | 7 + bsp/at91sam9g45/rtconfig.h | 125 +- bsp/avr32uc3b0/.config | 673 +++ bsp/avr32uc3b0/Kconfig | 28 + bsp/avr32uc3b0/rtconfig.h | 307 +- bsp/beaglebone/.config | 54 +- bsp/beaglebone/rtconfig.h | 13 +- bsp/bluetrum/ab32vg1-ab-prougen/.config | 55 +- bsp/bluetrum/ab32vg1-ab-prougen/rtconfig.h | 16 +- bsp/bm3803/.config | 55 +- bsp/bm3803/rtconfig.h | 16 +- bsp/ck802/.config | 54 +- bsp/ck802/rtconfig.h | 13 +- bsp/dm365/.config | 54 +- bsp/dm365/rtconfig.h | 13 +- bsp/essemi/es32f0654/.config | 54 +- bsp/essemi/es32f0654/project.uvprojx | 200 +- bsp/essemi/es32f0654/rtconfig.h | 13 +- bsp/essemi/es32f365x/.config | 54 +- bsp/essemi/es32f365x/project.ewp | 212 +- bsp/essemi/es32f365x/project.uvoptx | 920 +-- bsp/essemi/es32f365x/project.uvprojx | 445 +- bsp/essemi/es32f365x/rtconfig.h | 13 +- bsp/essemi/es32f369x/.config | 54 +- bsp/essemi/es32f369x/project.ewp | 113 +- bsp/essemi/es32f369x/project.uvprojx | 246 +- bsp/essemi/es32f369x/rtconfig.h | 13 +- bsp/fm33lc026/.config | 54 +- bsp/fm33lc026/project.uvprojx | 110 +- bsp/fm33lc026/rtconfig.h | 13 +- bsp/frdm-k64f/.config | 745 +++ bsp/frdm-k64f/Kconfig | 28 + bsp/frdm-k64f/project.uvproj | 883 +-- bsp/frdm-k64f/project.uvprojx | 859 +-- bsp/frdm-k64f/rtconfig.h | 349 +- bsp/ft2004/.config | 55 +- bsp/ft2004/rtconfig.h | 16 +- bsp/gd32/gd32407v-start/.config | 54 +- bsp/gd32/gd32407v-start/project.uvproj | 100 +- bsp/gd32/gd32407v-start/project.uvprojx | 94 +- bsp/gd32/gd32407v-start/rtconfig.h | 13 +- bsp/gd32103c-eval/.config | 705 +++ bsp/gd32103c-eval/rtconfig.h | 111 +- bsp/gd32105c-eval/.config | 54 +- bsp/gd32105c-eval/project.uvprojx | 202 +- bsp/gd32105c-eval/rtconfig.h | 13 +- bsp/gd32107c-eval/.config | 54 +- bsp/gd32107c-eval/project.uvprojx | 190 +- bsp/gd32107c-eval/rtconfig.h | 13 +- bsp/gd32303e-eval/.config | 54 +- bsp/gd32303e-eval/project.uvprojx | 223 +- bsp/gd32303e-eval/rtconfig.h | 13 +- bsp/gd32350r-eval/.config | 54 +- bsp/gd32350r-eval/project.uvprojx | 168 +- bsp/gd32350r-eval/rtconfig.h | 13 +- bsp/gd32450z-eval/.config | 57 +- bsp/gd32450z-eval/project.uvproj | 302 +- bsp/gd32450z-eval/project.uvprojx | 302 +- bsp/gd32450z-eval/rtconfig.h | 13 +- bsp/gd32e230k-start/.config | 54 +- bsp/gd32e230k-start/project.uvprojx | 170 +- bsp/gd32e230k-start/rtconfig.h | 13 +- bsp/gd32vf103v-eval/.config | 54 +- bsp/gd32vf103v-eval/rtconfig.h | 13 +- bsp/hc32f460/.config | 54 +- bsp/hc32f460/project.uvprojx | 133 +- bsp/hc32f460/rtconfig.h | 13 +- bsp/hc32f4a0/.config | 54 +- bsp/hc32f4a0/project.uvprojx | 123 +- bsp/hc32f4a0/rtconfig.h | 13 +- bsp/hc32l136/.config | 54 +- bsp/hc32l136/project.ewp | 53 +- bsp/hc32l136/project.uvprojx | 98 +- bsp/hc32l136/rtconfig.h | 13 +- bsp/hc32l196/.config | 54 +- bsp/hc32l196/project.uvprojx | 94 +- bsp/hc32l196/rtconfig.h | 13 +- bsp/hifive1/.config | 54 +- bsp/hifive1/rtconfig.h | 13 +- bsp/hk32/hk32f030c8-mini/.config | 54 +- bsp/hk32/hk32f030c8-mini/project.ewp | 71 +- bsp/hk32/hk32f030c8-mini/project.uvproj | 110 +- bsp/hk32/hk32f030c8-mini/project.uvprojx | 116 +- bsp/hk32/hk32f030c8-mini/rtconfig.h | 13 +- bsp/imx6sx/cortex-a9/.config | 54 +- bsp/imx6sx/cortex-a9/rtconfig.h | 13 +- bsp/imx6ul/.config | 54 +- bsp/imx6ul/rtconfig.h | 13 +- bsp/imxrt/imxrt1052-atk-commander/.config | 57 +- .../imxrt1052-atk-commander/project.uvprojx | 151 +- bsp/imxrt/imxrt1052-atk-commander/rtconfig.h | 15 +- bsp/imxrt/imxrt1052-fire-pro/.config | 57 +- bsp/imxrt/imxrt1052-fire-pro/project.ewp | 67 +- bsp/imxrt/imxrt1052-fire-pro/project.uvprojx | 106 +- bsp/imxrt/imxrt1052-fire-pro/rtconfig.h | 15 +- bsp/imxrt/imxrt1052-nxp-evk/.config | 57 +- bsp/imxrt/imxrt1052-nxp-evk/project.ewp | 77 +- bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx | 96 +- bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h | 15 +- bsp/imxrt/imxrt1052-seeed-ArchMix/.config | 57 +- .../imxrt1052-seeed-ArchMix/project.uvprojx | 102 +- bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h | 15 +- bsp/imxrt/imxrt1064-nxp-evk/.config | 57 +- bsp/imxrt/imxrt1064-nxp-evk/project.ewp | 75 +- bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx | 114 +- bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h | 15 +- bsp/juicevm/.config | 557 +- bsp/juicevm/Kconfig | 8 +- bsp/juicevm/rtconfig.h | 155 +- bsp/k210/.config | 49 +- bsp/k210/rtconfig.h | 17 +- bsp/lm3s8962/project.Uv2 | 273 +- bsp/lm3s9b9x/project.Uv2 | 221 +- bsp/lm4f232/project.uvproj | 318 +- bsp/lpc1114/.config | 54 +- bsp/lpc1114/rtconfig.h | 13 +- bsp/lpc176x/project.ewp | 200 +- bsp/lpc176x/project.uvproj | 311 +- bsp/lpc178x/project.uvproj | 177 +- bsp/lpc2148/project.Uv2 | 84 +- bsp/lpc2478/project.uvproj | 165 +- bsp/lpc408x/.config | 57 +- bsp/lpc408x/project.uvproj | 90 +- bsp/lpc408x/project.uvprojx | 102 +- bsp/lpc408x/rtconfig.h | 15 +- bsp/lpc5410x/project.uvprojx | 371 +- bsp/lpc54114-lite/.config | 54 +- bsp/lpc54114-lite/project.uvprojx | 279 +- bsp/lpc54114-lite/rtconfig.h | 13 +- bsp/lpc54608-LPCXpresso/.config | 58 +- bsp/lpc54608-LPCXpresso/project.uvprojx | 576 +- bsp/lpc54608-LPCXpresso/rtconfig.h | 16 +- bsp/lpc55sxx/lpc55s69_nxp_evk/.config | 54 +- bsp/lpc55sxx/lpc55s69_nxp_evk/project.ewp | 80 +- bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvoptx | 1134 +--- bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvprojx | 363 +- bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h | 13 +- bsp/lpc55sxx/lpc55s69_nxp_evk_ns/.config | 54 +- .../lpc55s69_nxp_evk_ns/project.uvprojx | 145 +- bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.h | 13 +- bsp/lpc824/project.ewp | 4075 +++++++------- bsp/lpc824/project.eww | 20 +- bsp/lpc824/project.uvprojx | 276 +- bsp/ls1bdev/.config | 54 +- bsp/ls1bdev/rtconfig.h | 13 +- bsp/ls1cdev/.config | 18 +- bsp/ls1cdev/rtconfig.h | 6 +- bsp/ls2kdev/.config | 54 +- bsp/ls2kdev/rtconfig.h | 13 +- bsp/maxim/MAX32660_EVSYS/.config | 54 +- bsp/maxim/MAX32660_EVSYS/project.uvprojx | 102 +- bsp/maxim/MAX32660_EVSYS/rtconfig.h | 13 +- bsp/mb9bf506r/project.ewp | 154 +- bsp/mb9bf506r/project.uvproj | 248 +- bsp/mb9bf568r/project.uvproj | 223 +- bsp/mb9bf618s/project.ewp | 128 +- bsp/mb9bf618s/project.uvproj | 218 +- bsp/mini2440/.config | 117 +- bsp/mini2440/project.Uv2 | 190 +- bsp/mini2440/project.uvproj | 787 +-- bsp/mini2440/rtconfig.h | 63 +- bsp/mini4020/project.Uv2 | 191 - bsp/mipssim/.config | 692 +++ bsp/mipssim/rtconfig.h | 109 +- bsp/mm32f103x/.config | 55 +- bsp/mm32f103x/project.ewp | 81 +- bsp/mm32f103x/project.uvprojx | 142 +- bsp/mm32f103x/rtconfig.h | 16 +- bsp/mm32f327x/.config | 55 +- bsp/mm32f327x/project.ewp | 111 +- bsp/mm32f327x/project.uvprojx | 208 +- bsp/mm32f327x/rtconfig.h | 16 +- bsp/mm32l07x/.config | 55 +- bsp/mm32l07x/project.ewp | 85 +- bsp/mm32l07x/project.uvprojx | 170 +- bsp/mm32l07x/rtconfig.h | 16 +- bsp/mm32l3xx/.config | 55 +- bsp/mm32l3xx/project.ewp | 83 +- bsp/mm32l3xx/project.uvprojx | 184 +- bsp/mm32l3xx/rtconfig.h | 16 +- bsp/n32g452xx/n32g452xx-mini-system/.config | 149 +- .../n32g452xx-mini-system/project.uvprojx | 270 +- .../n32g452xx-mini-system/rtconfig.h | 78 +- bsp/nrf5x/nrf51822/.config | 54 +- bsp/nrf5x/nrf51822/project.uvprojx | 84 +- bsp/nrf5x/nrf51822/rtconfig.h | 13 +- bsp/nrf5x/nrf52832/.config | 54 +- bsp/nrf5x/nrf52832/project.uvprojx | 94 +- bsp/nrf5x/nrf52832/rtconfig.h | 13 +- bsp/nrf5x/nrf52833/.config | 54 +- bsp/nrf5x/nrf52833/project.uvprojx | 88 +- bsp/nrf5x/nrf52833/rtconfig.h | 13 +- bsp/nrf5x/nrf52840/.config | 54 +- bsp/nrf5x/nrf52840/project.uvprojx | 86 +- bsp/nrf5x/nrf52840/rtconfig.h | 13 +- bsp/nuclei/gd32vf103_rvstar/.config | 54 +- bsp/nuclei/gd32vf103_rvstar/rtconfig.h | 13 +- bsp/nuclei/nuclei_fpga_eval/.config | 54 +- bsp/nuclei/nuclei_fpga_eval/rtconfig.h | 13 +- bsp/qemu-riscv-virt64/.config | 54 +- bsp/qemu-riscv-virt64/rtconfig.h | 13 +- bsp/qemu-vexpress-a9/.config | 72 +- bsp/qemu-vexpress-a9/drivers/automac.h | 6 +- bsp/qemu-vexpress-a9/rtconfig.h | 30 +- bsp/qemu-vexpress-gemini/.config | 56 +- bsp/qemu-vexpress-gemini/rtconfig.h | 13 +- bsp/qemu-virt64-aarch64/.config | 55 +- bsp/qemu-virt64-aarch64/rtconfig.h | 16 +- bsp/ra6m4-cpk/.config | 57 +- bsp/ra6m4-cpk/project.uvoptx | 432 +- bsp/ra6m4-cpk/project.uvprojx | 262 +- bsp/ra6m4-cpk/rtconfig.h | 14 +- bsp/raspberry-pi/raspi2/.config | 54 +- bsp/raspberry-pi/raspi2/rtconfig.h | 13 +- bsp/raspberry-pi/raspi3-32/.config | 55 +- bsp/raspberry-pi/raspi3-32/rtconfig.h | 16 +- bsp/raspberry-pi/raspi3-64/.config | 85 +- bsp/raspberry-pi/raspi3-64/rtconfig.h | 27 +- bsp/raspberry-pi/raspi4-32/.config | 37 +- bsp/raspberry-pi/raspi4-32/rtconfig.h | 4 + bsp/raspberry-pi/raspi4-64/.config | 84 +- bsp/raspberry-pi/raspi4-64/rtconfig.h | 24 +- bsp/raspberry-pico/.config | 54 +- bsp/raspberry-pico/rtconfig.h | 13 +- bsp/rv32m1_vega/ri5cy/.config | 54 +- bsp/rv32m1_vega/ri5cy/rtconfig.h | 13 +- bsp/sam7x/project.uvproj | 350 +- bsp/samd21/project.uvprojx | 218 +- bsp/simulator/.config | 54 +- bsp/simulator/rtconfig.h | 13 +- bsp/smartfusion2/.config | 704 +++ bsp/smartfusion2/project.uvproj | 123 +- bsp/smartfusion2/project.uvprojx | 115 +- bsp/smartfusion2/rtconfig.h | 112 +- bsp/stm32/stm32f072-st-nucleo/.config | 54 +- bsp/stm32/stm32f072-st-nucleo/project.ewp | 45 +- bsp/stm32/stm32f072-st-nucleo/project.uvproj | 90 +- bsp/stm32/stm32f072-st-nucleo/project.uvprojx | 96 +- bsp/stm32/stm32f072-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f091-st-nucleo/.config | 54 +- bsp/stm32/stm32f091-st-nucleo/project.ewp | 45 +- bsp/stm32/stm32f091-st-nucleo/project.uvprojx | 88 +- bsp/stm32/stm32f091-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f103-atk-nano/.config | 55 +- bsp/stm32/stm32f103-atk-nano/project.ewp | 57 +- bsp/stm32/stm32f103-atk-nano/project.uvproj | 104 +- bsp/stm32/stm32f103-atk-nano/project.uvprojx | 94 +- bsp/stm32/stm32f103-atk-nano/rtconfig.h | 16 +- bsp/stm32/stm32f103-atk-warshipv3/.config | 54 +- bsp/stm32/stm32f103-atk-warshipv3/project.ewp | 53 +- .../stm32f103-atk-warshipv3/project.uvproj | 102 +- .../stm32f103-atk-warshipv3/project.uvprojx | 106 +- bsp/stm32/stm32f103-atk-warshipv3/rtconfig.h | 13 +- bsp/stm32/stm32f103-blue-pill/.config | 54 +- bsp/stm32/stm32f103-blue-pill/project.ewp | 49 +- bsp/stm32/stm32f103-blue-pill/project.uvproj | 86 +- bsp/stm32/stm32f103-blue-pill/project.uvprojx | 84 +- bsp/stm32/stm32f103-blue-pill/rtconfig.h | 13 +- bsp/stm32/stm32f103-dofly-M3S/.config | 54 +- bsp/stm32/stm32f103-dofly-M3S/project.ewp | 39 +- bsp/stm32/stm32f103-dofly-M3S/project.uvproj | 100 +- bsp/stm32/stm32f103-dofly-M3S/project.uvprojx | 114 +- bsp/stm32/stm32f103-dofly-M3S/rtconfig.h | 13 +- bsp/stm32/stm32f103-dofly-lyc8/.config | 54 +- bsp/stm32/stm32f103-dofly-lyc8/project.ewp | 53 +- bsp/stm32/stm32f103-dofly-lyc8/project.uvproj | 90 +- .../stm32f103-dofly-lyc8/project.uvprojx | 92 +- bsp/stm32/stm32f103-dofly-lyc8/rtconfig.h | 13 +- bsp/stm32/stm32f103-fire-arbitrary/.config | 55 +- .../stm32f103-fire-arbitrary/project.ewp | 73 +- .../stm32f103-fire-arbitrary/project.uvproj | 118 +- .../stm32f103-fire-arbitrary/project.uvprojx | 132 +- bsp/stm32/stm32f103-fire-arbitrary/rtconfig.h | 16 +- bsp/stm32/stm32f103-gizwits-gokitv21/.config | 54 +- .../stm32f103-gizwits-gokitv21/project.ewp | 51 +- .../stm32f103-gizwits-gokitv21/project.uvproj | 70 +- .../project.uvprojx | 100 +- .../stm32f103-gizwits-gokitv21/rtconfig.h | 13 +- bsp/stm32/stm32f103-hw100k-ibox/.config | 54 +- bsp/stm32/stm32f103-hw100k-ibox/project.ewp | 67 +- .../stm32f103-hw100k-ibox/project.uvproj | 110 +- .../stm32f103-hw100k-ibox/project.uvprojx | 110 +- bsp/stm32/stm32f103-hw100k-ibox/rtconfig.h | 13 +- bsp/stm32/stm32f103-onenet-nbiot/.config | 55 +- bsp/stm32/stm32f103-onenet-nbiot/project.ewp | 47 +- .../stm32f103-onenet-nbiot/project.uvproj | 106 +- .../stm32f103-onenet-nbiot/project.uvprojx | 102 +- bsp/stm32/stm32f103-onenet-nbiot/rtconfig.h | 16 +- bsp/stm32/stm32f103-yf-ufun/.config | 54 +- bsp/stm32/stm32f103-yf-ufun/project.ewp | 45 +- bsp/stm32/stm32f103-yf-ufun/project.uvproj | 104 +- bsp/stm32/stm32f103-yf-ufun/project.uvprojx | 92 +- bsp/stm32/stm32f103-yf-ufun/rtconfig.h | 13 +- bsp/stm32/stm32f107-uc-eval/.config | 54 +- bsp/stm32/stm32f107-uc-eval/project.ewp | 47 +- bsp/stm32/stm32f107-uc-eval/project.uvproj | 112 +- bsp/stm32/stm32f107-uc-eval/project.uvprojx | 108 +- bsp/stm32/stm32f107-uc-eval/rtconfig.h | 13 +- bsp/stm32/stm32f302-st-nucleo/.config | 54 +- bsp/stm32/stm32f302-st-nucleo/project.ewp | 113 +- bsp/stm32/stm32f302-st-nucleo/project.uvprojx | 252 +- bsp/stm32/stm32f302-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f401-st-nucleo/.config | 54 +- bsp/stm32/stm32f401-st-nucleo/project.ewp | 33 +- bsp/stm32/stm32f401-st-nucleo/project.uvprojx | 88 +- bsp/stm32/stm32f401-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f405-smdz-breadfruit/.config | 54 +- .../stm32f405-smdz-breadfruit/project.ewp | 49 +- .../stm32f405-smdz-breadfruit/project.uvproj | 102 +- .../stm32f405-smdz-breadfruit/project.uvprojx | 110 +- .../stm32f405-smdz-breadfruit/rtconfig.h | 13 +- bsp/stm32/stm32f407-armfly-v5/.config | 54 +- bsp/stm32/stm32f407-armfly-v5/project.ewp | 55 +- bsp/stm32/stm32f407-armfly-v5/project.uvproj | 114 +- bsp/stm32/stm32f407-armfly-v5/project.uvprojx | 88 +- bsp/stm32/stm32f407-armfly-v5/rtconfig.h | 13 +- bsp/stm32/stm32f407-atk-explorer/.config | 54 +- bsp/stm32/stm32f407-atk-explorer/project.ewp | 51 +- .../stm32f407-atk-explorer/project.uvproj | 102 +- .../stm32f407-atk-explorer/project.uvprojx | 112 +- bsp/stm32/stm32f407-atk-explorer/rtconfig.h | 13 +- bsp/stm32/stm32f407-robomaster-c/.config | 54 +- bsp/stm32/stm32f407-robomaster-c/project.ewp | 53 +- .../stm32f407-robomaster-c/project.uvproj | 100 +- .../stm32f407-robomaster-c/project.uvprojx | 110 +- bsp/stm32/stm32f407-robomaster-c/rtconfig.h | 13 +- bsp/stm32/stm32f407-st-discovery/.config | 54 +- bsp/stm32/stm32f407-st-discovery/project.ewp | 55 +- .../stm32f407-st-discovery/project.uvproj | 84 +- .../stm32f407-st-discovery/project.uvprojx | 84 +- bsp/stm32/stm32f407-st-discovery/rtconfig.h | 13 +- bsp/stm32/stm32f410-st-nucleo/.config | 54 +- bsp/stm32/stm32f410-st-nucleo/project.ewp | 53 +- bsp/stm32/stm32f410-st-nucleo/project.uvprojx | 102 +- bsp/stm32/stm32f410-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f411-atk-nano/.config | 54 +- bsp/stm32/stm32f411-atk-nano/project.ewp | 69 +- bsp/stm32/stm32f411-atk-nano/project.uvprojx | 124 +- bsp/stm32/stm32f411-atk-nano/rtconfig.h | 13 +- bsp/stm32/stm32f411-st-nucleo/.config | 54 +- bsp/stm32/stm32f411-st-nucleo/project.ewp | 51 +- bsp/stm32/stm32f411-st-nucleo/project.uvprojx | 108 +- bsp/stm32/stm32f411-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f411-weact-MiniF4/.config | 54 +- bsp/stm32/stm32f411-weact-MiniF4/project.ewp | 47 +- .../stm32f411-weact-MiniF4/project.uvprojx | 92 +- bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h | 13 +- bsp/stm32/stm32f412-st-nucleo/.config | 54 +- bsp/stm32/stm32f412-st-nucleo/project.ewp | 57 +- bsp/stm32/stm32f412-st-nucleo/project.uvprojx | 90 +- bsp/stm32/stm32f412-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f413-st-nucleo/.config | 54 +- bsp/stm32/stm32f413-st-nucleo/project.ewp | 47 +- bsp/stm32/stm32f413-st-nucleo/project.uvproj | 92 +- bsp/stm32/stm32f413-st-nucleo/project.uvprojx | 90 +- bsp/stm32/stm32f413-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f427-robomaster-a/.config | 54 +- bsp/stm32/stm32f427-robomaster-a/project.ewp | 49 +- .../stm32f427-robomaster-a/project.uvproj | 98 +- .../stm32f427-robomaster-a/project.uvprojx | 106 +- bsp/stm32/stm32f427-robomaster-a/rtconfig.h | 13 +- bsp/stm32/stm32f429-armfly-v6/.config | 57 +- bsp/stm32/stm32f429-armfly-v6/project.ewp | 49 +- bsp/stm32/stm32f429-armfly-v6/project.uvproj | 106 +- bsp/stm32/stm32f429-armfly-v6/project.uvprojx | 100 +- bsp/stm32/stm32f429-armfly-v6/rtconfig.h | 15 +- bsp/stm32/stm32f429-atk-apollo/.config | 57 +- bsp/stm32/stm32f429-atk-apollo/project.ewp | 49 +- bsp/stm32/stm32f429-atk-apollo/project.uvproj | 110 +- .../stm32f429-atk-apollo/project.uvprojx | 102 +- bsp/stm32/stm32f429-atk-apollo/rtconfig.h | 15 +- bsp/stm32/stm32f429-fire-challenger/.config | 57 +- .../stm32f429-fire-challenger/project.ewp | 45 +- .../stm32f429-fire-challenger/project.uvproj | 102 +- .../stm32f429-fire-challenger/project.uvprojx | 96 +- .../stm32f429-fire-challenger/rtconfig.h | 15 +- bsp/stm32/stm32f429-st-disco/.config | 57 +- bsp/stm32/stm32f429-st-disco/project.uvproj | 157 +- bsp/stm32/stm32f429-st-disco/project.uvprojx | 161 +- bsp/stm32/stm32f429-st-disco/rtconfig.h | 15 +- bsp/stm32/stm32f446-st-nucleo/.config | 54 +- bsp/stm32/stm32f446-st-nucleo/project.ewp | 41 +- bsp/stm32/stm32f446-st-nucleo/project.uvprojx | 114 +- bsp/stm32/stm32f446-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32f469-st-disco/.config | 57 +- bsp/stm32/stm32f469-st-disco/project.ewp | 51 +- bsp/stm32/stm32f469-st-disco/project.uvproj | 290 +- bsp/stm32/stm32f469-st-disco/project.uvprojx | 106 +- bsp/stm32/stm32f469-st-disco/rtconfig.h | 15 +- bsp/stm32/stm32f746-st-disco/.config | 54 +- bsp/stm32/stm32f746-st-disco/project.ewp | 47 +- bsp/stm32/stm32f746-st-disco/project.uvprojx | 108 +- bsp/stm32/stm32f746-st-disco/rtconfig.h | 13 +- bsp/stm32/stm32f746-st-nucleo/project.ewp | 4965 +++++++++-------- bsp/stm32/stm32f746-st-nucleo/project.eww | 20 +- bsp/stm32/stm32f746-st-nucleo/project.uvprojx | 179 +- bsp/stm32/stm32f767-atk-apollo/.config | 57 +- bsp/stm32/stm32f767-atk-apollo/project.ewp | 43 +- .../stm32f767-atk-apollo/project.uvprojx | 86 +- bsp/stm32/stm32f767-atk-apollo/rtconfig.h | 15 +- .../stm32f767-fire-challenger-v1/.config | 57 +- .../stm32f767-fire-challenger-v1/project.ewp | 47 +- .../project.uvprojx | 92 +- .../stm32f767-fire-challenger-v1/rtconfig.h | 15 +- bsp/stm32/stm32f767-st-nucleo/project.ewp | 211 +- bsp/stm32/stm32f767-st-nucleo/project.uvprojx | 175 +- bsp/stm32/stm32f769-st-disco/.config | 54 +- bsp/stm32/stm32f769-st-disco/project.ewp | 55 +- bsp/stm32/stm32f769-st-disco/project.uvprojx | 116 +- bsp/stm32/stm32f769-st-disco/rtconfig.h | 13 +- bsp/stm32/stm32g070-st-nucleo/.config | 54 +- bsp/stm32/stm32g070-st-nucleo/project.ewp | 62 +- bsp/stm32/stm32g070-st-nucleo/project.uvprojx | 93 +- bsp/stm32/stm32g070-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32g071-st-nucleo/.config | 54 +- bsp/stm32/stm32g071-st-nucleo/project.ewp | 53 +- bsp/stm32/stm32g071-st-nucleo/project.uvprojx | 94 +- bsp/stm32/stm32g071-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32g431-st-nucleo/.config | 54 +- bsp/stm32/stm32g431-st-nucleo/project.ewp | 41 +- bsp/stm32/stm32g431-st-nucleo/project.uvprojx | 92 +- bsp/stm32/stm32g431-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32g474-st-nucleo/.config | 88 +- bsp/stm32/stm32g474-st-nucleo/project.ewp | 55 +- bsp/stm32/stm32g474-st-nucleo/project.uvoptx | 730 +-- bsp/stm32/stm32g474-st-nucleo/project.uvprojx | 269 +- bsp/stm32/stm32g474-st-nucleo/rtconfig.h | 58 +- bsp/stm32/stm32h743-armfly-V7/.config | 54 +- bsp/stm32/stm32h743-armfly-V7/project.ewp | 63 +- bsp/stm32/stm32h743-armfly-V7/project.uvprojx | 104 +- bsp/stm32/stm32h743-armfly-V7/rtconfig.h | 13 +- bsp/stm32/stm32h743-atk-apollo/.config | 54 +- bsp/stm32/stm32h743-atk-apollo/project.ewp | 49 +- .../stm32h743-atk-apollo/project.uvprojx | 110 +- bsp/stm32/stm32h743-atk-apollo/rtconfig.h | 13 +- bsp/stm32/stm32h743-st-nucleo/.config | 54 +- bsp/stm32/stm32h743-st-nucleo/project.ewp | 49 +- bsp/stm32/stm32h743-st-nucleo/project.uvprojx | 94 +- bsp/stm32/stm32h743-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32h747-st-discovery/.config | 54 +- bsp/stm32/stm32h747-st-discovery/project.ewp | 53 +- .../stm32h747-st-discovery/project.uvprojx | 102 +- bsp/stm32/stm32h747-st-discovery/rtconfig.h | 13 +- bsp/stm32/stm32h750-armfly-h7-tool/.config | 54 +- .../stm32h750-armfly-h7-tool/project.ewp | 53 +- .../stm32h750-armfly-h7-tool/project.uvprojx | 102 +- bsp/stm32/stm32h750-armfly-h7-tool/rtconfig.h | 13 +- bsp/stm32/stm32h750-artpi-h750/.config | 54 +- bsp/stm32/stm32h750-artpi-h750/project.ewp | 57 +- bsp/stm32/stm32h750-artpi-h750/project.uvoptx | 800 +-- .../stm32h750-artpi-h750/project.uvprojx | 272 +- bsp/stm32/stm32h750-artpi-h750/rtconfig.h | 13 +- bsp/stm32/stm32l010-st-nucleo/.config | 54 +- bsp/stm32/stm32l010-st-nucleo/project.ewp | 49 +- bsp/stm32/stm32l010-st-nucleo/project.uvprojx | 82 +- bsp/stm32/stm32l010-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l053-st-nucleo/.config | 54 +- bsp/stm32/stm32l053-st-nucleo/project.ewp | 41 +- bsp/stm32/stm32l053-st-nucleo/project.uvprojx | 90 +- bsp/stm32/stm32l053-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l412-st-nucleo/.config | 54 +- bsp/stm32/stm32l412-st-nucleo/project.ewp | 73 +- bsp/stm32/stm32l412-st-nucleo/project.uvprojx | 110 +- bsp/stm32/stm32l412-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l431-BearPi/.config | 54 +- bsp/stm32/stm32l431-BearPi/project.ewp | 71 +- bsp/stm32/stm32l431-BearPi/project.uvprojx | 106 +- bsp/stm32/stm32l431-BearPi/rtconfig.h | 13 +- bsp/stm32/stm32l432-st-nucleo/.config | 54 +- bsp/stm32/stm32l432-st-nucleo/project.ewp | 79 +- bsp/stm32/stm32l432-st-nucleo/project.uvprojx | 94 +- bsp/stm32/stm32l432-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l433-st-nucleo/.config | 54 +- bsp/stm32/stm32l433-st-nucleo/project.ewp | 61 +- bsp/stm32/stm32l433-st-nucleo/project.uvprojx | 128 +- bsp/stm32/stm32l433-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l452-st-nucleo/.config | 54 +- bsp/stm32/stm32l452-st-nucleo/project.ewp | 47 +- bsp/stm32/stm32l452-st-nucleo/project.uvprojx | 98 +- bsp/stm32/stm32l452-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l475-atk-pandora/.config | 60 +- bsp/stm32/stm32l475-atk-pandora/project.ewp | 57 +- .../stm32l475-atk-pandora/project.uvprojx | 88 +- bsp/stm32/stm32l475-atk-pandora/rtconfig.h | 17 +- bsp/stm32/stm32l475-st-discovery/.config | 54 +- bsp/stm32/stm32l475-st-discovery/project.ewp | 51 +- .../stm32l475-st-discovery/project.uvprojx | 90 +- bsp/stm32/stm32l475-st-discovery/rtconfig.h | 13 +- bsp/stm32/stm32l476-st-nucleo/.config | 59 +- bsp/stm32/stm32l476-st-nucleo/project.ewp | 72 +- bsp/stm32/stm32l476-st-nucleo/project.uvprojx | 99 +- bsp/stm32/stm32l476-st-nucleo/rtconfig.h | 14 +- bsp/stm32/stm32l496-ali-developer/.config | 54 +- bsp/stm32/stm32l496-ali-developer/project.ewp | 49 +- .../stm32l496-ali-developer/project.uvprojx | 96 +- bsp/stm32/stm32l496-ali-developer/rtconfig.h | 13 +- bsp/stm32/stm32l496-st-nucleo/.config | 54 +- bsp/stm32/stm32l496-st-nucleo/project.ewp | 53 +- bsp/stm32/stm32l496-st-nucleo/project.uvprojx | 86 +- bsp/stm32/stm32l496-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32l4r5-st-nucleo/.config | 55 +- bsp/stm32/stm32l4r5-st-nucleo/project.ewp | 45 +- bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx | 112 +- bsp/stm32/stm32l4r5-st-nucleo/rtconfig.h | 16 +- bsp/stm32/stm32l4r9-st-eval/.config | 57 +- bsp/stm32/stm32l4r9-st-eval/project.ewp | 47 +- bsp/stm32/stm32l4r9-st-eval/project.uvprojx | 92 +- bsp/stm32/stm32l4r9-st-eval/rtconfig.h | 15 +- bsp/stm32/stm32l4r9-st-sensortile-box/.config | 57 +- .../stm32l4r9-st-sensortile-box/project.ewp | 45 +- .../project.uvprojx | 86 +- .../stm32l4r9-st-sensortile-box/rtconfig.h | 15 +- bsp/stm32/stm32l552-st-nucleo/.config | 54 +- bsp/stm32/stm32l552-st-nucleo/project.ewp | 517 +- bsp/stm32/stm32l552-st-nucleo/project.uvoptx | 873 +-- bsp/stm32/stm32l552-st-nucleo/project.uvprojx | 400 +- bsp/stm32/stm32l552-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32mp157a-st-discovery/.config | 57 +- .../stm32mp157a-st-discovery/project.ewp | 47 +- .../stm32mp157a-st-discovery/project.uvprojx | 92 +- bsp/stm32/stm32mp157a-st-discovery/rtconfig.h | 15 +- bsp/stm32/stm32mp157a-st-ev1/.config | 57 +- bsp/stm32/stm32mp157a-st-ev1/project.ewp | 37 +- bsp/stm32/stm32mp157a-st-ev1/project.uvprojx | 98 +- bsp/stm32/stm32mp157a-st-ev1/rtconfig.h | 15 +- bsp/stm32/stm32u575-st-nucleo/.config | 55 +- bsp/stm32/stm32u575-st-nucleo/project.ewp | 90 +- bsp/stm32/stm32u575-st-nucleo/project.uvoptx | 853 +-- bsp/stm32/stm32u575-st-nucleo/project.uvprojx | 338 +- bsp/stm32/stm32u575-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32wb55-st-nucleo/.config | 54 +- bsp/stm32/stm32wb55-st-nucleo/project.ewp | 73 +- bsp/stm32/stm32wb55-st-nucleo/project.uvprojx | 102 +- bsp/stm32/stm32wb55-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32wl55-st-nucleo/.config | 54 +- bsp/stm32/stm32wl55-st-nucleo/project.uvprojx | 102 +- bsp/stm32/stm32wl55-st-nucleo/rtconfig.h | 13 +- bsp/stm32/stm32wle5-yizhilian-lm401/.config | 54 +- .../stm32wle5-yizhilian-lm401/project.uvprojx | 82 +- .../stm32wle5-yizhilian-lm401/rtconfig.h | 13 +- bsp/swm320-lq100/.config | 57 +- bsp/swm320-lq100/project.ewp | 123 +- bsp/swm320-lq100/project.uvproj | 194 +- bsp/swm320-lq100/project.uvprojx | 204 +- bsp/swm320-lq100/rtconfig.h | 15 +- bsp/swm320/.config | 57 +- bsp/swm320/project.ewp | 119 +- bsp/swm320/project.uvproj | 186 +- bsp/swm320/project.uvprojx | 174 +- bsp/swm320/rtconfig.h | 15 +- bsp/synopsys/boards/.config | 297 +- bsp/synopsys/boards/rtconfig.h | 53 +- bsp/tae32f5300/.config | 54 +- bsp/tae32f5300/project.uvprojx | 104 +- bsp/tae32f5300/rtconfig.h | 13 +- bsp/thead-smart/.config | 54 +- bsp/thead-smart/rtconfig.h | 13 +- bsp/tkm32F499/project.uvprojx | 427 +- bsp/tm4c123bsp/.config | 54 +- bsp/tm4c123bsp/project.ewp | 87 +- bsp/tm4c123bsp/project.uvproj | 92 +- bsp/tm4c123bsp/project.uvprojx | 106 +- bsp/tm4c123bsp/rtconfig.h | 13 +- bsp/tm4c129x/.config | 55 +- bsp/tm4c129x/project.ewp | 141 +- bsp/tm4c129x/project.uvproj | 258 +- bsp/tm4c129x/rtconfig.h | 16 +- bsp/tms320f28379d/.config | 368 +- bsp/tms320f28379d/rtconfig.h | 56 +- bsp/w60x/.config | 57 +- bsp/w60x/project.uvprojx | 194 +- bsp/w60x/rtconfig.h | 13 +- bsp/wch/arm/ch32f103c8-core/.config | 54 +- bsp/wch/arm/ch32f103c8-core/project.uvprojx | 82 +- bsp/wch/arm/ch32f103c8-core/rtconfig.h | 13 +- bsp/x86/.config | 86 +- bsp/x86/rtconfig.h | 23 +- bsp/xplorer4330/M0/project.uvopt | 1076 ---- bsp/xplorer4330/M0/project.uvproj | 815 +-- bsp/xplorer4330/M4/project.uvopt | 1076 ---- bsp/xplorer4330/M4/project.uvproj | 256 +- bsp/zynqmp-r5-axu4ev/.config | 57 +- bsp/zynqmp-r5-axu4ev/rtconfig.h | 13 +- 630 files changed, 40451 insertions(+), 35619 deletions(-) create mode 100644 bsp/CME_M7/.config create mode 100644 bsp/CME_M7/Kconfig create mode 100644 bsp/acm32f0x0-nucleo/.config create mode 100644 bsp/acm32f4xx-nucleo/.config create mode 100644 bsp/apollo2/.config create mode 100644 bsp/apollo2/Kconfig create mode 100644 bsp/at91sam9g45/Kconfig create mode 100644 bsp/at91sam9g45/drivers/Kconfig create mode 100644 bsp/avr32uc3b0/.config create mode 100644 bsp/avr32uc3b0/Kconfig create mode 100644 bsp/frdm-k64f/.config create mode 100644 bsp/frdm-k64f/Kconfig create mode 100644 bsp/gd32103c-eval/.config create mode 100644 bsp/mipssim/.config create mode 100644 bsp/smartfusion2/.config delete mode 100644 bsp/xplorer4330/M0/project.uvopt delete mode 100644 bsp/xplorer4330/M4/project.uvopt diff --git a/bsp/CME_M7/.config b/bsp/CME_M7/.config new file mode 100644 index 00000000000..44b0fef4fe1 --- /dev/null +++ b/bsp/CME_M7/.config @@ -0,0 +1,779 @@ +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) + +# +# RT-Thread Kernel +# +CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set +# CONFIG_RT_USING_SMP is not set +CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set +CONFIG_RT_THREAD_PRIORITY_MAX=32 +CONFIG_RT_TICK_PER_SECOND=100 +CONFIG_RT_USING_OVERFLOW_CHECK=y +CONFIG_RT_USING_HOOK=y +CONFIG_RT_USING_IDLE_HOOK=y +CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 +CONFIG_IDLE_THREAD_STACK_SIZE=256 +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + +CONFIG_RT_DEBUG=y +# CONFIG_RT_DEBUG_COLOR is not set +# CONFIG_RT_DEBUG_INIT_CONFIG is not set +# CONFIG_RT_DEBUG_THREAD_CONFIG is not set +# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set +# CONFIG_RT_DEBUG_IPC_CONFIG is not set +# CONFIG_RT_DEBUG_TIMER_CONFIG is not set +# CONFIG_RT_DEBUG_IRQ_CONFIG is not set +# CONFIG_RT_DEBUG_MEM_CONFIG is not set +# CONFIG_RT_DEBUG_SLAB_CONFIG is not set +# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set +# CONFIG_RT_DEBUG_MODULE_CONFIG is not set + +# +# Inter-Thread communication +# +CONFIG_RT_USING_SEMAPHORE=y +CONFIG_RT_USING_MUTEX=y +CONFIG_RT_USING_EVENT=y +CONFIG_RT_USING_MAILBOX=y +CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication + +# +# Memory Management +# +CONFIG_RT_USING_MEMPOOL=y +CONFIG_RT_USING_SMALL_MEM=y +# CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set +# CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set +CONFIG_RT_USING_HEAP=y +# end of Memory Management + +# +# Kernel Device Object +# +CONFIG_RT_USING_DEVICE=y +# CONFIG_RT_USING_DEVICE_OPS is not set +# CONFIG_RT_USING_INTERRUPT_INFO is not set +CONFIG_RT_USING_CONSOLE=y +CONFIG_RT_CONSOLEBUF_SIZE=128 +CONFIG_RT_CONSOLE_DEVICE_NAME="uart2" +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +CONFIG_ARCH_ARM=y +CONFIG_RT_USING_CPU_FFS=y +CONFIG_ARCH_ARM_CORTEX_M=y +CONFIG_ARCH_ARM_CORTEX_M3=y + +# +# RT-Thread Components +# +CONFIG_RT_USING_COMPONENTS_INIT=y +# CONFIG_RT_USING_LEGACY is not set + +# +# C++ features +# +# CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features + +# +# Command shell +# +CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y +CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 +CONFIG_FINSH_USING_HISTORY=y +CONFIG_FINSH_HISTORY_LINES=5 +CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y +CONFIG_FINSH_USING_DESCRIPTION=y +# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set +# CONFIG_FINSH_USING_AUTH is not set +CONFIG_FINSH_ARG_MAX=10 +# end of Command shell + +# +# Device virtual file system +# +CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y +CONFIG_DFS_USING_WORKDIR=y +CONFIG_DFS_FILESYSTEMS_MAX=4 +CONFIG_DFS_FILESYSTEM_TYPES_MAX=4 +CONFIG_DFS_FD_MAX=16 +# CONFIG_RT_USING_DFS_MNTTABLE is not set +CONFIG_RT_USING_DFS_ELMFAT=y + +# +# elm-chan's FatFs, Generic FAT Filesystem Module +# +CONFIG_RT_DFS_ELM_CODE_PAGE=437 +CONFIG_RT_DFS_ELM_WORD_ACCESS=y +# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set +# CONFIG_RT_DFS_ELM_USE_LFN_1 is not set +# CONFIG_RT_DFS_ELM_USE_LFN_2 is not set +CONFIG_RT_DFS_ELM_USE_LFN_3=y +CONFIG_RT_DFS_ELM_USE_LFN=3 +CONFIG_RT_DFS_ELM_LFN_UNICODE_0=y +# CONFIG_RT_DFS_ELM_LFN_UNICODE_1 is not set +# CONFIG_RT_DFS_ELM_LFN_UNICODE_2 is not set +# CONFIG_RT_DFS_ELM_LFN_UNICODE_3 is not set +CONFIG_RT_DFS_ELM_LFN_UNICODE=0 +CONFIG_RT_DFS_ELM_MAX_LFN=255 +CONFIG_RT_DFS_ELM_DRIVES=2 +CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 +# CONFIG_RT_DFS_ELM_USE_ERASE is not set +CONFIG_RT_DFS_ELM_REENTRANT=y +CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 +# end of elm-chan's FatFs, Generic FAT Filesystem Module + +# CONFIG_RT_USING_DFS_DEVFS is not set +# CONFIG_RT_USING_DFS_ROMFS is not set +# CONFIG_RT_USING_DFS_RAMFS is not set +# CONFIG_RT_USING_DFS_NFS is not set +# end of Device virtual file system + +# +# Device Drivers +# +CONFIG_RT_USING_DEVICE_IPC=y +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set +CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set +CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 +# CONFIG_RT_USING_CAN is not set +# CONFIG_RT_USING_HWTIMER is not set +# CONFIG_RT_USING_CPUTIME is not set +# CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set +CONFIG_RT_USING_PIN=y +# CONFIG_RT_USING_ADC is not set +# CONFIG_RT_USING_DAC is not set +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_MTD_NOR is not set +# CONFIG_RT_USING_MTD_NAND is not set +# CONFIG_RT_USING_PM is not set +# CONFIG_RT_USING_RTC is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set +# CONFIG_RT_USING_WDT is not set +# CONFIG_RT_USING_AUDIO is not set +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers + +# +# POSIX layer and C standard library +# +CONFIG_RT_USING_LIBC=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library + +# +# Network +# + +# +# Socket abstraction layer +# +# CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer + +# +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +CONFIG_NETDEV_USING_PING=y +# end of Network interface device + +# +# light weight TCP/IP stack +# +CONFIG_RT_USING_LWIP=y +# CONFIG_RT_USING_LWIP141 is not set +# CONFIG_RT_USING_LWIP202 is not set +CONFIG_RT_USING_LWIP203=y +# CONFIG_RT_USING_LWIP212 is not set +# CONFIG_RT_USING_LWIP_IPV6 is not set +CONFIG_RT_LWIP_MEM_ALIGNMENT=4 +CONFIG_RT_LWIP_IGMP=y +CONFIG_RT_LWIP_ICMP=y +# CONFIG_RT_LWIP_SNMP is not set +CONFIG_RT_LWIP_DNS=y +CONFIG_RT_LWIP_DHCP=y +CONFIG_IP_SOF_BROADCAST=1 +CONFIG_IP_SOF_BROADCAST_RECV=1 + +# +# Static IPv4 Address +# +CONFIG_RT_LWIP_IPADDR="192.168.1.30" +CONFIG_RT_LWIP_GWADDR="192.168.1.1" +CONFIG_RT_LWIP_MSKADDR="255.255.255.0" +# end of Static IPv4 Address + +CONFIG_RT_LWIP_UDP=y +CONFIG_RT_LWIP_TCP=y +CONFIG_RT_LWIP_RAW=y +# CONFIG_RT_LWIP_PPP is not set +CONFIG_RT_MEMP_NUM_NETCONN=12 +CONFIG_RT_LWIP_PBUF_NUM=3 +CONFIG_RT_LWIP_RAW_PCB_NUM=2 +CONFIG_RT_LWIP_UDP_PCB_NUM=4 +CONFIG_RT_LWIP_TCP_PCB_NUM=8 +CONFIG_RT_LWIP_TCP_SEG_NUM=40 +CONFIG_RT_LWIP_TCP_SND_BUF=4380 +CONFIG_RT_LWIP_TCP_WND=4380 +CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=12 +CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=4 +CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=1024 +# CONFIG_LWIP_NO_RX_THREAD is not set +# CONFIG_LWIP_NO_TX_THREAD is not set +CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=15 +CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=512 +CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=4 +# CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set +CONFIG_LWIP_NETIF_STATUS_CALLBACK=1 +CONFIG_LWIP_NETIF_LINK_CALLBACK=1 +CONFIG_SO_REUSE=1 +CONFIG_LWIP_SO_RCVTIMEO=1 +CONFIG_LWIP_SO_SNDTIMEO=1 +CONFIG_LWIP_SO_RCVBUF=1 +CONFIG_LWIP_SO_LINGER=0 +# CONFIG_RT_LWIP_NETIF_LOOPBACK is not set +CONFIG_LWIP_NETIF_LOOPBACK=0 +# CONFIG_RT_LWIP_STATS is not set +# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set +CONFIG_RT_LWIP_USING_PING=y +# CONFIG_RT_LWIP_DEBUG is not set +# end of light weight TCP/IP stack + +# +# AT commands +# +# CONFIG_RT_USING_AT is not set +# end of AT commands + +# CONFIG_LWIP_USING_DHCPD is not set +# end of Network + +# +# VBUS(Virtual Software BUS) +# +# CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) + +# +# Utilities +# +# CONFIG_RT_USING_RYM is not set +# CONFIG_RT_USING_ULOG is not set +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities + +# CONFIG_RT_USING_LWP is not set +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases + +# +# RT-Thread online packages +# + +# +# IoT - internet of things +# +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set +# CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set +# CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_WEBNET is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set +# CONFIG_PKG_USING_LJSON is not set +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_NANOPB is not set + +# +# Wi-Fi +# + +# +# Marvell WiFi +# +# CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi + +# +# Wiced WiFi +# +# CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + +# CONFIG_PKG_USING_COAP is not set +# CONFIG_PKG_USING_NOPOLL is not set +# CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set +# CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set +# CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set + +# +# IoT Cloud +# +# CONFIG_PKG_USING_ONENET is not set +# CONFIG_PKG_USING_GAGENT_CLOUD is not set +# CONFIG_PKG_USING_ALI_IOTKIT is not set +# CONFIG_PKG_USING_AZURE is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things + +# +# security packages +# +# CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages + +# +# language packages +# +# CONFIG_PKG_USING_LUA is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages + +# +# multimedia packages +# + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + +# CONFIG_PKG_USING_OPENMV is not set +# CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages + +# +# tools packages +# +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYFLASH is not set +# CONFIG_PKG_USING_EASYLOGGER is not set +# CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set +# CONFIG_PKG_USING_RDB is not set +# CONFIG_PKG_USING_QRCODE is not set +# CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages + +# +# system packages +# + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set +# CONFIG_PKG_USING_GUIENGINE is not set +# CONFIG_PKG_USING_CAIRO is not set +# CONFIG_PKG_USING_PIXMAN is not set +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set +# CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set +# CONFIG_PKG_USING_DFS_YAFFS is not set +# CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages + +# +# peripheral libraries and drivers +# +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set +# CONFIG_PKG_USING_REALTEK_AMEBA is not set +# CONFIG_PKG_USING_SHT2X is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set +# CONFIG_PKG_USING_STM32_SDIO is not set +# CONFIG_PKG_USING_ICM20608 is not set +# CONFIG_PKG_USING_BUTTON is not set +# CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set +# CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages + +# +# miscellaneous packages +# + +# +# samples: kernel and components samples +# +# CONFIG_PKG_USING_KERNEL_SAMPLES is not set +# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set +# CONFIG_PKG_USING_NETWORK_SAMPLES is not set +# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples + +# +# entertainment: terminal games and other interesting software packages +# +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages + +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +CONFIG_SOC_CME_M7=y diff --git a/bsp/CME_M7/Kconfig b/bsp/CME_M7/Kconfig new file mode 100644 index 00000000000..541d45b4c11 --- /dev/null +++ b/bsp/CME_M7/Kconfig @@ -0,0 +1,28 @@ +mainmenu "RT-Thread Configuration" + +config BSP_DIR + string + option env="BSP_ROOT" + default "." + +config RTT_DIR + string + option env="RTT_ROOT" + default "../.." + +# you can change the RTT_ROOT default "../.." to your rtthread_root, +# example : default "F:/git_repositories/rt-thread" + +config PKGS_DIR + string + option env="PKGS_ROOT" + default "packages" + +source "$RTT_DIR/Kconfig" +source "$PKGS_DIR/Kconfig" + +config SOC_CME_M7 + bool + select ARCH_ARM_CORTEX_M3 + select RT_USING_COMPONENTS_INIT + default y diff --git a/bsp/CME_M7/project.uvproj b/bsp/CME_M7/project.uvproj index 4076b40b0ef..fbccc96b2a5 100644 --- a/bsp/CME_M7/project.uvproj +++ b/bsp/CME_M7/project.uvproj @@ -361,9 +361,9 @@ 0 - RT_USING_ARM_LIBC + RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;..\..\include;applications;.;CMSIS\CME_M7;CMSIS\CMSIS\Include;drivers;StdPeriph_Driver\inc;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\net\lwip-2.0.2\src\include\posix + applications;.;CMSIS\CME_M7;CMSIS\CMSIS\Include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;StdPeriph_Driver\inc;..\..\components\net\lwip-2.0.3\src;..\..\components\net\lwip-2.0.3\src\include;..\..\components\net\lwip-2.0.3\src\include\ipv4;..\..\components\net\lwip-2.0.3\src\arch\include;..\..\components\net\lwip-2.0.3\src\include\netif;..\..\components\net\lwip-2.0.3\src\include\posix;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -404,151 +404,147 @@ - Kernel + Applications - clock.c + application.c 1 - ..\..\src\clock.c + applications\application.c - components.c + led.c 1 - ..\..\src\components.c + applications\led.c - cpu.c + startup.c 1 - ..\..\src\cpu.c + applications\startup.c + + + CMSIS - device.c - 1 - ..\..\src\device.c + startup_cmem7.s + 2 + CMSIS\CME_M7\startup\arm\startup_cmem7.s - idle.c + system_cmem7.c 1 - ..\..\src\idle.c + CMSIS\CME_M7\system_cmem7.c + + + CPU - ipc.c + showmem.c 1 - ..\..\src\ipc.c + ..\..\libcpu\arm\common\showmem.c - irq.c + div0.c 1 - ..\..\src\irq.c + ..\..\libcpu\arm\common\div0.c - kservice.c + backtrace.c 1 - ..\..\src\kservice.c + ..\..\libcpu\arm\common\backtrace.c - mem.c + cpuport.c 1 - ..\..\src\mem.c + ..\..\libcpu\arm\cortex-m3\cpuport.c - mempool.c - 1 - ..\..\src\mempool.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m3\context_rvds.S + + + DeviceDrivers - object.c + pin.c 1 - ..\..\src\object.c + ..\..\components\drivers\misc\pin.c - scheduler.c + serial.c 1 - ..\..\src\scheduler.c + ..\..\components\drivers\serial\serial.c - signal.c + ringbuffer.c 1 - ..\..\src\signal.c + ..\..\components\drivers\src\ringbuffer.c - thread.c + completion.c 1 - ..\..\src\thread.c + ..\..\components\drivers\src\completion.c - timer.c + waitqueue.c 1 - ..\..\src\timer.c + ..\..\components\drivers\src\waitqueue.c - - - Applications - application.c + dataqueue.c 1 - applications\application.c + ..\..\components\drivers\src\dataqueue.c - led.c + workqueue.c 1 - applications\led.c + ..\..\components\drivers\src\workqueue.c - startup.c + pipe.c 1 - applications\startup.c + ..\..\components\drivers\src\pipe.c - - - CMSIS - system_cmem7.c + ringblk_buf.c 1 - CMSIS\CME_M7\system_cmem7.c - - - - - startup_cmem7.s - 2 - CMSIS\CME_M7\startup\arm\startup_cmem7.s + ..\..\components\drivers\src\ringblk_buf.c @@ -556,9 +552,9 @@ Drivers - board.c + emac.c 1 - drivers\board.c + drivers\emac.c @@ -570,9 +566,9 @@ - emac.c + board.c 1 - drivers\emac.c + drivers\board.c @@ -584,346 +580,339 @@ - StdPeriph_Driver + Filesystem - cmem7_adc.c + dfs_posix.c 1 - StdPeriph_Driver\src\cmem7_adc.c + ..\..\components\dfs\src\dfs_posix.c - cmem7_aes.c + dfs_fs.c 1 - StdPeriph_Driver\src\cmem7_aes.c + ..\..\components\dfs\src\dfs_fs.c - cmem7_can.c + dfs.c 1 - StdPeriph_Driver\src\cmem7_can.c + ..\..\components\dfs\src\dfs.c - cmem7_ddr.c + dfs_file.c 1 - StdPeriph_Driver\src\cmem7_ddr.c + ..\..\components\dfs\src\dfs_file.c - cmem7_dma.c + dfs_elm.c 1 - StdPeriph_Driver\src\cmem7_dma.c + ..\..\components\dfs\filesystems\elmfat\dfs_elm.c - cmem7_efuse.c + ffunicode.c 1 - StdPeriph_Driver\src\cmem7_efuse.c + ..\..\components\dfs\filesystems\elmfat\ffunicode.c - cmem7_eth.c + ff.c 1 - StdPeriph_Driver\src\cmem7_eth.c + ..\..\components\dfs\filesystems\elmfat\ff.c + + + Finsh - cmem7_flash.c + shell.c 1 - StdPeriph_Driver\src\cmem7_flash.c + ..\..\components\finsh\shell.c - cmem7_gpio.c + msh.c 1 - StdPeriph_Driver\src\cmem7_gpio.c + ..\..\components\finsh\msh.c - cmem7_i2c.c + msh_file.c 1 - StdPeriph_Driver\src\cmem7_i2c.c + ..\..\components\finsh\msh_file.c - cmem7_misc.c + cmd.c 1 - StdPeriph_Driver\src\cmem7_misc.c + ..\..\components\finsh\cmd.c + + + Kernel - cmem7_rtc.c + mem.c 1 - StdPeriph_Driver\src\cmem7_rtc.c + ..\..\src\mem.c - cmem7_spi.c + object.c 1 - StdPeriph_Driver\src\cmem7_spi.c + ..\..\src\object.c - cmem7_tim.c + timer.c 1 - StdPeriph_Driver\src\cmem7_tim.c + ..\..\src\timer.c - cmem7_uart.c + components.c 1 - StdPeriph_Driver\src\cmem7_uart.c + ..\..\src\components.c - cmem7_usb.c + mempool.c 1 - StdPeriph_Driver\src\cmem7_usb.c + ..\..\src\mempool.c - cmem7_wdg.c + scheduler.c 1 - StdPeriph_Driver\src\cmem7_wdg.c + ..\..\src\scheduler.c - - - cpu - backtrace.c + thread.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\src\thread.c - div0.c + ipc.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\src\ipc.c - showmem.c + device.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\src\device.c - cpuport.c + clock.c 1 - ..\..\libcpu\arm\cortex-m3\cpuport.c - - - - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m3\context_rvds.S + ..\..\src\clock.c - - - DeviceDrivers - serial.c + idle.c 1 - ..\..\components\drivers\serial\serial.c + ..\..\src\idle.c - completion.c + kservice.c 1 - ..\..\components\drivers\src\completion.c + ..\..\src\kservice.c - dataqueue.c + irq.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\src\irq.c + + + libc - pipe.c + syscalls.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\libc\compilers\armlibc\syscalls.c - ringblk_buf.c + libc_syms.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - ringbuffer.c + mem_std.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\libc\compilers\armlibc\mem_std.c - waitqueue.c + time.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\libc\compilers\common\time.c - workqueue.c + stdlib.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\libc\compilers\common\stdlib.c - finsh + Libraries - shell.c + cmem7_usb.c 1 - ..\..\components\finsh\shell.c + StdPeriph_Driver\src\cmem7_usb.c - cmd.c + cmem7_spi.c 1 - ..\..\components\finsh\cmd.c + StdPeriph_Driver\src\cmem7_spi.c - msh.c + cmem7_adc.c 1 - ..\..\components\finsh\msh.c + StdPeriph_Driver\src\cmem7_adc.c - finsh_compiler.c + cmem7_dma.c 1 - ..\..\components\finsh\finsh_compiler.c + StdPeriph_Driver\src\cmem7_dma.c - finsh_error.c + cmem7_rtc.c 1 - ..\..\components\finsh\finsh_error.c + StdPeriph_Driver\src\cmem7_rtc.c - finsh_heap.c + cmem7_eth.c 1 - ..\..\components\finsh\finsh_heap.c + StdPeriph_Driver\src\cmem7_eth.c - finsh_init.c + cmem7_tim.c 1 - ..\..\components\finsh\finsh_init.c + StdPeriph_Driver\src\cmem7_tim.c - finsh_node.c + cmem7_flash.c 1 - ..\..\components\finsh\finsh_node.c + StdPeriph_Driver\src\cmem7_flash.c - finsh_ops.c + cmem7_can.c 1 - ..\..\components\finsh\finsh_ops.c + StdPeriph_Driver\src\cmem7_can.c - finsh_parser.c + cmem7_ddr.c 1 - ..\..\components\finsh\finsh_parser.c + StdPeriph_Driver\src\cmem7_ddr.c - finsh_var.c + cmem7_uart.c 1 - ..\..\components\finsh\finsh_var.c + StdPeriph_Driver\src\cmem7_uart.c - finsh_vm.c + cmem7_i2c.c 1 - ..\..\components\finsh\finsh_vm.c + StdPeriph_Driver\src\cmem7_i2c.c - finsh_token.c + cmem7_misc.c 1 - ..\..\components\finsh\finsh_token.c + StdPeriph_Driver\src\cmem7_misc.c - - - libc - libc.c + cmem7_gpio.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + StdPeriph_Driver\src\cmem7_gpio.c - mem_std.c + cmem7_aes.c 1 - ..\..\components\libc\compilers\armlibc\mem_std.c + StdPeriph_Driver\src\cmem7_aes.c - stubs.c + cmem7_wdg.c 1 - ..\..\components\libc\compilers\armlibc\stubs.c + StdPeriph_Driver\src\cmem7_wdg.c - time.c + cmem7_efuse.c 1 - ..\..\components\libc\compilers\common\time.c + StdPeriph_Driver\src\cmem7_efuse.c @@ -931,254 +920,261 @@ lwIP - sys_arch.c + netdb.c 1 - ..\..\components\net\lwip-2.0.2\src\arch\sys_arch.c + ..\..\components\net\lwip-2.0.3\src\api\netdb.c - api_lib.c + ip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\api_lib.c + ..\..\components\net\lwip-2.0.3\src\core\ip.c - api_msg.c + autoip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\api_msg.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\autoip.c - err.c + ethernet.c 1 - ..\..\components\net\lwip-2.0.2\src\api\err.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernet.c - netbuf.c + netif.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netbuf.c + ..\..\components\net\lwip-2.0.3\src\core\netif.c - netdb.c + sys.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netdb.c + ..\..\components\net\lwip-2.0.3\src\core\sys.c - netifapi.c + sockets.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netifapi.c + ..\..\components\net\lwip-2.0.3\src\api\sockets.c - sockets.c + netifapi.c 1 - ..\..\components\net\lwip-2.0.2\src\api\sockets.c + ..\..\components\net\lwip-2.0.3\src\api\netifapi.c tcpip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\tcpip.c + ..\..\components\net\lwip-2.0.3\src\api\tcpip.c - def.c + ip4_addr.c 1 - ..\..\components\net\lwip-2.0.2\src\core\def.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_addr.c - dns.c + dhcp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\dns.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\dhcp.c - inet_chksum.c + init.c 1 - ..\..\components\net\lwip-2.0.2\src\core\inet_chksum.c + ..\..\components\net\lwip-2.0.3\src\core\init.c - init.c + ethernetif.c 1 - ..\..\components\net\lwip-2.0.2\src\core\init.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernetif.c - ip.c + etharp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ip.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\etharp.c memp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\memp.c + ..\..\components\net\lwip-2.0.3\src\core\memp.c - netif.c + ip4.c 1 - ..\..\components\net\lwip-2.0.2\src\core\netif.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4.c - pbuf.c + netbuf.c 1 - ..\..\components\net\lwip-2.0.2\src\core\pbuf.c + ..\..\components\net\lwip-2.0.3\src\api\netbuf.c raw.c 1 - ..\..\components\net\lwip-2.0.2\src\core\raw.c + ..\..\components\net\lwip-2.0.3\src\core\raw.c - stats.c + ip4_frag.c 1 - ..\..\components\net\lwip-2.0.2\src\core\stats.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_frag.c - sys.c + tcp_out.c 1 - ..\..\components\net\lwip-2.0.2\src\core\sys.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_out.c - tcp.c + lowpan6.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp.c + ..\..\components\net\lwip-2.0.3\src\netif\lowpan6.c - tcp_in.c + icmp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp_in.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\icmp.c - tcp_out.c + api_lib.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp_out.c + ..\..\components\net\lwip-2.0.3\src\api\api_lib.c - timeouts.c + inet_chksum.c 1 - ..\..\components\net\lwip-2.0.2\src\core\timeouts.c + ..\..\components\net\lwip-2.0.3\src\core\inet_chksum.c - udp.c + stats.c 1 - ..\..\components\net\lwip-2.0.2\src\core\udp.c + ..\..\components\net\lwip-2.0.3\src\core\stats.c - ethernet.c + err.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\ethernet.c + ..\..\components\net\lwip-2.0.3\src\api\err.c - ethernetif.c + tcp_in.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\ethernetif.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_in.c - lowpan6.c + dns.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\lowpan6.c + ..\..\components\net\lwip-2.0.3\src\core\dns.c - autoip.c + sys_arch.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\autoip.c + ..\..\components\net\lwip-2.0.3\src\arch\sys_arch.c - dhcp.c + timeouts.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\dhcp.c + ..\..\components\net\lwip-2.0.3\src\core\timeouts.c - etharp.c + igmp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\etharp.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\igmp.c - icmp.c + udp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\icmp.c + ..\..\components\net\lwip-2.0.3\src\core\udp.c - igmp.c + ping.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\igmp.c + ..\..\components\net\lwip-2.0.3\src\apps\ping\ping.c - ip4.c + pbuf.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4.c + ..\..\components\net\lwip-2.0.3\src\core\pbuf.c - ip4_addr.c + def.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_addr.c + ..\..\components\net\lwip-2.0.3\src\core\def.c - ip4_frag.c + api_msg.c + 1 + ..\..\components\net\lwip-2.0.3\src\api\api_msg.c + + + + + tcp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_frag.c + ..\..\components\net\lwip-2.0.3\src\core\tcp.c diff --git a/bsp/CME_M7/rtconfig.h b/bsp/CME_M7/rtconfig.h index 81d7c22eb4f..107a0c1fe6e 100644 --- a/bsp/CME_M7/rtconfig.h +++ b/bsp/CME_M7/rtconfig.h @@ -1,136 +1,304 @@ -/* RT-Thread config file */ -#ifndef __RTTHREAD_CFG_H__ -#define __RTTHREAD_CFG_H__ +#ifndef RT_CONFIG_H__ +#define RT_CONFIG_H__ -/* RT_NAME_MAX*/ -#define RT_NAME_MAX 8 +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ -/* RT_ALIGN_SIZE*/ -#define RT_ALIGN_SIZE 4 +/* RT-Thread Kernel */ -/* PRIORITY_MAX */ -#define RT_THREAD_PRIORITY_MAX 32 +#define RT_NAME_MAX 8 +#define RT_ALIGN_SIZE 4 +#define RT_THREAD_PRIORITY_32 +#define RT_THREAD_PRIORITY_MAX 32 +#define RT_TICK_PER_SECOND 100 +#define RT_USING_OVERFLOW_CHECK +#define RT_USING_HOOK +#define RT_USING_IDLE_HOOK +#define RT_IDLE_HOOK_LIST_SIZE 4 +#define IDLE_THREAD_STACK_SIZE 256 +#define RT_USING_TIMER_SOFT +#define RT_TIMER_THREAD_PRIO 4 +#define RT_TIMER_THREAD_STACK_SIZE 512 -/* Tick per Second */ -#define RT_TICK_PER_SECOND 100 +/* kservice optimization */ -/* SECTION: RT_DEBUG */ -/* Thread Debug */ +/* end of kservice optimization */ #define RT_DEBUG -#define RT_DEBUG_COLOR -#define RT_USING_OVERFLOW_CHECK -/* Using Hook */ -#define RT_USING_HOOK +/* Inter-Thread communication */ -/* SECTION: IPC */ -/* Using Semaphore*/ #define RT_USING_SEMAPHORE - -/* Using Mutex */ #define RT_USING_MUTEX - -/* Using Event */ #define RT_USING_EVENT - -/* Using MailBox */ #define RT_USING_MAILBOX - -/* Using Message Queue */ #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ -/* SECTION: Memory Management */ -/* Using Memory Pool Management*/ -#define RT_USING_MEMPOOL +/* Memory Management */ -/* Using Dynamic Heap Management */ +#define RT_USING_MEMPOOL +#define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ -/* Using Small MM */ -#define RT_USING_SMALL_MEM +/* Kernel Device Object */ + +#define RT_USING_DEVICE +#define RT_USING_CONSOLE +#define RT_CONSOLEBUF_SIZE 128 +#define RT_CONSOLE_DEVICE_NAME "uart2" +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ +#define ARCH_ARM +#define RT_USING_CPU_FFS +#define ARCH_ARM_CORTEX_M +#define ARCH_ARM_CORTEX_M3 + +/* RT-Thread Components */ #define RT_USING_COMPONENTS_INIT -/* SECTION: Device System */ -/* Using Device System */ -#define RT_USING_DEVICE -#define RT_USING_DEVICE_IPC -#define RT_USING_SERIAL -#define RT_SERIAL_USING_DMA +/* C++ features */ -/* SECTION: Console options */ -#define RT_USING_CONSOLE -/* the buffer size of console*/ -#define RT_CONSOLEBUF_SIZE 128 -#define RT_CONSOLE_DEVICE_NAME "uart2" +/* end of C++ features */ + +/* Command shell */ -/* SECTION: finsh, a C-Express shell */ #define RT_USING_FINSH -/* Using symbol table */ +#define RT_USING_MSH +#define FINSH_USING_MSH +#define FINSH_THREAD_NAME "tshell" +#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_STACK_SIZE 4096 +#define FINSH_USING_HISTORY +#define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB +#define FINSH_CMD_SIZE 80 +#define MSH_USING_BUILT_IN_COMMANDS #define FINSH_USING_DESCRIPTION -#define FINSH_USING_MSH -//#define FINSH_USING_MSH_ONLY +#define FINSH_ARG_MAX 10 +/* end of Command shell */ -#define RT_USING_LIBC +/* Device virtual file system */ -/* SECTION: device filesystem */ -/* #define RT_USING_DFS */ +#define RT_USING_DFS +#define DFS_USING_POSIX +#define DFS_USING_WORKDIR +#define DFS_FILESYSTEMS_MAX 4 +#define DFS_FILESYSTEM_TYPES_MAX 4 +#define DFS_FD_MAX 16 #define RT_USING_DFS_ELMFAT -#define RT_DFS_ELM_REENTRANT + +/* elm-chan's FatFs, Generic FAT Filesystem Module */ + +#define RT_DFS_ELM_CODE_PAGE 437 #define RT_DFS_ELM_WORD_ACCESS -#define RT_DFS_ELM_DRIVES 1 -#define RT_DFS_ELM_USE_LFN 2 -#define RT_DFS_ELM_MAX_LFN 255 -#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 +#define RT_DFS_ELM_USE_LFN_3 +#define RT_DFS_ELM_USE_LFN 3 +#define RT_DFS_ELM_LFN_UNICODE_0 +#define RT_DFS_ELM_LFN_UNICODE 0 +#define RT_DFS_ELM_MAX_LFN 255 +#define RT_DFS_ELM_DRIVES 2 +#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 +#define RT_DFS_ELM_REENTRANT +#define RT_DFS_ELM_MUTEX_TIMEOUT 3000 +/* end of elm-chan's FatFs, Generic FAT Filesystem Module */ +/* end of Device virtual file system */ + +/* Device Drivers */ + +#define RT_USING_DEVICE_IPC +#define RT_USING_SERIAL +#define RT_USING_SERIAL_V1 +#define RT_SERIAL_USING_DMA +#define RT_SERIAL_RB_BUFSZ 64 +#define RT_USING_PIN + +/* Using USB */ + +/* end of Using USB */ +/* end of Device Drivers */ + +/* POSIX layer and C standard library */ + +#define RT_USING_LIBC +#define RT_LIBC_USING_TIME +#define RT_LIBC_DEFAULT_TIMEZONE 8 + +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ + +/* Network */ + +/* Socket abstraction layer */ + +/* end of Socket abstraction layer */ + +/* Network interface device */ + +#define NETDEV_USING_PING +/* end of Network interface device */ -/* the max number of mounted filesystem */ -#define DFS_FILESYSTEMS_MAX 2 -/* the max number of opened files */ -#define DFS_FD_MAX 4 +/* light weight TCP/IP stack */ -/* SECTION: lwip, a lighwight TCP/IP protocol stack */ #define RT_USING_LWIP #define RT_USING_LWIP203 -/* Enable ICMP protocol*/ +#define RT_LWIP_MEM_ALIGNMENT 4 +#define RT_LWIP_IGMP #define RT_LWIP_ICMP -/* Enable UDP protocol*/ -#define RT_LWIP_UDP -/* Enable TCP protocol*/ -#define RT_LWIP_TCP -/* Enable DNS */ #define RT_LWIP_DNS -/* Enable DHCP */ -// #define RT_LWIP_DHCP - -#define RT_MEMP_NUM_NETCONN 12 -#define RT_LWIP_PBUF_NUM 3 -#define RT_LWIP_RAW_PCB_NUM 2 -#define RT_LWIP_UDP_PCB_NUM 4 -#define RT_LWIP_TCP_PCB_NUM 8 -#define RT_LWIP_TCP_SEG_NUM 40 -#define RT_LWIP_TCP_SND_BUF 4380 -#define RT_LWIP_TCP_WND 4380 - -/* ip address of target */ +#define RT_LWIP_DHCP +#define IP_SOF_BROADCAST 1 +#define IP_SOF_BROADCAST_RECV 1 + +/* Static IPv4 Address */ + #define RT_LWIP_IPADDR "192.168.1.30" +#define RT_LWIP_GWADDR "192.168.1.1" +#define RT_LWIP_MSKADDR "255.255.255.0" +/* end of Static IPv4 Address */ +#define RT_LWIP_UDP +#define RT_LWIP_TCP +#define RT_LWIP_RAW +#define RT_MEMP_NUM_NETCONN 12 +#define RT_LWIP_PBUF_NUM 3 +#define RT_LWIP_RAW_PCB_NUM 2 +#define RT_LWIP_UDP_PCB_NUM 4 +#define RT_LWIP_TCP_PCB_NUM 8 +#define RT_LWIP_TCP_SEG_NUM 40 +#define RT_LWIP_TCP_SND_BUF 4380 +#define RT_LWIP_TCP_WND 4380 +#define RT_LWIP_TCPTHREAD_PRIORITY 12 +#define RT_LWIP_TCPTHREAD_MBOX_SIZE 4 +#define RT_LWIP_TCPTHREAD_STACKSIZE 1024 +#define RT_LWIP_ETHTHREAD_PRIORITY 15 +#define RT_LWIP_ETHTHREAD_STACKSIZE 512 +#define RT_LWIP_ETHTHREAD_MBOX_SIZE 4 +#define LWIP_NETIF_STATUS_CALLBACK 1 +#define LWIP_NETIF_LINK_CALLBACK 1 +#define SO_REUSE 1 +#define LWIP_SO_RCVTIMEO 1 +#define LWIP_SO_SNDTIMEO 1 +#define LWIP_SO_RCVBUF 1 +#define LWIP_SO_LINGER 0 +#define LWIP_NETIF_LOOPBACK 0 +#define RT_LWIP_USING_PING +/* end of light weight TCP/IP stack */ + +/* AT commands */ + +/* end of AT commands */ +/* end of Network */ + +/* VBUS(Virtual Software BUS) */ + +/* end of VBUS(Virtual Software BUS) */ + +/* Utilities */ + +/* end of Utilities */ +/* end of RT-Thread Components */ + +/* RT-Thread Utestcases */ + +/* end of RT-Thread Utestcases */ + +/* RT-Thread online packages */ + +/* IoT - internet of things */ + + +/* Wi-Fi */ + +/* Marvell WiFi */ + +/* end of Marvell WiFi */ + +/* Wiced WiFi */ + +/* end of Wiced WiFi */ +/* end of Wi-Fi */ + +/* IoT Cloud */ + +/* end of IoT Cloud */ +/* end of IoT - internet of things */ + +/* security packages */ + +/* end of security packages */ + +/* language packages */ + +/* end of language packages */ + +/* multimedia packages */ + +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ + +/* tools packages */ + +/* end of tools packages */ + +/* system packages */ + +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + +/* acceleration: Assembly language or algorithmic acceleration packages */ + +/* end of acceleration: Assembly language or algorithmic acceleration packages */ + +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* Micrium: Micrium software products porting for RT-Thread */ + +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ + +/* peripheral libraries and drivers */ + +/* end of peripheral libraries and drivers */ + +/* AI packages */ + +/* end of AI packages */ -/* gateway address of target */ -#define RT_LWIP_GWADDR "192.168.1.1" +/* miscellaneous packages */ -/* mask address of target */ -#define RT_LWIP_MSKADDR "255.255.255.0" +/* samples: kernel and components samples */ -/* tcp thread options */ -#define RT_LWIP_TCPTHREAD_PRIORITY 12 -#define RT_LWIP_TCPTHREAD_MBOX_SIZE 4 -#define RT_LWIP_TCPTHREAD_STACKSIZE 1024 +/* end of samples: kernel and components samples */ -#define RT_LWIP_ETHTHREAD_PRIORITY 15 -#define RT_LWIP_ETHTHREAD_MBOX_SIZE 4 -#define RT_LWIP_ETHTHREAD_STACKSIZE 512 +/* entertainment: terminal games and other interesting software packages */ -// -// #define RT_USING_CMSIS_OS +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ +#define SOC_CME_M7 #endif diff --git a/bsp/Vango_V85xx/.config b/bsp/Vango_V85xx/.config index ff718272cbb..7fb99b5265c 100644 --- a/bsp/Vango_V85xx/.config +++ b/bsp/Vango_V85xx/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -136,7 +140,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -190,10 +193,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -356,7 +366,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -378,10 +388,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -396,13 +413,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -460,9 +470,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -472,7 +489,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -487,6 +503,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -511,8 +528,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -520,6 +535,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/Vango_V85xx/project.uvprojx b/bsp/Vango_V85xx/project.uvprojx index cfb54c18e1b..1ea09f8bcb2 100644 --- a/bsp/Vango_V85xx/project.uvprojx +++ b/bsp/Vango_V85xx/project.uvprojx @@ -333,7 +333,7 @@ V85xx, USE_STDPERIPH_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, USE_TARGET_DRIVER, RT_USING_ARM_LIBC - applications;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel;Libraries\CMSIS\Vango\V85xx\Include;Libraries\CMSIS;Libraries\VangoV85xx_standard_peripheral\Include + applications;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel;Libraries\CMSIS\Vango\V85xx\Include;Libraries\CMSIS;Libraries\VangoV85xx_standard_peripheral\Include @@ -409,16 +409,16 @@ - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m0\context_rvds.S + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m0\cpuport.c - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m0\cpuport.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m0\context_rvds.S @@ -440,16 +440,16 @@ - waitqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\ringbuffer.c - completion.c + waitqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\waitqueue.c @@ -475,9 +475,9 @@ - ringbuffer.c + completion.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\completion.c @@ -523,16 +523,9 @@ - dfs_poll.c - 1 - ..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\components\dfs\src\dfs_file.c + ..\..\components\dfs\src\dfs_fs.c @@ -544,16 +537,9 @@ - dfs_fs.c - 1 - ..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\components\dfs\src\dfs_select.c + ..\..\components\dfs\src\dfs_file.c @@ -599,93 +585,93 @@ Kernel - idle.c + clock.c 1 - ..\..\src\idle.c + ..\..\src\clock.c - object.c + scheduler.c 1 - ..\..\src\object.c + ..\..\src\scheduler.c - ipc.c + components.c 1 - ..\..\src\ipc.c + ..\..\src\components.c - mempool.c + object.c 1 - ..\..\src\mempool.c + ..\..\src\object.c - thread.c + ipc.c 1 - ..\..\src\thread.c + ..\..\src\ipc.c - clock.c + irq.c 1 - ..\..\src\clock.c + ..\..\src\irq.c - timer.c + mem.c 1 - ..\..\src\timer.c + ..\..\src\mem.c - irq.c + mempool.c 1 - ..\..\src\irq.c + ..\..\src\mempool.c - kservice.c + timer.c 1 - ..\..\src\kservice.c + ..\..\src\timer.c - mem.c + device.c 1 - ..\..\src\mem.c + ..\..\src\device.c - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - components.c + kservice.c 1 - ..\..\src\components.c + ..\..\src\kservice.c - scheduler.c + idle.c 1 - ..\..\src\scheduler.c + ..\..\src\idle.c @@ -693,16 +679,9 @@ libc - libc.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\libc.c - - - - - stdio.c - 1 - ..\..\components\libc\compilers\armlibc\stdio.c + ..\..\components\libc\compilers\armlibc\libc_syms.c @@ -721,16 +700,9 @@ - delay.c - 1 - ..\..\components\libc\compilers\common\delay.c - - - - - unistd.c + stdlib.c 1 - ..\..\components\libc\compilers\common\unistd.c + ..\..\components\libc\compilers\common\stdlib.c @@ -740,21 +712,14 @@ ..\..\components\libc\compilers\common\time.c - - - stdlib.c - 1 - ..\..\components\libc\compilers\common\stdlib.c - - Vango_Lib - startup_target.S - 2 - Libraries\CMSIS\Vango\V85xx\Source\Keil5\startup_target.S + lib_uart.c + 1 + Libraries\VangoV85xx_standard_peripheral\Source\lib_uart.c @@ -773,121 +738,121 @@ - lib_misc.c + lib_LoadNVR.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_misc.c + Libraries\CMSIS\Vango\V85xx\Source\lib_LoadNVR.c - lib_adc.c + lib_iso7816.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_adc.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_iso7816.c - lib_uart.c + lib_tmr.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_uart.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_tmr.c - system_target.c + lib_adc.c 1 - Libraries\CMSIS\Vango\V85xx\Source\system_target.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_adc.c - lib_clk.c - 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_clk.c + startup_target.S + 2 + Libraries\CMSIS\Vango\V85xx\Source\Keil5\startup_target.S - lib_pwm.c + lib_i2c.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_pwm.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_i2c.c - lib_adc_tiny.c + lib_pwm.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_adc_tiny.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_pwm.c - lib_tmr.c + lib_dma.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_tmr.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_dma.c - lib_wdt.c + lib_comp.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_wdt.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_comp.c - lib_crypt.c + lib_cortex.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_crypt.c + Libraries\CMSIS\Vango\V85xx\Source\lib_cortex.c - lib_cortex.c + lib_gpio.c 1 - Libraries\CMSIS\Vango\V85xx\Source\lib_cortex.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_gpio.c - lib_ana.c + lib_misc.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_ana.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_misc.c - lib_iso7816.c + lib_version.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_iso7816.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_version.c - lib_u32k.c + lib_rtc.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_u32k.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_rtc.c - lib_flash.c + lib_spi.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_flash.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_spi.c - lib_version.c + lib_ana.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_version.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_ana.c - lib_dma.c + lib_adc_tiny.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_dma.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_adc_tiny.c @@ -899,44 +864,44 @@ - lib_LoadNVR.c + lib_u32k.c 1 - Libraries\CMSIS\Vango\V85xx\Source\lib_LoadNVR.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_u32k.c - lib_rtc.c + lib_clk.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_rtc.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_clk.c - lib_comp.c + system_target.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_comp.c + Libraries\CMSIS\Vango\V85xx\Source\system_target.c - lib_i2c.c + lib_flash.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_i2c.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_flash.c - lib_spi.c + lib_wdt.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_spi.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_wdt.c - lib_gpio.c + lib_crypt.c 1 - Libraries\VangoV85xx_standard_peripheral\Source\lib_gpio.c + Libraries\VangoV85xx_standard_peripheral\Source\lib_crypt.c diff --git a/bsp/Vango_V85xx/rtconfig.h b/bsp/Vango_V85xx/rtconfig.h index d1c6908c27d..ee2c5b12fea 100644 --- a/bsp/Vango_V85xx/rtconfig.h +++ b/bsp/Vango_V85xx/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -112,6 +112,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -197,6 +204,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/acm32f0x0-nucleo/.config b/bsp/acm32f0x0-nucleo/.config new file mode 100644 index 00000000000..841e683adae --- /dev/null +++ b/bsp/acm32f0x0-nucleo/.config @@ -0,0 +1,787 @@ +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) + +# +# RT-Thread Kernel +# +CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set +# CONFIG_RT_USING_SMP is not set +CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set +CONFIG_RT_THREAD_PRIORITY_MAX=32 +CONFIG_RT_TICK_PER_SECOND=100 +CONFIG_RT_USING_OVERFLOW_CHECK=y +CONFIG_RT_USING_HOOK=y +CONFIG_RT_USING_IDLE_HOOK=y +CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 +CONFIG_IDLE_THREAD_STACK_SIZE=256 +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + +CONFIG_RT_DEBUG=y +# CONFIG_RT_DEBUG_COLOR is not set +# CONFIG_RT_DEBUG_INIT_CONFIG is not set +# CONFIG_RT_DEBUG_THREAD_CONFIG is not set +# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set +# CONFIG_RT_DEBUG_IPC_CONFIG is not set +# CONFIG_RT_DEBUG_TIMER_CONFIG is not set +# CONFIG_RT_DEBUG_IRQ_CONFIG is not set +# CONFIG_RT_DEBUG_MEM_CONFIG is not set +# CONFIG_RT_DEBUG_SLAB_CONFIG is not set +# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set +# CONFIG_RT_DEBUG_MODULE_CONFIG is not set + +# +# Inter-Thread communication +# +CONFIG_RT_USING_SEMAPHORE=y +CONFIG_RT_USING_MUTEX=y +CONFIG_RT_USING_EVENT=y +CONFIG_RT_USING_MAILBOX=y +CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication + +# +# Memory Management +# +CONFIG_RT_USING_MEMPOOL=y +CONFIG_RT_USING_SMALL_MEM=y +# CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set +# CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set +CONFIG_RT_USING_HEAP=y +# end of Memory Management + +# +# Kernel Device Object +# +CONFIG_RT_USING_DEVICE=y +CONFIG_RT_USING_DEVICE_OPS=y +# CONFIG_RT_USING_INTERRUPT_INFO is not set +CONFIG_RT_USING_CONSOLE=y +CONFIG_RT_CONSOLEBUF_SIZE=128 +CONFIG_RT_CONSOLE_DEVICE_NAME="uart1" +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +CONFIG_ARCH_ARM=y +CONFIG_ARCH_ARM_CORTEX_M=y +CONFIG_ARCH_ARM_CORTEX_M0=y + +# +# RT-Thread Components +# +CONFIG_RT_USING_COMPONENTS_INIT=y +CONFIG_RT_USING_USER_MAIN=y +CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 +CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set + +# +# C++ features +# +# CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features + +# +# Command shell +# +CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y +CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 +CONFIG_FINSH_USING_HISTORY=y +CONFIG_FINSH_HISTORY_LINES=5 +CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y +CONFIG_FINSH_USING_DESCRIPTION=y +# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set +# CONFIG_FINSH_USING_AUTH is not set +CONFIG_FINSH_ARG_MAX=10 +# end of Command shell + +# +# Device virtual file system +# +# CONFIG_RT_USING_DFS is not set +# end of Device virtual file system + +# +# Device Drivers +# +CONFIG_RT_USING_DEVICE_IPC=y +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set +CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set +CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 +# CONFIG_RT_USING_CAN is not set +CONFIG_RT_USING_HWTIMER=y +# CONFIG_RT_USING_CPUTIME is not set +# CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set +CONFIG_RT_USING_PIN=y +CONFIG_RT_USING_ADC=y +# CONFIG_RT_USING_DAC is not set +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_MTD_NOR is not set +# CONFIG_RT_USING_MTD_NAND is not set +# CONFIG_RT_USING_PM is not set +# CONFIG_RT_USING_RTC is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set +CONFIG_RT_USING_WDT=y +# CONFIG_RT_USING_AUDIO is not set +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers + +# +# POSIX layer and C standard library +# +CONFIG_RT_USING_LIBC=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library + +# +# Network +# + +# +# Socket abstraction layer +# +# CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer + +# +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +# end of Network interface device + +# +# light weight TCP/IP stack +# +# CONFIG_RT_USING_LWIP is not set +# end of light weight TCP/IP stack + +# +# AT commands +# +# CONFIG_RT_USING_AT is not set +# end of AT commands +# end of Network + +# +# VBUS(Virtual Software BUS) +# +# CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) + +# +# Utilities +# +# CONFIG_RT_USING_RYM is not set +# CONFIG_RT_USING_ULOG is not set +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities + +# CONFIG_RT_USING_LWP is not set +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases + +# +# RT-Thread online packages +# + +# +# IoT - internet of things +# +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set +# CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set +# CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_WEBNET is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set +# CONFIG_PKG_USING_LJSON is not set +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_NANOPB is not set + +# +# Wi-Fi +# + +# +# Marvell WiFi +# +# CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi + +# +# Wiced WiFi +# +# CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + +# CONFIG_PKG_USING_COAP is not set +# CONFIG_PKG_USING_NOPOLL is not set +# CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set +# CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set +# CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set + +# +# IoT Cloud +# +# CONFIG_PKG_USING_ONENET is not set +# CONFIG_PKG_USING_GAGENT_CLOUD is not set +# CONFIG_PKG_USING_ALI_IOTKIT is not set +# CONFIG_PKG_USING_AZURE is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things + +# +# security packages +# +# CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages + +# +# language packages +# +# CONFIG_PKG_USING_LUA is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages + +# +# multimedia packages +# + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + +# CONFIG_PKG_USING_OPENMV is not set +# CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages + +# +# tools packages +# +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYFLASH is not set +# CONFIG_PKG_USING_EASYLOGGER is not set +# CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set +# CONFIG_PKG_USING_RDB is not set +# CONFIG_PKG_USING_QRCODE is not set +# CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages + +# +# system packages +# + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set +# CONFIG_PKG_USING_GUIENGINE is not set +# CONFIG_PKG_USING_CAIRO is not set +# CONFIG_PKG_USING_PIXMAN is not set +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set +# CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set +# CONFIG_PKG_USING_DFS_YAFFS is not set +# CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages + +# +# peripheral libraries and drivers +# +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set +# CONFIG_PKG_USING_REALTEK_AMEBA is not set +# CONFIG_PKG_USING_SHT2X is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set +# CONFIG_PKG_USING_STM32_SDIO is not set +# CONFIG_PKG_USING_ICM20608 is not set +# CONFIG_PKG_USING_BUTTON is not set +# CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set +# CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages + +# +# miscellaneous packages +# + +# +# samples: kernel and components samples +# +# CONFIG_PKG_USING_KERNEL_SAMPLES is not set +# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set +# CONFIG_PKG_USING_NETWORK_SAMPLES is not set +# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples + +# +# entertainment: terminal games and other interesting software packages +# +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages + +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +CONFIG_SOC_SERIES_ACM32F0=y + +# +# Hardware Drivers Config +# +CONFIG_SOC_ACM32F070RBT7=y +CONFIG_SOC_SRAM_START_ADDR=0x20000000 +CONFIG_SOC_SRAM_SIZE=0x20 +CONFIG_SOC_FLASH_START_ADDR=0x00000000 +CONFIG_SOC_FLASH_SIZE=0x80 + +# +# Onboard Peripheral Drivers +# + +# +# On-chip Peripheral Drivers +# + +# +# Hardware GPIO +# +CONFIG_BSP_USING_GPIO1=y +CONFIG_BSP_USING_GPIO2=y +# end of Hardware GPIO + +CONFIG_BSP_USING_ADC=y + +# +# Hardware UART +# +CONFIG_BSP_USING_UART1=y +CONFIG_BSP_USING_UART2=y +CONFIG_BSP_UART2_RX_USING_DMA=y +CONFIG_BSP_UART2_TX_USING_DMA=y +CONFIG_BSP_USING_UART3=y +CONFIG_BSP_UART3_RX_USING_DMA=y +CONFIG_BSP_UART3_TX_USING_DMA=y +# end of Hardware UART + +# CONFIG_BSP_USING_RTC is not set + +# +# Hardware I2C +# +# CONFIG_BSP_USING_I2C1 is not set +# CONFIG_BSP_USING_I2C2 is not set +# end of Hardware I2C + +# +# Hardware CAN +# +# CONFIG_BSP_USING_CAN1 is not set +# end of Hardware CAN + +# +# Hardware TIMER +# +CONFIG_BSP_USING_TIM1=y +CONFIG_BSP_USING_TIM3=y +CONFIG_BSP_USING_TIM6=y +CONFIG_BSP_USING_TIM14=y +CONFIG_BSP_USING_TIM15=y +CONFIG_BSP_USING_TIM16=y +CONFIG_BSP_USING_TIM17=y +# end of Hardware TIMER + +# +# Hardware WDT +# +CONFIG_BSP_USING_WDT=y +CONFIG_BSP_USING_IWDT=y +# end of Hardware WDT + +# CONFIG_BSP_USING_LCD is not set + +# +# Hardware SPI +# +# CONFIG_BSP_USING_SPI1 is not set +# CONFIG_BSP_USING_SPI2 is not set +# end of Hardware SPI + +# +# Hardware CRYPTO +# +# CONFIG_BSP_USING_CRC is not set +# CONFIG_BSP_USING_AES is not set +# CONFIG_BSP_USING_HRNG is not set +# end of Hardware CRYPTO + +# CONFIG_BSP_USING_CMP is not set +# CONFIG_BSP_USING_OPA is not set +# CONFIG_BSP_USING_TKEY is not set +# CONFIG_BSP_USING_RPMU is not set +# end of On-chip Peripheral Drivers + +# +# Board extended module Drivers +# +# end of Hardware Drivers Config diff --git a/bsp/acm32f0x0-nucleo/drivers/Kconfig b/bsp/acm32f0x0-nucleo/drivers/Kconfig index 59145af73f6..c8859436436 100644 --- a/bsp/acm32f0x0-nucleo/drivers/Kconfig +++ b/bsp/acm32f0x0-nucleo/drivers/Kconfig @@ -4,6 +4,7 @@ config SOC_ACM32F070RBT7 bool select SOC_SERIES_ACM32F0 select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN default y config SOC_SRAM_START_ADDR diff --git a/bsp/acm32f0x0-nucleo/project.ewp b/bsp/acm32f0x0-nucleo/project.ewp index 53f732889cd..4e817f72564 100644 --- a/bsp/acm32f0x0-nucleo/project.ewp +++ b/bsp/acm32f0x0-nucleo/project.ewp @@ -354,13 +354,13 @@ $PROJ_DIR$\libraries\HAL_Driver\Inc $PROJ_DIR$\..\..\include $PROJ_DIR$\applications - $PROJ_DIR$\..\..\components\libc\compilers\dlib $PROJ_DIR$\drivers $PROJ_DIR$\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. $PROJ_DIR$\libraries\Device $PROJ_DIR$\..\..\components\libc\compilers\common\nogcc - $PROJ_DIR$\..\..\examples\utest\testcases\kernel + $PROJ_DIR$\..\..\components\libc\posix\io\poll $PROJ_DIR$\libraries\CMSIS $PROJ_DIR$\..\..\libcpu\arm\cortex-m0 $PROJ_DIR$\..\..\components\drivers\include @@ -1406,13 +1406,13 @@ $PROJ_DIR$\libraries\HAL_Driver\Inc $PROJ_DIR$\..\..\include $PROJ_DIR$\applications - $PROJ_DIR$\..\..\components\libc\compilers\dlib $PROJ_DIR$\drivers $PROJ_DIR$\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. $PROJ_DIR$\libraries\Device $PROJ_DIR$\..\..\components\libc\compilers\common\nogcc - $PROJ_DIR$\..\..\examples\utest\testcases\kernel + $PROJ_DIR$\..\..\components\libc\posix\io\poll $PROJ_DIR$\libraries\CMSIS $PROJ_DIR$\..\..\libcpu\arm\cortex-m0 $PROJ_DIR$\..\..\components\drivers\include @@ -2155,10 +2155,10 @@ $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\cpuport.c + $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\context_iar.S - $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\context_iar.S + $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\cpuport.c @@ -2175,23 +2175,23 @@ $PROJ_DIR$\..\..\components\drivers\serial\serial.c - - $PROJ_DIR$\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\components\drivers\src\workqueue.c + + + $PROJ_DIR$\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\components\drivers\src\pipe.c @@ -2203,22 +2203,22 @@ Drivers - $PROJ_DIR$\drivers\drv_hwtimer.c + $PROJ_DIR$\drivers\board.c - $PROJ_DIR$\drivers\drv_wdt.c + $PROJ_DIR$\drivers\drv_uart.c $PROJ_DIR$\drivers\drv_adc.c - $PROJ_DIR$\drivers\drv_uart.c + $PROJ_DIR$\drivers\drv_gpio.c - $PROJ_DIR$\drivers\drv_gpio.c + $PROJ_DIR$\drivers\drv_wdt.c - $PROJ_DIR$\drivers\board.c + $PROJ_DIR$\drivers\drv_hwtimer.c @@ -2229,47 +2229,50 @@ $PROJ_DIR$\..\..\components\finsh\msh.c + + $PROJ_DIR$\..\..\components\finsh\cmd.c + Kernel - $PROJ_DIR$\..\..\src\mempool.c + $PROJ_DIR$\..\..\src\components.c - $PROJ_DIR$\..\..\src\object.c + $PROJ_DIR$\..\..\src\clock.c - $PROJ_DIR$\..\..\src\thread.c + $PROJ_DIR$\..\..\src\timer.c $PROJ_DIR$\..\..\src\scheduler.c - $PROJ_DIR$\..\..\src\clock.c + $PROJ_DIR$\..\..\src\mem.c - $PROJ_DIR$\..\..\src\kservice.c + $PROJ_DIR$\..\..\src\mempool.c - $PROJ_DIR$\..\..\src\components.c + $PROJ_DIR$\..\..\src\idle.c - $PROJ_DIR$\..\..\src\timer.c + $PROJ_DIR$\..\..\src\device.c - $PROJ_DIR$\..\..\src\device.c + $PROJ_DIR$\..\..\src\kservice.c - $PROJ_DIR$\..\..\src\ipc.c + $PROJ_DIR$\..\..\src\thread.c - $PROJ_DIR$\..\..\src\irq.c + $PROJ_DIR$\..\..\src\object.c - $PROJ_DIR$\..\..\src\mem.c + $PROJ_DIR$\..\..\src\ipc.c - $PROJ_DIR$\..\..\src\idle.c + $PROJ_DIR$\..\..\src\irq.c @@ -2281,10 +2284,7 @@ $PROJ_DIR$\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscalls.c - - - $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_open.c $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_lseek.c @@ -2293,27 +2293,27 @@ $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\components\libc\compilers\dlib\environ.c $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_mem.c - - $PROJ_DIR$\..\..\components\libc\compilers\dlib\stdio.c - $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\components\libc\compilers\dlib\syscall_read.c + + POSIX + utestcases diff --git a/bsp/acm32f0x0-nucleo/project.uvprojx b/bsp/acm32f0x0-nucleo/project.uvprojx index 19937dc43c5..35f50dac96a 100644 --- a/bsp/acm32f0x0-nucleo/project.uvprojx +++ b/bsp/acm32f0x0-nucleo/project.uvprojx @@ -336,7 +336,7 @@ RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - libraries\HAL_Driver\Inc;libraries\Device;libraries\CMSIS;applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + libraries\HAL_Driver\Inc;libraries\Device;libraries\CMSIS;applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -469,6 +469,13 @@ ..\..\libcpu\arm\common\showmem.c + + + div0.c + 1 + ..\..\libcpu\arm\common\div0.c + + backtrace.c @@ -478,9 +485,9 @@ - div0.c + cpuport.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\cortex-m0\cpuport.c @@ -490,13 +497,6 @@ ..\..\libcpu\arm\cortex-m0\context_rvds.S - - - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m0\cpuport.c - - DeviceDrivers @@ -530,51 +530,51 @@ - waitqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\ringblk_buf.c - pipe.c + dataqueue.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + completion.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\completion.c - workqueue.c + pipe.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\pipe.c - ringbuffer.c + waitqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\waitqueue.c - completion.c + workqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\workqueue.c @@ -596,37 +596,37 @@ - drv_uart.c + drv_hwtimer.c 1 - drivers\drv_uart.c + drivers\drv_hwtimer.c - drv_hwtimer.c + drv_wdt.c 1 - drivers\drv_hwtimer.c + drivers\drv_wdt.c - drv_adc.c + board.c 1 - drivers\drv_adc.c + drivers\board.c - drv_wdt.c + drv_adc.c 1 - drivers\drv_wdt.c + drivers\drv_adc.c - board.c + drv_uart.c 1 - drivers\board.c + drivers\drv_uart.c @@ -646,21 +646,28 @@ ..\..\components\finsh\msh.c + + + cmd.c + 1 + ..\..\components\finsh\cmd.c + + Kernel - clock.c + components.c 1 - ..\..\src\clock.c + ..\..\src\components.c - scheduler.c + object.c 1 - ..\..\src\scheduler.c + ..\..\src\object.c @@ -672,72 +679,72 @@ - ipc.c + clock.c 1 - ..\..\src\ipc.c + ..\..\src\clock.c - components.c + irq.c 1 - ..\..\src\components.c + ..\..\src\irq.c - mem.c + mempool.c 1 - ..\..\src\mem.c + ..\..\src\mempool.c - timer.c + ipc.c 1 - ..\..\src\timer.c + ..\..\src\ipc.c - irq.c + kservice.c 1 - ..\..\src\irq.c + ..\..\src\kservice.c - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - object.c + scheduler.c 1 - ..\..\src\object.c + ..\..\src\scheduler.c - thread.c + device.c 1 - ..\..\src\thread.c + ..\..\src\device.c - kservice.c + timer.c 1 - ..\..\src\kservice.c + ..\..\src\timer.c - mempool.c + mem.c 1 - ..\..\src\mempool.c + ..\..\src\mem.c @@ -752,30 +759,30 @@ - libc.c + mem_std.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\mem_std.c - mem_std.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - time.c + stdlib.c 1 - ..\..\components\libc\compilers\common\time.c + ..\..\components\libc\compilers\common\stdlib.c - stdlib.c + time.c 1 - ..\..\components\libc\compilers\common\stdlib.c + ..\..\components\libc\compilers\common\time.c diff --git a/bsp/acm32f0x0-nucleo/rtconfig.h b/bsp/acm32f0x0-nucleo/rtconfig.h index 0e4fdd245ac..fb405a49be4 100644 --- a/bsp/acm32f0x0-nucleo/rtconfig.h +++ b/bsp/acm32f0x0-nucleo/rtconfig.h @@ -1,8 +1,7 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Project Configuration */ +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ /* RT-Thread Kernel */ @@ -22,6 +21,7 @@ /* kservice optimization */ +/* end of kservice optimization */ #define RT_DEBUG /* Inter-Thread communication */ @@ -31,12 +31,15 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ /* Kernel Device Object */ @@ -45,7 +48,9 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart1" -#define RT_VER_NUM 0x40004 +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ #define ARCH_ARM #define ARCH_ARM_CORTEX_M #define ARCH_ARM_CORTEX_M0 @@ -54,33 +59,37 @@ #define RT_USING_COMPONENTS_INIT #define RT_USING_USER_MAIN -#define RT_MAIN_THREAD_STACK_SIZE 2048 +#define RT_MAIN_THREAD_STACK_SIZE 2048 +#define RT_MAIN_THREAD_PRIORITY 10 /* C++ features */ +/* end of C++ features */ /* Command shell */ #define RT_USING_FINSH +#define RT_USING_MSH +#define FINSH_USING_MSH #define FINSH_THREAD_NAME "tshell" +#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB -#define FINSH_USING_DESCRIPTION -#define FINSH_THREAD_PRIORITY 20 -#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_CMD_SIZE 80 -#define FINSH_USING_MSH -#define FINSH_USING_MSH_DEFAULT +#define MSH_USING_BUILT_IN_COMMANDS +#define FINSH_USING_DESCRIPTION #define FINSH_ARG_MAX 10 +/* end of Command shell */ /* Device virtual file system */ +/* end of Device virtual file system */ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -92,34 +101,58 @@ /* Using USB */ +/* end of Using USB */ +/* end of Device Drivers */ /* POSIX layer and C standard library */ #define RT_USING_LIBC +#define RT_LIBC_USING_TIME #define RT_LIBC_DEFAULT_TIMEZONE 8 +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ + /* Network */ /* Socket abstraction layer */ +/* end of Socket abstraction layer */ /* Network interface device */ +/* end of Network interface device */ /* light weight TCP/IP stack */ +/* end of light weight TCP/IP stack */ /* AT commands */ +/* end of AT commands */ +/* end of Network */ /* VBUS(Virtual Software BUS) */ +/* end of VBUS(Virtual Software BUS) */ /* Utilities */ +/* end of Utilities */ +/* end of RT-Thread Components */ /* RT-Thread Utestcases */ +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -130,36 +163,83 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ +/* end of language packages */ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + +/* acceleration: Assembly language or algorithmic acceleration packages */ + +/* end of acceleration: Assembly language or algorithmic acceleration packages */ + +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* Micrium: Micrium software products porting for RT-Thread */ + +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ /* peripheral libraries and drivers */ +/* end of peripheral libraries and drivers */ -/* miscellaneous packages */ +/* AI packages */ +/* end of AI packages */ + +/* miscellaneous packages */ /* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ + +/* entertainment: terminal games and other interesting software packages */ + +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ #define SOC_SERIES_ACM32F0 /* Hardware Drivers Config */ @@ -178,6 +258,7 @@ #define BSP_USING_GPIO1 #define BSP_USING_GPIO2 +/* end of Hardware GPIO */ #define BSP_USING_ADC /* Hardware UART */ @@ -189,12 +270,15 @@ #define BSP_USING_UART3 #define BSP_UART3_RX_USING_DMA #define BSP_UART3_TX_USING_DMA +/* end of Hardware UART */ /* Hardware I2C */ +/* end of Hardware I2C */ /* Hardware CAN */ +/* end of Hardware CAN */ /* Hardware TIMER */ @@ -205,19 +289,25 @@ #define BSP_USING_TIM15 #define BSP_USING_TIM16 #define BSP_USING_TIM17 +/* end of Hardware TIMER */ /* Hardware WDT */ #define BSP_USING_WDT #define BSP_USING_IWDT +/* end of Hardware WDT */ /* Hardware SPI */ +/* end of Hardware SPI */ /* Hardware CRYPTO */ +/* end of Hardware CRYPTO */ +/* end of On-chip Peripheral Drivers */ /* Board extended module Drivers */ +/* end of Hardware Drivers Config */ #endif diff --git a/bsp/acm32f4xx-nucleo/.config b/bsp/acm32f4xx-nucleo/.config new file mode 100644 index 00000000000..cfd03cbe174 --- /dev/null +++ b/bsp/acm32f4xx-nucleo/.config @@ -0,0 +1,810 @@ +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) + +# +# RT-Thread Kernel +# +CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set +# CONFIG_RT_USING_SMP is not set +CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set +CONFIG_RT_THREAD_PRIORITY_MAX=32 +CONFIG_RT_TICK_PER_SECOND=100 +CONFIG_RT_USING_OVERFLOW_CHECK=y +CONFIG_RT_USING_HOOK=y +CONFIG_RT_USING_IDLE_HOOK=y +CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 +CONFIG_IDLE_THREAD_STACK_SIZE=256 +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + +CONFIG_RT_DEBUG=y +# CONFIG_RT_DEBUG_COLOR is not set +# CONFIG_RT_DEBUG_INIT_CONFIG is not set +# CONFIG_RT_DEBUG_THREAD_CONFIG is not set +# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set +# CONFIG_RT_DEBUG_IPC_CONFIG is not set +# CONFIG_RT_DEBUG_TIMER_CONFIG is not set +# CONFIG_RT_DEBUG_IRQ_CONFIG is not set +# CONFIG_RT_DEBUG_MEM_CONFIG is not set +# CONFIG_RT_DEBUG_SLAB_CONFIG is not set +# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set +# CONFIG_RT_DEBUG_MODULE_CONFIG is not set + +# +# Inter-Thread communication +# +CONFIG_RT_USING_SEMAPHORE=y +CONFIG_RT_USING_MUTEX=y +CONFIG_RT_USING_EVENT=y +CONFIG_RT_USING_MAILBOX=y +CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication + +# +# Memory Management +# +CONFIG_RT_USING_MEMPOOL=y +CONFIG_RT_USING_SMALL_MEM=y +# CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set +# CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set +CONFIG_RT_USING_HEAP=y +# end of Memory Management + +# +# Kernel Device Object +# +CONFIG_RT_USING_DEVICE=y +CONFIG_RT_USING_DEVICE_OPS=y +# CONFIG_RT_USING_INTERRUPT_INFO is not set +CONFIG_RT_USING_CONSOLE=y +CONFIG_RT_CONSOLEBUF_SIZE=128 +CONFIG_RT_CONSOLE_DEVICE_NAME="uart1" +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +# +# RT-Thread Components +# +CONFIG_RT_USING_COMPONENTS_INIT=y +CONFIG_RT_USING_USER_MAIN=y +CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 +CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set + +# +# C++ features +# +# CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features + +# +# Command shell +# +CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y +CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 +CONFIG_FINSH_USING_HISTORY=y +CONFIG_FINSH_HISTORY_LINES=5 +CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y +CONFIG_FINSH_USING_DESCRIPTION=y +# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set +# CONFIG_FINSH_USING_AUTH is not set +CONFIG_FINSH_ARG_MAX=10 +# end of Command shell + +# +# Device virtual file system +# +# CONFIG_RT_USING_DFS is not set +# end of Device virtual file system + +# +# Device Drivers +# +CONFIG_RT_USING_DEVICE_IPC=y +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set +CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set +CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 +# CONFIG_RT_USING_CAN is not set +# CONFIG_RT_USING_HWTIMER is not set +# CONFIG_RT_USING_CPUTIME is not set +# CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set +CONFIG_RT_USING_PIN=y +# CONFIG_RT_USING_ADC is not set +# CONFIG_RT_USING_DAC is not set +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_MTD_NOR is not set +# CONFIG_RT_USING_MTD_NAND is not set +# CONFIG_RT_USING_PM is not set +# CONFIG_RT_USING_RTC is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set +# CONFIG_RT_USING_WDT is not set +# CONFIG_RT_USING_AUDIO is not set +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers + +# +# POSIX layer and C standard library +# +CONFIG_RT_USING_LIBC=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library + +# +# Network +# + +# +# Socket abstraction layer +# +# CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer + +# +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +# end of Network interface device + +# +# light weight TCP/IP stack +# +# CONFIG_RT_USING_LWIP is not set +# end of light weight TCP/IP stack + +# +# AT commands +# +# CONFIG_RT_USING_AT is not set +# end of AT commands +# end of Network + +# +# VBUS(Virtual Software BUS) +# +# CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) + +# +# Utilities +# +# CONFIG_RT_USING_RYM is not set +# CONFIG_RT_USING_ULOG is not set +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases + +# +# RT-Thread online packages +# + +# +# IoT - internet of things +# +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set +# CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set +# CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_WEBNET is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set +# CONFIG_PKG_USING_LJSON is not set +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_NANOPB is not set + +# +# Wi-Fi +# + +# +# Marvell WiFi +# +# CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi + +# +# Wiced WiFi +# +# CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + +# CONFIG_PKG_USING_COAP is not set +# CONFIG_PKG_USING_NOPOLL is not set +# CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set +# CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set +# CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set + +# +# IoT Cloud +# +# CONFIG_PKG_USING_ONENET is not set +# CONFIG_PKG_USING_GAGENT_CLOUD is not set +# CONFIG_PKG_USING_ALI_IOTKIT is not set +# CONFIG_PKG_USING_AZURE is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things + +# +# security packages +# +# CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages + +# +# language packages +# +# CONFIG_PKG_USING_LUA is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages + +# +# multimedia packages +# + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + +# CONFIG_PKG_USING_OPENMV is not set +# CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages + +# +# tools packages +# +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYFLASH is not set +# CONFIG_PKG_USING_EASYLOGGER is not set +# CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set +# CONFIG_PKG_USING_RDB is not set +# CONFIG_PKG_USING_QRCODE is not set +# CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages + +# +# system packages +# + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set +# CONFIG_PKG_USING_GUIENGINE is not set +# CONFIG_PKG_USING_CAIRO is not set +# CONFIG_PKG_USING_PIXMAN is not set +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set +# CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set +# CONFIG_PKG_USING_DFS_YAFFS is not set +# CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages + +# +# peripheral libraries and drivers +# +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set +# CONFIG_PKG_USING_REALTEK_AMEBA is not set +# CONFIG_PKG_USING_SHT2X is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set +# CONFIG_PKG_USING_STM32_SDIO is not set +# CONFIG_PKG_USING_ICM20608 is not set +# CONFIG_PKG_USING_BUTTON is not set +# CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set +# CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages + +# +# miscellaneous packages +# + +# +# samples: kernel and components samples +# +# CONFIG_PKG_USING_KERNEL_SAMPLES is not set +# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set +# CONFIG_PKG_USING_NETWORK_SAMPLES is not set +# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples + +# +# entertainment: terminal games and other interesting software packages +# +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages + +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +# +# Hardware Drivers Config +# +# CONFIG_SOC_ACM32F403KCU7 is not set +# CONFIG_SOC_ACM32F403KEU7 is not set +# CONFIG_SOC_ACM32F403CCT7 is not set +# CONFIG_SOC_ACM32F403CET7 is not set +# CONFIG_SOC_ACM32F403RCT7 is not set +CONFIG_SOC_ACM32F403RET7=y +# CONFIG_SOC_ACM32F403VCT7 is not set +# CONFIG_SOC_ACM32F403VET7 is not set + +# +# ACM32F403RET7 +# +CONFIG_SOC_SRAM_START_ADDR=0x20000000 +CONFIG_SOC_SRAM_SIZE=0xC0 +CONFIG_SOC_FLASH_START_ADDR=0x00000000 +CONFIG_SOC_FLASH_SIZE=0x8000 +# end of ACM32F403RET7 + +# +# Onboard Peripheral Drivers +# + +# +# On-chip Peripheral Drivers +# + +# +# Hardware GPIO +# +CONFIG_BSP_USING_GPIO1=y +CONFIG_BSP_USING_GPIO2=y +CONFIG_BSP_USING_GPIO3=y +# end of Hardware GPIO + +# CONFIG_BSP_USING_ADC is not set +# CONFIG_BSP_USING_DAC is not set + +# +# Hardware UART +# +CONFIG_BSP_USING_UART1=y +CONFIG_BSP_USING_UART2=y +CONFIG_BSP_UART2_RX_USING_DMA=y +CONFIG_BSP_UART2_TX_USING_DMA=y +CONFIG_BSP_USING_UART3=y +CONFIG_BSP_UART3_RX_USING_DMA=y +CONFIG_BSP_UART3_TX_USING_DMA=y +CONFIG_BSP_USING_UART4=y +CONFIG_BSP_UART4_RX_USING_DMA=y +CONFIG_BSP_UART4_TX_USING_DMA=y +# end of Hardware UART + +# CONFIG_BSP_USING_RTC is not set +# CONFIG_BSP_USING_LPUART is not set + +# +# Hardware I2C +# +# CONFIG_BSP_USING_I2C1 is not set +# CONFIG_BSP_USING_I2C2 is not set +# end of Hardware I2C + +# +# Hardware I2S +# +# CONFIG_BSP_USING_I2S1 is not set +# end of Hardware I2S + +# +# Hardware CAN +# +# CONFIG_BSP_USING_CAN1 is not set +# CONFIG_BSP_USING_CAN2 is not set +# end of Hardware CAN + +# +# Hardware TIMER +# +# CONFIG_BSP_USING_TIM1 is not set +# CONFIG_BSP_USING_TIM2 is not set +# CONFIG_BSP_USING_TIM3 is not set +# CONFIG_BSP_USING_TIM4 is not set +# CONFIG_BSP_USING_TIM6 is not set +# CONFIG_BSP_USING_TIM7 is not set +# CONFIG_BSP_USING_TIM14 is not set +# CONFIG_BSP_USING_TIM15 is not set +# CONFIG_BSP_USING_TIM16 is not set +# CONFIG_BSP_USING_TIM17 is not set +# end of Hardware TIMER + +# +# Hardware WDT +# +# CONFIG_BSP_USING_WDT is not set +# CONFIG_BSP_USING_IWDT is not set +# end of Hardware WDT + +# CONFIG_BSP_USING_LCD is not set + +# +# Hardware SPI +# +# CONFIG_BSP_USING_SPI1 is not set +# CONFIG_BSP_USING_SPI2 is not set +# CONFIG_BSP_USING_SPI3 is not set +# CONFIG_BSP_USING_SPI4 is not set +# end of Hardware SPI + +# +# Hardware CRYPTO +# +# CONFIG_BSP_USING_CRC is not set +# CONFIG_BSP_USING_AES is not set +# CONFIG_BSP_USING_HRNG is not set +# end of Hardware CRYPTO + +# CONFIG_BSP_USING_CMP is not set +# CONFIG_BSP_USING_OPA is not set +# CONFIG_BSP_USING_TKEY is not set +# CONFIG_BSP_USING_RPMU is not set +# CONFIG_BSP_USING_USBD is not set +# end of On-chip Peripheral Drivers + +# +# Board extended module Drivers +# +# end of Hardware Drivers Config diff --git a/bsp/acm32f4xx-nucleo/project.uvprojx b/bsp/acm32f4xx-nucleo/project.uvprojx index 1f3d437cdc7..b98a5e43f6b 100644 --- a/bsp/acm32f4xx-nucleo/project.uvprojx +++ b/bsp/acm32f4xx-nucleo/project.uvprojx @@ -336,7 +336,7 @@ RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - libraries\HAL_Driver\Inc;libraries\Device;libraries\CMSIS;applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m33;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + libraries\HAL_Driver\Inc;libraries\Device;libraries\CMSIS;applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m33;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -443,16 +443,16 @@ CPU - div0.c + showmem.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\libcpu\arm\common\div0.c @@ -464,30 +464,30 @@ - trustzone.c - 1 - ..\..\libcpu\arm\cortex-m33\trustzone.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m33\context_rvds.S - syscall_rvds.S - 2 - ..\..\libcpu\arm\cortex-m33\syscall_rvds.S + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m33\cpuport.c - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m33\context_rvds.S + trustzone.c + 1 + ..\..\libcpu\arm\cortex-m33\trustzone.c - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m33\cpuport.c + syscall_rvds.S + 2 + ..\..\libcpu\arm\cortex-m33\syscall_rvds.S @@ -509,23 +509,23 @@ - dataqueue.c + waitqueue.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\waitqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + dataqueue.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\dataqueue.c @@ -537,23 +537,23 @@ - ringbuffer.c + completion.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\completion.c - ringblk_buf.c + workqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\workqueue.c - completion.c + ringbuffer.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\ringbuffer.c @@ -561,23 +561,23 @@ Drivers - drv_gpio.c + board.c 1 - drivers\drv_gpio.c + drivers\board.c - drv_uart.c + drv_gpio.c 1 - drivers\drv_uart.c + drivers\drv_gpio.c - board.c + drv_uart.c 1 - drivers\board.c + drivers\drv_uart.c @@ -609,65 +609,65 @@ Kernel - irq.c + mem.c 1 - ..\..\src\irq.c + ..\..\src\mem.c - components.c + idle.c 1 - ..\..\src\components.c + ..\..\src\idle.c - kservice.c + timer.c 1 - ..\..\src\kservice.c + ..\..\src\timer.c - mem.c + irq.c 1 - ..\..\src\mem.c + ..\..\src\irq.c - ipc.c + components.c 1 - ..\..\src\ipc.c + ..\..\src\components.c - timer.c + object.c 1 - ..\..\src\timer.c + ..\..\src\object.c - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - scheduler.c + ipc.c 1 - ..\..\src\scheduler.c + ..\..\src\ipc.c - object.c + clock.c 1 - ..\..\src\object.c + ..\..\src\clock.c @@ -679,23 +679,23 @@ - clock.c + device.c 1 - ..\..\src\clock.c + ..\..\src\device.c - idle.c + kservice.c 1 - ..\..\src\idle.c + ..\..\src\kservice.c - thread.c + scheduler.c 1 - ..\..\src\thread.c + ..\..\src\scheduler.c @@ -703,16 +703,16 @@ libc - syscalls.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - libc.c + syscalls.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\syscalls.c @@ -724,16 +724,16 @@ - stdlib.c + time.c 1 - ..\..\components\libc\compilers\common\stdlib.c + ..\..\components\libc\compilers\common\time.c - time.c + stdlib.c 1 - ..\..\components\libc\compilers\common\time.c + ..\..\components\libc\compilers\common\stdlib.c diff --git a/bsp/acm32f4xx-nucleo/rtconfig.h b/bsp/acm32f4xx-nucleo/rtconfig.h index 210adaa7144..22061493a66 100644 --- a/bsp/acm32f4xx-nucleo/rtconfig.h +++ b/bsp/acm32f4xx-nucleo/rtconfig.h @@ -1,8 +1,7 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Project Configuration */ +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ /* RT-Thread Kernel */ @@ -22,6 +21,7 @@ /* kservice optimization */ +/* end of kservice optimization */ #define RT_DEBUG /* Inter-Thread communication */ @@ -31,12 +31,15 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ /* Kernel Device Object */ @@ -45,7 +48,9 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart1" -#define RT_VER_NUM 0x40004 +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ /* RT-Thread Components */ @@ -56,6 +61,7 @@ /* C++ features */ +/* end of C++ features */ /* Command shell */ @@ -72,14 +78,15 @@ #define MSH_USING_BUILT_IN_COMMANDS #define FINSH_USING_DESCRIPTION #define FINSH_ARG_MAX 10 +/* end of Command shell */ /* Device virtual file system */ +/* end of Device virtual file system */ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -88,34 +95,58 @@ /* Using USB */ +/* end of Using USB */ +/* end of Device Drivers */ /* POSIX layer and C standard library */ #define RT_USING_LIBC +#define RT_LIBC_USING_TIME #define RT_LIBC_DEFAULT_TIMEZONE 8 +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ + /* Network */ /* Socket abstraction layer */ +/* end of Socket abstraction layer */ /* Network interface device */ +/* end of Network interface device */ /* light weight TCP/IP stack */ +/* end of light weight TCP/IP stack */ /* AT commands */ +/* end of AT commands */ +/* end of Network */ /* VBUS(Virtual Software BUS) */ +/* end of VBUS(Virtual Software BUS) */ /* Utilities */ +/* end of Utilities */ +/* end of RT-Thread Components */ /* RT-Thread Utestcases */ +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -126,36 +157,83 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ +/* end of language packages */ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + +/* acceleration: Assembly language or algorithmic acceleration packages */ + +/* end of acceleration: Assembly language or algorithmic acceleration packages */ + +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* Micrium: Micrium software products porting for RT-Thread */ + +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ /* peripheral libraries and drivers */ +/* end of peripheral libraries and drivers */ -/* miscellaneous packages */ +/* AI packages */ +/* end of AI packages */ + +/* miscellaneous packages */ /* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ + +/* entertainment: terminal games and other interesting software packages */ + +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ /* Hardware Drivers Config */ @@ -167,6 +245,7 @@ #define SOC_SRAM_SIZE 0xC0 #define SOC_FLASH_START_ADDR 0x00000000 #define SOC_FLASH_SIZE 0x8000 +/* end of ACM32F403RET7 */ /* Onboard Peripheral Drivers */ @@ -177,6 +256,7 @@ #define BSP_USING_GPIO1 #define BSP_USING_GPIO2 #define BSP_USING_GPIO3 +/* end of Hardware GPIO */ /* Hardware UART */ @@ -190,26 +270,39 @@ #define BSP_USING_UART4 #define BSP_UART4_RX_USING_DMA #define BSP_UART4_TX_USING_DMA +/* end of Hardware UART */ /* Hardware I2C */ +/* end of Hardware I2C */ + +/* Hardware I2S */ + +/* end of Hardware I2S */ /* Hardware CAN */ +/* end of Hardware CAN */ /* Hardware TIMER */ +/* end of Hardware TIMER */ /* Hardware WDT */ +/* end of Hardware WDT */ /* Hardware SPI */ +/* end of Hardware SPI */ /* Hardware CRYPTO */ +/* end of Hardware CRYPTO */ +/* end of On-chip Peripheral Drivers */ /* Board extended module Drivers */ +/* end of Hardware Drivers Config */ #endif diff --git a/bsp/allwinner_tina/.config b/bsp/allwinner_tina/.config index 4fe3ff40133..464e42de66f 100644 --- a/bsp/allwinner_tina/.config +++ b/bsp/allwinner_tina/.config @@ -17,7 +17,9 @@ CONFIG_RT_USING_HOOK=y CONFIG_RT_USING_IDLE_HOOK=y CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 CONFIG_IDLE_THREAD_STACK_SIZE=256 -# CONFIG_RT_USING_TIMER_SOFT is not set +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 # # kservice optimization @@ -56,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -161,7 +167,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -231,10 +236,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -399,7 +411,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -421,10 +433,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -439,13 +458,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -503,9 +515,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -515,7 +534,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -530,6 +548,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -555,8 +574,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -564,6 +581,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/allwinner_tina/rtconfig.h b/bsp/allwinner_tina/rtconfig.h index dab281bd6e2..189c3da00f0 100644 --- a/bsp/allwinner_tina/rtconfig.h +++ b/bsp/allwinner_tina/rtconfig.h @@ -15,6 +15,9 @@ #define RT_USING_IDLE_HOOK #define RT_IDLE_HOOK_LIST_SIZE 4 #define IDLE_THREAD_STACK_SIZE 256 +#define RT_USING_TIMER_SOFT +#define RT_TIMER_THREAD_PRIO 4 +#define RT_TIMER_THREAD_STACK_SIZE 512 /* kservice optimization */ @@ -35,6 +38,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -108,7 +112,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -139,6 +142,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -224,6 +234,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/amebaz/.config b/bsp/amebaz/.config index 6b494216457..5ce7eecf1c7 100644 --- a/bsp/amebaz/.config +++ b/bsp/amebaz/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +130,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -212,10 +215,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -440,7 +450,7 @@ CONFIG_DHCPD_USING_ROUTER=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -462,10 +472,17 @@ CONFIG_DHCPD_USING_ROUTER=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -480,13 +497,6 @@ CONFIG_DHCPD_USING_ROUTER=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -544,9 +554,16 @@ CONFIG_DHCPD_USING_ROUTER=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -556,7 +573,6 @@ CONFIG_DHCPD_USING_ROUTER=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -571,6 +587,7 @@ CONFIG_DHCPD_USING_ROUTER=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -595,8 +612,6 @@ CONFIG_DHCPD_USING_ROUTER=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -604,6 +619,7 @@ CONFIG_DHCPD_USING_ROUTER=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/amebaz/project.ewp b/bsp/amebaz/project.ewp index 51de51acc6d..36d2d164ce8 100644 --- a/bsp/amebaz/project.ewp +++ b/bsp/amebaz/project.ewp @@ -305,15 +305,14 @@ - - - - + + + - diff --git a/bsp/essemi/es32f365x/rtconfig.h b/bsp/essemi/es32f365x/rtconfig.h index 70babf63aa5..131ba821ec8 100644 --- a/bsp/essemi/es32f365x/rtconfig.h +++ b/bsp/essemi/es32f365x/rtconfig.h @@ -36,6 +36,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -84,7 +85,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -102,6 +102,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -187,6 +194,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/essemi/es32f369x/.config b/bsp/essemi/es32f369x/.config index c4ceb54b3cb..ea8df1777dc 100644 --- a/bsp/essemi/es32f369x/.config +++ b/bsp/essemi/es32f369x/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_SIGNALS=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -124,7 +128,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -176,10 +179,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -342,7 +352,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -364,10 +374,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -382,13 +399,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -446,9 +456,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -458,7 +475,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -473,6 +489,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -497,8 +514,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -506,6 +521,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/essemi/es32f369x/project.ewp b/bsp/essemi/es32f369x/project.ewp index c71317ef55e..25da71bcdf6 100644 --- a/bsp/essemi/es32f369x/project.ewp +++ b/bsp/essemi/es32f369x/project.ewp @@ -349,6 +349,7 @@ $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\libraries\CMSIS\Device\EastSoft\ES32F36xx\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\drivers $PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc @@ -1376,6 +1377,7 @@ $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\libraries\CMSIS\Device\EastSoft\ES32F36xx\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\drivers $PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc @@ -2066,13 +2068,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S @@ -2090,22 +2092,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c @@ -2138,46 +2140,46 @@ Kernel - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\signal.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2189,111 +2191,114 @@ Libraries - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_spi.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_tsense.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_qspi.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_timer.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_wdt.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_cmu.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_usb.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_sram.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_ebi.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_wdt.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rmu.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2c.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dac.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_iap.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2c.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crc.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dma.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rmu.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_acmp.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dma.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_bkpc.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_uart.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nand.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_calc.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_usb.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2s.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_calc.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_sram.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtchw.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_timer.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_uart.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_cmu.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_ebi.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtc.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nor_lcd.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dac.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_gpio.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtchw.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_iap.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_acmp.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_qspi.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\utils.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pmu.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_bkpc.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crc.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_trng.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\utils.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash_ext.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_can.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pmu.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_spi.c $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crypt.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nor_lcd.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pis.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_tsense.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtc.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_adc.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash_ext.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pis.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_adc.c - $PROJ_DIR$\libraries\CMSIS\Device\EastSoft\ES32F36xx\Startup\iar\startup_es32f36xx.s + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2s.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_gpio.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash.c - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_can.c + $PROJ_DIR$\libraries\CMSIS\Device\EastSoft\ES32F36xx\Startup\iar\startup_es32f36xx.s - $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nand.c + $PROJ_DIR$\libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_trng.c + + POSIX + utestcases diff --git a/bsp/essemi/es32f369x/project.uvprojx b/bsp/essemi/es32f369x/project.uvprojx index a5affac85c1..5a8d2884869 100644 --- a/bsp/essemi/es32f369x/project.uvprojx +++ b/bsp/essemi/es32f369x/project.uvprojx @@ -335,7 +335,7 @@ ES32F36xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;drivers\ES;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;libraries\CMSIS\Device\EastSoft\ES32F36xx\Include;libraries\CMSIS\Include;libraries\ES32F36xx_ALD_StdPeriph_Driver\Include;..\..\..\examples\utest\testcases\kernel + applications;.;drivers\ES;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;libraries\CMSIS\Device\EastSoft\ES32F36xx\Include;libraries\CMSIS\Include;libraries\ES32F36xx_ALD_StdPeriph_Driver\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,6 +388,13 @@ CPU + + + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c + + div0.c @@ -404,9 +411,9 @@ - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S @@ -416,13 +423,6 @@ ..\..\..\libcpu\arm\cortex-m3\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - DeviceDrivers @@ -442,51 +442,51 @@ - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -542,23 +542,23 @@ Kernel - scheduler.c + irq.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\irq.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - components.c + ipc.c 1 - ..\..\..\src\components.c + ..\..\..\src\ipc.c @@ -570,72 +570,72 @@ - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c - object.c + mempool.c 1 - ..\..\..\src\object.c + ..\..\..\src\mempool.c - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c - signal.c + mem.c 1 - ..\..\..\src\signal.c + ..\..\..\src\mem.c - device.c + signal.c 1 - ..\..\..\src\device.c + ..\..\..\src\signal.c - clock.c + components.c 1 - ..\..\..\src\clock.c + ..\..\..\src\components.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c @@ -653,247 +653,247 @@ Libraries - ald_sram.c + ald_calc.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_sram.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_calc.c - ald_crc.c + ald_sram.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crc.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_sram.c - ald_pmu.c + ald_bkpc.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pmu.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_bkpc.c - ald_pis.c + ald_spi.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pis.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_spi.c - ald_can.c + ald_acmp.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_can.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_acmp.c - ald_qspi.c + ald_adc.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_qspi.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_adc.c - ald_calc.c + ald_flash_ext.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_calc.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash_ext.c - ald_rmu.c + ald_flash.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rmu.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash.c - ald_trng.c + ald_tsense.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_trng.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_tsense.c - ald_crypt.c + ald_nand.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crypt.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nand.c - ald_wdt.c + ald_timer.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_wdt.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_timer.c - ald_flash_ext.c + ald_dac.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash_ext.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dac.c - ald_iap.c + ald_usb.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_iap.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_usb.c - ald_uart.c + ald_crc.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_uart.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crc.c - ald_bkpc.c + ald_i2s.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_bkpc.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2s.c - ald_rtchw.c + ald_rtc.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtchw.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtc.c - ald_ebi.c + ald_crypt.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_ebi.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_crypt.c - ald_spi.c + ald_iap.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_spi.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_iap.c - ald_timer.c + utils.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_timer.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\utils.c - ald_cmu.c + ald_qspi.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_cmu.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_qspi.c - ald_rtc.c + ald_uart.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtc.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_uart.c - ald_nor_lcd.c - 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nor_lcd.c + startup_es32f36xx.s + 2 + libraries\CMSIS\Device\EastSoft\ES32F36xx\Startup\keil\startup_es32f36xx.s - ald_acmp.c + ald_ebi.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_acmp.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_ebi.c - ald_nand.c + ald_pis.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nand.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pis.c - utils.c + ald_gpio.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\utils.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_gpio.c - ald_gpio.c + ald_rtchw.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_gpio.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rtchw.c - ald_tsense.c + ald_trng.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_tsense.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_trng.c - ald_flash.c + ald_can.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_flash.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_can.c - startup_es32f36xx.s - 2 - libraries\CMSIS\Device\EastSoft\ES32F36xx\Startup\keil\startup_es32f36xx.s + ald_rmu.c + 1 + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_rmu.c - ald_dma.c + ald_cmu.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dma.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_cmu.c - ald_i2c.c + ald_pmu.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2c.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_pmu.c - ald_adc.c + ald_wdt.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_adc.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_wdt.c - ald_dac.c + ald_dma.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dac.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_dma.c - ald_usb.c + ald_nor_lcd.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_usb.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_nor_lcd.c - ald_i2s.c + ald_i2c.c 1 - libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2s.c + libraries\ES32F36xx_ALD_StdPeriph_Driver\Source\ald_i2c.c diff --git a/bsp/essemi/es32f369x/rtconfig.h b/bsp/essemi/es32f369x/rtconfig.h index 70babf63aa5..131ba821ec8 100644 --- a/bsp/essemi/es32f369x/rtconfig.h +++ b/bsp/essemi/es32f369x/rtconfig.h @@ -36,6 +36,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -84,7 +85,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -102,6 +102,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -187,6 +194,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/fm33lc026/.config b/bsp/fm33lc026/.config index 1e3a3ff4cce..61082d68480 100644 --- a/bsp/fm33lc026/.config +++ b/bsp/fm33lc026/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -179,10 +182,17 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -347,7 +357,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -369,10 +379,17 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -387,13 +404,6 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -451,9 +461,16 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -463,7 +480,6 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -478,6 +494,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -502,8 +519,6 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -511,6 +526,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/fm33lc026/project.uvprojx b/bsp/fm33lc026/project.uvprojx index 4641db699e3..b9ee0e85a76 100644 --- a/bsp/fm33lc026/project.uvprojx +++ b/bsp/fm33lc026/project.uvprojx @@ -333,7 +333,7 @@ USE_HAL_DRIVER, FM33LC0XX, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;board;libraries\HAL_Drivers;libraries\HAL_Drivers\config;..\..\components\finsh;libraries\FM33LC0xx_FL_Driver\CMSIS\Include;libraries\FM33LC0xx_FL_Driver\Inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + applications;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;board;libraries\HAL_Drivers;libraries\HAL_Drivers\config;..\..\components\finsh;libraries\FM33LC0xx_FL_Driver\CMSIS\Include;libraries\FM33LC0xx_FL_Driver\Inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -386,6 +386,13 @@ CPU + + + showmem.c + 1 + ..\..\libcpu\arm\common\showmem.c + + backtrace.c @@ -402,9 +409,9 @@ - showmem.c - 1 - ..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m0\context_rvds.S @@ -414,13 +421,6 @@ ..\..\libcpu\arm\cortex-m0\cpuport.c - - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m0\context_rvds.S - - DeviceDrivers @@ -433,44 +433,44 @@ - workqueue.c + completion.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\completion.c - completion.c + ringbuffer.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\ringbuffer.c - pipe.c + dataqueue.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + workqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\workqueue.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + pipe.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\pipe.c @@ -485,16 +485,16 @@ Drivers - startup_fm33lc0xx.s - 2 - libraries\FM\FM33xx\Source\Templates\ARM\startup_fm33lc0xx.s + board.c + 1 + board\board.c - board.c - 1 - board\board.c + startup_fm33lc0xx.s + 2 + libraries\FM\FM33xx\Source\Templates\ARM\startup_fm33lc0xx.s @@ -592,93 +592,93 @@ Kernel - timer.c + clock.c 1 - ..\..\src\timer.c + ..\..\src\clock.c - kservice.c + ipc.c 1 - ..\..\src\kservice.c + ..\..\src\ipc.c - thread.c + idle.c 1 - ..\..\src\thread.c + ..\..\src\idle.c - ipc.c + scheduler.c 1 - ..\..\src\ipc.c + ..\..\src\scheduler.c - mem.c + mempool.c 1 - ..\..\src\mem.c + ..\..\src\mempool.c - components.c + object.c 1 - ..\..\src\components.c + ..\..\src\object.c - object.c + timer.c 1 - ..\..\src\object.c + ..\..\src\timer.c - mempool.c + kservice.c 1 - ..\..\src\mempool.c + ..\..\src\kservice.c - irq.c + components.c 1 - ..\..\src\irq.c + ..\..\src\components.c - scheduler.c + mem.c 1 - ..\..\src\scheduler.c + ..\..\src\mem.c - device.c + irq.c 1 - ..\..\src\device.c + ..\..\src\irq.c - clock.c + device.c 1 - ..\..\src\clock.c + ..\..\src\device.c - idle.c + thread.c 1 - ..\..\src\idle.c + ..\..\src\thread.c diff --git a/bsp/fm33lc026/rtconfig.h b/bsp/fm33lc026/rtconfig.h index 50bef3b0c28..f7d30f3b3ee 100644 --- a/bsp/fm33lc026/rtconfig.h +++ b/bsp/fm33lc026/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -101,6 +101,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -186,6 +193,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/frdm-k64f/.config b/bsp/frdm-k64f/.config new file mode 100644 index 00000000000..0f0a940686f --- /dev/null +++ b/bsp/frdm-k64f/.config @@ -0,0 +1,745 @@ +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) + +# +# RT-Thread Kernel +# +CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set +# CONFIG_RT_USING_SMP is not set +CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set +CONFIG_RT_THREAD_PRIORITY_MAX=32 +CONFIG_RT_TICK_PER_SECOND=100 +CONFIG_RT_USING_OVERFLOW_CHECK=y +CONFIG_RT_USING_HOOK=y +CONFIG_RT_USING_IDLE_HOOK=y +CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 +CONFIG_IDLE_THREAD_STACK_SIZE=1024 +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + +CONFIG_RT_DEBUG=y +# CONFIG_RT_DEBUG_COLOR is not set +# CONFIG_RT_DEBUG_INIT_CONFIG is not set +# CONFIG_RT_DEBUG_THREAD_CONFIG is not set +# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set +# CONFIG_RT_DEBUG_IPC_CONFIG is not set +# CONFIG_RT_DEBUG_TIMER_CONFIG is not set +# CONFIG_RT_DEBUG_IRQ_CONFIG is not set +# CONFIG_RT_DEBUG_MEM_CONFIG is not set +# CONFIG_RT_DEBUG_SLAB_CONFIG is not set +# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set +# CONFIG_RT_DEBUG_MODULE_CONFIG is not set + +# +# Inter-Thread communication +# +CONFIG_RT_USING_SEMAPHORE=y +CONFIG_RT_USING_MUTEX=y +CONFIG_RT_USING_EVENT=y +CONFIG_RT_USING_MAILBOX=y +CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication + +# +# Memory Management +# +CONFIG_RT_USING_MEMPOOL=y +CONFIG_RT_USING_SMALL_MEM=y +# CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set +# CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set +CONFIG_RT_USING_HEAP=y +# end of Memory Management + +# +# Kernel Device Object +# +CONFIG_RT_USING_DEVICE=y +# CONFIG_RT_USING_DEVICE_OPS is not set +# CONFIG_RT_USING_INTERRUPT_INFO is not set +CONFIG_RT_USING_CONSOLE=y +CONFIG_RT_CONSOLEBUF_SIZE=128 +CONFIG_RT_CONSOLE_DEVICE_NAME="uart" +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +CONFIG_ARCH_ARM=y +CONFIG_RT_USING_CPU_FFS=y +CONFIG_ARCH_ARM_CORTEX_M=y +CONFIG_ARCH_ARM_CORTEX_M4=y + +# +# RT-Thread Components +# +CONFIG_RT_USING_COMPONENTS_INIT=y +# CONFIG_RT_USING_LEGACY is not set + +# +# C++ features +# +# CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features + +# +# Command shell +# +CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y +CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 +CONFIG_FINSH_USING_HISTORY=y +CONFIG_FINSH_HISTORY_LINES=5 +CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y +CONFIG_FINSH_USING_DESCRIPTION=y +# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set +# CONFIG_FINSH_USING_AUTH is not set +CONFIG_FINSH_ARG_MAX=10 +# end of Command shell + +# +# Device virtual file system +# +# CONFIG_RT_USING_DFS is not set +# end of Device virtual file system + +# +# Device Drivers +# +CONFIG_RT_USING_DEVICE_IPC=y +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set +CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set +CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 +# CONFIG_RT_USING_CAN is not set +# CONFIG_RT_USING_HWTIMER is not set +# CONFIG_RT_USING_CPUTIME is not set +# CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set +CONFIG_RT_USING_PIN=y +# CONFIG_RT_USING_ADC is not set +# CONFIG_RT_USING_DAC is not set +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_MTD_NOR is not set +# CONFIG_RT_USING_MTD_NAND is not set +# CONFIG_RT_USING_PM is not set +# CONFIG_RT_USING_RTC is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set +# CONFIG_RT_USING_WDT is not set +# CONFIG_RT_USING_AUDIO is not set +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers + +# +# POSIX layer and C standard library +# +CONFIG_RT_USING_LIBC=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library + +# +# Network +# + +# +# Socket abstraction layer +# +# CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer + +# +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +CONFIG_NETDEV_USING_PING=y +# end of Network interface device + +# +# light weight TCP/IP stack +# +CONFIG_RT_USING_LWIP=y +# CONFIG_RT_USING_LWIP141 is not set +# CONFIG_RT_USING_LWIP202 is not set +CONFIG_RT_USING_LWIP203=y +# CONFIG_RT_USING_LWIP212 is not set +# CONFIG_RT_USING_LWIP_IPV6 is not set +CONFIG_RT_LWIP_MEM_ALIGNMENT=4 +CONFIG_RT_LWIP_IGMP=y +CONFIG_RT_LWIP_ICMP=y +# CONFIG_RT_LWIP_SNMP is not set +CONFIG_RT_LWIP_DNS=y +CONFIG_RT_LWIP_DHCP=y +CONFIG_IP_SOF_BROADCAST=1 +CONFIG_IP_SOF_BROADCAST_RECV=1 + +# +# Static IPv4 Address +# +CONFIG_RT_LWIP_IPADDR="192.168.1.201" +CONFIG_RT_LWIP_GWADDR="192.168.1.1" +CONFIG_RT_LWIP_MSKADDR="255.255.255.0" +# end of Static IPv4 Address + +CONFIG_RT_LWIP_UDP=y +CONFIG_RT_LWIP_TCP=y +CONFIG_RT_LWIP_RAW=y +# CONFIG_RT_LWIP_PPP is not set +CONFIG_RT_MEMP_NUM_NETCONN=8 +CONFIG_RT_LWIP_PBUF_NUM=16 +CONFIG_RT_LWIP_RAW_PCB_NUM=4 +CONFIG_RT_LWIP_UDP_PCB_NUM=4 +CONFIG_RT_LWIP_TCP_PCB_NUM=4 +CONFIG_RT_LWIP_TCP_SEG_NUM=40 +CONFIG_RT_LWIP_TCP_SND_BUF=8196 +CONFIG_RT_LWIP_TCP_WND=8196 +CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=12 +CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=4 +CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=1024 +# CONFIG_LWIP_NO_RX_THREAD is not set +# CONFIG_LWIP_NO_TX_THREAD is not set +CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=15 +CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=512 +CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=4 +# CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set +CONFIG_LWIP_NETIF_STATUS_CALLBACK=1 +CONFIG_LWIP_NETIF_LINK_CALLBACK=1 +CONFIG_SO_REUSE=1 +CONFIG_LWIP_SO_RCVTIMEO=1 +CONFIG_LWIP_SO_SNDTIMEO=1 +CONFIG_LWIP_SO_RCVBUF=1 +CONFIG_LWIP_SO_LINGER=0 +# CONFIG_RT_LWIP_NETIF_LOOPBACK is not set +CONFIG_LWIP_NETIF_LOOPBACK=0 +# CONFIG_RT_LWIP_STATS is not set +# CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set +CONFIG_RT_LWIP_USING_PING=y +# CONFIG_RT_LWIP_DEBUG is not set +# end of light weight TCP/IP stack + +# +# AT commands +# +# CONFIG_RT_USING_AT is not set +# end of AT commands + +# CONFIG_LWIP_USING_DHCPD is not set +# end of Network + +# +# VBUS(Virtual Software BUS) +# +# CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) + +# +# Utilities +# +# CONFIG_RT_USING_RYM is not set +# CONFIG_RT_USING_ULOG is not set +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities + +# CONFIG_RT_USING_LWP is not set +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases + +# +# RT-Thread online packages +# + +# +# IoT - internet of things +# +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set +# CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set +# CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_WEBNET is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set +# CONFIG_PKG_USING_LJSON is not set +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_NANOPB is not set + +# +# Wi-Fi +# + +# +# Marvell WiFi +# +# CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi + +# +# Wiced WiFi +# +# CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + +# CONFIG_PKG_USING_COAP is not set +# CONFIG_PKG_USING_NOPOLL is not set +# CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set +# CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set +# CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set + +# +# IoT Cloud +# +# CONFIG_PKG_USING_ONENET is not set +# CONFIG_PKG_USING_GAGENT_CLOUD is not set +# CONFIG_PKG_USING_ALI_IOTKIT is not set +# CONFIG_PKG_USING_AZURE is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things + +# +# security packages +# +# CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages + +# +# language packages +# +# CONFIG_PKG_USING_LUA is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages + +# +# multimedia packages +# + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + +# CONFIG_PKG_USING_OPENMV is not set +# CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages + +# +# tools packages +# +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYFLASH is not set +# CONFIG_PKG_USING_EASYLOGGER is not set +# CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set +# CONFIG_PKG_USING_RDB is not set +# CONFIG_PKG_USING_QRCODE is not set +# CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages + +# +# system packages +# + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set +# CONFIG_PKG_USING_GUIENGINE is not set +# CONFIG_PKG_USING_PERSIMMON is not set +# CONFIG_PKG_USING_CAIRO is not set +# CONFIG_PKG_USING_PIXMAN is not set +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set +# CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set +# CONFIG_PKG_USING_DFS_YAFFS is not set +# CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages + +# +# peripheral libraries and drivers +# +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set +# CONFIG_PKG_USING_REALTEK_AMEBA is not set +# CONFIG_PKG_USING_SHT2X is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set +# CONFIG_PKG_USING_STM32_SDIO is not set +# CONFIG_PKG_USING_ICM20608 is not set +# CONFIG_PKG_USING_BUTTON is not set +# CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set +# CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages + +# +# miscellaneous packages +# + +# +# samples: kernel and components samples +# +# CONFIG_PKG_USING_KERNEL_SAMPLES is not set +# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set +# CONFIG_PKG_USING_NETWORK_SAMPLES is not set +# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples + +# +# entertainment: terminal games and other interesting software packages +# +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages + +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +CONFIG_SOC_FRDM_K64F=y diff --git a/bsp/frdm-k64f/Kconfig b/bsp/frdm-k64f/Kconfig new file mode 100644 index 00000000000..59c18fee6b7 --- /dev/null +++ b/bsp/frdm-k64f/Kconfig @@ -0,0 +1,28 @@ +mainmenu "RT-Thread Configuration" + +config BSP_DIR + string + option env="BSP_ROOT" + default "." + +config RTT_DIR + string + option env="RTT_ROOT" + default "../.." + +# you can change the RTT_ROOT default "../.." to your rtthread_root, +# example : default "F:/git_repositories/rt-thread" + +config PKGS_DIR + string + option env="PKGS_ROOT" + default "packages" + +source "$RTT_DIR/Kconfig" +source "$PKGS_DIR/Kconfig" + +config SOC_FRDM_K64F + bool + select ARCH_ARM_CORTEX_M4 + select RT_USING_COMPONENTS_INIT + default y diff --git a/bsp/frdm-k64f/project.uvproj b/bsp/frdm-k64f/project.uvproj index 9530fc5210c..bd72e6d7d83 100644 --- a/bsp/frdm-k64f/project.uvproj +++ b/bsp/frdm-k64f/project.uvproj @@ -1,10 +1,7 @@ - 1.1 -
### uVision Project, (C) Keil Software
- RT-Thread @@ -15,26 +12,26 @@ MK64FN1M0xxx12 Freescale Semiconductor IRAM(0x1FFF0000-0x1FFFFFFF) IRAM2(0x20000000-0x2002FFFF) IROM(0x0-0xFFFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") FPU2 ELITTLE - + "STARTUP\Freescale\Kinetis\startup_MK64F12.s" ("Freescale MK64Xxxxxxx12 Startup Code") UL2CM3(-O2511 -S0 -C0 -FO15 -FD20000000 -FC4000 -FN1 -FF0MK_P1M0 -FS00 -FL0100000) 7425 MK64F12.H - - - - - - - - - + + + + + + + + + SFD\Freescale\Kinetis\MK64F12.sfr 0 0 - - - + + + Freescale\Kinetis\ Freescale\Kinetis\ @@ -58,8 +55,8 @@ 0 0 - - + + 0 0 0 @@ -68,25 +65,21 @@ 0 0 - - + + 0 0 - 0 - 0 0 0 - - + + 0 0 - 0 - 0 0 - + 0 @@ -100,17 +93,17 @@ 0 0 3 - - + + 1 SARMCM3.DLL - + DCM.DLL -pCM4 SARMCM3.DLL - + TCM.DLL -pCM4 @@ -145,22 +138,23 @@ 1 1 1 + 0 0 - 3 + 6 - - - - - + + + + + - - - - - + + + + + Segger\JL2CM3.dll @@ -176,10 +170,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -212,7 +206,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -227,7 +221,6 @@ 0 0 0 - 0 3 3 0 @@ -344,7 +337,7 @@ 0x30000 - + 1 @@ -360,20 +353,13 @@ 0 0 0 - 1 + 0 0 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - CPU_MK64FN1M0VLL12 - - device;device/MK64F12;board;applications;.;../../include;../../libcpu/arm/cortex-m4;../../libcpu/arm/common;../../components/drivers/include;../../components/drivers/include;../../components/finsh;../../components/net/lwip-2.0.2/src;../../components/net/lwip-2.0.2/src/include;../../components/net/lwip-2.0.2/src/include/ipv4;../../components/net/lwip-2.0.2/src/arch/include;../../components/net/lwip-2.0.2/src/include/netif;../../components/net/lwip-2.0.2/src/include/posix + + CPU_MK64FN1M0VLL12, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND + + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;device;device\MK64F12;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\net\lwip-2.0.3\src;..\..\components\net\lwip-2.0.3\src\include;..\..\components\net\lwip-2.0.3\src\include\ipv4;..\..\components\net\lwip-2.0.3\src\arch\include;..\..\components\net\lwip-2.0.3\src\include\netif;..\..\components\net\lwip-2.0.3\src\include\posix;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -386,12 +372,11 @@ 0 0 0 - 0 - - - - + + + + @@ -403,484 +388,616 @@ 0 0x00000000 0x1FFF0000 - - - - - --keep *.o(.rti_fn.*) --keep *.o(FSymTab) --keep *.o(VSymTab) - - + + + + + + + - Device + Applications - fsl_adc16.c + startup.c 1 - device/MK64F12/fsl_adc16.c + applications\startup.c + + - fsl_clock.c + application.c 1 - device/MK64F12/fsl_clock.c + applications\application.c + + + + CPU + - fsl_cmp.c + backtrace.c 1 - device/MK64F12/fsl_cmp.c + ..\..\libcpu\arm\common\backtrace.c + + - fsl_cmt.c + div0.c 1 - device/MK64F12/fsl_cmt.c + ..\..\libcpu\arm\common\div0.c + + - fsl_common.c + showmem.c 1 - device/MK64F12/fsl_common.c + ..\..\libcpu\arm\common\showmem.c + + - fsl_crc.c + cpuport.c 1 - device/MK64F12/fsl_crc.c + ..\..\libcpu\arm\cortex-m4\cpuport.c + + - fsl_dac.c - 1 - device/MK64F12/fsl_dac.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S + + + + DeviceDrivers + - fsl_dmamux.c + pin.c 1 - device/MK64F12/fsl_dmamux.c + ..\..\components\drivers\misc\pin.c + + - fsl_dspi.c + serial.c 1 - device/MK64F12/fsl_dspi.c + ..\..\components\drivers\serial\serial.c + + - fsl_dspi_edma.c + pipe.c 1 - device/MK64F12/fsl_dspi_edma.c + ..\..\components\drivers\src\pipe.c + + - fsl_edma.c + completion.c 1 - device/MK64F12/fsl_edma.c + ..\..\components\drivers\src\completion.c + + - fsl_enet.c + waitqueue.c 1 - device/MK64F12/fsl_enet.c + ..\..\components\drivers\src\waitqueue.c + + - fsl_ewm.c + workqueue.c 1 - device/MK64F12/fsl_ewm.c + ..\..\components\drivers\src\workqueue.c + + - fsl_flash.c + ringbuffer.c 1 - device/MK64F12/fsl_flash.c + ..\..\components\drivers\src\ringbuffer.c + + - fsl_flexbus.c + dataqueue.c 1 - device/MK64F12/fsl_flexbus.c + ..\..\components\drivers\src\dataqueue.c + + - fsl_flexcan.c + ringblk_buf.c 1 - device/MK64F12/fsl_flexcan.c + ..\..\components\drivers\src\ringblk_buf.c + + + + Drivers + - fsl_ftm.c + drv_uart.c 1 - device/MK64F12/fsl_ftm.c + board\drv_uart.c + + - fsl_gpio.c + clock_config.c 1 - device/MK64F12/fsl_gpio.c + board\clock_config.c + + - fsl_i2c.c + fsl_phy.c 1 - device/MK64F12/fsl_i2c.c + board\fsl_phy.c + + - fsl_i2c_edma.c + led.c 1 - device/MK64F12/fsl_i2c_edma.c + board\led.c + + - fsl_llwu.c + drv_emac.c 1 - device/MK64F12/fsl_llwu.c + board\drv_emac.c + + - fsl_lptmr.c + board.c 1 - device/MK64F12/fsl_lptmr.c + board\board.c + + - fsl_pdb.c + fsl_i2c_edma.c 1 - device/MK64F12/fsl_pdb.c + device\MK64F12\fsl_i2c_edma.c + + - fsl_pit.c + fsl_uart.c 1 - device/MK64F12/fsl_pit.c + device\MK64F12\fsl_uart.c + + - fsl_pmc.c + fsl_flash.c 1 - device/MK64F12/fsl_pmc.c + device\MK64F12\fsl_flash.c + + - fsl_rcm.c + fsl_rnga.c 1 - device/MK64F12/fsl_rcm.c + device\MK64F12\fsl_rnga.c + + - fsl_rnga.c + fsl_clock.c 1 - device/MK64F12/fsl_rnga.c + device\MK64F12\fsl_clock.c + + - fsl_rtc.c + fsl_pdb.c 1 - device/MK64F12/fsl_rtc.c + device\MK64F12\fsl_pdb.c + + - fsl_sai.c + fsl_smc.c 1 - device/MK64F12/fsl_sai.c + device\MK64F12\fsl_smc.c + + - fsl_sai_edma.c + fsl_common.c 1 - device/MK64F12/fsl_sai_edma.c + device\MK64F12\fsl_common.c + + - fsl_sdhc.c + fsl_gpio.c 1 - device/MK64F12/fsl_sdhc.c + device\MK64F12\fsl_gpio.c + + - fsl_sim.c + fsl_ewm.c 1 - device/MK64F12/fsl_sim.c + device\MK64F12\fsl_ewm.c + + - fsl_smc.c + fsl_adc16.c 1 - device/MK64F12/fsl_smc.c + device\MK64F12\fsl_adc16.c + + - fsl_sysmpu.c + fsl_dac.c 1 - device/MK64F12/fsl_sysmpu.c + device\MK64F12\fsl_dac.c + + - fsl_uart.c + system_MK64F12.c 1 - device/MK64F12/fsl_uart.c + device\system_MK64F12.c + + - fsl_uart_edma.c + fsl_lptmr.c 1 - device/MK64F12/fsl_uart_edma.c + device\MK64F12\fsl_lptmr.c + + fsl_vref.c 1 - device/MK64F12/fsl_vref.c + device\MK64F12\fsl_vref.c + + - fsl_wdog.c + fsl_sdhc.c 1 - device/MK64F12/fsl_wdog.c + device\MK64F12\fsl_sdhc.c + + - system_MK64F12.c + fsl_dspi_edma.c 1 - device/system_MK64F12.c + device\MK64F12\fsl_dspi_edma.c + + - startup_MK64F12.s - 2 - device/TOOLCHAIN_ARM_STD/startup_MK64F12.s + fsl_rtc.c + 1 + device\MK64F12\fsl_rtc.c - - - Board - board.c + fsl_sysmpu.c 1 - board/board.c + device\MK64F12\fsl_sysmpu.c + + - clock_config.c + fsl_cmt.c 1 - board/clock_config.c + device\MK64F12\fsl_cmt.c + + - drv_uart.c + fsl_llwu.c 1 - board/drv_uart.c + device\MK64F12\fsl_llwu.c + + - led.c + fsl_sai_edma.c 1 - board/led.c + device\MK64F12\fsl_sai_edma.c + + - drv_emac.c + fsl_dspi.c 1 - board/drv_emac.c + device\MK64F12\fsl_dspi.c + + - fsl_phy.c + fsl_flexbus.c 1 - board/fsl_phy.c + device\MK64F12\fsl_flexbus.c - - - Applications - application.c + fsl_sai.c 1 - applications/application.c + device\MK64F12\fsl_sai.c + + - startup.c + fsl_pmc.c 1 - applications/startup.c + device\MK64F12\fsl_pmc.c - - - Kernel - clock.c - 1 - ../../src/clock.c + startup_MK64F12.s + 2 + device\TOOLCHAIN_ARM_STD\startup_MK64F12.s + + - components.c + fsl_ftm.c 1 - ../../src/components.c + device\MK64F12\fsl_ftm.c + + - device.c + fsl_wdog.c 1 - ../../src/device.c + device\MK64F12\fsl_wdog.c + + - idle.c + fsl_edma.c 1 - ../../src/idle.c + device\MK64F12\fsl_edma.c + + - ipc.c + fsl_i2c.c 1 - ../../src/ipc.c + device\MK64F12\fsl_i2c.c + + - irq.c + fsl_uart_edma.c 1 - ../../src/irq.c + device\MK64F12\fsl_uart_edma.c + + - kservice.c + fsl_dmamux.c 1 - ../../src/kservice.c + device\MK64F12\fsl_dmamux.c + + - mem.c + fsl_rcm.c 1 - ../../src/mem.c + device\MK64F12\fsl_rcm.c + + - mempool.c + fsl_sim.c 1 - ../../src/mempool.c + device\MK64F12\fsl_sim.c + + - object.c + fsl_cmp.c 1 - ../../src/object.c + device\MK64F12\fsl_cmp.c + + - scheduler.c + fsl_pit.c 1 - ../../src/scheduler.c + device\MK64F12\fsl_pit.c + + - signal.c + fsl_flexcan.c 1 - ../../src/signal.c + device\MK64F12\fsl_flexcan.c + + - thread.c + fsl_crc.c 1 - ../../src/thread.c + device\MK64F12\fsl_crc.c + + - timer.c + fsl_enet.c 1 - ../../src/timer.c + device\MK64F12\fsl_enet.c - CORTEX-M4 + Finsh - cpuport.c - 1 - ../../libcpu/arm/cortex-m4/cpuport.c - - - context_rvds.S - 2 - ../../libcpu/arm/cortex-m4/context_rvds.S - - - backtrace.c + shell.c 1 - ../../libcpu/arm/common/backtrace.c + ..\..\components\finsh\shell.c + + - div0.c + msh.c 1 - ../../libcpu/arm/common/div0.c + ..\..\components\finsh\msh.c + + - showmem.c + cmd.c 1 - ../../libcpu/arm/common/showmem.c + ..\..\components\finsh\cmd.c - DeviceDrivers + Kernel - serial.c - 1 - ../../components/drivers/serial/serial.c - - - completion.c - 1 - ../../components/drivers/src/completion.c - - - dataqueue.c + mempool.c 1 - ../../components/drivers/src/dataqueue.c + ..\..\src\mempool.c + + - pipe.c + components.c 1 - ../../components/drivers/src/pipe.c + ..\..\src\components.c + + - ringbuffer.c + timer.c 1 - ../../components/drivers/src/ringbuffer.c + ..\..\src\timer.c + + - waitqueue.c + ipc.c 1 - ../../components/drivers/src/waitqueue.c + ..\..\src\ipc.c + + - workqueue.c + kservice.c 1 - ../../components/drivers/src/workqueue.c + ..\..\src\kservice.c - - - finsh - shell.c + object.c 1 - ../../components/finsh/shell.c + ..\..\src\object.c + + - symbol.c + mem.c 1 - ../../components/finsh/symbol.c + ..\..\src\mem.c + + - cmd.c + scheduler.c 1 - ../../components/finsh/cmd.c + ..\..\src\scheduler.c + + - finsh_compiler.c + thread.c 1 - ../../components/finsh/finsh_compiler.c + ..\..\src\thread.c + + - finsh_error.c + clock.c 1 - ../../components/finsh/finsh_error.c + ..\..\src\clock.c + + - finsh_heap.c + device.c 1 - ../../components/finsh/finsh_heap.c + ..\..\src\device.c + + - finsh_init.c + irq.c 1 - ../../components/finsh/finsh_init.c + ..\..\src\irq.c + + - finsh_node.c + idle.c 1 - ../../components/finsh/finsh_node.c + ..\..\src\idle.c + + + + libc + - finsh_ops.c + mem_std.c 1 - ../../components/finsh/finsh_ops.c + ..\..\components\libc\compilers\armlibc\mem_std.c + + - finsh_parser.c + libc_syms.c 1 - ../../components/finsh/finsh_parser.c + ..\..\components\libc\compilers\armlibc\libc_syms.c + + - finsh_var.c + syscalls.c 1 - ../../components/finsh/finsh_var.c + ..\..\components\libc\compilers\armlibc\syscalls.c + + - finsh_vm.c + time.c 1 - ../../components/finsh/finsh_vm.c + ..\..\components\libc\compilers\common\time.c + + - finsh_token.c + stdlib.c 1 - ../../components/finsh/finsh_token.c + ..\..\components\libc\compilers\common\stdlib.c @@ -888,189 +1005,265 @@ lwIP - sys_arch.c + netdb.c 1 - ../../components/net/lwip-2.0.2/src/arch/sys_arch.c + ..\..\components\net\lwip-2.0.3\src\api\netdb.c + + - api_lib.c + ip.c 1 - ../../components/net/lwip-2.0.2/src/api/api_lib.c + ..\..\components\net\lwip-2.0.3\src\core\ip.c + + - api_msg.c + autoip.c 1 - ../../components/net/lwip-2.0.2/src/api/api_msg.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\autoip.c + + - err.c + ethernet.c 1 - ../../components/net/lwip-2.0.2/src/api/err.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernet.c + + - netbuf.c + netif.c 1 - ../../components/net/lwip-2.0.2/src/api/netbuf.c + ..\..\components\net\lwip-2.0.3\src\core\netif.c + + - netdb.c + ping.c 1 - ../../components/net/lwip-2.0.2/src/api/netdb.c + ..\..\components\net\lwip-2.0.3\src\apps\ping\ping.c + + - netifapi.c + sys.c 1 - ../../components/net/lwip-2.0.2/src/api/netifapi.c + ..\..\components\net\lwip-2.0.3\src\core\sys.c + + sockets.c 1 - ../../components/net/lwip-2.0.2/src/api/sockets.c + ..\..\components\net\lwip-2.0.3\src\api\sockets.c + + - tcpip.c + netifapi.c 1 - ../../components/net/lwip-2.0.2/src/api/tcpip.c + ..\..\components\net\lwip-2.0.3\src\api\netifapi.c + + - def.c + tcpip.c 1 - ../../components/net/lwip-2.0.2/src/core/def.c + ..\..\components\net\lwip-2.0.3\src\api\tcpip.c + + - dns.c + ip4_addr.c 1 - ../../components/net/lwip-2.0.2/src/core/dns.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_addr.c + + - inet_chksum.c + dhcp.c 1 - ../../components/net/lwip-2.0.2/src/core/inet_chksum.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\dhcp.c + + init.c 1 - ../../components/net/lwip-2.0.2/src/core/init.c + ..\..\components\net\lwip-2.0.3\src\core\init.c + + - ip.c + ethernetif.c + 1 + ..\..\components\net\lwip-2.0.3\src\netif\ethernetif.c + + + + + etharp.c 1 - ../../components/net/lwip-2.0.2/src/core/ip.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\etharp.c + + memp.c 1 - ../../components/net/lwip-2.0.2/src/core/memp.c + ..\..\components\net\lwip-2.0.3\src\core\memp.c + + - netif.c + ip4.c 1 - ../../components/net/lwip-2.0.2/src/core/netif.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4.c + + - pbuf.c + netbuf.c 1 - ../../components/net/lwip-2.0.2/src/core/pbuf.c + ..\..\components\net\lwip-2.0.3\src\api\netbuf.c + + raw.c 1 - ../../components/net/lwip-2.0.2/src/core/raw.c + ..\..\components\net\lwip-2.0.3\src\core\raw.c + + - stats.c + ip4_frag.c 1 - ../../components/net/lwip-2.0.2/src/core/stats.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_frag.c + + - sys.c + tcp_out.c 1 - ../../components/net/lwip-2.0.2/src/core/sys.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_out.c + + - tcp.c + lowpan6.c 1 - ../../components/net/lwip-2.0.2/src/core/tcp.c + ..\..\components\net\lwip-2.0.3\src\netif\lowpan6.c + + - tcp_in.c + icmp.c 1 - ../../components/net/lwip-2.0.2/src/core/tcp_in.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\icmp.c + + - tcp_out.c + api_lib.c 1 - ../../components/net/lwip-2.0.2/src/core/tcp_out.c + ..\..\components\net\lwip-2.0.3\src\api\api_lib.c + + - timeouts.c + inet_chksum.c 1 - ../../components/net/lwip-2.0.2/src/core/timeouts.c + ..\..\components\net\lwip-2.0.3\src\core\inet_chksum.c + + - udp.c + stats.c 1 - ../../components/net/lwip-2.0.2/src/core/udp.c + ..\..\components\net\lwip-2.0.3\src\core\stats.c + + - ethernet.c + err.c 1 - ../../components/net/lwip-2.0.2/src/netif/ethernet.c + ..\..\components\net\lwip-2.0.3\src\api\err.c + + - ethernetif.c + tcp_in.c 1 - ../../components/net/lwip-2.0.2/src/netif/ethernetif.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_in.c + + - lowpan6.c + dns.c 1 - ../../components/net/lwip-2.0.2/src/netif/lowpan6.c + ..\..\components\net\lwip-2.0.3\src\core\dns.c + + - autoip.c + sys_arch.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/autoip.c + ..\..\components\net\lwip-2.0.3\src\arch\sys_arch.c + + - dhcp.c + timeouts.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/dhcp.c + ..\..\components\net\lwip-2.0.3\src\core\timeouts.c + + - etharp.c + igmp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/etharp.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\igmp.c + + - icmp.c + udp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/icmp.c + ..\..\components\net\lwip-2.0.3\src\core\udp.c + + - igmp.c + pbuf.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/igmp.c + ..\..\components\net\lwip-2.0.3\src\core\pbuf.c + + - ip4.c + def.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/ip4.c + ..\..\components\net\lwip-2.0.3\src\core\def.c + + - ip4_addr.c + api_msg.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/ip4_addr.c + ..\..\components\net\lwip-2.0.3\src\api\api_msg.c + + - ip4_frag.c + tcp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/ip4_frag.c + ..\..\components\net\lwip-2.0.3\src\core\tcp.c - diff --git a/bsp/frdm-k64f/project.uvprojx b/bsp/frdm-k64f/project.uvprojx index 085ba8f25e5..c1f3fe7b37c 100644 --- a/bsp/frdm-k64f/project.uvprojx +++ b/bsp/frdm-k64f/project.uvprojx @@ -1,17 +1,12 @@ - 2.1 -
### uVision Project, (C) Keil Software
- RT-Thread 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::ARMCC - 0 MK64FN1M0xxx12 @@ -19,28 +14,28 @@ NXP.MK64F12_DFP.10.0.4 http://mcuxpresso.nxp.com/cmsis_pack/repo/ IRAM(0x20000000,0x00030000) IRAM2(0x1FFF0000,0x00010000) IROM(0x00000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0MK_P1M0 -FS00 -FL0100000 -FP0($$Device:MK64FN1M0xxx12$Flash\MK_P1M0.FLM)) 7425 $$Device:MK64FN1M0xxx12$Device\Include\MK64F12.h - - - - - - - - - + + + + + + + + + $$Device:MK64FN1M0xxx12$SVD\MK64F12.svd 0 0 - - - - - + + + + + 0 0 @@ -62,8 +57,8 @@ 0 0 - - + + 0 0 0 @@ -72,8 +67,8 @@ 0 0 - - + + 0 0 0 @@ -82,15 +77,15 @@ 0 0 - - + + 0 0 0 0 0 - + 0 @@ -104,17 +99,17 @@ 0 0 3 - - + + 1 SARMCM3.DLL - + DCM.DLL -pCM4 SARMCM3.DLL - + TCM.DLL -pCM4 @@ -138,11 +133,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -175,7 +170,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -307,7 +302,7 @@ 0x30000 - + 1 @@ -324,7 +319,6 @@ 0 0 1 - 0 0 1 1 @@ -334,10 +328,10 @@ 0 0 - - CPU_MK64FN1M0VLL12 - - .;..\..\include;applications;.;board;device;device\MK64F12;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\common;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\net\lwip-2.0.2\src\include\posix + + CPU_MK64FN1M0VLL12, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND + + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;device;device\MK64F12;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\net\lwip-2.0.3\src;..\..\components\net\lwip-2.0.3\src\include;..\..\components\net\lwip-2.0.3\src\include\ipv4;..\..\components\net\lwip-2.0.3\src\arch\include;..\..\components\net\lwip-2.0.3\src\include\netif;..\..\components\net\lwip-2.0.3\src\include\posix;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -352,10 +346,10 @@ 0 0 - - - - + + + + @@ -367,695 +361,894 @@ 0 0x00000000 0x1FFF0000 - - - - - - - + + + + + + + - Kernel + Applications - clock.c - 1 - ..\..\src\clock.c - - - components.c + startup.c 1 - ..\..\src\components.c + applications\startup.c + + - cpu.c + application.c 1 - ..\..\src\cpu.c + applications\application.c + + + + CPU + - device.c + showmem.c 1 - ..\..\src\device.c + ..\..\libcpu\arm\common\showmem.c + + - idle.c + div0.c 1 - ..\..\src\idle.c + ..\..\libcpu\arm\common\div0.c + + - ipc.c + backtrace.c 1 - ..\..\src\ipc.c + ..\..\libcpu\arm\common\backtrace.c + + - irq.c - 1 - ..\..\src\irq.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S + + - kservice.c + cpuport.c 1 - ..\..\src\kservice.c + ..\..\libcpu\arm\cortex-m4\cpuport.c + + + + DeviceDrivers + - mem.c + pin.c 1 - ..\..\src\mem.c + ..\..\components\drivers\misc\pin.c + + - mempool.c + serial.c 1 - ..\..\src\mempool.c + ..\..\components\drivers\serial\serial.c + + - object.c + workqueue.c 1 - ..\..\src\object.c + ..\..\components\drivers\src\workqueue.c + + - scheduler.c + ringbuffer.c 1 - ..\..\src\scheduler.c + ..\..\components\drivers\src\ringbuffer.c + + - signal.c + waitqueue.c 1 - ..\..\src\signal.c + ..\..\components\drivers\src\waitqueue.c + + - thread.c + dataqueue.c 1 - ..\..\src\thread.c + ..\..\components\drivers\src\dataqueue.c + + - timer.c + completion.c 1 - ..\..\src\timer.c + ..\..\components\drivers\src\completion.c - - - Applications - application.c + ringblk_buf.c 1 - applications\application.c + ..\..\components\drivers\src\ringblk_buf.c + + - startup.c + pipe.c 1 - applications\startup.c + ..\..\components\drivers\src\pipe.c - Board + Drivers - board.c + drv_uart.c 1 - board\board.c + board\drv_uart.c + + clock_config.c 1 board\clock_config.c + + - drv_uart.c + fsl_phy.c 1 - board\drv_uart.c + board\fsl_phy.c + + led.c 1 board\led.c + + drv_emac.c 1 board\drv_emac.c - - fsl_phy.c - 1 - board\fsl_phy.c - - - - Device - fsl_adc16.c - 1 - device\MK64F12\fsl_adc16.c - - - fsl_clock.c - 1 - device\MK64F12\fsl_clock.c - - - fsl_cmp.c + board.c 1 - device\MK64F12\fsl_cmp.c + board\board.c + + - fsl_cmt.c + fsl_ftm.c 1 - device\MK64F12\fsl_cmt.c + device\MK64F12\fsl_ftm.c + + - fsl_common.c + fsl_dspi_edma.c 1 - device\MK64F12\fsl_common.c + device\MK64F12\fsl_dspi_edma.c + + - fsl_crc.c + fsl_pdb.c 1 - device\MK64F12\fsl_crc.c + device\MK64F12\fsl_pdb.c + + - fsl_dac.c + fsl_rtc.c 1 - device\MK64F12\fsl_dac.c + device\MK64F12\fsl_rtc.c + + fsl_dmamux.c 1 device\MK64F12\fsl_dmamux.c + + - fsl_dspi.c + fsl_flash.c 1 - device\MK64F12\fsl_dspi.c + device\MK64F12\fsl_flash.c + + - fsl_dspi_edma.c + fsl_common.c 1 - device\MK64F12\fsl_dspi_edma.c + device\MK64F12\fsl_common.c + + - fsl_edma.c + fsl_sysmpu.c 1 - device\MK64F12\fsl_edma.c + device\MK64F12\fsl_sysmpu.c + + - fsl_enet.c + fsl_cmp.c 1 - device\MK64F12\fsl_enet.c + device\MK64F12\fsl_cmp.c + + - fsl_ewm.c + fsl_i2c.c 1 - device\MK64F12\fsl_ewm.c + device\MK64F12\fsl_i2c.c + + - fsl_flash.c + fsl_vref.c 1 - device\MK64F12\fsl_flash.c + device\MK64F12\fsl_vref.c + + - fsl_flexbus.c + fsl_smc.c 1 - device\MK64F12\fsl_flexbus.c + device\MK64F12\fsl_smc.c + + - fsl_flexcan.c + fsl_crc.c 1 - device\MK64F12\fsl_flexcan.c + device\MK64F12\fsl_crc.c + + - fsl_ftm.c + fsl_clock.c 1 - device\MK64F12\fsl_ftm.c + device\MK64F12\fsl_clock.c + + - fsl_gpio.c + fsl_pit.c 1 - device\MK64F12\fsl_gpio.c + device\MK64F12\fsl_pit.c + + - fsl_i2c.c + system_MK64F12.c 1 - device\MK64F12\fsl_i2c.c + device\system_MK64F12.c + + - fsl_i2c_edma.c + fsl_wdog.c 1 - device\MK64F12\fsl_i2c_edma.c + device\MK64F12\fsl_wdog.c + + - fsl_llwu.c + fsl_cmt.c 1 - device\MK64F12\fsl_llwu.c + device\MK64F12\fsl_cmt.c + + - fsl_lptmr.c + fsl_llwu.c 1 - device\MK64F12\fsl_lptmr.c + device\MK64F12\fsl_llwu.c + + - fsl_pdb.c + fsl_edma.c 1 - device\MK64F12\fsl_pdb.c + device\MK64F12\fsl_edma.c + + - fsl_pit.c + fsl_flexcan.c 1 - device\MK64F12\fsl_pit.c + device\MK64F12\fsl_flexcan.c + + - fsl_pmc.c + fsl_dspi.c 1 - device\MK64F12\fsl_pmc.c + device\MK64F12\fsl_dspi.c + + fsl_rcm.c 1 device\MK64F12\fsl_rcm.c + + fsl_rnga.c 1 device\MK64F12\fsl_rnga.c + + - fsl_rtc.c + fsl_sai.c 1 - device\MK64F12\fsl_rtc.c + device\MK64F12\fsl_sai.c + + - fsl_sai.c + fsl_uart_edma.c 1 - device\MK64F12\fsl_sai.c + device\MK64F12\fsl_uart_edma.c + + - fsl_sai_edma.c + fsl_dac.c 1 - device\MK64F12\fsl_sai_edma.c + device\MK64F12\fsl_dac.c + + + + fsl_gpio.c + 1 + device\MK64F12\fsl_gpio.c + + + fsl_sdhc.c 1 device\MK64F12\fsl_sdhc.c + + - fsl_sim.c + startup_MK64F12.s + 2 + device\TOOLCHAIN_ARM_STD\startup_MK64F12.s + + + + + fsl_pmc.c 1 - device\MK64F12\fsl_sim.c + device\MK64F12\fsl_pmc.c + + - fsl_smc.c + fsl_uart.c 1 - device\MK64F12\fsl_smc.c + device\MK64F12\fsl_uart.c + + - fsl_sysmpu.c + fsl_ewm.c 1 - device\MK64F12\fsl_sysmpu.c + device\MK64F12\fsl_ewm.c + + - fsl_uart.c + fsl_lptmr.c 1 - device\MK64F12\fsl_uart.c + device\MK64F12\fsl_lptmr.c + + - fsl_uart_edma.c + fsl_sim.c 1 - device\MK64F12\fsl_uart_edma.c + device\MK64F12\fsl_sim.c + + - fsl_vref.c + fsl_i2c_edma.c 1 - device\MK64F12\fsl_vref.c + device\MK64F12\fsl_i2c_edma.c + + - fsl_wdog.c + fsl_enet.c 1 - device\MK64F12\fsl_wdog.c + device\MK64F12\fsl_enet.c + + - system_MK64F12.c + fsl_flexbus.c 1 - device\system_MK64F12.c + device\MK64F12\fsl_flexbus.c + + - startup_MK64F12.s - 2 - device\TOOLCHAIN_ARM_STD\startup_MK64F12.s + fsl_sai_edma.c + 1 + device\MK64F12\fsl_sai_edma.c + + + + + fsl_adc16.c + 1 + device\MK64F12\fsl_adc16.c - cpu + Finsh - backtrace.c - 1 - ..\..\libcpu\arm\common\backtrace.c - - - div0.c + shell.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\components\finsh\shell.c + + - showmem.c + msh.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\components\finsh\msh.c + + - cpuport.c + cmd.c 1 - ..\..\libcpu\arm\cortex-m4\cpuport.c - - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S + ..\..\components\finsh\cmd.c - DeviceDrivers + Kernel - serial.c + ipc.c 1 - ..\..\components\drivers\serial\serial.c + ..\..\src\ipc.c + + - completion.c + kservice.c 1 - ..\..\components\drivers\src\completion.c + ..\..\src\kservice.c + + - dataqueue.c + scheduler.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\src\scheduler.c + + - pipe.c + object.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\src\object.c + + - ringblk_buf.c + timer.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\src\timer.c + + - ringbuffer.c + clock.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\src\clock.c + + - waitqueue.c + irq.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\src\irq.c + + - workqueue.c + mempool.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\src\mempool.c - - - finsh - shell.c + thread.c 1 - ..\..\components\finsh\shell.c + ..\..\src\thread.c + + - cmd.c + device.c 1 - ..\..\components\finsh\cmd.c + ..\..\src\device.c + + - finsh_compiler.c + mem.c 1 - ..\..\components\finsh\finsh_compiler.c + ..\..\src\mem.c + + - finsh_error.c + idle.c 1 - ..\..\components\finsh\finsh_error.c + ..\..\src\idle.c + + - finsh_heap.c + components.c 1 - ..\..\components\finsh\finsh_heap.c + ..\..\src\components.c + + + + libc + - finsh_init.c + libc_syms.c 1 - ..\..\components\finsh\finsh_init.c + ..\..\components\libc\compilers\armlibc\libc_syms.c + + - finsh_node.c + mem_std.c 1 - ..\..\components\finsh\finsh_node.c + ..\..\components\libc\compilers\armlibc\mem_std.c + + - finsh_ops.c + syscalls.c 1 - ..\..\components\finsh\finsh_ops.c + ..\..\components\libc\compilers\armlibc\syscalls.c + + - finsh_parser.c + stdlib.c 1 - ..\..\components\finsh\finsh_parser.c + ..\..\components\libc\compilers\common\stdlib.c + + - finsh_var.c + time.c 1 - ..\..\components\finsh\finsh_var.c + ..\..\components\libc\compilers\common\time.c + + + + lwIP + - finsh_vm.c + netdb.c 1 - ..\..\components\finsh\finsh_vm.c + ..\..\components\net\lwip-2.0.3\src\api\netdb.c + + - finsh_token.c + ip.c 1 - ..\..\components\finsh\finsh_token.c + ..\..\components\net\lwip-2.0.3\src\core\ip.c - - - lwIP - sys_arch.c + autoip.c 1 - ..\..\components\net\lwip-2.0.2\src\arch\sys_arch.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\autoip.c + + - api_lib.c + ethernet.c 1 - ..\..\components\net\lwip-2.0.2\src\api\api_lib.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernet.c + + - api_msg.c + netif.c 1 - ..\..\components\net\lwip-2.0.2\src\api\api_msg.c + ..\..\components\net\lwip-2.0.3\src\core\netif.c + + - err.c + sys.c 1 - ..\..\components\net\lwip-2.0.2\src\api\err.c + ..\..\components\net\lwip-2.0.3\src\core\sys.c + + - netbuf.c + sockets.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netbuf.c + ..\..\components\net\lwip-2.0.3\src\api\sockets.c + + - netdb.c + ping.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netdb.c + ..\..\components\net\lwip-2.0.3\src\apps\ping\ping.c + + netifapi.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netifapi.c - - - sockets.c - 1 - ..\..\components\net\lwip-2.0.2\src\api\sockets.c + ..\..\components\net\lwip-2.0.3\src\api\netifapi.c + + tcpip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\tcpip.c + ..\..\components\net\lwip-2.0.3\src\api\tcpip.c + + - def.c + ip4_addr.c 1 - ..\..\components\net\lwip-2.0.2\src\core\def.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_addr.c + + - dns.c + dhcp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\dns.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\dhcp.c + + - inet_chksum.c + init.c 1 - ..\..\components\net\lwip-2.0.2\src\core\inet_chksum.c + ..\..\components\net\lwip-2.0.3\src\core\init.c + + - init.c + ethernetif.c 1 - ..\..\components\net\lwip-2.0.2\src\core\init.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernetif.c + + - ip.c + etharp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ip.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\etharp.c + + memp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\memp.c + ..\..\components\net\lwip-2.0.3\src\core\memp.c + + - netif.c + ip4.c 1 - ..\..\components\net\lwip-2.0.2\src\core\netif.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4.c + + - pbuf.c + netbuf.c 1 - ..\..\components\net\lwip-2.0.2\src\core\pbuf.c + ..\..\components\net\lwip-2.0.3\src\api\netbuf.c + + raw.c 1 - ..\..\components\net\lwip-2.0.2\src\core\raw.c + ..\..\components\net\lwip-2.0.3\src\core\raw.c + + - stats.c + ip4_frag.c 1 - ..\..\components\net\lwip-2.0.2\src\core\stats.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_frag.c + + - sys.c + tcp_out.c 1 - ..\..\components\net\lwip-2.0.2\src\core\sys.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_out.c + + - tcp.c + lowpan6.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp.c + ..\..\components\net\lwip-2.0.3\src\netif\lowpan6.c + + - tcp_in.c + icmp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp_in.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\icmp.c + + - tcp_out.c + api_lib.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp_out.c + ..\..\components\net\lwip-2.0.3\src\api\api_lib.c + + - timeouts.c + inet_chksum.c 1 - ..\..\components\net\lwip-2.0.2\src\core\timeouts.c + ..\..\components\net\lwip-2.0.3\src\core\inet_chksum.c + + - udp.c + stats.c 1 - ..\..\components\net\lwip-2.0.2\src\core\udp.c + ..\..\components\net\lwip-2.0.3\src\core\stats.c + + - ethernet.c + err.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\ethernet.c + ..\..\components\net\lwip-2.0.3\src\api\err.c + + - ethernetif.c + tcp_in.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\ethernetif.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_in.c + + - lowpan6.c + dns.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\lowpan6.c + ..\..\components\net\lwip-2.0.3\src\core\dns.c + + - autoip.c + sys_arch.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\autoip.c + ..\..\components\net\lwip-2.0.3\src\arch\sys_arch.c + + - dhcp.c + timeouts.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\dhcp.c + ..\..\components\net\lwip-2.0.3\src\core\timeouts.c + + - etharp.c + igmp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\etharp.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\igmp.c + + - icmp.c + udp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\icmp.c + ..\..\components\net\lwip-2.0.3\src\core\udp.c + + - igmp.c + pbuf.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\igmp.c + ..\..\components\net\lwip-2.0.3\src\core\pbuf.c + + - ip4.c + def.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4.c + ..\..\components\net\lwip-2.0.3\src\core\def.c + + - ip4_addr.c + api_msg.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_addr.c + ..\..\components\net\lwip-2.0.3\src\api\api_msg.c + + - ip4_frag.c + tcp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_frag.c + ..\..\components\net\lwip-2.0.3\src\core\tcp.c - - ::CMSIS - - - + - + - + - + - diff --git a/bsp/frdm-k64f/rtconfig.h b/bsp/frdm-k64f/rtconfig.h index 81b5b29f8c2..ba9347539af 100644 --- a/bsp/frdm-k64f/rtconfig.h +++ b/bsp/frdm-k64f/rtconfig.h @@ -1,153 +1,282 @@ -/* RT-Thread config file */ -#ifndef __RTTHREAD_CFG_H__ -#define __RTTHREAD_CFG_H__ +#ifndef RT_CONFIG_H__ +#define RT_CONFIG_H__ -/* RT_NAME_MAX*/ -#define RT_NAME_MAX 8 +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ -/* RT_ALIGN_SIZE*/ -#define RT_ALIGN_SIZE 8 - -/* PRIORITY_MAX */ -#define RT_THREAD_PRIORITY_MAX 32 - -/* Tick per Second */ -#define RT_TICK_PER_SECOND 100 - -/* SECTION: RT_DEBUG */ -/* Thread Debug */ -#define RT_DEBUG -#define RT_DEBUG_COLOR +/* RT-Thread Kernel */ +#define RT_NAME_MAX 8 +#define RT_ALIGN_SIZE 4 +#define RT_THREAD_PRIORITY_32 +#define RT_THREAD_PRIORITY_MAX 32 +#define RT_TICK_PER_SECOND 100 #define RT_USING_OVERFLOW_CHECK - -/* Using Hook */ #define RT_USING_HOOK +#define RT_USING_IDLE_HOOK +#define RT_IDLE_HOOK_LIST_SIZE 4 +#define IDLE_THREAD_STACK_SIZE 1024 +#define RT_USING_TIMER_SOFT +#define RT_TIMER_THREAD_PRIO 4 +#define RT_TIMER_THREAD_STACK_SIZE 512 + +/* kservice optimization */ -#define IDLE_THREAD_STACK_SIZE 1024 +/* end of kservice optimization */ +#define RT_DEBUG -/* Using Software Timer */ -/* #define RT_USING_TIMER_SOFT */ -#define RT_TIMER_THREAD_PRIO 4 -#define RT_TIMER_THREAD_STACK_SIZE 512 -#define RT_TIMER_TICK_PER_SECOND 10 +/* Inter-Thread communication */ -/* SECTION: IPC */ -/* Using Semaphore*/ #define RT_USING_SEMAPHORE - -/* Using Mutex */ #define RT_USING_MUTEX - -/* Using Event */ #define RT_USING_EVENT - -/* Using MailBox */ #define RT_USING_MAILBOX - -/* Using Message Queue */ #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ -/* SECTION: Memory Management */ -/* Using Memory Pool Management*/ -#define RT_USING_MEMPOOL +/* Memory Management */ -/* Using Dynamic Heap Management */ +#define RT_USING_MEMPOOL +#define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ -/* Using Small MM */ -#define RT_USING_SMALL_MEM +/* Kernel Device Object */ -/* "Using Device Driver Framework" default="true" */ #define RT_USING_DEVICE -/* Using IPC in Device Driver Framework" default="true" */ -#define RT_USING_DEVICE_IPC -/* Using Serial Device Driver Framework" default="true" */ -#define RT_USING_SERIAL -#define RT_SERIAL_USING_DMA +#define RT_USING_CONSOLE +#define RT_CONSOLEBUF_SIZE 128 +#define RT_CONSOLE_DEVICE_NAME "uart" +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ +#define ARCH_ARM +#define RT_USING_CPU_FFS +#define ARCH_ARM_CORTEX_M +#define ARCH_ARM_CORTEX_M4 + +/* RT-Thread Components */ -//
#define RT_USING_COMPONENTS_INIT -//
-/* SECTION: Console options */ -#define RT_USING_CONSOLE -/* the buffer size of console*/ -#define RT_CONSOLEBUF_SIZE 128 +/* C++ features */ + +/* end of C++ features */ + +/* Command shell */ -/* SECTION: finsh, a C-Express shell */ #define RT_USING_FINSH -/* Using symbol table */ +#define RT_USING_MSH +#define FINSH_USING_MSH +#define FINSH_THREAD_NAME "tshell" +#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_STACK_SIZE 4096 +#define FINSH_USING_HISTORY +#define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB +#define FINSH_CMD_SIZE 80 +#define MSH_USING_BUILT_IN_COMMANDS #define FINSH_USING_DESCRIPTION +#define FINSH_ARG_MAX 10 +/* end of Command shell */ + +/* Device virtual file system */ + +/* end of Device virtual file system */ + +/* Device Drivers */ + +#define RT_USING_DEVICE_IPC +#define RT_USING_SERIAL +#define RT_USING_SERIAL_V1 +#define RT_SERIAL_USING_DMA +#define RT_SERIAL_RB_BUFSZ 64 +#define RT_USING_PIN + +/* Using USB */ + +/* end of Using USB */ +/* end of Device Drivers */ + +/* POSIX layer and C standard library */ + +#define RT_USING_LIBC +#define RT_LIBC_USING_TIME +#define RT_LIBC_DEFAULT_TIMEZONE 8 + +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ + +/* Network */ + +/* Socket abstraction layer */ + +/* end of Socket abstraction layer */ + +/* Network interface device */ + +#define NETDEV_USING_PING +/* end of Network interface device */ + +/* light weight TCP/IP stack */ -/* SECTION: device filesystem */ -/* #define RT_USING_DFS */ -//#define RT_USING_DFS_ELMFAT -#define RT_DFS_ELM_WORD_ACCESS -/* Reentrancy (thread safe) of the FatFs module. */ -#define RT_DFS_ELM_REENTRANT -/* Number of volumes (logical drives) to be used. */ -#define RT_DFS_ELM_DRIVES 2 -/* #define RT_DFS_ELM_USE_LFN 1 */ -#define RT_DFS_ELM_MAX_LFN 255 -/* Maximum sector size to be handled. */ -#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 - -#define RT_USING_DFS_ROMFS - -/* the max number of mounted filesystem */ -#define DFS_FILESYSTEMS_MAX 2 -/* the max number of opened files */ -#define DFS_FD_MAX 4 - -/* SECTION: lwip, a lighwight TCP/IP protocol stack */ #define RT_USING_LWIP #define RT_USING_LWIP203 -/* Enable LwIP debug output */ -//#define RT_LWIP_DEBUG -/* Enable ICMP protocol*/ +#define RT_LWIP_MEM_ALIGNMENT 4 +#define RT_LWIP_IGMP #define RT_LWIP_ICMP -/* Enable UDP protocol*/ -#define RT_LWIP_UDP -/* Enable TCP protocol*/ -#define RT_LWIP_TCP -/* Enable DNS */ #define RT_LWIP_DNS +#define RT_LWIP_DHCP +#define IP_SOF_BROADCAST 1 +#define IP_SOF_BROADCAST_RECV 1 -/* the number of simulatenously active TCP connections*/ -#define RT_LWIP_TCP_PCB_NUM 5 +/* Static IPv4 Address */ -/* ip address of target */ #define RT_LWIP_IPADDR "192.168.1.201" +#define RT_LWIP_GWADDR "192.168.1.1" +#define RT_LWIP_MSKADDR "255.255.255.0" +/* end of Static IPv4 Address */ +#define RT_LWIP_UDP +#define RT_LWIP_TCP +#define RT_LWIP_RAW +#define RT_MEMP_NUM_NETCONN 8 +#define RT_LWIP_PBUF_NUM 16 +#define RT_LWIP_RAW_PCB_NUM 4 +#define RT_LWIP_UDP_PCB_NUM 4 +#define RT_LWIP_TCP_PCB_NUM 4 +#define RT_LWIP_TCP_SEG_NUM 40 +#define RT_LWIP_TCP_SND_BUF 8196 +#define RT_LWIP_TCP_WND 8196 +#define RT_LWIP_TCPTHREAD_PRIORITY 12 +#define RT_LWIP_TCPTHREAD_MBOX_SIZE 4 +#define RT_LWIP_TCPTHREAD_STACKSIZE 1024 +#define RT_LWIP_ETHTHREAD_PRIORITY 15 +#define RT_LWIP_ETHTHREAD_STACKSIZE 512 +#define RT_LWIP_ETHTHREAD_MBOX_SIZE 4 +#define LWIP_NETIF_STATUS_CALLBACK 1 +#define LWIP_NETIF_LINK_CALLBACK 1 +#define SO_REUSE 1 +#define LWIP_SO_RCVTIMEO 1 +#define LWIP_SO_SNDTIMEO 1 +#define LWIP_SO_RCVBUF 1 +#define LWIP_SO_LINGER 0 +#define LWIP_NETIF_LOOPBACK 0 +#define RT_LWIP_USING_PING +/* end of light weight TCP/IP stack */ + +/* AT commands */ + +/* end of AT commands */ +/* end of Network */ + +/* VBUS(Virtual Software BUS) */ + +/* end of VBUS(Virtual Software BUS) */ + +/* Utilities */ + +/* end of Utilities */ +/* end of RT-Thread Components */ + +/* RT-Thread Utestcases */ + +/* end of RT-Thread Utestcases */ + +/* RT-Thread online packages */ + +/* IoT - internet of things */ + + +/* Wi-Fi */ + +/* Marvell WiFi */ + +/* end of Marvell WiFi */ + +/* Wiced WiFi */ + +/* end of Wiced WiFi */ +/* end of Wi-Fi */ + +/* IoT Cloud */ + +/* end of IoT Cloud */ +/* end of IoT - internet of things */ + +/* security packages */ + +/* end of security packages */ + +/* language packages */ + +/* end of language packages */ + +/* multimedia packages */ + +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ + +/* tools packages */ + +/* end of tools packages */ + +/* system packages */ + +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + +/* acceleration: Assembly language or algorithmic acceleration packages */ + +/* end of acceleration: Assembly language or algorithmic acceleration packages */ + +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* Micrium: Micrium software products porting for RT-Thread */ + +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ + +/* peripheral libraries and drivers */ + +/* end of peripheral libraries and drivers */ -/* gateway address of target */ -#define RT_LWIP_GWADDR "192.168.1.1" +/* AI packages */ -/* mask address of target */ -#define RT_LWIP_MSKADDR "255.255.255.0" +/* end of AI packages */ -/* tcp thread options */ -#define RT_LWIP_TCPTHREAD_PRIORITY 12 -#define RT_LWIP_TCPTHREAD_MBOX_SIZE 4 -#define RT_LWIP_TCPTHREAD_STACKSIZE 1024 +/* miscellaneous packages */ -/* ethernet if thread options */ -#define RT_LWIP_ETHTHREAD_PRIORITY 15 -#define RT_LWIP_ETHTHREAD_MBOX_SIZE 4 -#define RT_LWIP_ETHTHREAD_STACKSIZE 512 +/* samples: kernel and components samples */ -/* TCP sender buffer space */ -#define RT_LWIP_TCP_SND_BUF 8192 -/* TCP receive window. */ -#define RT_LWIP_TCP_WND 8192 +/* end of samples: kernel and components samples */ -#define CHECKSUM_CHECK_TCP 0 -#define CHECKSUM_CHECK_IP 0 -#define CHECKSUM_CHECK_UDP 0 +/* entertainment: terminal games and other interesting software packages */ -#define CHECKSUM_GEN_TCP 1 -#define CHECKSUM_GEN_IP 1 -#define CHECKSUM_GEN_UDP 1 +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ +#define SOC_FRDM_K64F #endif diff --git a/bsp/ft2004/.config b/bsp/ft2004/.config index 88b814c0091..834c7781210 100644 --- a/bsp/ft2004/.config +++ b/bsp/ft2004/.config @@ -60,13 +60,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # # CONFIG_RT_USING_MEMPOOL is not set -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set CONFIG_RT_USING_SLAB=y +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +CONFIG_RT_USING_SLAB_AS_HEAP=y # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -169,7 +174,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -240,10 +244,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -497,7 +508,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -519,10 +530,17 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -537,13 +555,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -601,9 +612,16 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -613,7 +631,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -628,6 +645,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -653,8 +671,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -662,6 +678,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/ft2004/rtconfig.h b/bsp/ft2004/rtconfig.h index 10b82c81104..a7259102395 100644 --- a/bsp/ft2004/rtconfig.h +++ b/bsp/ft2004/rtconfig.h @@ -39,8 +39,10 @@ /* Memory Management */ -#define RT_USING_MEMHEAP #define RT_USING_SLAB +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SLAB_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -117,7 +119,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -150,6 +151,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -295,6 +303,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32/gd32407v-start/.config b/bsp/gd32/gd32407v-start/.config index c263db29c65..f1cde52c684 100644 --- a/bsp/gd32/gd32407v-start/.config +++ b/bsp/gd32/gd32407v-start/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 CONFIG_RT_USING_SYSTEM_WORKQUEUE=y CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=2048 CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23 @@ -183,10 +186,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +361,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +383,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +408,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +465,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +484,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +498,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -507,8 +524,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +531,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32/gd32407v-start/project.uvproj b/bsp/gd32/gd32407v-start/project.uvproj index 8d46275e823..cbc552859c3 100644 --- a/bsp/gd32/gd32407v-start/project.uvproj +++ b/bsp/gd32/gd32407v-start/project.uvproj @@ -372,7 +372,7 @@ GD32F407xx, USE_STDPERIPH_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\HAL_Drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\GD32F4xx_HAL\CMSIS\GD\GD32F4xx\Include;..\libraries\GD32F4xx_HAL\CMSIS;..\libraries\GD32F4xx_HAL\GD32F4xx_standard_peripheral\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\HAL_Drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\GD32F4xx_HAL\CMSIS\GD\GD32F4xx\Include;..\libraries\GD32F4xx_HAL\CMSIS;..\libraries\GD32F4xx_HAL\GD32F4xx_standard_peripheral\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -425,13 +425,6 @@ CPU - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - div0.c @@ -448,9 +441,9 @@ - cpuport.c + backtrace.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -460,6 +453,13 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + DeviceDrivers @@ -479,51 +479,51 @@ - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c @@ -586,93 +586,93 @@ Kernel - thread.c + components.c 1 - ..\..\..\src\thread.c + ..\..\..\src\components.c - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - device.c + object.c 1 - ..\..\..\src\device.c + ..\..\..\src\object.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - mem.c + ipc.c 1 - ..\..\..\src\mem.c + ..\..\..\src\ipc.c diff --git a/bsp/gd32/gd32407v-start/project.uvprojx b/bsp/gd32/gd32407v-start/project.uvprojx index edfcc3a20d2..e6830471eb1 100644 --- a/bsp/gd32/gd32407v-start/project.uvprojx +++ b/bsp/gd32/gd32407v-start/project.uvprojx @@ -335,7 +335,7 @@ GD32F407xx, USE_STDPERIPH_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\HAL_Drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\GD32F4xx_HAL\CMSIS\GD\GD32F4xx\Include;..\libraries\GD32F4xx_HAL\CMSIS;..\libraries\GD32F4xx_HAL\GD32F4xx_standard_peripheral\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\HAL_Drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\GD32F4xx_HAL\CMSIS\GD\GD32F4xx\Include;..\libraries\GD32F4xx_HAL\CMSIS;..\libraries\GD32F4xx_HAL\GD32F4xx_standard_peripheral\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -411,16 +411,16 @@ - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -442,51 +442,51 @@ - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c @@ -549,93 +549,93 @@ Kernel - object.c + idle.c 1 - ..\..\..\src\object.c + ..\..\..\src\idle.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c - mempool.c + ipc.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\ipc.c - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c - clock.c + kservice.c 1 - ..\..\..\src\clock.c + ..\..\..\src\kservice.c - scheduler.c + irq.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\irq.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - idle.c + thread.c 1 - ..\..\..\src\idle.c + ..\..\..\src\thread.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c diff --git a/bsp/gd32/gd32407v-start/rtconfig.h b/bsp/gd32/gd32407v-start/rtconfig.h index 484b94754ec..dbaa1a76a26 100644 --- a/bsp/gd32/gd32407v-start/rtconfig.h +++ b/bsp/gd32/gd32407v-start/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SYSTEM_WORKQUEUE #define RT_SYSTEM_WORKQUEUE_STACKSIZE 2048 #define RT_SYSTEM_WORKQUEUE_PRIORITY 23 @@ -109,6 +109,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -194,6 +201,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32103c-eval/.config b/bsp/gd32103c-eval/.config new file mode 100644 index 00000000000..f22b89a1740 --- /dev/null +++ b/bsp/gd32103c-eval/.config @@ -0,0 +1,705 @@ +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) + +# +# RT-Thread Kernel +# +CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set +# CONFIG_RT_USING_SMP is not set +CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set +CONFIG_RT_THREAD_PRIORITY_MAX=32 +CONFIG_RT_TICK_PER_SECOND=100 +CONFIG_RT_USING_OVERFLOW_CHECK=y +CONFIG_RT_USING_HOOK=y +CONFIG_RT_USING_IDLE_HOOK=y +CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 +CONFIG_IDLE_THREAD_STACK_SIZE=256 +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + +CONFIG_RT_DEBUG=y +# CONFIG_RT_DEBUG_COLOR is not set +# CONFIG_RT_DEBUG_INIT_CONFIG is not set +# CONFIG_RT_DEBUG_THREAD_CONFIG is not set +# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set +# CONFIG_RT_DEBUG_IPC_CONFIG is not set +# CONFIG_RT_DEBUG_TIMER_CONFIG is not set +# CONFIG_RT_DEBUG_IRQ_CONFIG is not set +# CONFIG_RT_DEBUG_MEM_CONFIG is not set +# CONFIG_RT_DEBUG_SLAB_CONFIG is not set +# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set +# CONFIG_RT_DEBUG_MODULE_CONFIG is not set + +# +# Inter-Thread communication +# +CONFIG_RT_USING_SEMAPHORE=y +CONFIG_RT_USING_MUTEX=y +CONFIG_RT_USING_EVENT=y +CONFIG_RT_USING_MAILBOX=y +CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication + +# +# Memory Management +# +CONFIG_RT_USING_MEMPOOL=y +CONFIG_RT_USING_SMALL_MEM=y +# CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set +# CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set +CONFIG_RT_USING_HEAP=y +# end of Memory Management + +# +# Kernel Device Object +# +CONFIG_RT_USING_DEVICE=y +# CONFIG_RT_USING_DEVICE_OPS is not set +# CONFIG_RT_USING_INTERRUPT_INFO is not set +CONFIG_RT_USING_CONSOLE=y +CONFIG_RT_CONSOLEBUF_SIZE=128 +CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +# +# RT-Thread Components +# +CONFIG_RT_USING_COMPONENTS_INIT=y +CONFIG_RT_USING_USER_MAIN=y +CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 +CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set + +# +# C++ features +# +# CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features + +# +# Command shell +# +CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y +CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 +CONFIG_FINSH_USING_HISTORY=y +CONFIG_FINSH_HISTORY_LINES=5 +CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y +CONFIG_FINSH_USING_DESCRIPTION=y +# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set +# CONFIG_FINSH_USING_AUTH is not set +CONFIG_FINSH_ARG_MAX=10 +# end of Command shell + +# +# Device virtual file system +# +CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y +CONFIG_DFS_USING_WORKDIR=y +CONFIG_DFS_FILESYSTEMS_MAX=2 +CONFIG_DFS_FILESYSTEM_TYPES_MAX=2 +CONFIG_DFS_FD_MAX=16 +# CONFIG_RT_USING_DFS_MNTTABLE is not set +# CONFIG_RT_USING_DFS_ELMFAT is not set +CONFIG_RT_USING_DFS_DEVFS=y +# CONFIG_RT_USING_DFS_ROMFS is not set +# CONFIG_RT_USING_DFS_RAMFS is not set +# end of Device virtual file system + +# +# Device Drivers +# +CONFIG_RT_USING_DEVICE_IPC=y +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set +CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set +CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 +# CONFIG_RT_USING_CAN is not set +# CONFIG_RT_USING_HWTIMER is not set +# CONFIG_RT_USING_CPUTIME is not set +# CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set +CONFIG_RT_USING_PIN=y +# CONFIG_RT_USING_ADC is not set +# CONFIG_RT_USING_DAC is not set +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_MTD_NOR is not set +# CONFIG_RT_USING_MTD_NAND is not set +# CONFIG_RT_USING_PM is not set +# CONFIG_RT_USING_RTC is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set +# CONFIG_RT_USING_WDT is not set +# CONFIG_RT_USING_AUDIO is not set +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers + +# +# POSIX layer and C standard library +# +# CONFIG_RT_USING_LIBC is not set +CONFIG_RT_LIBC_USING_TIME=y +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library + +# +# Network +# + +# +# Socket abstraction layer +# +# CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer + +# +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +# end of Network interface device + +# +# light weight TCP/IP stack +# +# CONFIG_RT_USING_LWIP is not set +# end of light weight TCP/IP stack + +# +# AT commands +# +# CONFIG_RT_USING_AT is not set +# end of AT commands +# end of Network + +# +# VBUS(Virtual Software BUS) +# +# CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) + +# +# Utilities +# +# CONFIG_RT_USING_RYM is not set +# CONFIG_RT_USING_ULOG is not set +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases + +# +# RT-Thread online packages +# + +# +# IoT - internet of things +# +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set +# CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set +# CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_WEBNET is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set +# CONFIG_PKG_USING_LJSON is not set +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_NANOPB is not set + +# +# Wi-Fi +# + +# +# Marvell WiFi +# +# CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi + +# +# Wiced WiFi +# +# CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + +# CONFIG_PKG_USING_COAP is not set +# CONFIG_PKG_USING_NOPOLL is not set +# CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set +# CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set +# CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set + +# +# IoT Cloud +# +# CONFIG_PKG_USING_ONENET is not set +# CONFIG_PKG_USING_GAGENT_CLOUD is not set +# CONFIG_PKG_USING_ALI_IOTKIT is not set +# CONFIG_PKG_USING_AZURE is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things + +# +# security packages +# +# CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages + +# +# language packages +# +# CONFIG_PKG_USING_LUA is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages + +# +# multimedia packages +# + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + +# CONFIG_PKG_USING_OPENMV is not set +# CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages + +# +# tools packages +# +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYFLASH is not set +# CONFIG_PKG_USING_EASYLOGGER is not set +# CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set +# CONFIG_PKG_USING_RDB is not set +# CONFIG_PKG_USING_QRCODE is not set +# CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages + +# +# system packages +# + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set +# CONFIG_PKG_USING_GUIENGINE is not set +# CONFIG_PKG_USING_CAIRO is not set +# CONFIG_PKG_USING_PIXMAN is not set +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set +# CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set +# CONFIG_PKG_USING_DFS_YAFFS is not set +# CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages + +# +# peripheral libraries and drivers +# +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set +# CONFIG_PKG_USING_REALTEK_AMEBA is not set +# CONFIG_PKG_USING_SHT2X is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set +# CONFIG_PKG_USING_STM32_SDIO is not set +# CONFIG_PKG_USING_ICM20608 is not set +# CONFIG_PKG_USING_BUTTON is not set +# CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set +# CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages + +# +# miscellaneous packages +# + +# +# samples: kernel and components samples +# +# CONFIG_PKG_USING_KERNEL_SAMPLES is not set +# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set +# CONFIG_PKG_USING_NETWORK_SAMPLES is not set +# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples + +# +# entertainment: terminal games and other interesting software packages +# +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages + +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +CONFIG_SOC_SERIES_GD32F1=y +CONFIG_SOC_GD32103C=y + +# +# On-chip Peripheral Drivers +# +CONFIG_BSP_USING_UART=y +CONFIG_BSP_USING_UART0=y +# CONFIG_BSP_USING_UART1 is not set +# CONFIG_BSP_USING_UART2 is not set +# CONFIG_BSP_USING_UART3 is not set +# CONFIG_BSP_USING_UART4 is not set +# CONFIG_BSP_USING_ADC is not set +# CONFIG_BSP_USING_HWTIMER is not set +# CONFIG_BSP_USING_WDT is not set +# CONFIG_BSP_USING_RTC is not set +# end of On-chip Peripheral Drivers diff --git a/bsp/gd32103c-eval/rtconfig.h b/bsp/gd32103c-eval/rtconfig.h index cb5321e9e64..869c7879b5b 100644 --- a/bsp/gd32103c-eval/rtconfig.h +++ b/bsp/gd32103c-eval/rtconfig.h @@ -1,8 +1,7 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Configuration */ +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ /* RT-Thread Kernel */ @@ -19,6 +18,10 @@ #define RT_USING_TIMER_SOFT #define RT_TIMER_THREAD_PRIO 4 #define RT_TIMER_THREAD_STACK_SIZE 512 + +/* kservice optimization */ + +/* end of kservice optimization */ #define RT_DEBUG /* Inter-Thread communication */ @@ -28,12 +31,15 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ /* Kernel Device Object */ @@ -41,7 +47,9 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x40003 +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ /* RT-Thread Components */ @@ -52,67 +60,98 @@ /* C++ features */ +/* end of C++ features */ /* Command shell */ #define RT_USING_FINSH +#define RT_USING_MSH +#define FINSH_USING_MSH #define FINSH_THREAD_NAME "tshell" +#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB -#define FINSH_USING_DESCRIPTION -#define FINSH_THREAD_PRIORITY 20 -#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_CMD_SIZE 80 -#define FINSH_USING_MSH -#define FINSH_USING_MSH_DEFAULT +#define MSH_USING_BUILT_IN_COMMANDS +#define FINSH_USING_DESCRIPTION #define FINSH_ARG_MAX 10 +/* end of Command shell */ /* Device virtual file system */ #define RT_USING_DFS +#define DFS_USING_POSIX #define DFS_USING_WORKDIR #define DFS_FILESYSTEMS_MAX 2 #define DFS_FILESYSTEM_TYPES_MAX 2 #define DFS_FD_MAX 16 #define RT_USING_DFS_DEVFS +/* end of Device virtual file system */ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL +#define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_PIN /* Using USB */ +/* end of Using USB */ +/* end of Device Drivers */ /* POSIX layer and C standard library */ -#define RT_USING_LIBC -#define RT_USING_POSIX +#define RT_LIBC_USING_TIME +#define RT_LIBC_DEFAULT_TIMEZONE 8 + +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ /* Network */ /* Socket abstraction layer */ +/* end of Socket abstraction layer */ /* Network interface device */ +/* end of Network interface device */ /* light weight TCP/IP stack */ +/* end of light weight TCP/IP stack */ /* AT commands */ +/* end of AT commands */ +/* end of Network */ /* VBUS(Virtual Software BUS) */ +/* end of VBUS(Virtual Software BUS) */ /* Utilities */ +/* end of Utilities */ +/* end of RT-Thread Components */ + +/* RT-Thread Utestcases */ + +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -123,36 +162,83 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ +/* end of language packages */ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + +/* acceleration: Assembly language or algorithmic acceleration packages */ + +/* end of acceleration: Assembly language or algorithmic acceleration packages */ + +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* Micrium: Micrium software products porting for RT-Thread */ + +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ /* peripheral libraries and drivers */ +/* end of peripheral libraries and drivers */ -/* miscellaneous packages */ +/* AI packages */ +/* end of AI packages */ + +/* miscellaneous packages */ /* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ + +/* entertainment: terminal games and other interesting software packages */ + +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ #define SOC_SERIES_GD32F1 #define SOC_GD32103C @@ -160,5 +246,6 @@ #define BSP_USING_UART #define BSP_USING_UART0 +/* end of On-chip Peripheral Drivers */ #endif diff --git a/bsp/gd32105c-eval/.config b/bsp/gd32105c-eval/.config index 55f34d137c1..2bd5ccc25c4 100644 --- a/bsp/gd32105c-eval/.config +++ b/bsp/gd32105c-eval/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -158,7 +162,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -222,10 +225,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -388,7 +398,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -410,10 +420,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -428,13 +445,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -492,9 +502,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -504,7 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -519,6 +535,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -543,8 +560,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -552,6 +567,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32105c-eval/project.uvprojx b/bsp/gd32105c-eval/project.uvprojx index e8cb65b5943..f2bf2e4c740 100644 --- a/bsp/gd32105c-eval/project.uvprojx +++ b/bsp/gd32105c-eval/project.uvprojx @@ -362,7 +362,7 @@ GD32F10X_CL, USE_STDPERIPH_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F10x\Include;Libraries\CMSIS;Libraries\GD32F10x_standard_peripheral\Include;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F10x\Include;Libraries\CMSIS;Libraries\GD32F10x_standard_peripheral\Include;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -416,16 +416,16 @@ CPU - backtrace.c + div0.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\libcpu\arm\common\div0.c - div0.c + backtrace.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\common\backtrace.c @@ -437,16 +437,16 @@ - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m3\cpuport.c @@ -517,9 +517,16 @@ - waitqueue.c + dataqueue.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\dataqueue.c + + + + + ringblk_buf.c + 1 + ..\..\components\drivers\src\ringblk_buf.c @@ -538,9 +545,9 @@ - ringblk_buf.c + waitqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\waitqueue.c @@ -550,13 +557,6 @@ ..\..\components\drivers\src\workqueue.c - - - dataqueue.c - 1 - ..\..\components\drivers\src\dataqueue.c - - ringbuffer.c @@ -661,23 +661,23 @@ - dfs_elm.c + ff.c 1 - ..\..\components\dfs\filesystems\elmfat\dfs_elm.c + ..\..\components\dfs\filesystems\elmfat\ff.c - ffunicode.c + dfs_elm.c 1 - ..\..\components\dfs\filesystems\elmfat\ffunicode.c + ..\..\components\dfs\filesystems\elmfat\dfs_elm.c - ff.c + ffunicode.c 1 - ..\..\components\dfs\filesystems\elmfat\ff.c + ..\..\components\dfs\filesystems\elmfat\ffunicode.c @@ -716,30 +716,23 @@ Kernel - kservice.c - 1 - ..\..\src\kservice.c - - - - - device.c + components.c 1 - ..\..\src\device.c + ..\..\src\components.c - idle.c + thread.c 1 - ..\..\src\idle.c + ..\..\src\thread.c - clock.c + device.c 1 - ..\..\src\clock.c + ..\..\src\device.c @@ -751,23 +744,23 @@ - object.c + irq.c 1 - ..\..\src\object.c + ..\..\src\irq.c - thread.c + idle.c 1 - ..\..\src\thread.c + ..\..\src\idle.c - scheduler.c + object.c 1 - ..\..\src\scheduler.c + ..\..\src\object.c @@ -786,23 +779,30 @@ - components.c + mempool.c 1 - ..\..\src\components.c + ..\..\src\mempool.c - irq.c + scheduler.c 1 - ..\..\src\irq.c + ..\..\src\scheduler.c - mempool.c + clock.c 1 - ..\..\src\mempool.c + ..\..\src\clock.c + + + + + kservice.c + 1 + ..\..\src\kservice.c @@ -820,135 +820,135 @@ Libraries - gd32f10x_dbg.c + gd32f10x_can.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dbg.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_can.c - gd32f10x_misc.c + gd32f10x_rtc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_misc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rtc.c - gd32f10x_rtc.c + gd32f10x_exmc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rtc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exmc.c - gd32f10x_adc.c + gd32f10x_exti.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_adc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exti.c - gd32f10x_fmc.c + gd32f10x_gpio.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fmc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_gpio.c - gd32f10x_rcu.c + gd32f10x_i2c.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rcu.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_i2c.c - gd32f10x_enet.c + gd32f10x_crc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_enet.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_crc.c - system_gd32f10x.c + gd32f10x_usart.c 1 - Libraries\CMSIS\GD\GD32F10x\Source\system_gd32f10x.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_usart.c - gd32f10x_fwdgt.c + gd32f10x_rcu.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fwdgt.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rcu.c - gd32f10x_wwdgt.c + gd32f10x_dma.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_wwdgt.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dma.c - gd32f10x_exti.c + gd32f10x_spi.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exti.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_spi.c - gd32f10x_gpio.c + gd32f10x_fmc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_gpio.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fmc.c - gd32f10x_crc.c + gd32f10x_pmu.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_crc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_pmu.c - gd32f10x_exmc.c + gd32f10x_fwdgt.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exmc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fwdgt.c - gd32f10x_pmu.c + gd32f10x_timer.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_pmu.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_timer.c - gd32f10x_usart.c + gd32f10x_adc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_usart.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_adc.c - gd32f10x_i2c.c + gd32f10x_misc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_i2c.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_misc.c - gd32f10x_dac.c + gd32f10x_wwdgt.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dac.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_wwdgt.c - gd32f10x_spi.c + system_gd32f10x.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_spi.c + Libraries\CMSIS\GD\GD32F10x\Source\system_gd32f10x.c @@ -960,37 +960,37 @@ - gd32f10x_dma.c + gd32f10x_bkp.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dma.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_bkp.c - gd32f10x_can.c + gd32f10x_sdio.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_can.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_sdio.c - gd32f10x_bkp.c + gd32f10x_enet.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_bkp.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_enet.c - gd32f10x_sdio.c + gd32f10x_dac.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_sdio.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dac.c - gd32f10x_timer.c + gd32f10x_dbg.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_timer.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dbg.c diff --git a/bsp/gd32105c-eval/rtconfig.h b/bsp/gd32105c-eval/rtconfig.h index cb200c514ef..7d0c03205b3 100644 --- a/bsp/gd32105c-eval/rtconfig.h +++ b/bsp/gd32105c-eval/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -106,7 +107,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -131,6 +131,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -216,6 +223,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32107c-eval/.config b/bsp/gd32107c-eval/.config index 3b55cab753d..307521894be 100644 --- a/bsp/gd32107c-eval/.config +++ b/bsp/gd32107c-eval/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -158,7 +162,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -222,10 +225,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -388,7 +398,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -410,10 +420,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -428,13 +445,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -492,9 +502,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -504,7 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -519,6 +535,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -543,8 +560,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -552,6 +567,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32107c-eval/project.uvprojx b/bsp/gd32107c-eval/project.uvprojx index 0ad2a15964b..11547412987 100644 --- a/bsp/gd32107c-eval/project.uvprojx +++ b/bsp/gd32107c-eval/project.uvprojx @@ -362,7 +362,7 @@ GD32F10X_CL, USE_STDPERIPH_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F10x\Include;Libraries\CMSIS;Libraries\GD32F10x_standard_peripheral\Include;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F10x\Include;Libraries\CMSIS;Libraries\GD32F10x_standard_peripheral\Include;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -416,23 +416,23 @@ CPU - div0.c + showmem.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\libcpu\arm\common\div0.c @@ -517,51 +517,51 @@ - workqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\ringblk_buf.c - completion.c + waitqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\waitqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\dataqueue.c - pipe.c + completion.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\completion.c - dataqueue.c + pipe.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\pipe.c - ringblk_buf.c + workqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\workqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\ringbuffer.c @@ -661,23 +661,23 @@ - dfs_elm.c + ff.c 1 - ..\..\components\dfs\filesystems\elmfat\dfs_elm.c + ..\..\components\dfs\filesystems\elmfat\ff.c - ff.c + ffunicode.c 1 - ..\..\components\dfs\filesystems\elmfat\ff.c + ..\..\components\dfs\filesystems\elmfat\ffunicode.c - ffunicode.c + dfs_elm.c 1 - ..\..\components\dfs\filesystems\elmfat\ffunicode.c + ..\..\components\dfs\filesystems\elmfat\dfs_elm.c @@ -716,30 +716,30 @@ Kernel - ipc.c + irq.c 1 - ..\..\src\ipc.c + ..\..\src\irq.c - thread.c + mem.c 1 - ..\..\src\thread.c + ..\..\src\mem.c - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - clock.c + components.c 1 - ..\..\src\clock.c + ..\..\src\components.c @@ -751,58 +751,58 @@ - mem.c + scheduler.c 1 - ..\..\src\mem.c + ..\..\src\scheduler.c - scheduler.c + idle.c 1 - ..\..\src\scheduler.c + ..\..\src\idle.c - timer.c + kservice.c 1 - ..\..\src\timer.c + ..\..\src\kservice.c - mempool.c + ipc.c 1 - ..\..\src\mempool.c + ..\..\src\ipc.c - irq.c + clock.c 1 - ..\..\src\irq.c + ..\..\src\clock.c - idle.c + mempool.c 1 - ..\..\src\idle.c + ..\..\src\mempool.c - components.c + device.c 1 - ..\..\src\components.c + ..\..\src\device.c - kservice.c + timer.c 1 - ..\..\src\kservice.c + ..\..\src\timer.c @@ -834,72 +834,72 @@ - gd32f10x_sdio.c + gd32f10x_fmc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_sdio.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fmc.c - gd32f10x_rcu.c + gd32f10x_dbg.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rcu.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dbg.c - gd32f10x_misc.c + gd32f10x_bkp.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_misc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_bkp.c - gd32f10x_gpio.c + gd32f10x_i2c.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_gpio.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_i2c.c - gd32f10x_exti.c + gd32f10x_dma.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exti.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dma.c - gd32f10x_timer.c + gd32f10x_dac.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_timer.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dac.c - gd32f10x_dac.c + gd32f10x_pmu.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dac.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_pmu.c - system_gd32f10x.c + gd32f10x_fwdgt.c 1 - Libraries\CMSIS\GD\GD32F10x\Source\system_gd32f10x.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fwdgt.c - gd32f10x_pmu.c + gd32f10x_spi.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_pmu.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_spi.c - gd32f10x_exmc.c + system_gd32f10x.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exmc.c + Libraries\CMSIS\GD\GD32F10x\Source\system_gd32f10x.c @@ -911,86 +911,86 @@ - gd32f10x_dbg.c + gd32f10x_timer.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dbg.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_timer.c - gd32f10x_usart.c + gd32f10x_enet.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_usart.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_enet.c - gd32f10x_crc.c + gd32f10x_misc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_crc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_misc.c - gd32f10x_enet.c + gd32f10x_sdio.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_enet.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_sdio.c - gd32f10x_i2c.c + gd32f10x_gpio.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_i2c.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_gpio.c - gd32f10x_dma.c + gd32f10x_exti.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_dma.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exti.c - gd32f10x_fwdgt.c + gd32f10x_exmc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fwdgt.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_exmc.c - gd32f10x_rtc.c + gd32f10x_usart.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rtc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_usart.c - gd32f10x_bkp.c + gd32f10x_rtc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_bkp.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rtc.c - gd32f10x_fmc.c + gd32f10x_rcu.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_fmc.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_rcu.c - gd32f10x_wwdgt.c + gd32f10x_crc.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_wwdgt.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_crc.c - gd32f10x_spi.c + gd32f10x_wwdgt.c 1 - Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_spi.c + Libraries\GD32F10x_standard_peripheral\Source\gd32f10x_wwdgt.c diff --git a/bsp/gd32107c-eval/rtconfig.h b/bsp/gd32107c-eval/rtconfig.h index 880ef4b5864..d0fe577cadd 100644 --- a/bsp/gd32107c-eval/rtconfig.h +++ b/bsp/gd32107c-eval/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -106,7 +107,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -131,6 +131,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -216,6 +223,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32303e-eval/.config b/bsp/gd32303e-eval/.config index 8cbcb849fd4..1817894c2e8 100644 --- a/bsp/gd32303e-eval/.config +++ b/bsp/gd32303e-eval/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -158,7 +162,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -224,10 +227,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -390,7 +400,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -412,10 +422,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -430,13 +447,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -494,9 +504,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -506,7 +523,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -521,6 +537,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -545,8 +562,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -554,6 +569,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32303e-eval/project.uvprojx b/bsp/gd32303e-eval/project.uvprojx index 9496a31ced5..37ca3c089d4 100644 --- a/bsp/gd32303e-eval/project.uvprojx +++ b/bsp/gd32303e-eval/project.uvprojx @@ -333,7 +333,7 @@ USE_STDPERIPH_DRIVER, GD32F30X_HD, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F30x\Include;Libraries\CMSIS;Libraries\GD32F30x_standard_peripheral\Include;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F30x\Include;Libraries\CMSIS;Libraries\GD32F30x_standard_peripheral\Include;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -386,6 +386,13 @@ CPU + + + backtrace.c + 1 + ..\..\libcpu\arm\common\backtrace.c + + showmem.c @@ -402,9 +409,9 @@ - backtrace.c - 1 - ..\..\libcpu\arm\common\backtrace.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -414,13 +421,6 @@ ..\..\libcpu\arm\cortex-m4\cpuport.c - - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S - - DeviceDrivers @@ -482,16 +482,9 @@ - pipe.c - 1 - ..\..\components\drivers\src\pipe.c - - - - - dataqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\ringbuffer.c @@ -503,9 +496,9 @@ - ringbuffer.c + pipe.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\pipe.c @@ -529,6 +522,13 @@ ..\..\components\drivers\src\waitqueue.c + + + dataqueue.c + 1 + ..\..\components\drivers\src\dataqueue.c + + @@ -626,9 +626,9 @@ - ff.c + dfs_elm.c 1 - ..\..\components\dfs\filesystems\elmfat\ff.c + ..\..\components\dfs\filesystems\elmfat\dfs_elm.c @@ -640,9 +640,9 @@ - dfs_elm.c + ff.c 1 - ..\..\components\dfs\filesystems\elmfat\dfs_elm.c + ..\..\components\dfs\filesystems\elmfat\ff.c @@ -681,93 +681,93 @@ Kernel - idle.c + clock.c 1 - ..\..\src\idle.c + ..\..\src\clock.c - ipc.c + object.c 1 - ..\..\src\ipc.c + ..\..\src\object.c - irq.c + mem.c 1 - ..\..\src\irq.c + ..\..\src\mem.c - scheduler.c + idle.c 1 - ..\..\src\scheduler.c + ..\..\src\idle.c - mempool.c + components.c 1 - ..\..\src\mempool.c + ..\..\src\components.c - thread.c + mempool.c 1 - ..\..\src\thread.c + ..\..\src\mempool.c - device.c + irq.c 1 - ..\..\src\device.c + ..\..\src\irq.c - clock.c + timer.c 1 - ..\..\src\clock.c + ..\..\src\timer.c - timer.c + ipc.c 1 - ..\..\src\timer.c + ..\..\src\ipc.c - mem.c + thread.c 1 - ..\..\src\mem.c + ..\..\src\thread.c - components.c + kservice.c 1 - ..\..\src\components.c + ..\..\src\kservice.c - object.c + scheduler.c 1 - ..\..\src\object.c + ..\..\src\scheduler.c - kservice.c + device.c 1 - ..\..\src\kservice.c + ..\..\src\device.c @@ -782,9 +782,9 @@ - libc.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\libc_syms.c @@ -796,9 +796,9 @@ - stdio.c + time.c 1 - ..\..\components\libc\compilers\armlibc\stdio.c + ..\..\components\libc\compilers\common\time.c @@ -808,16 +808,16 @@ ..\..\components\libc\compilers\common\stdlib.c + + + Libraries - time.c + gd32f30x_sdio.c 1 - ..\..\components\libc\compilers\common\time.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_sdio.c - - - Libraries gd32f30x_usart.c @@ -827,30 +827,30 @@ - system_gd32f30x.c + gd32f30x_fmc.c 1 - Libraries\CMSIS\GD\GD32F30x\Source\system_gd32f30x.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_fmc.c - gd32f30x_enet.c + gd32f30x_crc.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_enet.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_crc.c - gd32f30x_fmc.c + system_gd32f30x.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_fmc.c + Libraries\CMSIS\GD\GD32F30x\Source\system_gd32f30x.c - gd32f30x_gpio.c - 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_gpio.c + startup_gd32f30x_hd.s + 2 + Libraries\CMSIS\GD\GD32F30x\Source\ARM\startup_gd32f30x_hd.s @@ -862,142 +862,135 @@ - gd32f30x_crc.c + gd32f30x_fwdgt.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_crc.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_fwdgt.c - gd32f30x_pmu.c + gd32f30x_exti.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_pmu.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_exti.c - gd32f30x_wwdgt.c + gd32f30x_ctc.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_wwdgt.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_ctc.c - gd32f30x_dac.c + gd32f30x_pmu.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_dac.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_pmu.c - gd32f30x_rtc.c + gd32f30x_dac.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_rtc.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_dac.c - gd32f30x_rcu.c + gd32f30x_dma.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_rcu.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_dma.c - gd32f30x_exmc.c + gd32f30x_wwdgt.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_exmc.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_wwdgt.c - gd32f30x_can.c + gd32f30x_dbg.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_can.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_dbg.c - gd32f30x_exti.c + gd32f30x_timer.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_exti.c - - - - - startup_gd32f30x_hd.s - 2 - Libraries\CMSIS\GD\GD32F30x\Source\ARM\startup_gd32f30x_hd.s + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_timer.c - gd32f30x_dma.c + gd32f30x_gpio.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_dma.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_gpio.c - gd32f30x_adc.c + gd32f30x_rcu.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_adc.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_rcu.c - gd32f30x_ctc.c + gd32f30x_i2c.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_ctc.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_i2c.c - gd32f30x_spi.c + gd32f30x_enet.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_spi.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_enet.c - gd32f30x_dbg.c + gd32f30x_bkp.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_dbg.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_bkp.c - gd32f30x_timer.c + gd32f30x_spi.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_timer.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_spi.c - gd32f30x_sdio.c + gd32f30x_adc.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_sdio.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_adc.c - gd32f30x_bkp.c + gd32f30x_rtc.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_bkp.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_rtc.c - gd32f30x_fwdgt.c + gd32f30x_can.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_fwdgt.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_can.c - gd32f30x_i2c.c + gd32f30x_exmc.c 1 - Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_i2c.c + Libraries\GD32F30x_standard_peripheral\Source\gd32f30x_exmc.c diff --git a/bsp/gd32303e-eval/rtconfig.h b/bsp/gd32303e-eval/rtconfig.h index 162dd23c400..34b4715e30d 100644 --- a/bsp/gd32303e-eval/rtconfig.h +++ b/bsp/gd32303e-eval/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -106,7 +107,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -131,6 +131,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -216,6 +223,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32350r-eval/.config b/bsp/gd32350r-eval/.config index 80081b9b52e..02753af9ce6 100644 --- a/bsp/gd32350r-eval/.config +++ b/bsp/gd32350r-eval/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +130,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -177,10 +180,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -343,7 +353,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -365,10 +375,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -383,13 +400,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -447,9 +457,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -459,7 +476,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -474,6 +490,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -498,8 +515,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -507,6 +522,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32350r-eval/project.uvprojx b/bsp/gd32350r-eval/project.uvprojx index 7737044e256..577426e7d5d 100644 --- a/bsp/gd32350r-eval/project.uvprojx +++ b/bsp/gd32350r-eval/project.uvprojx @@ -334,7 +334,7 @@ GD32F350, USE_STDPERIPH_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F3x0\Include;Libraries\CMSIS;Libraries\GD32F3x0_standard_peripheral\Include;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F3x0\Include;Libraries\CMSIS;Libraries\GD32F3x0_standard_peripheral\Include;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -441,23 +441,23 @@ - ringbuffer.c + workqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\workqueue.c - completion.c + waitqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\waitqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\ringbuffer.c @@ -469,9 +469,9 @@ - workqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\ringblk_buf.c @@ -483,9 +483,9 @@ - ringblk_buf.c + completion.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\completion.c @@ -541,30 +541,23 @@ Kernel - ipc.c - 1 - ..\..\src\ipc.c - - - - - device.c + timer.c 1 - ..\..\src\device.c + ..\..\src\timer.c - kservice.c + mempool.c 1 - ..\..\src\kservice.c + ..\..\src\mempool.c - object.c + scheduler.c 1 - ..\..\src\object.c + ..\..\src\scheduler.c @@ -576,9 +569,9 @@ - thread.c + ipc.c 1 - ..\..\src\thread.c + ..\..\src\ipc.c @@ -590,9 +583,9 @@ - timer.c + irq.c 1 - ..\..\src\timer.c + ..\..\src\irq.c @@ -604,145 +597,138 @@ - mem.c - 1 - ..\..\src\mem.c - - - - - mempool.c + object.c 1 - ..\..\src\mempool.c + ..\..\src\object.c - scheduler.c + thread.c 1 - ..\..\src\scheduler.c + ..\..\src\thread.c - irq.c + mem.c 1 - ..\..\src\irq.c + ..\..\src\mem.c - - - Libraries - gd32f3x0_wwdgt.c + kservice.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_wwdgt.c + ..\..\src\kservice.c - gd32f3x0_i2c.c + device.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_i2c.c + ..\..\src\device.c + + + Libraries - gd32f3x0_crc.c + gd32f3x0_exti.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_crc.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_exti.c - gd32f3x0_exti.c + gd32f3x0_syscfg.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_exti.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_syscfg.c - gd32f3x0_rcu.c + gd32f3x0_dbg.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_rcu.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_dbg.c - gd32f3x0_cmp.c + gd32f3x0_dac.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_cmp.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_dac.c - gd32f3x0_usart.c + gd32f3x0_timer.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_usart.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_timer.c - gd32f3x0_fwdgt.c + gd32f3x0_dma.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_fwdgt.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_dma.c - gd32f3x0_tsi.c + gd32f3x0_i2c.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_tsi.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_i2c.c - gd32f3x0_pmu.c + gd32f3x0_rtc.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_pmu.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_rtc.c - gd32f3x0_timer.c + gd32f3x0_crc.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_timer.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_crc.c - gd32f3x0_cec.c + gd32f3x0_usart.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_cec.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_usart.c - gd32f3x0_dac.c + gd32f3x0_cmp.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_dac.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_cmp.c - gd32f3x0_adc.c + gd32f3x0_tsi.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_adc.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_tsi.c - gd32f3x0_dbg.c + gd32f3x0_pmu.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_dbg.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_pmu.c - gd32f3x0_rtc.c + gd32f3x0_rcu.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_rtc.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_rcu.c @@ -754,9 +740,9 @@ - gd32f3x0_spi.c + gd32f3x0_fwdgt.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_spi.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_fwdgt.c @@ -775,9 +761,9 @@ - gd32f3x0_gpio.c + gd32f3x0_spi.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_gpio.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_spi.c @@ -787,6 +773,20 @@ Libraries\CMSIS\GD\GD32F3x0\Source\system_gd32f3x0.c + + + gd32f3x0_gpio.c + 1 + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_gpio.c + + + + + gd32f3x0_cec.c + 1 + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_cec.c + + gd32f3x0_misc.c @@ -796,16 +796,16 @@ - gd32f3x0_syscfg.c + gd32f3x0_adc.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_syscfg.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_adc.c - gd32f3x0_dma.c + gd32f3x0_wwdgt.c 1 - Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_dma.c + Libraries\GD32F3x0_standard_peripheral\Source\gd32f3x0_wwdgt.c diff --git a/bsp/gd32350r-eval/rtconfig.h b/bsp/gd32350r-eval/rtconfig.h index dca2137f537..fd6ec07281c 100644 --- a/bsp/gd32350r-eval/rtconfig.h +++ b/bsp/gd32350r-eval/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -102,6 +102,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -187,6 +194,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32450z-eval/.config b/bsp/gd32450z-eval/.config index 34451d61de7..c4bc79eafb4 100644 --- a/bsp/gd32450z-eval/.config +++ b/bsp/gd32450z-eval/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -159,7 +163,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 CONFIG_RT_USING_SYSTEM_WORKQUEUE=y CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=2048 CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23 @@ -216,12 +219,22 @@ CONFIG_RT_USING_POSIX_FS=y # CONFIG_RT_USING_POSIX_DEVIO is not set CONFIG_RT_USING_POSIX_POLL=y CONFIG_RT_USING_POSIX_SELECT=y -# CONFIG_RT_USING_POSIX_DELAY is not set -# CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set # CONFIG_RT_USING_POSIX_TERMIOS is not set # CONFIG_RT_USING_POSIX_AIO is not set +# CONFIG_RT_USING_POSIX_MMAN is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -458,7 +471,7 @@ CONFIG_RT_LWIP_USING_PING=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -480,10 +493,17 @@ CONFIG_RT_LWIP_USING_PING=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -498,13 +518,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -562,9 +575,16 @@ CONFIG_RT_LWIP_USING_PING=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -574,7 +594,6 @@ CONFIG_RT_LWIP_USING_PING=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -589,6 +608,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -613,8 +633,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -622,6 +640,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32450z-eval/project.uvproj b/bsp/gd32450z-eval/project.uvproj index b6dd4da246c..b678e47176c 100644 --- a/bsp/gd32450z-eval/project.uvproj +++ b/bsp/gd32450z-eval/project.uvproj @@ -372,7 +372,7 @@ USE_STDPERIPH_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F4xx\Include;Libraries\CMSIS;Libraries\GD32F4xx_standard_peripheral\Include;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\net\netdev\include;..\..\components\net\sal_socket\include;..\..\components\net\sal_socket\include\socket;..\..\components\net\sal_socket\impl;..\..\components\net\sal_socket\include\dfs_net;..\..\components\net\sal_socket\include\socket\sys_socket;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F4xx\Include;Libraries\CMSIS;Libraries\GD32F4xx_standard_peripheral\Include;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\libc\posix\io;..\..\components\libc\posix\io\poll;..\..\components\net\netdev\include;..\..\components\net\sal_socket\include;..\..\components\net\sal_socket\include\socket;..\..\components\net\sal_socket\impl;..\..\components\net\sal_socket\include\dfs_net;..\..\components\net\sal_socket\include\socket\sys_socket;..\..\examples\utest\testcases\kernel @@ -448,16 +448,16 @@ - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -479,16 +479,16 @@ - waitqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + workqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\workqueue.c @@ -507,23 +507,23 @@ - workqueue.c + waitqueue.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\waitqueue.c - dataqueue.c + completion.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\completion.c - completion.c + dataqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\dataqueue.c @@ -576,16 +576,9 @@ - dfs_poll.c - 1 - ..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\components\dfs\src\dfs_file.c + ..\..\components\dfs\src\dfs_fs.c @@ -597,16 +590,9 @@ - dfs_fs.c - 1 - ..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\components\dfs\src\dfs_select.c + ..\..\components\dfs\src\dfs_file.c @@ -671,13 +657,6 @@ Kernel - - - ipc.c - 1 - ..\..\src\ipc.c - - kservice.c @@ -687,16 +666,9 @@ - thread.c - 1 - ..\..\src\thread.c - - - - - scheduler.c + mempool.c 1 - ..\..\src\scheduler.c + ..\..\src\mempool.c @@ -708,77 +680,77 @@ - idle.c + object.c 1 - ..\..\src\idle.c + ..\..\src\object.c - device.c + timer.c 1 - ..\..\src\device.c + ..\..\src\timer.c - object.c + irq.c 1 - ..\..\src\object.c + ..\..\src\irq.c - mem.c + clock.c 1 - ..\..\src\mem.c + ..\..\src\clock.c - clock.c + ipc.c 1 - ..\..\src\clock.c + ..\..\src\ipc.c - timer.c + scheduler.c 1 - ..\..\src\timer.c + ..\..\src\scheduler.c - mempool.c + thread.c 1 - ..\..\src\mempool.c + ..\..\src\thread.c - irq.c + idle.c 1 - ..\..\src\irq.c + ..\..\src\idle.c - - - libc - stdio.c + device.c 1 - ..\..\components\libc\compilers\armlibc\stdio.c + ..\..\src\device.c - libc.c + mem.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\src\mem.c + + + libc syscalls.c @@ -795,23 +767,16 @@ - time.c - 1 - ..\..\components\libc\compilers\common\time.c - - - - - unistd.c + libc_syms.c 1 - ..\..\components\libc\compilers\common\unistd.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - delay.c + time.c 1 - ..\..\components\libc\compilers\common\delay.c + ..\..\components\libc\compilers\common\time.c @@ -826,121 +791,121 @@ Libraries - gd32f4xx_exti.c + gd32f4xx_wwdgt.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exti.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_wwdgt.c - gd32f4xx_usart.c + gd32f4xx_adc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_usart.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_adc.c - gd32f4xx_pmu.c + gd32f4xx_enet.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_pmu.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_enet.c - gd32f4xx_can.c + gd32f4xx_spi.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_can.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_spi.c - gd32f4xx_timer.c + gd32f4xx_dma.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_timer.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dma.c - gd32f4xx_adc.c + gd32f4xx_iref.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_adc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_iref.c - gd32f4xx_ctc.c + gd32f4xx_dci.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ctc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dci.c - gd32f4xx_rtc.c + gd32f4xx_syscfg.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rtc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_syscfg.c - gd32f4xx_exmc.c + gd32f4xx_usart.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exmc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_usart.c - gd32f4xx_syscfg.c + gd32f4xx_fwdgt.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_syscfg.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fwdgt.c - gd32f4xx_enet.c + gd32f4xx_fmc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_enet.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fmc.c - gd32f4xx_crc.c + gd32f4xx_rtc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_crc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rtc.c - gd32f4xx_misc.c + gd32f4xx_timer.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_misc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_timer.c - gd32f4xx_tli.c + gd32f4xx_dac.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_tli.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dac.c - gd32f4xx_wwdgt.c + gd32f4xx_misc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_wwdgt.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_misc.c - gd32f4xx_dbg.c + system_gd32f4xx.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dbg.c + Libraries\CMSIS\GD\GD32F4xx\Source\system_gd32f4xx.c - gd32f4xx_fmc.c + gd32f4xx_dbg.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fmc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dbg.c @@ -952,30 +917,30 @@ - gd32f4xx_iref.c + gd32f4xx_sdio.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_iref.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_sdio.c - gd32f4xx_dma.c + gd32f4xx_trng.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dma.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_trng.c - gd32f4xx_trng.c + gd32f4xx_exmc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_trng.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exmc.c - gd32f4xx_sdio.c + gd32f4xx_pmu.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_sdio.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_pmu.c @@ -987,63 +952,70 @@ - gd32f4xx_gpio.c + gd32f4xx_crc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_gpio.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_crc.c - gd32f4xx_rcu.c + gd32f4xx_ipa.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rcu.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ipa.c - gd32f4xx_dac.c + gd32f4xx_ctc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dac.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ctc.c - gd32f4xx_ipa.c + gd32f4xx_can.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ipa.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_can.c - gd32f4xx_dci.c + gd32f4xx_tli.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dci.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_tli.c - gd32f4xx_fwdgt.c + gd32f4xx_exti.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fwdgt.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exti.c - gd32f4xx_spi.c + gd32f4xx_rcu.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_spi.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rcu.c - system_gd32f4xx.c + gd32f4xx_gpio.c 1 - Libraries\CMSIS\GD\GD32F4xx\Source\system_gd32f4xx.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_gpio.c lwIP + + + ping.c + 1 + ..\..\components\net\lwip-2.0.2\src\apps\ping\ping.c + + netdb.c @@ -1149,13 +1121,6 @@ ..\..\components\net\lwip-2.0.2\src\core\memp.c - - - ping.c - 1 - ..\..\components\net\lwip-2.0.2\src\apps\ping\ping.c - - ip4.c @@ -1304,6 +1269,23 @@ + + POSIX + + + select.c + 1 + ..\..\components\libc\posix\io\select.c + + + + + poll.c + 1 + ..\..\components\libc\posix\io\poll\poll.c + + + SAL @@ -1322,37 +1304,37 @@ - sal_socket.c + af_inet_lwip.c 1 - ..\..\components\net\sal_socket\src\sal_socket.c + ..\..\components\net\sal_socket\impl\af_inet_lwip.c - net_netdb.c + sal_socket.c 1 - ..\..\components\net\sal_socket\socket\net_netdb.c + ..\..\components\net\sal_socket\src\sal_socket.c - dfs_net.c + net_sockets.c 1 - ..\..\components\net\sal_socket\dfs_net\dfs_net.c + ..\..\components\net\sal_socket\socket\net_sockets.c - net_sockets.c + dfs_net.c 1 - ..\..\components\net\sal_socket\socket\net_sockets.c + ..\..\components\net\sal_socket\dfs_net\dfs_net.c - af_inet_lwip.c + net_netdb.c 1 - ..\..\components\net\sal_socket\impl\af_inet_lwip.c + ..\..\components\net\sal_socket\socket\net_netdb.c diff --git a/bsp/gd32450z-eval/project.uvprojx b/bsp/gd32450z-eval/project.uvprojx index 2d2bb333364..03bd82e4546 100644 --- a/bsp/gd32450z-eval/project.uvprojx +++ b/bsp/gd32450z-eval/project.uvprojx @@ -333,7 +333,7 @@ USE_STDPERIPH_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F4xx\Include;Libraries\CMSIS;Libraries\GD32F4xx_standard_peripheral\Include;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\net\netdev\include;..\..\components\net\sal_socket\include;..\..\components\net\sal_socket\include\socket;..\..\components\net\sal_socket\impl;..\..\components\net\sal_socket\include\dfs_net;..\..\components\net\sal_socket\include\socket\sys_socket;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32F4xx\Include;Libraries\CMSIS;Libraries\GD32F4xx_standard_peripheral\Include;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\libc\posix\io;..\..\components\libc\posix\io\poll;..\..\components\net\netdev\include;..\..\components\net\sal_socket\include;..\..\components\net\sal_socket\include\socket;..\..\components\net\sal_socket\impl;..\..\components\net\sal_socket\include\dfs_net;..\..\components\net\sal_socket\include\socket\sys_socket;..\..\examples\utest\testcases\kernel @@ -409,16 +409,16 @@ - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m4\cpuport.c @@ -440,37 +440,37 @@ - waitqueue.c + completion.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\completion.c - ringblk_buf.c + workqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\workqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\ringblk_buf.c - workqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\ringbuffer.c @@ -482,9 +482,9 @@ - completion.c + waitqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\waitqueue.c @@ -537,16 +537,9 @@ - dfs_poll.c - 1 - ..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\components\dfs\src\dfs_file.c + ..\..\components\dfs\src\dfs_fs.c @@ -558,16 +551,9 @@ - dfs_fs.c - 1 - ..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\components\dfs\src\dfs_select.c + ..\..\components\dfs\src\dfs_file.c @@ -634,9 +620,9 @@ Kernel - thread.c + scheduler.c 1 - ..\..\src\thread.c + ..\..\src\scheduler.c @@ -648,79 +634,79 @@ - mempool.c + idle.c 1 - ..\..\src\mempool.c + ..\..\src\idle.c - ipc.c + mempool.c 1 - ..\..\src\ipc.c + ..\..\src\mempool.c - object.c + ipc.c 1 - ..\..\src\object.c + ..\..\src\ipc.c - device.c + components.c 1 - ..\..\src\device.c + ..\..\src\components.c - components.c + kservice.c 1 - ..\..\src\components.c + ..\..\src\kservice.c - clock.c + object.c 1 - ..\..\src\clock.c + ..\..\src\object.c - irq.c + mem.c 1 - ..\..\src\irq.c + ..\..\src\mem.c - idle.c + clock.c 1 - ..\..\src\idle.c + ..\..\src\clock.c - scheduler.c + irq.c 1 - ..\..\src\scheduler.c + ..\..\src\irq.c - kservice.c + thread.c 1 - ..\..\src\kservice.c + ..\..\src\thread.c - mem.c + device.c 1 - ..\..\src\mem.c + ..\..\src\device.c @@ -728,16 +714,16 @@ libc - mem_std.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - stdio.c + mem_std.c 1 - ..\..\components\libc\compilers\armlibc\stdio.c + ..\..\components\libc\compilers\armlibc\mem_std.c @@ -749,47 +735,47 @@ - libc.c + stdlib.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\common\stdlib.c - delay.c + time.c 1 - ..\..\components\libc\compilers\common\delay.c + ..\..\components\libc\compilers\common\time.c + + + Libraries - stdlib.c + gd32f4xx_misc.c 1 - ..\..\components\libc\compilers\common\stdlib.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_misc.c - time.c + gd32f4xx_fmc.c 1 - ..\..\components\libc\compilers\common\time.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fmc.c - unistd.c + gd32f4xx_ipa.c 1 - ..\..\components\libc\compilers\common\unistd.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ipa.c - - - Libraries - gd32f4xx_trng.c + gd32f4xx_fwdgt.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_trng.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fwdgt.c @@ -801,30 +787,30 @@ - gd32f4xx_usart.c + gd32f4xx_syscfg.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_usart.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_syscfg.c - gd32f4xx_crc.c + gd32f4xx_exmc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_crc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exmc.c - gd32f4xx_syscfg.c + gd32f4xx_pmu.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_syscfg.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_pmu.c - gd32f4xx_sdio.c + gd32f4xx_dbg.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_sdio.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dbg.c @@ -836,16 +822,16 @@ - gd32f4xx_iref.c + gd32f4xx_usart.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_iref.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_usart.c - gd32f4xx_wwdgt.c + gd32f4xx_can.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_wwdgt.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_can.c @@ -857,9 +843,9 @@ - gd32f4xx_misc.c + gd32f4xx_spi.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_misc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_spi.c @@ -871,93 +857,72 @@ - gd32f4xx_exti.c - 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exti.c - - - - - gd32f4xx_pmu.c - 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_pmu.c - - - - - gd32f4xx_dci.c - 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dci.c - - - - - gd32f4xx_ctc.c + gd32f4xx_iref.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ctc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_iref.c - gd32f4xx_rcu.c + system_gd32f4xx.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rcu.c + Libraries\CMSIS\GD\GD32F4xx\Source\system_gd32f4xx.c - gd32f4xx_exmc.c + gd32f4xx_dac.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exmc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dac.c - gd32f4xx_dma.c + gd32f4xx_wwdgt.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dma.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_wwdgt.c - gd32f4xx_fwdgt.c + gd32f4xx_crc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fwdgt.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_crc.c - gd32f4xx_ipa.c + gd32f4xx_tli.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ipa.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_tli.c - gd32f4xx_spi.c + gd32f4xx_exti.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_spi.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_exti.c - gd32f4xx_fmc.c + gd32f4xx_trng.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_fmc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_trng.c - gd32f4xx_can.c + gd32f4xx_dma.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_can.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dma.c - gd32f4xx_dbg.c + gd32f4xx_rcu.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dbg.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_rcu.c @@ -969,37 +934,37 @@ - gd32f4xx_adc.c + gd32f4xx_dci.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_adc.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dci.c - gd32f4xx_gpio.c + gd32f4xx_adc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_gpio.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_adc.c - gd32f4xx_dac.c + gd32f4xx_ctc.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_dac.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_ctc.c - gd32f4xx_tli.c + gd32f4xx_sdio.c 1 - Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_tli.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_sdio.c - system_gd32f4xx.c + gd32f4xx_gpio.c 1 - Libraries\CMSIS\GD\GD32F4xx\Source\system_gd32f4xx.c + Libraries\GD32F4xx_standard_peripheral\Source\gd32f4xx_gpio.c @@ -1166,13 +1131,6 @@ ..\..\components\net\lwip-2.0.2\src\api\api_lib.c - - - ping.c - 1 - ..\..\components\net\lwip-2.0.2\src\apps\ping\ping.c - - inet_chksum.c @@ -1257,6 +1215,13 @@ ..\..\components\net\lwip-2.0.2\src\api\api_msg.c + + + ping.c + 1 + ..\..\components\net\lwip-2.0.2\src\apps\ping\ping.c + + tcp.c @@ -1265,6 +1230,23 @@ + + POSIX + + + select.c + 1 + ..\..\components\libc\posix\io\select.c + + + + + poll.c + 1 + ..\..\components\libc\posix\io\poll\poll.c + + + SAL @@ -1290,30 +1272,30 @@ - dfs_net.c + net_netdb.c 1 - ..\..\components\net\sal_socket\dfs_net\dfs_net.c + ..\..\components\net\sal_socket\socket\net_netdb.c - af_inet_lwip.c + sal_socket.c 1 - ..\..\components\net\sal_socket\impl\af_inet_lwip.c + ..\..\components\net\sal_socket\src\sal_socket.c - net_netdb.c + dfs_net.c 1 - ..\..\components\net\sal_socket\socket\net_netdb.c + ..\..\components\net\sal_socket\dfs_net\dfs_net.c - sal_socket.c + af_inet_lwip.c 1 - ..\..\components\net\sal_socket\src\sal_socket.c + ..\..\components\net\sal_socket\impl\af_inet_lwip.c diff --git a/bsp/gd32450z-eval/rtconfig.h b/bsp/gd32450z-eval/rtconfig.h index 4542f7f8a7f..0e7c4c3f156 100644 --- a/bsp/gd32450z-eval/rtconfig.h +++ b/bsp/gd32450z-eval/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -106,7 +107,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SYSTEM_WORKQUEUE #define RT_SYSTEM_WORKQUEUE_STACKSIZE 2048 #define RT_SYSTEM_WORKQUEUE_PRIORITY 23 @@ -132,6 +132,13 @@ #define RT_USING_POSIX_FS #define RT_USING_POSIX_POLL #define RT_USING_POSIX_SELECT + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -274,6 +281,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32e230k-start/.config b/bsp/gd32e230k-start/.config index 1c5a87fb6a8..06383f02c82 100644 --- a/bsp/gd32e230k-start/.config +++ b/bsp/gd32e230k-start/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -124,7 +128,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -188,10 +191,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -354,7 +364,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -376,10 +386,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -394,13 +411,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -458,9 +468,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -470,7 +487,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -485,6 +501,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -509,8 +526,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +533,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32e230k-start/project.uvprojx b/bsp/gd32e230k-start/project.uvprojx index d3473a987c8..26b9560929c 100644 --- a/bsp/gd32e230k-start/project.uvprojx +++ b/bsp/gd32e230k-start/project.uvprojx @@ -335,7 +335,7 @@ GD32E230, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m23;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32E230\Include;Libraries\CMSIS;Libraries\GD32E230_standard_peripheral\Include;..\..\examples\utest\testcases\kernel + applications;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m23;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\CMSIS\GD\GD32E230\Include;Libraries\CMSIS;Libraries\GD32E230_standard_peripheral\Include;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -390,23 +390,23 @@ CPU - div0.c + showmem.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\libcpu\arm\common\div0.c @@ -484,9 +484,9 @@ - ringblk_buf.c + dataqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\dataqueue.c @@ -498,37 +498,37 @@ - ringbuffer.c + workqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\workqueue.c - workqueue.c + completion.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\completion.c - dataqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\ringbuffer.c - pipe.c + ringblk_buf.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\ringblk_buf.c - completion.c + pipe.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\pipe.c @@ -610,93 +610,93 @@ Kernel - scheduler.c + idle.c 1 - ..\..\src\scheduler.c + ..\..\src\idle.c - kservice.c + object.c 1 - ..\..\src\kservice.c + ..\..\src\object.c - thread.c + timer.c 1 - ..\..\src\thread.c + ..\..\src\timer.c - mem.c + mempool.c 1 - ..\..\src\mem.c + ..\..\src\mempool.c - clock.c + thread.c 1 - ..\..\src\clock.c + ..\..\src\thread.c - mempool.c + components.c 1 - ..\..\src\mempool.c + ..\..\src\components.c - object.c + mem.c 1 - ..\..\src\object.c + ..\..\src\mem.c - device.c + clock.c 1 - ..\..\src\device.c + ..\..\src\clock.c - ipc.c + device.c 1 - ..\..\src\ipc.c + ..\..\src\device.c - components.c + scheduler.c 1 - ..\..\src\components.c + ..\..\src\scheduler.c - timer.c + kservice.c 1 - ..\..\src\timer.c + ..\..\src\kservice.c - irq.c + ipc.c 1 - ..\..\src\irq.c + ..\..\src\ipc.c - idle.c + irq.c 1 - ..\..\src\idle.c + ..\..\src\irq.c @@ -714,86 +714,86 @@ Libraries - gd32e230_cmp.c + gd32e230_fwdgt.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_cmp.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_fwdgt.c - gd32e230_timer.c + gd32e230_usart.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_timer.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_usart.c - gd32e230_exti.c + gd32e230_timer.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_exti.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_timer.c - gd32e230_wwdgt.c + gd32e230_gpio.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_wwdgt.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_gpio.c - gd32e230_adc.c + system_gd32e230.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_adc.c + Libraries\CMSIS\GD\GD32E230\Source\system_gd32e230.c - gd32e230_syscfg.c - 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_syscfg.c + startup_gd32e230.s + 2 + Libraries\CMSIS\GD\GD32E230\Source\ARM\startup_gd32e230.s - gd32e230_gpio.c + gd32e230_rtc.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_gpio.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_rtc.c - startup_gd32e230.s - 2 - Libraries\CMSIS\GD\GD32E230\Source\ARM\startup_gd32e230.s + gd32e230_pmu.c + 1 + Libraries\GD32E230_standard_peripheral\Source\gd32e230_pmu.c - gd32e230_spi.c + gd32e230_misc.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_spi.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_misc.c - gd32e230_i2c.c + gd32e230_rcu.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_i2c.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_rcu.c - system_gd32e230.c + gd32e230_fmc.c 1 - Libraries\CMSIS\GD\GD32E230\Source\system_gd32e230.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_fmc.c - gd32e230_fwdgt.c + gd32e230_cmp.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_fwdgt.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_cmp.c @@ -805,51 +805,51 @@ - gd32e230_fmc.c + gd32e230_i2c.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_fmc.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_i2c.c - gd32e230_rcu.c + gd32e230_exti.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_rcu.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_exti.c - gd32e230_dma.c + gd32e230_wwdgt.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_dma.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_wwdgt.c - gd32e230_misc.c + gd32e230_dma.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_misc.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_dma.c - gd32e230_pmu.c + gd32e230_spi.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_pmu.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_spi.c - gd32e230_rtc.c + gd32e230_adc.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_rtc.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_adc.c - gd32e230_usart.c + gd32e230_syscfg.c 1 - Libraries\GD32E230_standard_peripheral\Source\gd32e230_usart.c + Libraries\GD32E230_standard_peripheral\Source\gd32e230_syscfg.c diff --git a/bsp/gd32e230k-start/rtconfig.h b/bsp/gd32e230k-start/rtconfig.h index 81655eddb0a..61ef9398d9b 100644 --- a/bsp/gd32e230k-start/rtconfig.h +++ b/bsp/gd32e230k-start/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -83,7 +84,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/gd32vf103v-eval/.config b/bsp/gd32vf103v-eval/.config index 60a474db2e3..cbe1f5b9800 100644 --- a/bsp/gd32vf103v-eval/.config +++ b/bsp/gd32vf103v-eval/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +130,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -178,10 +181,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -344,7 +354,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -366,10 +376,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -384,13 +401,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -448,9 +458,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -460,7 +477,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -475,6 +491,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -499,8 +516,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -508,6 +523,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/gd32vf103v-eval/rtconfig.h b/bsp/gd32vf103v-eval/rtconfig.h index 306066a7e96..2fb30b28344 100644 --- a/bsp/gd32vf103v-eval/rtconfig.h +++ b/bsp/gd32vf103v-eval/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -103,6 +103,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -188,6 +195,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/hc32f460/.config b/bsp/hc32f460/.config index e2d99dee520..45678cd18c6 100644 --- a/bsp/hc32f460/.config +++ b/bsp/hc32f460/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -141,7 +145,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -195,10 +198,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -363,7 +373,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -385,10 +395,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -403,13 +420,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -467,9 +477,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -479,7 +496,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -494,6 +510,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -519,8 +536,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -528,6 +543,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/hc32f460/project.uvprojx b/bsp/hc32f460/project.uvprojx index 35c3a808152..59868da45de 100644 --- a/bsp/hc32f460/project.uvprojx +++ b/bsp/hc32f460/project.uvprojx @@ -336,7 +336,7 @@ --diag_suppress=186,66 USE_DEVICE_DRIVER_LIB, __CLK_TCK=RT_TICK_PER_SECOND, HC32F460, __RTTHREAD__, __DEBUG, RT_USING_ARM_LIBC - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32F460\Include;Libraries\HC32F460_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32F460\Include;Libraries\HC32F460_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -443,51 +443,51 @@ - workqueue.c + dataqueue.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\dataqueue.c - waitqueue.c + pipe.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\pipe.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\ringbuffer.c - completion.c + ringblk_buf.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + waitqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\waitqueue.c - pipe.c + completion.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\workqueue.c @@ -540,16 +540,9 @@ - dfs_poll.c - 1 - ..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\components\dfs\src\dfs_file.c + ..\..\components\dfs\src\dfs_fs.c @@ -561,16 +554,9 @@ - dfs_fs.c - 1 - ..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\components\dfs\src\dfs_select.c + ..\..\components\dfs\src\dfs_file.c @@ -703,51 +689,51 @@ Kernel - object.c + components.c 1 - ..\..\src\object.c + ..\..\src\components.c - mempool.c + timer.c 1 - ..\..\src\mempool.c + ..\..\src\timer.c - idle.c + mempool.c 1 - ..\..\src\idle.c + ..\..\src\mempool.c - irq.c + kservice.c 1 - ..\..\src\irq.c + ..\..\src\kservice.c - ipc.c + thread.c 1 - ..\..\src\ipc.c + ..\..\src\thread.c - components.c + clock.c 1 - ..\..\src\components.c + ..\..\src\clock.c - thread.c + device.c 1 - ..\..\src\thread.c + ..\..\src\device.c @@ -759,37 +745,37 @@ - kservice.c + scheduler.c 1 - ..\..\src\kservice.c + ..\..\src\scheduler.c - device.c + idle.c 1 - ..\..\src\device.c + ..\..\src\idle.c - clock.c + ipc.c 1 - ..\..\src\clock.c + ..\..\src\ipc.c - scheduler.c + irq.c 1 - ..\..\src\scheduler.c + ..\..\src\irq.c - timer.c + object.c 1 - ..\..\src\timer.c + ..\..\src\object.c @@ -797,30 +783,23 @@ libc - mem_std.c - 1 - ..\..\components\libc\compilers\armlibc\mem_std.c - - - - - libc.c + syscalls.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + mem_std.c 1 - ..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\components\libc\compilers\armlibc\mem_std.c - stdio.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\stdio.c + ..\..\components\libc\compilers\armlibc\libc_syms.c @@ -837,20 +816,6 @@ ..\..\components\libc\compilers\common\time.c - - - unistd.c - 1 - ..\..\components\libc\compilers\common\unistd.c - - - - - delay.c - 1 - ..\..\components\libc\compilers\common\delay.c - - diff --git a/bsp/hc32f460/rtconfig.h b/bsp/hc32f460/rtconfig.h index f7b73bf03de..ab3d03b8bd0 100644 --- a/bsp/hc32f460/rtconfig.h +++ b/bsp/hc32f460/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -96,7 +97,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -115,6 +115,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -200,6 +207,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/hc32f4a0/.config b/bsp/hc32f4a0/.config index 89960612d96..aedc90bfa19 100644 --- a/bsp/hc32f4a0/.config +++ b/bsp/hc32f4a0/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -141,7 +145,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -195,10 +198,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -363,7 +373,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -385,10 +395,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -403,13 +420,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -467,9 +477,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -479,7 +496,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -494,6 +510,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -519,8 +536,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -528,6 +543,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/hc32f4a0/project.uvprojx b/bsp/hc32f4a0/project.uvprojx index 3bb0e9bd8b4..a50a01b5428 100644 --- a/bsp/hc32f4a0/project.uvprojx +++ b/bsp/hc32f4a0/project.uvprojx @@ -370,7 +370,7 @@ --diag_suppress=186,66 __CLK_TCK=RT_TICK_PER_SECOND, USE_DDL_DRIVER, HC32F4A0, __RTTHREAD__, __DEBUG, RT_USING_ARM_LIBC - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32F4A0\Include;Libraries\HC32F4A0_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32F4A0\Include;Libraries\HC32F4A0_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -445,16 +445,16 @@ - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -483,9 +483,9 @@ - ringbuffer.c + workqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\workqueue.c @@ -497,16 +497,16 @@ - workqueue.c + completion.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\completion.c - completion.c + ringbuffer.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\ringbuffer.c @@ -573,16 +573,9 @@ - dfs_poll.c - 1 - ..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\components\dfs\src\dfs_file.c + ..\..\components\dfs\src\dfs_fs.c @@ -594,16 +587,9 @@ - dfs_fs.c - 1 - ..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\components\dfs\src\dfs_select.c + ..\..\components\dfs\src\dfs_file.c @@ -743,23 +729,16 @@ Kernel - kservice.c - 1 - ..\..\src\kservice.c - - - - - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - clock.c + mempool.c 1 - ..\..\src\clock.c + ..\..\src\mempool.c @@ -771,16 +750,9 @@ - idle.c - 1 - ..\..\src\idle.c - - - - - thread.c + scheduler.c 1 - ..\..\src\thread.c + ..\..\src\scheduler.c @@ -799,9 +771,9 @@ - scheduler.c + irq.c 1 - ..\..\src\scheduler.c + ..\..\src\irq.c @@ -813,42 +785,42 @@ - object.c + kservice.c 1 - ..\..\src\object.c + ..\..\src\kservice.c - irq.c + idle.c 1 - ..\..\src\irq.c + ..\..\src\idle.c - mempool.c + device.c 1 - ..\..\src\mempool.c + ..\..\src\device.c - - - libc - libc.c + clock.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\src\clock.c - stdio.c + object.c 1 - ..\..\components\libc\compilers\armlibc\stdio.c + ..\..\src\object.c + + + libc syscalls.c @@ -858,30 +830,23 @@ - mem_std.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - stdlib.c - 1 - ..\..\components\libc\compilers\common\stdlib.c - - - - - delay.c + mem_std.c 1 - ..\..\components\libc\compilers\common\delay.c + ..\..\components\libc\compilers\armlibc\mem_std.c - unistd.c + stdlib.c 1 - ..\..\components\libc\compilers\common\unistd.c + ..\..\components\libc\compilers\common\stdlib.c diff --git a/bsp/hc32f4a0/rtconfig.h b/bsp/hc32f4a0/rtconfig.h index 689fdd8746a..677d02e0d28 100644 --- a/bsp/hc32f4a0/rtconfig.h +++ b/bsp/hc32f4a0/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -96,7 +97,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -116,6 +116,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -201,6 +208,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/hc32l136/.config b/bsp/hc32l136/.config index f8ed8606278..4b96cf57150 100644 --- a/bsp/hc32l136/.config +++ b/bsp/hc32l136/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +134,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/hc32l136/project.ewp b/bsp/hc32l136/project.ewp index a53a7f0e702..679139faf40 100644 --- a/bsp/hc32l136/project.ewp +++ b/bsp/hc32l136/project.ewp @@ -320,9 +320,10 @@ $PROJ_DIR$\drivers $PROJ_DIR$\..\..\components\libc\compilers\common $PROJ_DIR$\Libraries\HC32L136_StdPeriph_Driver\inc + $PROJ_DIR$\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. $PROJ_DIR$\applications - $PROJ_DIR$\..\..\examples\utest\testcases\kernel + $PROJ_DIR$\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\libcpu\arm\cortex-m0 $PROJ_DIR$\..\..\components\drivers\include @@ -1302,9 +1303,10 @@ $PROJ_DIR$\drivers $PROJ_DIR$\..\..\components\libc\compilers\common $PROJ_DIR$\Libraries\HC32L136_StdPeriph_Driver\inc + $PROJ_DIR$\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. $PROJ_DIR$\applications - $PROJ_DIR$\..\..\examples\utest\testcases\kernel + $PROJ_DIR$\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\libcpu\arm\cortex-m0 $PROJ_DIR$\..\..\components\drivers\include @@ -1972,9 +1974,6 @@ CPU - - $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c @@ -1982,11 +1981,14 @@ $PROJ_DIR$\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\context_iar.S + $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\cpuport.c + + $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\context_iar.S + DeviceDrivers @@ -1997,25 +1999,25 @@ $PROJ_DIR$\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\components\drivers\src\ringblk_buf.c @@ -2087,48 +2089,51 @@ Kernel - $PROJ_DIR$\..\..\src\clock.c + $PROJ_DIR$\..\..\src\device.c - $PROJ_DIR$\..\..\src\object.c + $PROJ_DIR$\..\..\src\clock.c - $PROJ_DIR$\..\..\src\mem.c + $PROJ_DIR$\..\..\src\object.c - $PROJ_DIR$\..\..\src\device.c + $PROJ_DIR$\..\..\src\components.c - $PROJ_DIR$\..\..\src\mempool.c + $PROJ_DIR$\..\..\src\irq.c - $PROJ_DIR$\..\..\src\kservice.c + $PROJ_DIR$\..\..\src\scheduler.c - $PROJ_DIR$\..\..\src\scheduler.c + $PROJ_DIR$\..\..\src\mempool.c - $PROJ_DIR$\..\..\src\timer.c + $PROJ_DIR$\..\..\src\thread.c - $PROJ_DIR$\..\..\src\idle.c + $PROJ_DIR$\..\..\src\kservice.c - $PROJ_DIR$\..\..\src\components.c + $PROJ_DIR$\..\..\src\ipc.c - $PROJ_DIR$\..\..\src\irq.c + $PROJ_DIR$\..\..\src\idle.c - $PROJ_DIR$\..\..\src\ipc.c + $PROJ_DIR$\..\..\src\mem.c - $PROJ_DIR$\..\..\src\thread.c + $PROJ_DIR$\..\..\src\timer.c libc + + POSIX + utestcases diff --git a/bsp/hc32l136/project.uvprojx b/bsp/hc32l136/project.uvprojx index 98810316a42..357958e8172 100644 --- a/bsp/hc32l136/project.uvprojx +++ b/bsp/hc32l136/project.uvprojx @@ -336,7 +336,7 @@ --diag_suppress=186,66 USE_DDL_DRIVER, __DEBUG, __RTTHREAD__, HC32L136, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32L136\Include;Libraries\HC32L136_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32L136\Include;Libraries\HC32L136_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -389,6 +389,13 @@ CPU + + + showmem.c + 1 + ..\..\libcpu\arm\common\showmem.c + + div0.c @@ -405,9 +412,9 @@ - showmem.c - 1 - ..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m0\context_rvds.S @@ -417,13 +424,6 @@ ..\..\libcpu\arm\cortex-m0\cpuport.c - - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m0\context_rvds.S - - DeviceDrivers @@ -441,6 +441,13 @@ ..\..\components\drivers\serial\serial.c + + + completion.c + 1 + ..\..\components\drivers\src\completion.c + + pipe.c @@ -457,16 +464,16 @@ - workqueue.c + waitqueue.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\waitqueue.c - completion.c + dataqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\dataqueue.c @@ -478,16 +485,9 @@ - waitqueue.c - 1 - ..\..\components\drivers\src\waitqueue.c - - - - - dataqueue.c + workqueue.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\workqueue.c @@ -637,44 +637,37 @@ Kernel - idle.c - 1 - ..\..\src\idle.c - - - - - components.c + irq.c 1 - ..\..\src\components.c + ..\..\src\irq.c - irq.c + scheduler.c 1 - ..\..\src\irq.c + ..\..\src\scheduler.c - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - thread.c + ipc.c 1 - ..\..\src\thread.c + ..\..\src\ipc.c - object.c + timer.c 1 - ..\..\src\object.c + ..\..\src\timer.c @@ -693,9 +686,9 @@ - mempool.c + components.c 1 - ..\..\src\mempool.c + ..\..\src\components.c @@ -707,23 +700,30 @@ - timer.c + mempool.c 1 - ..\..\src\timer.c + ..\..\src\mempool.c - ipc.c + object.c 1 - ..\..\src\ipc.c + ..\..\src\object.c - scheduler.c + device.c 1 - ..\..\src\scheduler.c + ..\..\src\device.c + + + + + idle.c + 1 + ..\..\src\idle.c diff --git a/bsp/hc32l136/rtconfig.h b/bsp/hc32l136/rtconfig.h index 68ce89f334c..8d8bb1932ea 100644 --- a/bsp/hc32l136/rtconfig.h +++ b/bsp/hc32l136/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +89,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -104,6 +104,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -189,6 +196,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/hc32l196/.config b/bsp/hc32l196/.config index 2529f5fd0fc..1464532b5a7 100644 --- a/bsp/hc32l196/.config +++ b/bsp/hc32l196/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +134,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -184,10 +187,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -352,7 +362,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -374,10 +384,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -392,13 +409,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -456,9 +466,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -468,7 +485,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -483,6 +499,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -507,8 +524,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +531,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/hc32l196/project.uvprojx b/bsp/hc32l196/project.uvprojx index 8d6b4aabb95..04d3cb38c08 100644 --- a/bsp/hc32l196/project.uvprojx +++ b/bsp/hc32l196/project.uvprojx @@ -329,7 +329,7 @@ RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32L196\Include;Libraries\HC32L196_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;board;drivers;..\..\components\finsh;Libraries\CMSIS\Include;Libraries\CMSIS\Device\HDSC\HC32L196\Include;Libraries\HC32L196_StdPeriph_Driver\inc;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -383,23 +383,23 @@ CPU - div0.c + backtrace.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\libcpu\arm\common\div0.c @@ -435,16 +435,16 @@ - pipe.c + completion.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\completion.c - ringblk_buf.c + workqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\workqueue.c @@ -456,30 +456,30 @@ - completion.c + dataqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\ringblk_buf.c - workqueue.c + waitqueue.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\waitqueue.c - waitqueue.c + pipe.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\pipe.c @@ -601,16 +601,16 @@ Kernel - irq.c + ipc.c 1 - ..\..\src\irq.c + ..\..\src\ipc.c - timer.c + thread.c 1 - ..\..\src\timer.c + ..\..\src\thread.c @@ -622,44 +622,44 @@ - thread.c + object.c 1 - ..\..\src\thread.c + ..\..\src\object.c - clock.c + kservice.c 1 - ..\..\src\clock.c + ..\..\src\kservice.c - mem.c + irq.c 1 - ..\..\src\mem.c + ..\..\src\irq.c - kservice.c + idle.c 1 - ..\..\src\kservice.c + ..\..\src\idle.c - idle.c + mempool.c 1 - ..\..\src\idle.c + ..\..\src\mempool.c - ipc.c + clock.c 1 - ..\..\src\ipc.c + ..\..\src\clock.c @@ -671,23 +671,23 @@ - components.c + mem.c 1 - ..\..\src\components.c + ..\..\src\mem.c - object.c + components.c 1 - ..\..\src\object.c + ..\..\src\components.c - mempool.c + timer.c 1 - ..\..\src\mempool.c + ..\..\src\timer.c @@ -695,23 +695,23 @@ libc - libc.c + syscalls.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\syscalls.c - mem_std.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\components\libc\compilers\armlibc\libc_syms.c - syscalls.c + mem_std.c 1 - ..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\components\libc\compilers\armlibc\mem_std.c diff --git a/bsp/hc32l196/rtconfig.h b/bsp/hc32l196/rtconfig.h index 633ef011318..8f874413be1 100644 --- a/bsp/hc32l196/rtconfig.h +++ b/bsp/hc32l196/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +89,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -108,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/hifive1/.config b/bsp/hifive1/.config index bf61b23cc0f..f3184f96701 100644 --- a/bsp/hifive1/.config +++ b/bsp/hifive1/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_MEMTRACE=y +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -124,7 +128,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -176,10 +179,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -342,7 +352,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -364,10 +374,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -382,13 +399,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -446,9 +456,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -458,7 +475,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -473,6 +489,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -497,8 +514,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -506,6 +521,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/hifive1/rtconfig.h b/bsp/hifive1/rtconfig.h index d066f120377..97d6d354248 100644 --- a/bsp/hifive1/rtconfig.h +++ b/bsp/hifive1/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_MEMTRACE #define RT_USING_HEAP /* end of Memory Management */ @@ -84,7 +85,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -102,6 +102,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -187,6 +194,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/hk32/hk32f030c8-mini/.config b/bsp/hk32/hk32f030c8-mini/.config index 04fde5119a7..bc3bba9523f 100644 --- a/bsp/hk32/hk32f030c8-mini/.config +++ b/bsp/hk32/hk32f030c8-mini/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # # CONFIG_RT_USING_MEMPOOL is not set -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +188,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +363,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +385,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +410,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +467,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +486,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +500,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -508,8 +525,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -517,6 +532,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/hk32/hk32f030c8-mini/project.ewp b/bsp/hk32/hk32f030c8-mini/project.ewp index 19c4c84de66..511d0840bf2 100644 --- a/bsp/hk32/hk32f030c8-mini/project.ewp +++ b/bsp/hk32/hk32f030c8-mini/project.ewp @@ -359,9 +359,9 @@ $PROJ_DIR$\..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Include $PROJ_DIR$\applications $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\Core $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc @@ -1398,9 +1398,9 @@ $PROJ_DIR$\..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Include $PROJ_DIR$\applications $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\Core $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc @@ -2090,10 +2090,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\cpuport.c @@ -2120,25 +2120,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c @@ -2180,13 +2180,16 @@ Kernel - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\irq.c + + + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\timer.c @@ -2195,67 +2198,58 @@ $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\thread.c $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mem.c - - - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c @@ -2318,6 +2312,9 @@ $PROJ_DIR$\..\libraries\HK32F0xx_StdPeriph_Driver\src\hk32f0xx_adc.c + + POSIX + utestcases diff --git a/bsp/hk32/hk32f030c8-mini/project.uvproj b/bsp/hk32/hk32f030c8-mini/project.uvproj index 3d61cfa029c..20abd969476 100644 --- a/bsp/hk32/hk32f030c8-mini/project.uvproj +++ b/bsp/hk32/hk32f030c8-mini/project.uvproj @@ -359,7 +359,7 @@ HK32F030x8, USE_STDPERIPH_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\msp;..\libraries\rt_drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Include;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\Core;..\libraries\HK32F0xx_StdPeriph_Driver\inc;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\msp;..\libraries\rt_drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Include;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\Core;..\libraries\HK32F0xx_StdPeriph_Driver\inc;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,23 +413,23 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -486,51 +486,51 @@ - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -538,16 +538,16 @@ Drivers - startup_hk32f030x4x6x8.s - 2 - ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\ARM\startup_hk32f030x4x6x8.s + system_hk32f0xx.c + 1 + ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\system_hk32f0xx.c - system_hk32f0xx.c - 1 - ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\system_hk32f0xx.c + startup_hk32f030x4x6x8.s + 2 + ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\ARM\startup_hk32f030x4x6x8.s @@ -621,79 +621,79 @@ - object.c + idle.c 1 - ..\..\..\src\object.c + ..\..\..\src\idle.c - thread.c + mem.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mem.c - scheduler.c + object.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\object.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - components.c + kservice.c 1 - ..\..\..\src\components.c + ..\..\..\src\kservice.c - idle.c + clock.c 1 - ..\..\..\src\idle.c + ..\..\..\src\clock.c - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c - device.c + irq.c 1 - ..\..\..\src\device.c + ..\..\..\src\irq.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c - mem.c + components.c 1 - ..\..\..\src\mem.c + ..\..\..\src\components.c - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c @@ -701,23 +701,23 @@ libc - libc.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - syscalls.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - mem_std.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c diff --git a/bsp/hk32/hk32f030c8-mini/project.uvprojx b/bsp/hk32/hk32f030c8-mini/project.uvprojx index 59afda7662b..5e9725b6adc 100644 --- a/bsp/hk32/hk32f030c8-mini/project.uvprojx +++ b/bsp/hk32/hk32f030c8-mini/project.uvprojx @@ -336,7 +336,7 @@ HK32F030x8, USE_STDPERIPH_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\msp;..\libraries\rt_drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Include;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\Core;..\libraries\HK32F0xx_StdPeriph_Driver\inc;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\msp;..\libraries\rt_drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Include;..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\Core;..\libraries\HK32F0xx_StdPeriph_Driver\inc;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -398,16 +398,16 @@ - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -464,51 +464,51 @@ - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c @@ -516,16 +516,16 @@ Drivers - startup_hk32f030x4x6x8.s - 2 - ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\ARM\startup_hk32f030x4x6x8.s + system_hk32f0xx.c + 1 + ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\system_hk32f0xx.c - system_hk32f0xx.c - 1 - ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\system_hk32f0xx.c + startup_hk32f030x4x6x8.s + 2 + ..\libraries\HK32F0xx_StdPeriph_Driver\CMSIS\HK32F0xx\Source\ARM\startup_hk32f030x4x6x8.s @@ -592,91 +592,98 @@ Kernel - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - components.c + kservice.c 1 - ..\..\..\src\components.c + ..\..\..\src\kservice.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c - object.c + ipc.c 1 - ..\..\..\src\object.c + ..\..\..\src\ipc.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - clock.c + components.c 1 - ..\..\..\src\clock.c + ..\..\..\src\components.c - thread.c + mem.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mem.c - idle.c + scheduler.c 1 - ..\..\..\src\idle.c + ..\..\..\src\scheduler.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c libc + + + libc_syms.c + 1 + ..\..\..\components\libc\compilers\armlibc\libc_syms.c + + syscalls.c @@ -693,9 +700,9 @@ - libc.c + time.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\common\time.c @@ -705,13 +712,6 @@ ..\..\..\components\libc\compilers\common\stdlib.c - - - time.c - 1 - ..\..\..\components\libc\compilers\common\time.c - - Libraries diff --git a/bsp/hk32/hk32f030c8-mini/rtconfig.h b/bsp/hk32/hk32f030c8-mini/rtconfig.h index cc98f9a3e04..207d836818a 100644 --- a/bsp/hk32/hk32f030c8-mini/rtconfig.h +++ b/bsp/hk32/hk32f030c8-mini/rtconfig.h @@ -34,6 +34,7 @@ /* Memory Management */ #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imx6sx/cortex-a9/.config b/bsp/imx6sx/cortex-a9/.config index 15da659c100..47b2fe3618e 100644 --- a/bsp/imx6sx/cortex-a9/.config +++ b/bsp/imx6sx/cortex-a9/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -135,7 +139,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 CONFIG_RT_USING_SYSTEM_WORKQUEUE=y CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=2048 CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23 @@ -191,10 +194,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -432,7 +442,7 @@ CONFIG_RT_LWIP_USING_PING=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -454,10 +464,17 @@ CONFIG_RT_LWIP_USING_PING=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -472,13 +489,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -536,9 +546,16 @@ CONFIG_RT_LWIP_USING_PING=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -548,7 +565,6 @@ CONFIG_RT_LWIP_USING_PING=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -563,6 +579,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -587,8 +604,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -596,6 +611,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imx6sx/cortex-a9/rtconfig.h b/bsp/imx6sx/cortex-a9/rtconfig.h index e08dc176a2c..c8766fe84a3 100644 --- a/bsp/imx6sx/cortex-a9/rtconfig.h +++ b/bsp/imx6sx/cortex-a9/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -90,7 +91,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SYSTEM_WORKQUEUE #define RT_SYSTEM_WORKQUEUE_STACKSIZE 2048 #define RT_SYSTEM_WORKQUEUE_PRIORITY 23 @@ -113,6 +113,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -255,6 +262,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imx6ul/.config b/bsp/imx6ul/.config index 1e16ddb39bb..0e454a70e12 100644 --- a/bsp/imx6ul/.config +++ b/bsp/imx6ul/.config @@ -57,12 +57,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -138,7 +142,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -192,10 +195,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -360,7 +370,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -382,10 +392,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -400,13 +417,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -464,9 +474,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -476,7 +493,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -491,6 +507,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -516,8 +533,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -525,6 +540,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imx6ul/rtconfig.h b/bsp/imx6ul/rtconfig.h index 3e5f5aa300f..539087c576e 100644 --- a/bsp/imx6ul/rtconfig.h +++ b/bsp/imx6ul/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -112,6 +112,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -197,6 +204,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imxrt/imxrt1052-atk-commander/.config b/bsp/imxrt/imxrt1052-atk-commander/.config index 547be587743..d3cf728baf2 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/.config +++ b/bsp/imxrt/imxrt1052-atk-commander/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -136,7 +141,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -200,10 +204,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -366,7 +377,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -388,10 +399,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -406,13 +424,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -470,9 +481,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -482,7 +500,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -497,6 +514,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -521,8 +539,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -530,6 +546,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imxrt/imxrt1052-atk-commander/project.uvprojx b/bsp/imxrt/imxrt1052-atk-commander/project.uvprojx index b0bcf68f4a3..2e8b18c57a3 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/project.uvprojx +++ b/bsp/imxrt/imxrt1052-atk-commander/project.uvprojx @@ -333,7 +333,7 @@ --library_interface=armcc --library_type=standardlib --diag_suppress=66,1296,186 SKIP_SYSCLK_INIT, CPU_MIMXRT1052CVL5B, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1, XIP_EXTERNAL_FLASH=1, EVK_MCIMXRM, RT_USING_ARM_LIBC - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\spi\sfud\inc;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\spi\sfud\inc;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -395,9 +395,9 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -409,9 +409,16 @@ - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c + + + + + cpu_cache.c + 1 + ..\..\..\libcpu\arm\cortex-m7\cpu_cache.c @@ -428,13 +435,6 @@ ..\..\..\libcpu\arm\cortex-m7\cpuport.c - - - cpu_cache.c - 1 - ..\..\..\libcpu\arm\cortex-m7\cpu_cache.c - - DeviceDrivers @@ -496,51 +496,51 @@ - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -612,16 +612,9 @@ - dfs_poll.c - 1 - ..\..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\..\components\dfs\src\dfs_file.c + ..\..\..\components\dfs\src\dfs_fs.c @@ -633,16 +626,9 @@ - dfs_fs.c - 1 - ..\..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\..\components\dfs\src\dfs_select.c + ..\..\..\components\dfs\src\dfs_file.c @@ -688,93 +674,93 @@ Kernel - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - thread.c + memheap.c 1 - ..\..\..\src\thread.c + ..\..\..\src\memheap.c - object.c + timer.c 1 - ..\..\..\src\object.c + ..\..\..\src\timer.c - ipc.c + kservice.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\kservice.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - memheap.c + mempool.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\mempool.c - components.c + clock.c 1 - ..\..\..\src\components.c + ..\..\..\src\clock.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - mempool.c + thread.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\thread.c - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c @@ -787,13 +773,6 @@ ..\..\..\components\libc\compilers\armlibc\syscalls.c - - - stdio.c - 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c - - mem_std.c @@ -803,16 +782,9 @@ - libc.c - 1 - ..\..\..\components\libc\compilers\armlibc\libc.c - - - - - delay.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\common\delay.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -822,13 +794,6 @@ ..\..\..\components\libc\compilers\common\time.c - - - unistd.c - 1 - ..\..\..\components\libc\compilers\common\unistd.c - - stdlib.c diff --git a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.h b/bsp/imxrt/imxrt1052-atk-commander/rtconfig.h index a188da7ff68..08ad8e087de 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.h +++ b/bsp/imxrt/imxrt1052-atk-commander/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -117,6 +117,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -202,6 +209,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imxrt/imxrt1052-fire-pro/.config b/bsp/imxrt/imxrt1052-fire-pro/.config index 28a836796df..f43c133dfbb 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/.config +++ b/bsp/imxrt/imxrt1052-fire-pro/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +131,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -346,7 +357,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -368,10 +379,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -386,13 +404,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -450,9 +461,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -462,7 +480,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -477,6 +494,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -501,8 +519,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -510,6 +526,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.ewp b/bsp/imxrt/imxrt1052-fire-pro/project.ewp index 62ae59cb123..07e70a88123 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/project.ewp +++ b/bsp/imxrt/imxrt1052-fire-pro/project.ewp @@ -368,11 +368,11 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\MIMXRT1050\MIMXRT1052\drivers - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\libraries\MIMXRT1050\CMSIS\Include $PROJ_DIR$\..\libraries\MIMXRT1050\MIMXRT1052 $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc @@ -1079,13 +1079,13 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c @@ -1100,25 +1100,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -1154,43 +1154,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c @@ -1202,37 +1202,31 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c @@ -1259,6 +1253,9 @@ $PROJ_DIR$\..\libraries\MIMXRT1050\MIMXRT1052\drivers\fsl_common.c + + POSIX + utestcases diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.uvprojx b/bsp/imxrt/imxrt1052-fire-pro/project.uvprojx index 64da9804bf5..a01d97e98ba 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/project.uvprojx +++ b/bsp/imxrt/imxrt1052-fire-pro/project.uvprojx @@ -333,7 +333,7 @@ --library_interface=armcc --library_type=standardlib --diag_suppress=66,1296,186 SKIP_SYSCLK_INIT, CPU_MIMXRT1052CVL5B, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1, XIP_EXTERNAL_FLASH=1, EVK_MCIMXRM, RT_USING_ARM_LIBC - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -386,13 +386,6 @@ CPU - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - showmem.c @@ -409,9 +402,16 @@ - cpuport.c + backtrace.c 1 - ..\..\..\libcpu\arm\cortex-m7\cpuport.c + ..\..\..\libcpu\arm\common\backtrace.c + + + + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m7\context_rvds.S @@ -423,9 +423,9 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m7\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m7\cpuport.c @@ -454,51 +454,51 @@ - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c @@ -568,16 +568,16 @@ Kernel - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - ipc.c + clock.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\clock.c @@ -589,9 +589,9 @@ - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c @@ -603,58 +603,58 @@ - mempool.c + memheap.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\memheap.c - timer.c + ipc.c 1 - ..\..\..\src\timer.c + ..\..\..\src\ipc.c - components.c + thread.c 1 - ..\..\..\src\components.c + ..\..\..\src\thread.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - kservice.c + timer.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\timer.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - memheap.c + object.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\object.c @@ -669,16 +669,16 @@ - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c diff --git a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.h b/bsp/imxrt/imxrt1052-fire-pro/rtconfig.h index e2b94c16d87..07675ad72ec 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.h +++ b/bsp/imxrt/imxrt1052-fire-pro/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imxrt/imxrt1052-nxp-evk/.config b/bsp/imxrt/imxrt1052-nxp-evk/.config index 158da9e0683..9d376412179 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/.config +++ b/bsp/imxrt/imxrt1052-nxp-evk/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +131,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +364,7 @@ CONFIG_NETDEV_IPV6=0 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +386,17 @@ CONFIG_NETDEV_IPV6=0 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +411,6 @@ CONFIG_NETDEV_IPV6=0 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +468,16 @@ CONFIG_NETDEV_IPV6=0 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +487,6 @@ CONFIG_NETDEV_IPV6=0 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +501,7 @@ CONFIG_NETDEV_IPV6=0 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -508,8 +526,6 @@ CONFIG_NETDEV_IPV6=0 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -517,6 +533,7 @@ CONFIG_NETDEV_IPV6=0 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.ewp b/bsp/imxrt/imxrt1052-nxp-evk/project.ewp index ae44ad06468..e690308435b 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/project.ewp +++ b/bsp/imxrt/imxrt1052-nxp-evk/project.ewp @@ -359,7 +359,6 @@ $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\components\drivers\include $PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\..\libraries\MIMXRT1050\MIMXRT1052 $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\drivers @@ -372,6 +371,7 @@ $PROJ_DIR$\board\ports $PROJ_DIR$\..\libraries\drivers\config $PROJ_DIR$\applications + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\libraries\peripherals $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\libcpu\arm\common @@ -1067,10 +1067,10 @@ Applications - $PROJ_DIR$\applications\main.c + $PROJ_DIR$\applications\mnt.c - $PROJ_DIR$\applications\mnt.c + $PROJ_DIR$\applications\main.c @@ -1078,14 +1078,11 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c @@ -1093,6 +1090,9 @@ $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c + DeviceDrivers @@ -1109,22 +1109,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -1163,85 +1163,79 @@ Kernel - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\clock.c libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c @@ -1268,6 +1262,9 @@ $PROJ_DIR$\..\libraries\MIMXRT1050\MIMXRT1052\drivers\fsl_common.c + + POSIX + SAL diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx b/bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx index 981a31d1e03..1b13ea87f30 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx +++ b/bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx @@ -333,7 +333,7 @@ --library_interface=armcc --library_type=standardlib --diag_suppress=66,1296,186 SKIP_SYSCLK_INIT, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1, XIP_EXTERNAL_FLASH=1, EVK_MCIMXRM, CPU_MIMXRT1052DVL6B, RT_USING_ARM_LIBC - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\libraries\peripherals;..\..\..\components\net\netdev\include;..\..\..\examples\utest\testcases\kernel;xip + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\libraries\peripherals;..\..\..\components\libc\posix\io\poll;..\..\..\components\net\netdev\include;..\..\..\examples\utest\testcases\kernel;xip @@ -400,6 +400,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + backtrace.c @@ -409,9 +416,9 @@ - div0.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\cortex-m7\cpuport.c @@ -421,13 +428,6 @@ ..\..\..\libcpu\arm\cortex-m7\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m7\cpuport.c - - cpu_cache.c @@ -496,16 +496,16 @@ - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c @@ -582,16 +582,16 @@ Kernel - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c @@ -603,72 +603,72 @@ - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c - idle.c + thread.c 1 - ..\..\..\src\idle.c + ..\..\..\src\thread.c - ipc.c + irq.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\irq.c - device.c + memheap.c 1 - ..\..\..\src\device.c + ..\..\..\src\memheap.c - kservice.c + timer.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\timer.c - components.c + ipc.c 1 - ..\..\..\src\components.c + ..\..\..\src\ipc.c - memheap.c + kservice.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\kservice.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c @@ -676,37 +676,37 @@ libc - mem_std.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c diff --git a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h b/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h index ab57708ba0f..8679eeeb4be 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h +++ b/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -198,6 +205,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/.config b/bsp/imxrt/imxrt1052-seeed-ArchMix/.config index 9fe98b2457d..94c2414e458 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/.config +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +131,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -178,10 +182,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -344,7 +355,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -366,10 +377,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -384,13 +402,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -448,9 +459,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -460,7 +478,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -475,6 +492,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -499,8 +517,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -508,6 +524,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx b/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx index a92e448fd4e..fb69443d9cd 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx @@ -336,7 +336,7 @@ --library_interface=armcc --library_type=standardlib --diag_suppress=66,1296,186 SKIP_SYSCLK_INIT, CPU_MIMXRT1052CVL5B, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1, XIP_EXTERNAL_FLASH=1, EVK_MCIMXRM - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1050\CMSIS\Include;..\libraries\MIMXRT1050\MIMXRT1052;..\libraries\MIMXRT1050\MIMXRT1052\drivers;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -398,16 +398,16 @@ - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -419,16 +419,16 @@ - cpu_cache.c - 1 - ..\..\..\libcpu\arm\cortex-m7\cpu_cache.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m7\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m7\context_rvds.S + cpu_cache.c + 1 + ..\..\..\libcpu\arm\cortex-m7\cpu_cache.c @@ -450,51 +450,51 @@ - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -564,93 +564,93 @@ Kernel - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c - scheduler.c + memheap.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\memheap.c - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c - memheap.c + device.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\device.c diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h b/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h index 8140aba0419..efb92a7c342 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -104,6 +104,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -189,6 +196,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/imxrt/imxrt1064-nxp-evk/.config b/bsp/imxrt/imxrt1064-nxp-evk/.config index a16884d4276..a88f0744e57 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/.config +++ b/bsp/imxrt/imxrt1064-nxp-evk/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +131,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -346,7 +357,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -368,10 +379,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -386,13 +404,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -450,9 +461,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -462,7 +480,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -477,6 +494,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -501,8 +519,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -510,6 +526,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.ewp b/bsp/imxrt/imxrt1064-nxp-evk/project.ewp index cc8c26999c1..fb3a54292e1 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/project.ewp +++ b/bsp/imxrt/imxrt1064-nxp-evk/project.ewp @@ -372,9 +372,9 @@ $PROJ_DIR$\. $PROJ_DIR$\xip $PROJ_DIR$\applications - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\libraries\peripherals $PROJ_DIR$\..\libraries\MIMXRT1064\CMSIS\Include $PROJ_DIR$\..\..\..\include @@ -1074,16 +1074,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c @@ -1091,6 +1088,9 @@ $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c + DeviceDrivers @@ -1104,10 +1104,7 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c @@ -1116,14 +1113,17 @@ $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + Drivers @@ -1158,43 +1158,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\kservice.c $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c @@ -1206,37 +1206,31 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c @@ -1263,16 +1257,19 @@ $PROJ_DIR$\..\libraries\MIMXRT1064\MIMXRT1064\system_MIMXRT1064.c + + POSIX + utestcases xip - $PROJ_DIR$\xip\evkmimxrt1064_flexspi_nor_config.c + $PROJ_DIR$\xip\evkmimxrt1064_sdram_ini_dcd.c - $PROJ_DIR$\xip\evkmimxrt1064_sdram_ini_dcd.c + $PROJ_DIR$\xip\evkmimxrt1064_flexspi_nor_config.c $PROJ_DIR$\xip\fsl_flexspi_nor_boot.c diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx b/bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx index 1a5677f42ad..dff6106417e 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx +++ b/bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx @@ -334,7 +334,7 @@ --library_interface=armcc --library_type=standardlib --diag_suppress=66,1296,186 XIP_BOOT_HEADER_DCD_ENABLE=1, SKIP_SYSCLK_INIT, __FPU_PRESENT=1, CPU_MIMXRT1064DVL6A, __RTTHREAD__, XIP_BOOT_HEADER_ENABLE=1, FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1, __CLK_TCK=RT_TICK_PER_SECOND, XIP_EXTERNAL_FLASH=1, EVK_MCIMXRM, RT_USING_ARM_LIBC - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1064\CMSIS\Include;..\libraries\MIMXRT1064\MIMXRT1064;..\libraries\MIMXRT1064\MIMXRT1064\drivers;..\libraries\peripherals;..\..\..\examples\utest\testcases\kernel;xip + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\MCUX_Config;board\ports;..\libraries\drivers;..\libraries\drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MIMXRT1064\CMSIS\Include;..\libraries\MIMXRT1064\MIMXRT1064;..\libraries\MIMXRT1064\MIMXRT1064\drivers;..\libraries\peripherals;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel;xip @@ -387,6 +387,13 @@ CPU + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + backtrace.c @@ -403,9 +410,9 @@ - div0.c + cpu_cache.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\cortex-m7\cpu_cache.c @@ -422,13 +429,6 @@ ..\..\..\libcpu\arm\cortex-m7\cpuport.c - - - cpu_cache.c - 1 - ..\..\..\libcpu\arm\cortex-m7\cpu_cache.c - - DeviceDrivers @@ -455,9 +455,16 @@ - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c + + + + + dataqueue.c + 1 + ..\..\..\components\drivers\src\dataqueue.c @@ -469,9 +476,9 @@ - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -483,9 +490,9 @@ - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -495,13 +502,6 @@ ..\..\..\components\drivers\src\completion.c - - - ringbuffer.c - 1 - ..\..\..\components\drivers\src\ringbuffer.c - - Drivers @@ -569,16 +569,16 @@ Kernel - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c @@ -590,58 +590,58 @@ - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - ipc.c + memheap.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\memheap.c - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - mempool.c + thread.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\thread.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - memheap.c + clock.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\clock.c @@ -653,9 +653,9 @@ - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c @@ -663,9 +663,9 @@ libc - libc.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -684,16 +684,16 @@ - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c @@ -753,23 +753,23 @@ xip - evkmimxrt1064_flexspi_nor_config.c + evkmimxrt1064_sdram_ini_dcd.c 1 - xip\evkmimxrt1064_flexspi_nor_config.c + xip\evkmimxrt1064_sdram_ini_dcd.c - evkmimxrt1064_sdram_ini_dcd.c + fsl_flexspi_nor_boot.c 1 - xip\evkmimxrt1064_sdram_ini_dcd.c + xip\fsl_flexspi_nor_boot.c - fsl_flexspi_nor_boot.c + evkmimxrt1064_flexspi_nor_config.c 1 - xip\fsl_flexspi_nor_boot.c + xip\evkmimxrt1064_flexspi_nor_config.c diff --git a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h b/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h index bf1ffb47847..3cd02608979 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h +++ b/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/juicevm/.config b/bsp/juicevm/.config index 84669e03492..8e9ff6dc06d 100755 --- a/bsp/juicevm/.config +++ b/bsp/juicevm/.config @@ -1,12 +1,10 @@ -# -# Automatically generated file; DO NOT EDIT. -# RT-Thread Project Configuration -# +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) # # RT-Thread Kernel # CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set # CONFIG_RT_USING_SMP is not set CONFIG_RT_ALIGN_SIZE=4 # CONFIG_RT_THREAD_PRIORITY_8 is not set @@ -20,6 +18,16 @@ CONFIG_RT_USING_IDLE_HOOK=y CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 CONFIG_IDLE_THREAD_STACK_SIZE=1024 # CONFIG_RT_USING_TIMER_SOFT is not set + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + CONFIG_RT_DEBUG=y CONFIG_RT_DEBUG_COLOR=y # CONFIG_RT_DEBUG_INIT_CONFIG is not set @@ -42,17 +50,24 @@ CONFIG_RT_USING_EVENT=y CONFIG_RT_USING_MAILBOX=y CONFIG_RT_USING_MESSAGEQUEUE=y # CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication # # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y +# end of Memory Management # # Kernel Device Object @@ -63,9 +78,14 @@ CONFIG_RT_USING_DEVICE=y CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" -CONFIG_RT_VER_NUM=0x40000 +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +CONFIG_ARCH_CPU_64BIT=y CONFIG_ARCH_RISCV=y -# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set +CONFIG_ARCH_RISCV64=y # # RT-Thread Components @@ -74,91 +94,84 @@ CONFIG_RT_USING_COMPONENTS_INIT=y CONFIG_RT_USING_USER_MAIN=y CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set # # C++ features # # CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features # # Command shell # CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 CONFIG_FINSH_USING_HISTORY=y CONFIG_FINSH_HISTORY_LINES=5 CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y CONFIG_FINSH_USING_DESCRIPTION=y # CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set -CONFIG_FINSH_THREAD_PRIORITY=20 -CONFIG_FINSH_THREAD_STACK_SIZE=4096 -CONFIG_FINSH_CMD_SIZE=80 # CONFIG_FINSH_USING_AUTH is not set -CONFIG_FINSH_USING_MSH=y -CONFIG_FINSH_USING_MSH_DEFAULT=y -CONFIG_FINSH_USING_MSH_ONLY=y CONFIG_FINSH_ARG_MAX=10 +# end of Command shell # # Device virtual file system # -# CONFIG_RT_USING_DFS is not set +CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y # CONFIG_DFS_USING_WORKDIR is not set -# CONFIG_DFS_FILESYSTEMS_MAX is not set -# CONFIG_DFS_FILESYSTEM_TYPES_MAX is not set -# CONFIG_DFS_FD_MAX is not set +CONFIG_DFS_FILESYSTEMS_MAX=4 +CONFIG_DFS_FILESYSTEM_TYPES_MAX=4 +CONFIG_DFS_FD_MAX=16 # CONFIG_RT_USING_DFS_MNTTABLE is not set # CONFIG_RT_USING_DFS_ELMFAT is not set - -# -# elm-chan's FatFs, Generic FAT Filesystem Module -# -# CONFIG_RT_DFS_ELM_CODE_PAGE is not set -# CONFIG_RT_DFS_ELM_WORD_ACCESS is not set -# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set -# CONFIG_RT_DFS_ELM_USE_LFN_1 is not set -# CONFIG_RT_DFS_ELM_USE_LFN_2 is not set -# CONFIG_RT_DFS_ELM_USE_LFN_3=y -# CONFIG_RT_DFS_ELM_USE_LFN=3 -# CONFIG_RT_DFS_ELM_MAX_LFN=255 -# CONFIG_RT_DFS_ELM_DRIVES=2 -# CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 -# CONFIG_RT_DFS_ELM_USE_ERASE is not set -# CONFIG_RT_DFS_ELM_REENTRANT=y -# CONFIG_RT_USING_DFS_DEVFS=y +# CONFIG_RT_USING_DFS_DEVFS is not set # CONFIG_RT_USING_DFS_ROMFS is not set # CONFIG_RT_USING_DFS_RAMFS is not set -# CONFIG_RT_USING_DFS_UFFS is not set -# CONFIG_RT_USING_DFS_JFFS2 is not set +# end of Device virtual file system # # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_RT_USING_CAN is not set # CONFIG_RT_USING_HWTIMER is not set # CONFIG_RT_USING_CPUTIME is not set # CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set # CONFIG_RT_USING_PIN is not set # CONFIG_RT_USING_ADC is not set +# CONFIG_RT_USING_DAC is not set # CONFIG_RT_USING_PWM is not set # CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NAND is not set -# CONFIG_RT_USING_MTD is not set # CONFIG_RT_USING_PM is not set -# CONFIG_RT_USING_RTC is not set +CONFIG_RT_USING_RTC=y +# CONFIG_RT_USING_ALARM is not set # CONFIG_RT_USING_SOFT_RTC is not set # CONFIG_RT_USING_SDIO is not set # CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_AUDIO is not set - -# -# Using WiFi -# +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set # CONFIG_RT_USING_WIFI is not set # @@ -166,17 +179,37 @@ CONFIG_RT_SERIAL_USING_DMA=y # # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers # # POSIX layer and C standard library # CONFIG_RT_USING_LIBC=y -# CONFIG_RT_USING_PTHREADS is not set -# CONFIG_RT_USING_POSIX=y -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set # CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library # # Network @@ -186,31 +219,36 @@ CONFIG_RT_USING_LIBC=y # Socket abstraction layer # # CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer # -# light weight TCP/IP stack +# Network interface device # -# CONFIG_RT_USING_LWIP is not set +# CONFIG_RT_USING_NETDEV is not set +# end of Network interface device # -# Modbus master and slave stack +# light weight TCP/IP stack # -# CONFIG_RT_USING_MODBUS is not set +# CONFIG_RT_USING_LWIP is not set +# end of light weight TCP/IP stack # # AT commands # # CONFIG_RT_USING_AT is not set +# end of AT commands +# end of Network # # VBUS(Virtual Software BUS) # # CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) # # Utilities # -# CONFIG_RT_USING_LOGTRACE is not set # CONFIG_RT_USING_RYM is not set CONFIG_RT_USING_ULOG=y # CONFIG_ULOG_OUTPUT_LVL_A is not set @@ -234,10 +272,22 @@ CONFIG_ULOG_OUTPUT_TIME=y CONFIG_ULOG_OUTPUT_LEVEL=y CONFIG_ULOG_OUTPUT_TAG=y # CONFIG_ULOG_OUTPUT_THREAD_NAME is not set +# end of log format + CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_ULOG_USING_FILTER is not set # CONFIG_ULOG_USING_SYSLOG is not set -CONFIG_ULOG_SW_VERSION_NUM=0x00101 +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases # # RT-Thread online packages @@ -246,13 +296,20 @@ CONFIG_ULOG_SW_VERSION_NUM=0x00101 # # IoT - internet of things # +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set # CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set # CONFIG_PKG_USING_WEBCLIENT is not set # CONFIG_PKG_USING_WEBNET is not set # CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set # CONFIG_PKG_USING_WEBTERMINAL is not set # CONFIG_PKG_USING_CJSON is not set # CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set # CONFIG_PKG_USING_LJSON is not set # CONFIG_PKG_USING_EZXML is not set # CONFIG_PKG_USING_NANOPB is not set @@ -265,16 +322,26 @@ CONFIG_ULOG_SW_VERSION_NUM=0x00101 # Marvell WiFi # # CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi # # Wiced WiFi # # CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + # CONFIG_PKG_USING_COAP is not set # CONFIG_PKG_USING_NOPOLL is not set # CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set # CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set # CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set # # IoT Cloud @@ -283,14 +350,57 @@ CONFIG_ULOG_SW_VERSION_NUM=0x00101 # CONFIG_PKG_USING_GAGENT_CLOUD is not set # CONFIG_PKG_USING_ALI_IOTKIT is not set # CONFIG_PKG_USING_AZURE is not set -# CONFIG_PKG_USING_TENCENT_IOTKIT is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things # # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages # # language packages @@ -306,15 +416,26 @@ CONFIG_PKG_MICROPYTHON_PATH="/packages/language/micropython" # CONFIG_MICROPYTHON_USING_MACHINE_I2C is not set # CONFIG_MICROPYTHON_USING_MACHINE_SPI is not set CONFIG_MICROPYTHON_USING_MACHINE_UART=y +# CONFIG_MICROPYTHON_USING_MACHINE_RTC is not set +# CONFIG_MICROPYTHON_USING_MACHINE_PWM is not set +# CONFIG_MICROPYTHON_USING_MACHINE_ADC is not set +# CONFIG_MICROPYTHON_USING_MACHINE_WDT is not set +# CONFIG_MICROPYTHON_USING_MACHINE_TIMER is not set +# CONFIG_MICROPYTHON_USING_NETWORK is not set +# CONFIG_MICROPYTHON_USING_MACHINE_LCD is not set +# end of Hardware Module # # System Module # CONFIG_MICROPYTHON_USING_UOS=y +# CONFIG_MICROPYTHON_USING_FILE_SYNC_VIA_IDE is not set CONFIG_MICROPYTHON_USING_THREAD=y # CONFIG_MICROPYTHON_USING_USELECT is not set # CONFIG_MICROPYTHON_USING_UCTYPES is not set # CONFIG_MICROPYTHON_USING_UERRNO is not set +# CONFIG_MICROPYTHON_USING_FFI is not set +# end of System Module # # Tools Module @@ -327,22 +448,75 @@ CONFIG_MICROPYTHON_USING_UJSON=y # CONFIG_MICROPYTHON_USING_URE is not set # CONFIG_MICROPYTHON_USING_UZLIB is not set # CONFIG_MICROPYTHON_USING_URANDOM is not set +# end of Tools Module # # Network Module # # CONFIG_MICROPYTHON_USING_USOCKET is not set # CONFIG_MICROPYTHON_USING_USSL is not set +# end of Network Module + +# +# User Extended Module +# +# CONFIG_MICROPYTHON_USING_USEREXTMODS is not set +# end of User Extended Module + CONFIG_PKG_MICROPYTHON_HEAP_SIZE=8192 -CONFIG_PKG_USING_MICROPYTHON_LATEST_VERSION=y +# CONFIG_MICROPYTHON_USING_FLOAT_IMPL_FLOAT is not set +# CONFIG_PKG_USING_MICROPYTHON_V11200 is not set +# CONFIG_PKG_USING_MICROPYTHON_V11004 is not set +# CONFIG_PKG_USING_MICROPYTHON_V11003 is not set +# CONFIG_PKG_USING_MICROPYTHON_V11002 is not set +# CONFIG_PKG_USING_MICROPYTHON_V11001 is not set +# CONFIG_PKG_USING_MICROPYTHON_V11000 is not set # CONFIG_PKG_USING_MICROPYTHON_V10903 is not set +CONFIG_PKG_USING_MICROPYTHON_LATEST_VERSION=y CONFIG_PKG_MICROPYTHON_VER="latest" +CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages # # multimedia packages # + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages # # tools packages @@ -351,58 +525,211 @@ CONFIG_PKG_MICROPYTHON_VER="latest" # CONFIG_PKG_USING_EASYFLASH is not set # CONFIG_PKG_USING_EASYLOGGER is not set # CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set # CONFIG_PKG_USING_RDB is not set # CONFIG_PKG_USING_QRCODE is not set # CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages # # system packages # + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set -# CONFIG_PKG_USING_LWEXT4 is not set # CONFIG_PKG_USING_PARTITION is not set # CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set # CONFIG_PKG_USING_SQLITE is not set # CONFIG_PKG_USING_RTI is not set -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set -# CONFIG_PKG_USING_CMSIS is not set # CONFIG_PKG_USING_DFS_YAFFS is not set # CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages # # peripheral libraries and drivers # +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set # CONFIG_PKG_USING_REALTEK_AMEBA is not set # CONFIG_PKG_USING_SHT2X is not set -# CONFIG_PKG_USING_AHT10 is not set -# CONFIG_PKG_USING_AP3216C is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set -# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_BUTTON is not set -# CONFIG_PKG_USING_MPU6XXX is not set # CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_NUCLEI_SDK is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages # # miscellaneous packages # -# CONFIG_PKG_USING_LIBCSV is not set -# CONFIG_PKG_USING_OPTPARSE is not set -# CONFIG_PKG_USING_FASTLZ is not set -# CONFIG_PKG_USING_MINILZO is not set -# CONFIG_PKG_USING_QUICKLZ is not set -# CONFIG_PKG_USING_MULTIBUTTON is not set -# CONFIG_PKG_USING_CANFESTIVAL is not set -# CONFIG_PKG_USING_ZLIB is not set -# CONFIG_PKG_USING_DSTR is not set -# CONFIG_PKG_USING_TINYFRAME is not set - -# -# sample package -# # # samples: kernel and components samples @@ -411,31 +738,55 @@ CONFIG_PKG_MICROPYTHON_VER="latest" # CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set # CONFIG_PKG_USING_NETWORK_SAMPLES is not set # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples # -# example package: hello -# -# CONFIG_PKG_USING_HELLO is not set - -# -# Privated Packages of RealThread -# -# CONFIG_PKG_USING_CODEC is not set -# CONFIG_PKG_USING_PLAYER is not set -# CONFIG_PKG_USING_PERSIMMON_SRC is not set -# CONFIG_PKG_USING_JS_PERSIMMON is not set -# CONFIG_PKG_USING_JERRYSCRIPT_WIN32 is not set - -# -# Network Utilities +# entertainment: terminal games and other interesting software packages # -# CONFIG_PKG_USING_WICED is not set -# CONFIG_PKG_USING_CLOUDSDK is not set -# CONFIG_PKG_USING_COREMARK is not set -# CONFIG_PKG_USING_POWER_MANAGER is not set -# CONFIG_PKG_USING_RT_OTA is not set -# CONFIG_PKG_USING_RDBD_SRC is not set -# CONFIG_PKG_USING_RTINSIGHT is not set -# CONFIG_PKG_USING_SMARTCONFIG is not set -# CONFIG_PKG_USING_RTX is not set +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +CONFIG_SOC_JUICEVM_RV64=y +CONFIG_BOARD_RV64_FRDM_JUICEVM=y +CONFIG_BSP_USING_UART0=y +CONFIG___STACKSIZE__=4096 diff --git a/bsp/juicevm/Kconfig b/bsp/juicevm/Kconfig index 6e9d5f66cba..833f7eeec50 100755 --- a/bsp/juicevm/Kconfig +++ b/bsp/juicevm/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../../.." + default "../.." config PKGS_DIR string @@ -20,7 +20,7 @@ source "$PKGS_DIR/Kconfig" config SOC_JUICEVM_RV64 bool - select ARCH_RISCV + select ARCH_RISCV64 config BOARD_RV64_FRDM_JUICEVM bool @@ -30,3 +30,7 @@ config BOARD_RV64_FRDM_JUICEVM default y source "driver/Kconfig" + +config __STACKSIZE__ + int + default 4096 diff --git a/bsp/juicevm/rtconfig.h b/bsp/juicevm/rtconfig.h index b2b72b8f45b..2d15677c292 100755 --- a/bsp/juicevm/rtconfig.h +++ b/bsp/juicevm/rtconfig.h @@ -1,8 +1,7 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Project Configuration */ +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ /* RT-Thread Kernel */ @@ -16,6 +15,10 @@ #define RT_USING_IDLE_HOOK #define RT_IDLE_HOOK_LIST_SIZE 4 #define IDLE_THREAD_STACK_SIZE 1024 + +/* kservice optimization */ + +/* end of kservice optimization */ #define RT_DEBUG #define RT_DEBUG_COLOR @@ -26,12 +29,15 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ /* Kernel Device Object */ @@ -39,7 +45,9 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x40000 +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ #define ARCH_CPU_64BIT #define ARCH_RISCV #define ARCH_RISCV64 @@ -53,76 +61,88 @@ /* C++ features */ +/* end of C++ features */ /* Command shell */ #define RT_USING_FINSH +#define RT_USING_MSH +#define FINSH_USING_MSH #define FINSH_THREAD_NAME "tshell" +#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB -#define FINSH_USING_DESCRIPTION -#define FINSH_THREAD_PRIORITY 20 -#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_CMD_SIZE 80 -#define FINSH_USING_MSH -#define FINSH_USING_MSH_DEFAULT -#define FINSH_USING_MSH_ONLY +#define MSH_USING_BUILT_IN_COMMANDS +#define FINSH_USING_DESCRIPTION #define FINSH_ARG_MAX 10 +/* end of Command shell */ /* Device virtual file system */ -// #define RT_USING_DFS -// #define DFS_USING_WORKDIR -// #define DFS_FILESYSTEMS_MAX 4 -// #define DFS_FILESYSTEM_TYPES_MAX 4 -// #define DFS_FD_MAX 16 -// #define RT_USING_DFS_ELMFAT - -/* elm-chan's FatFs, Generic FAT Filesystem Module */ - -// #define RT_DFS_ELM_CODE_PAGE 437 -// #define RT_DFS_ELM_WORD_ACCESS -// #define RT_DFS_ELM_USE_LFN_3 -// #define RT_DFS_ELM_USE_LFN 3 -// #define RT_DFS_ELM_MAX_LFN 255 -// #define RT_DFS_ELM_DRIVES 2 -// #define RT_DFS_ELM_MAX_SECTOR_SIZE 512 -// #define RT_DFS_ELM_REENTRANT -// #define RT_USING_DFS_DEVFS +#define RT_USING_DFS +#define DFS_USING_POSIX +#define DFS_FILESYSTEMS_MAX 4 +#define DFS_FILESYSTEM_TYPES_MAX 4 +#define DFS_FD_MAX 16 +/* end of Device virtual file system */ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL - -/* Using WiFi */ - +#define RT_USING_SERIAL_V1 +#define RT_SERIAL_USING_DMA +#define RT_SERIAL_RB_BUFSZ 64 +#define RT_USING_RTC /* Using USB */ +/* end of Using USB */ +/* end of Device Drivers */ /* POSIX layer and C standard library */ #define RT_USING_LIBC +#define RT_LIBC_USING_TIME +#define RT_LIBC_DEFAULT_TIMEZONE 8 + +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ /* Network */ /* Socket abstraction layer */ +/* end of Socket abstraction layer */ -/* light weight TCP/IP stack */ +/* Network interface device */ +/* end of Network interface device */ -/* Modbus master and slave stack */ +/* light weight TCP/IP stack */ +/* end of light weight TCP/IP stack */ /* AT commands */ +/* end of AT commands */ +/* end of Network */ /* VBUS(Virtual Software BUS) */ +/* end of VBUS(Virtual Software BUS) */ /* Utilities */ @@ -139,8 +159,14 @@ #define ULOG_OUTPUT_TIME #define ULOG_OUTPUT_LEVEL #define ULOG_OUTPUT_TAG +/* end of log format */ #define ULOG_BACKEND_USING_CONSOLE -#define ULOG_SW_VERSION_NUM 0x00101 +/* end of Utilities */ +/* end of RT-Thread Components */ + +/* RT-Thread Utestcases */ + +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -151,15 +177,21 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ @@ -168,49 +200,90 @@ /* Hardware Module */ #define MICROPYTHON_USING_MACHINE_UART +/* end of Hardware Module */ /* System Module */ #define MICROPYTHON_USING_UOS #define MICROPYTHON_USING_THREAD +/* end of System Module */ /* Tools Module */ #define MICROPYTHON_USING_UJSON +/* end of Tools Module */ /* Network Module */ +/* end of Network Module */ + +/* User Extended Module */ + +/* end of User Extended Module */ #define PKG_MICROPYTHON_HEAP_SIZE 8192 #define PKG_USING_MICROPYTHON_LATEST_VERSION +#define PKG_MICROPYTHON_VER_NUM 0x99999 +/* end of language packages */ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ +/* enhanced kernel services */ -/* peripheral libraries and drivers */ +/* end of enhanced kernel services */ +/* acceleration: Assembly language or algorithmic acceleration packages */ -/* miscellaneous packages */ +/* end of acceleration: Assembly language or algorithmic acceleration packages */ +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ -/* sample package */ +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ -/* samples: kernel and components samples */ +/* Micrium: Micrium software products porting for RT-Thread */ +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ + +/* peripheral libraries and drivers */ -/* example package: hello */ +/* end of peripheral libraries and drivers */ +/* AI packages */ -/* Privated Packages of RealThread */ +/* end of AI packages */ + +/* miscellaneous packages */ + +/* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ -/* Network Utilities */ +/* entertainment: terminal games and other interesting software packages */ +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ +#define SOC_JUICEVM_RV64 +#define BOARD_RV64_FRDM_JUICEVM #define BSP_USING_UART0 #define __STACKSIZE__ 4096 diff --git a/bsp/k210/.config b/bsp/k210/.config index 3e1fe4aa4be..800d2c10aa2 100644 --- a/bsp/k210/.config +++ b/bsp/k210/.config @@ -31,6 +31,9 @@ CONFIG_SYSTEM_THREAD_STACK_SIZE=4096 # CONFIG_RT_KSERVICE_USING_STDLIB is not set # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set # CONFIG_RT_USING_ASM_MEMCPY is not set +# CONFIG_RT_USING_ASM_MEMSET is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set CONFIG_RT_DEBUG=y CONFIG_RT_DEBUG_COLOR=y CONFIG_RT_DEBUG_INIT_CONFIG=y @@ -59,13 +62,18 @@ CONFIG_RT_USING_SIGNALS=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set CONFIG_RT_USING_SLAB=y +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +CONFIG_RT_USING_SLAB_AS_HEAP=y # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # @@ -77,8 +85,7 @@ CONFIG_RT_USING_DEVICE=y CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uarths" -# CONFIG_RT_PRINTF_LONGLONG is not set -CONFIG_RT_VER_NUM=0x40004 +CONFIG_RT_VER_NUM=0x40100 CONFIG_ARCH_CPU_64BIT=y # CONFIG_RT_USING_CPU_FFS is not set CONFIG_ARCH_RISCV=y @@ -94,6 +101,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y CONFIG_RT_USING_USER_MAIN=y CONFIG_RT_MAIN_THREAD_STACK_SIZE=8192 CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set # # C++ features @@ -124,6 +132,7 @@ CONFIG_FINSH_ARG_MAX=10 # Device virtual file system # CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y CONFIG_DFS_USING_WORKDIR=y CONFIG_DFS_FILESYSTEMS_MAX=16 CONFIG_DFS_FILESYSTEM_TYPES_MAX=16 @@ -216,10 +225,11 @@ CONFIG_RT_LIBC_USING_TIME=y # CONFIG_RT_LIBC_USING_FILEIO is not set # CONFIG_RT_USING_MODULE is not set CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 -CONFIG_RT_USING_POSIX=y -# CONFIG_RT_USING_POSIX_STDIO is not set -# CONFIG_RT_USING_POSIX_POLL is not set -# CONFIG_RT_USING_POSIX_SELECT is not set + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set CONFIG_RT_USING_POSIX_DELAY=y # CONFIG_RT_USING_POSIX_GETLINE is not set # CONFIG_RT_USING_POSIX_MMAP is not set @@ -413,8 +423,14 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -430,10 +446,10 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_UGUI is not set # -# u8g2: a monochrome graphic library +# PainterEngine: A cross-platform graphics application framework written in C language # -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set # # tools packages @@ -476,11 +492,18 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_MEM_SANDBOX is not set # CONFIG_PKG_USING_SOLAR_TERMS is not set # CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set # # system packages # +# +# rt_kprintf: enhanced rt_kprintf packages +# +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set + # # acceleration: Assembly language or algorithmic acceleration packages # @@ -529,7 +552,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -537,6 +559,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # # peripheral libraries and drivers diff --git a/bsp/k210/rtconfig.h b/bsp/k210/rtconfig.h index fccbcdc3993..f49394196e1 100644 --- a/bsp/k210/rtconfig.h +++ b/bsp/k210/rtconfig.h @@ -39,8 +39,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SLAB +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SLAB_AS_HEAP #define RT_USING_HEAP /* Kernel Device Object */ @@ -49,7 +51,7 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uarths" -#define RT_VER_NUM 0x40004 +#define RT_VER_NUM 0x40100 #define ARCH_CPU_64BIT #define ARCH_RISCV #define ARCH_RISCV_FPU @@ -86,6 +88,7 @@ /* Device virtual file system */ #define RT_USING_DFS +#define DFS_USING_POSIX #define DFS_USING_WORKDIR #define DFS_FILESYSTEMS_MAX 16 #define DFS_FILESYSTEM_TYPES_MAX 16 @@ -132,7 +135,9 @@ #define RT_USING_LIBC #define RT_LIBC_USING_TIME #define RT_LIBC_DEFAULT_TIMEZONE 8 -#define RT_USING_POSIX + +/* POSIX (Portable Operating System Interface) layer */ + #define RT_USING_POSIX_DELAY /* Network */ @@ -201,11 +206,17 @@ /* u8g2: a monochrome graphic library */ +/* PainterEngine: A cross-platform graphics application framework written in C language */ + + /* tools packages */ /* system packages */ +/* rt_kprintf: enhanced rt_kprintf packages */ + + /* acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/lm3s8962/project.Uv2 b/bsp/lm3s8962/project.Uv2 index f87d84f5401..5159e187b5f 100644 --- a/bsp/lm3s8962/project.Uv2 +++ b/bsp/lm3s8962/project.Uv2 @@ -3,143 +3,136 @@ Target (RT-Thread-lm3s), 0x0004 // Tools: 'ARM-ADS' -Group (Drivers) -Group (Applications) -Group (Libraries) -Group (Kernel) -Group (CORTEX-M3) -Group (DeviceDrivers) -Group (libc) -Group (finsh) -Group (LwIP) -Group (Filesystem) - -File 1,1, -File 1,1, -File 1,1, -File 1,1, -File 2,1, -File 2,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,2, -File 4,1,<../../src/clock.c> -File 4,1,<../../src/device.c> -File 4,1,<../../src/idle.c> -File 4,1,<../../src/ipc.c> -File 4,1,<../../src/irq.c> -File 4,1,<../../src/kservice.c> -File 4,1,<../../src/mem.c> -File 4,1,<../../src/mempool.c> -File 4,1,<../../src/object.c> -File 4,1,<../../src/scheduler.c> -File 4,1,<../../src/signal.c> -File 4,1,<../../src/thread.c> -File 4,1,<../../src/timer.c> -File 5,1,<../../libcpu/arm/cortex-m3/cpuport.c> -File 5,2,<../../libcpu/arm/cortex-m3/context_rvds.S> -File 5,1,<../../libcpu/arm/common/backtrace.c> -File 5,1,<../../libcpu/arm/common/div0.c> -File 5,1,<../../libcpu/arm/common/showmem.c> -File 6,1,<../../components/drivers/src/completion.c> -File 6,1,<../../components/drivers/src/dataqueue.c> -File 6,1,<../../components/drivers/src/pipe.c> -File 6,1,<../../components/drivers/src/ringbuffer.c> -File 6,1,<../../components/drivers/src/waitqueue.c> -File 6,1,<../../components/drivers/src/workqueue.c> -File 7,1,<../../components/libc/compilers/armlibc/libc.c> -File 7,1,<../../components/libc/compilers/armlibc/libc_syms.c> -File 7,1,<../../components/libc/compilers/armlibc/mem_std.c> -File 7,1,<../../components/libc/compilers/armlibc/stdio.c> -File 7,1,<../../components/libc/compilers/armlibc/stubs.c> -File 7,1,<../../components/libc/compilers/armlibc/time.c> -File 8,1,<../../components/finsh/shell.c> -File 8,1,<../../components/finsh/symbol.c> -File 8,1,<../../components/finsh/cmd.c> -File 8,1,<../../components/finsh/finsh_compiler.c> -File 8,1,<../../components/finsh/finsh_error.c> -File 8,1,<../../components/finsh/finsh_heap.c> -File 8,1,<../../components/finsh/finsh_init.c> -File 8,1,<../../components/finsh/finsh_node.c> -File 8,1,<../../components/finsh/finsh_ops.c> -File 8,1,<../../components/finsh/finsh_parser.c> -File 8,1,<../../components/finsh/finsh_var.c> -File 8,1,<../../components/finsh/finsh_vm.c> -File 8,1,<../../components/finsh/finsh_token.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/api_lib.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/api_msg.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/err.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/netbuf.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/netdb.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/netifapi.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/sockets.c> -File 9,1,<../../components/net/lwip-1.4.1/src/api/tcpip.c> -File 9,1,<../../components/net/lwip-1.4.1/src/arch/sys_arch.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/def.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/dhcp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/dns.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/init.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/memp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/netif.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/pbuf.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/raw.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/stats.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/sys.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/tcp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/tcp_in.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/tcp_out.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/timers.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/udp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/autoip.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/icmp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/igmp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/inet.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/inet_chksum.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip_addr.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/ipv4/ip_frag.c> -File 9,1,<../../components/net/lwip-1.4.1/src/netif/etharp.c> -File 9,1,<../../components/net/lwip-1.4.1/src/netif/ethernetif.c> -File 9,1,<../../components/net/lwip-1.4.1/src/netif/slipif.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/snmp/asn1_dec.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/snmp/asn1_enc.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/snmp/mib2.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/snmp/mib_structs.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/snmp/msg_in.c> -File 9,1,<../../components/net/lwip-1.4.1/src/core/snmp/msg_out.c> -File 10,1,<../../components/dfs/src/dfs.c> -File 10,1,<../../components/dfs/src/dfs_file.c> -File 10,1,<../../components/dfs/src/dfs_fs.c> -File 10,1,<../../components/dfs/src/dfs_posix.c> -File 10,1,<../../components/dfs/filesystems/elmfat/dfs_elm.c> -File 10,1,<../../components/dfs/filesystems/elmfat/ff.c> - +Group (Applications) +Group (CPU) +Group (DeviceDrivers) +Group (Drivers) +Group (Filesystem) +Group (Finsh) +Group (Kernel) +Group (libc) +Group (Libraries) +Group (lwIP) +Group (POSIX) +Group (utestcases) + +File 1,1, +File 1,1, +File 2,1,<..\..\libcpu\arm\common\backtrace.c> +File 2,1,<..\..\libcpu\arm\common\showmem.c> +File 2,1,<..\..\libcpu\arm\common\div0.c> +File 2,1,<..\..\libcpu\arm\cortex-m3\cpuport.c> +File 2,2,<..\..\libcpu\arm\cortex-m3\context_rvds.S> +File 3,1,<..\..\components\drivers\src\completion.c> +File 3,1,<..\..\components\drivers\src\pipe.c> +File 3,1,<..\..\components\drivers\src\ringblk_buf.c> +File 3,1,<..\..\components\drivers\src\ringbuffer.c> +File 3,1,<..\..\components\drivers\src\waitqueue.c> +File 3,1,<..\..\components\drivers\src\dataqueue.c> +File 3,1,<..\..\components\drivers\src\workqueue.c> +File 4,1, +File 4,1, +File 4,1, +File 4,1, +File 5,1,<..\..\components\dfs\src\dfs_fs.c> +File 5,1,<..\..\components\dfs\src\dfs.c> +File 5,1,<..\..\components\dfs\src\dfs_file.c> +File 5,1,<..\..\components\dfs\filesystems\devfs\devfs.c> +File 5,1,<..\..\components\dfs\filesystems\elmfat\ff.c> +File 5,1,<..\..\components\dfs\filesystems\elmfat\ffunicode.c> +File 5,1,<..\..\components\dfs\filesystems\elmfat\dfs_elm.c> +File 6,1,<..\..\components\finsh\shell.c> +File 6,1,<..\..\components\finsh\msh.c> +File 7,1,<..\..\src\mempool.c> +File 7,1,<..\..\src\timer.c> +File 7,1,<..\..\src\object.c> +File 7,1,<..\..\src\idle.c> +File 7,1,<..\..\src\kservice.c> +File 7,1,<..\..\src\mem.c> +File 7,1,<..\..\src\device.c> +File 7,1,<..\..\src\ipc.c> +File 7,1,<..\..\src\clock.c> +File 7,1,<..\..\src\components.c> +File 7,1,<..\..\src\thread.c> +File 7,1,<..\..\src\irq.c> +File 7,1,<..\..\src\scheduler.c> +File 8,1,<..\..\components\libc\compilers\armlibc\mem_std.c> +File 8,1,<..\..\components\libc\compilers\armlibc\syscalls.c> +File 8,1,<..\..\components\libc\compilers\armlibc\libc_syms.c> +File 8,1,<..\..\components\libc\compilers\common\time.c> +File 8,1,<..\..\components\libc\compilers\common\stdlib.c> +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,2, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 9,1, +File 10,1,<..\..\components\net\lwip-1.4.1\src\netif\etharp.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\netdb.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\autoip.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_frag.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\inet_chksum.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\netif.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\sys.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\snmp\msg_in.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\sockets.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\netifapi.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\tcpip.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\snmp\msg_out.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\inet.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\init.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\netif\ethernetif.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\netif\slipif.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\memp.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\snmp\mib_structs.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\snmp\asn1_enc.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip_addr.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\dhcp.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\netbuf.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\raw.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\tcp_out.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\icmp.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\api_lib.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\stats.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\err.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\tcp_in.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\dns.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\arch\sys_arch.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\snmp\asn1_dec.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\igmp.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\udp.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\pbuf.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\ipv4\ip.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\def.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\api\api_msg.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\timers.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\snmp\mib2.c> +File 10,1,<..\..\components\net\lwip-1.4.1\src\core\tcp.c> + @@ -199,9 +192,9 @@ Options 1,0,0 // Target 'RT-Thread-lm3s' RV_STAVEC () ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSCMISC () - ADSCDEFN (PART_LM3S8962, RT_USING_ARM_LIBC) + ADSCDEFN (PART_LM3S8962, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND) ADSCUDEF () - ADSCINCD (../../components/net/lwip-1.4.1/src/include/netif;../../libcpu/arm/cortex-m3;../../components/drivers/include;../../components/net/lwip-1.4.1/src;../../components/libc/compilers/armlibc;../../components/dfs/filesystems/elmfat;drivers;../../libcpu/arm/common;.;Libraries;applications;../../include;../../components/dfs/include;../../components/net/lwip-1.4.1/src/include;../../components/finsh;../../components/net/lwip-1.4.1/src/arch/include;../../components/net/lwip-1.4.1/src/include/ipv4) + ADSCINCD (..\..\components\net\lwip-1.4.1\src;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\components\dfs\filesystems\elmfat;..\..\include;drivers;..\..\components\libc\compilers\common;..\..\components\net\lwip-1.4.1\src\include\netif;..\..\examples\utest\testcases\kernel;.;Libraries;applications;..\..\components\net\lwip-1.4.1\src\include;..\..\libcpu\arm\cortex-m3;..\..\components\net\lwip-1.4.1\src\include\ipv4;..\..\components\drivers\include;..\..\libcpu\arm\common;..\..\components\net\lwip-1.4.1\src\arch\include;..\..\components\dfs\filesystems\devfs;..\..\components\finsh;..\..\components\dfs\include) ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSAMISC () ADSADEFN () @@ -222,7 +215,7 @@ Options 1,0,0 // Target 'RT-Thread-lm3s' ADSLDSC () ADSLDIB () ADSLDIC () - ADSLDMC ( --keep *.o(FSymTab) --keep *.o(VSymTab) ) + ADSLDMC () ADSLDIF () ADSLDDW () OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S8962)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S8962) diff --git a/bsp/lm3s9b9x/project.Uv2 b/bsp/lm3s9b9x/project.Uv2 index d02f44f0785..4ce6a207177 100644 --- a/bsp/lm3s9b9x/project.Uv2 +++ b/bsp/lm3s9b9x/project.Uv2 @@ -3,117 +3,110 @@ Target (RT-Thread-lm3s), 0x0004 // Tools: 'ARM-ADS' -Group (Drivers) -Group (Applications) -Group (Libraries) -Group (Kernel) -Group (CORTEX-M3) -Group (finsh) -Group (lwIP) - -File 1,1, -File 1,1, -File 1,1, -File 1,1, -File 2,1, -File 2,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,1, -File 3,2, -File 4,1,<../../src/clock.c> -File 4,1,<../../src/device.c> -File 4,1,<../../src/idle.c> -File 4,1,<../../src/ipc.c> -File 4,1,<../../src/irq.c> -File 4,1,<../../src/kservice.c> -File 4,1,<../../src/mem.c> -File 4,1,<../../src/mempool.c> -File 4,1,<../../src/object.c> -File 4,1,<../../src/scheduler.c> -File 4,1,<../../src/signal.c> -File 4,1,<../../src/thread.c> -File 4,1,<../../src/timer.c> -File 5,1,<../../libcpu/arm/cortex-m3/cpuport.c> -File 5,2,<../../libcpu/arm/cortex-m3/context_rvds.S> -File 5,1,<../../libcpu/arm/common/backtrace.c> -File 5,1,<../../libcpu/arm/common/div0.c> -File 5,1,<../../libcpu/arm/common/showmem.c> -File 6,1,<../../components/finsh/shell.c> -File 6,1,<../../components/finsh/symbol.c> -File 6,1,<../../components/finsh/cmd.c> -File 6,1,<../../components/finsh/finsh_compiler.c> -File 6,1,<../../components/finsh/finsh_error.c> -File 6,1,<../../components/finsh/finsh_heap.c> -File 6,1,<../../components/finsh/finsh_init.c> -File 6,1,<../../components/finsh/finsh_node.c> -File 6,1,<../../components/finsh/finsh_ops.c> -File 6,1,<../../components/finsh/finsh_parser.c> -File 6,1,<../../components/finsh/finsh_var.c> -File 6,1,<../../components/finsh/finsh_vm.c> -File 6,1,<../../components/finsh/finsh_token.c> -File 7,1,<../../components/net/lwip-2.0.2/src/arch/sys_arch.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/api_lib.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/api_msg.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/err.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/netbuf.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/netdb.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/netifapi.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/sockets.c> -File 7,1,<../../components/net/lwip-2.0.2/src/api/tcpip.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/def.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/dns.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/inet_chksum.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/init.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ip.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/memp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/netif.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/pbuf.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/raw.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/stats.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/sys.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/tcp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/tcp_in.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/tcp_out.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/timeouts.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/udp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/netif/ethernet.c> -File 7,1,<../../components/net/lwip-2.0.2/src/netif/ethernetif.c> -File 7,1,<../../components/net/lwip-2.0.2/src/netif/lowpan6.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/autoip.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/dhcp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/etharp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/icmp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/igmp.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/ip4.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/ip4_addr.c> -File 7,1,<../../components/net/lwip-2.0.2/src/core/ipv4/ip4_frag.c> - +Group (Applications) +Group (CPU) +Group (Drivers) +Group (Finsh) +Group (Kernel) +Group (libc) +Group (Libraries) +Group (lwIP) +Group (POSIX) +Group (utestcases) + +File 1,1, +File 1,1, +File 2,1,<..\..\libcpu\arm\common\showmem.c> +File 2,1,<..\..\libcpu\arm\common\div0.c> +File 2,1,<..\..\libcpu\arm\common\backtrace.c> +File 2,1,<..\..\libcpu\arm\cortex-m3\cpuport.c> +File 2,2,<..\..\libcpu\arm\cortex-m3\context_rvds.S> +File 3,1, +File 3,1, +File 3,1, +File 3,1, +File 4,1,<..\..\components\finsh\shell.c> +File 4,1,<..\..\components\finsh\msh.c> +File 5,1,<..\..\src\scheduler.c> +File 5,1,<..\..\src\mem.c> +File 5,1,<..\..\src\timer.c> +File 5,1,<..\..\src\mempool.c> +File 5,1,<..\..\src\idle.c> +File 5,1,<..\..\src\ipc.c> +File 5,1,<..\..\src\kservice.c> +File 5,1,<..\..\src\object.c> +File 5,1,<..\..\src\device.c> +File 5,1,<..\..\src\thread.c> +File 5,1,<..\..\src\irq.c> +File 5,1,<..\..\src\clock.c> +File 5,1,<..\..\src\components.c> +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,1, +File 7,2, +File 7,1, +File 7,1, +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\netdb.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ip.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\autoip.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\netif\ethernet.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\netif.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\sys.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\sockets.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\netifapi.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\tcpip.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_addr.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\dhcp.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\init.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\netif\ethernetif.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\etharp.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\memp.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\netbuf.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\raw.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_frag.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\tcp_out.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\netif\lowpan6.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\icmp.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\api_lib.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\inet_chksum.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\stats.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\err.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\tcp_in.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\dns.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\arch\sys_arch.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\timeouts.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\ipv4\igmp.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\udp.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\pbuf.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\def.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\api\api_msg.c> +File 8,1,<..\..\components\net\lwip-2.0.3\src\core\tcp.c> + @@ -173,9 +166,9 @@ Options 1,0,0 // Target 'RT-Thread-lm3s' RV_STAVEC () ADSCCFLG { 13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSCMISC () - ADSCDEFN (PART_LM3S9B96) + ADSCDEFN (PART_LM3S9B96, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND) ADSCUDEF () - ADSCINCD (../../components/net/lwip-2.0.2/src;../../libcpu/arm/cortex-m3;../../components/net/lwip-2.0.2/src/include/posix;drivers;../../libcpu/arm/common;.;Libraries;applications;../../include;../../components/net/lwip-2.0.2/src/include/netif;../../components/net/lwip-2.0.2/src/arch/include;../../components/net/lwip-2.0.2/src/include/ipv4;../../components/finsh;../../components/net/lwip-2.0.2/src/include) + ADSCINCD (..\..\components\libc\compilers\common\nogcc;..\..\include;..\..\components\net\lwip-2.0.3\src\include;drivers;..\..\components\libc\compilers\common;..\..\components\net\lwip-2.0.3\src\include\ipv4;..\..\examples\utest\testcases\kernel;.;Libraries;applications;..\..\components\net\lwip-2.0.3\src\include\netif;..\..\components\libc\posix\io\poll;..\..\libcpu\arm\cortex-m3;..\..\components\net\lwip-2.0.3\src;..\..\libcpu\arm\common;..\..\components\net\lwip-2.0.3\src\include\posix;..\..\components\finsh;..\..\components\net\lwip-2.0.3\src\arch\include) ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSAMISC () ADSADEFN () @@ -196,7 +189,7 @@ Options 1,0,0 // Target 'RT-Thread-lm3s' ADSLDSC () ADSLDIB () ADSLDIC () - ADSLDMC ( --keep *.o(FSymTab) --keep *.o(VSymTab) ) + ADSLDMC () ADSLDIF () ADSLDDW () OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S9B96)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S9B96) diff --git a/bsp/lm4f232/project.uvproj b/bsp/lm4f232/project.uvproj index b38a9b843c8..580f5c904ac 100644 --- a/bsp/lm4f232/project.uvproj +++ b/bsp/lm4f232/project.uvproj @@ -341,9 +341,9 @@ 0 - PART_LM4F232H5QD + PART_LM4F232H5QD, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;..\..\include;applications;.;drivers;Libraries;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\finsh;..\..\components\libc\compilers\common + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -381,308 +381,265 @@ - Kernel - - - clock.c - 1 - ..\..\src\clock.c - - - - - components.c - 1 - ..\..\src\components.c - - - - - cpu.c - 1 - ..\..\src\cpu.c - - - - - device.c - 1 - ..\..\src\device.c - - - - - idle.c - 1 - ..\..\src\idle.c - - - - - ipc.c - 1 - ..\..\src\ipc.c - - + Applications - irq.c + application.c 1 - ..\..\src\irq.c + applications\application.c - kservice.c + startup.c 1 - ..\..\src\kservice.c + applications\startup.c + + + CPU - mem.c + div0.c 1 - ..\..\src\mem.c + ..\..\libcpu\arm\common\div0.c - mempool.c + backtrace.c 1 - ..\..\src\mempool.c + ..\..\libcpu\arm\common\backtrace.c - object.c + showmem.c 1 - ..\..\src\object.c + ..\..\libcpu\arm\common\showmem.c - scheduler.c + cpuport.c 1 - ..\..\src\scheduler.c + ..\..\libcpu\arm\cortex-m4\cpuport.c - signal.c - 1 - ..\..\src\signal.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S + + + Drivers - thread.c + board.c 1 - ..\..\src\thread.c + drivers\board.c - timer.c + serial.c 1 - ..\..\src\timer.c + drivers\serial.c - Applications + Finsh - application.c + shell.c 1 - applications\application.c + ..\..\components\finsh\shell.c - startup.c + msh.c 1 - applications\startup.c + ..\..\components\finsh\msh.c - Drivers - - - board.c - 1 - drivers\board.c - - + Kernel - serial.c + object.c 1 - drivers\serial.c + ..\..\src\object.c - - - Libraries - adc.c + clock.c 1 - Libraries\driverlib\adc.c + ..\..\src\clock.c - can.c + device.c 1 - Libraries\driverlib\can.c + ..\..\src\device.c - comp.c + ipc.c 1 - Libraries\driverlib\comp.c + ..\..\src\ipc.c - driverlib_cpu.c + components.c 1 - Libraries\driverlib\cpu.c + ..\..\src\components.c - eeprom.c + scheduler.c 1 - Libraries\driverlib\eeprom.c + ..\..\src\scheduler.c - epi.c + idle.c 1 - Libraries\driverlib\epi.c + ..\..\src\idle.c - ethernet.c + thread.c 1 - Libraries\driverlib\ethernet.c + ..\..\src\thread.c - fan.c + kservice.c 1 - Libraries\driverlib\fan.c + ..\..\src\kservice.c - flash.c + mempool.c 1 - Libraries\driverlib\flash.c + ..\..\src\mempool.c - fpu.c + timer.c 1 - Libraries\driverlib\fpu.c + ..\..\src\timer.c - gpio.c + mem.c 1 - Libraries\driverlib\gpio.c + ..\..\src\mem.c - hibernate.c + irq.c 1 - Libraries\driverlib\hibernate.c + ..\..\src\irq.c + + + Libraries - i2c.c + comp.c 1 - Libraries\driverlib\i2c.c + Libraries\driverlib\comp.c - i2s.c + hibernate.c 1 - Libraries\driverlib\i2s.c + Libraries\driverlib\hibernate.c - interrupt.c + adc.c 1 - Libraries\driverlib\interrupt.c + Libraries\driverlib\adc.c - lpc.c + driverlib_timer.c 1 - Libraries\driverlib\lpc.c + Libraries\driverlib\timer.c - mpu.c + watchdog.c 1 - Libraries\driverlib\mpu.c + Libraries\driverlib\watchdog.c - peci.c + flash.c 1 - Libraries\driverlib\peci.c + Libraries\driverlib\flash.c - pwm.c + qei.c 1 - Libraries\driverlib\pwm.c + Libraries\driverlib\qei.c - qei.c + epi.c 1 - Libraries\driverlib\qei.c + Libraries\driverlib\epi.c - ssi.c + gpio.c 1 - Libraries\driverlib\ssi.c + Libraries\driverlib\gpio.c - sysctl.c + pwm.c 1 - Libraries\driverlib\sysctl.c + Libraries\driverlib\pwm.c - sysexc.c + i2s.c 1 - Libraries\driverlib\sysexc.c + Libraries\driverlib\i2s.c @@ -694,23 +651,23 @@ - driverlib_timer.c + i2c.c 1 - Libraries\driverlib\timer.c + Libraries\driverlib\i2c.c - uart.c + fpu.c 1 - Libraries\driverlib\uart.c + Libraries\driverlib\fpu.c - udma.c + peci.c 1 - Libraries\driverlib\udma.c + Libraries\driverlib\peci.c @@ -722,9 +679,9 @@ - watchdog.c + cpu.c 1 - Libraries\driverlib\watchdog.c + Libraries\driverlib\cpu.c @@ -734,129 +691,88 @@ Libraries\startup\arm\start_rvds.S - - - cpu - - - backtrace.c - 1 - ..\..\libcpu\arm\common\backtrace.c - - - - - div0.c - 1 - ..\..\libcpu\arm\common\div0.c - - - - - showmem.c - 1 - ..\..\libcpu\arm\common\showmem.c - - - - - cpuport.c - 1 - ..\..\libcpu\arm\cortex-m4\cpuport.c - - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S - - - - - finsh - - - shell.c + uart.c 1 - ..\..\components\finsh\shell.c + Libraries\driverlib\uart.c - cmd.c + can.c 1 - ..\..\components\finsh\cmd.c + Libraries\driverlib\can.c - finsh_compiler.c + sysctl.c 1 - ..\..\components\finsh\finsh_compiler.c + Libraries\driverlib\sysctl.c - finsh_error.c + mpu.c 1 - ..\..\components\finsh\finsh_error.c + Libraries\driverlib\mpu.c - finsh_heap.c + fan.c 1 - ..\..\components\finsh\finsh_heap.c + Libraries\driverlib\fan.c - finsh_init.c + interrupt.c 1 - ..\..\components\finsh\finsh_init.c + Libraries\driverlib\interrupt.c - finsh_node.c + ssi.c 1 - ..\..\components\finsh\finsh_node.c + Libraries\driverlib\ssi.c - finsh_ops.c + ethernet.c 1 - ..\..\components\finsh\finsh_ops.c + Libraries\driverlib\ethernet.c - finsh_parser.c + lpc.c 1 - ..\..\components\finsh\finsh_parser.c + Libraries\driverlib\lpc.c - finsh_var.c + udma.c 1 - ..\..\components\finsh\finsh_var.c + Libraries\driverlib\udma.c - finsh_vm.c + eeprom.c 1 - ..\..\components\finsh\finsh_vm.c + Libraries\driverlib\eeprom.c - finsh_token.c + sysexc.c 1 - ..\..\components\finsh\finsh_token.c + Libraries\driverlib\sysexc.c diff --git a/bsp/lpc1114/.config b/bsp/lpc1114/.config index a3fb132cdb3..a4760d693f4 100644 --- a/bsp/lpc1114/.config +++ b/bsp/lpc1114/.config @@ -44,12 +44,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -116,7 +120,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=128 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -168,10 +171,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -336,7 +346,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -358,10 +368,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -376,13 +393,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -440,9 +450,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -452,7 +469,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -467,6 +483,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -491,8 +508,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -500,6 +515,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/lpc1114/rtconfig.h b/bsp/lpc1114/rtconfig.h index 699afec2135..24d1b25c517 100644 --- a/bsp/lpc1114/rtconfig.h +++ b/bsp/lpc1114/rtconfig.h @@ -29,6 +29,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -80,7 +81,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 128 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -98,6 +98,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -183,6 +190,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/lpc176x/project.ewp b/bsp/lpc176x/project.ewp index cc30279eaef..66ab8bcf531 100644 --- a/bsp/lpc176x/project.ewp +++ b/bsp/lpc176x/project.ewp @@ -285,21 +285,25 @@ - - - - + + + - diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h index d33256fca60..511a34cb823 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h @@ -38,6 +38,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/.config b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/.config index b9535d10ab1..bde523dbaf3 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/.config +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/.config @@ -59,12 +59,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -163,7 +167,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -233,10 +236,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -399,7 +409,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set CONFIG_PKG_USING_TFM=y CONFIG_PKG_TFM_PATH="/packages/security/trusted-firmware-m" @@ -425,10 +435,17 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -443,13 +460,6 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -507,9 +517,16 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -519,7 +536,6 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -534,6 +550,7 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -558,8 +575,6 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -567,6 +582,7 @@ CONFIG_PKG_TFM_VER="nxp-lpc55-v1.0-beta" # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/project.uvprojx b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/project.uvprojx index 751770b12a8..6b8fc388dc8 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/project.uvprojx +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/project.uvprojx @@ -336,7 +336,7 @@ --target=arm-arm-none-eabi CPU_LPC55S69JBD100_cm33_core0, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - ..\lpc55s69_nxp_evk\applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\lpc55s69_nxp_evk\board;..\lpc55s69_nxp_evk\board\MCUX_Config\board;..\Libraries\drivers;..\Libraries\drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\Libraries\LPC55S6X\CMSIS\Include;..\Libraries\LPC55S6X\components\codec;..\Libraries\LPC55S6X\LPC55S6X;..\Libraries\LPC55S6X\LPC55S6X\drivers;..\Libraries\LPC55S6X\middleware\sdmmc\inc;..\Libraries\LPC55S6X\middleware\sdmmc\port;..\..\..\examples\utest\testcases\kernel + ..\lpc55s69_nxp_evk\applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\lpc55s69_nxp_evk\board;..\lpc55s69_nxp_evk\board\MCUX_Config\board;..\Libraries\drivers;..\Libraries\drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\Libraries\LPC55S6X\CMSIS\Include;..\Libraries\LPC55S6X\components\codec;..\Libraries\LPC55S6X\LPC55S6X;..\Libraries\LPC55S6X\LPC55S6X\drivers;..\Libraries\LPC55S6X\middleware\sdmmc\inc;..\Libraries\LPC55S6X\middleware\sdmmc\port;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -381,16 +381,16 @@ Applications - mnt.c + main.c 1 - ..\lpc55s69_nxp_evk\applications\mnt.c + ..\lpc55s69_nxp_evk\applications\main.c - main.c + mnt.c 1 - ..\lpc55s69_nxp_evk\applications\main.c + ..\lpc55s69_nxp_evk\applications\mnt.c @@ -398,9 +398,9 @@ CPU - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -412,9 +412,9 @@ - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -555,9 +555,9 @@ - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -569,23 +569,23 @@ - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -727,16 +727,9 @@ - dfs_poll.c - 1 - ..\..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\..\components\dfs\src\dfs_file.c + ..\..\..\components\dfs\src\dfs_fs.c @@ -748,23 +741,23 @@ - dfs_fs.c + dfs_file.c 1 - ..\..\..\components\dfs\src\dfs_fs.c + ..\..\..\components\dfs\src\dfs_file.c - dfs_select.c + devfs.c 1 - ..\..\..\components\dfs\src\dfs_select.c + ..\..\..\components\dfs\filesystems\devfs\devfs.c - devfs.c + dfs_elm.c 1 - ..\..\..\components\dfs\filesystems\devfs\devfs.c + ..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c @@ -781,13 +774,6 @@ ..\..\..\components\dfs\filesystems\elmfat\ff.c - - - dfs_elm.c - 1 - ..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c - - Finsh @@ -824,37 +810,37 @@ Kernel - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - kservice.c + components.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\components.c @@ -866,51 +852,51 @@ - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c - object.c + clock.c 1 - ..\..\..\src\object.c + ..\..\..\src\clock.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - idle.c + kservice.c 1 - ..\..\..\src\idle.c + ..\..\..\src\kservice.c @@ -918,9 +904,9 @@ libc - stdio.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -930,13 +916,6 @@ ..\..\..\components\libc\compilers\armlibc\mem_std.c - - - libc.c - 1 - ..\..\..\components\libc\compilers\armlibc\libc.c - - syscalls.c @@ -946,30 +925,16 @@ - time.c - 1 - ..\..\..\components\libc\compilers\common\time.c - - - - - delay.c - 1 - ..\..\..\components\libc\compilers\common\delay.c - - - - - unistd.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\unistd.c + ..\..\..\components\libc\compilers\common\stdlib.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.h b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.h index d15a4332703..68463ff7a8a 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.h @@ -38,6 +38,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -110,7 +111,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -143,6 +143,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -230,6 +237,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/lpc824/project.ewp b/bsp/lpc824/project.ewp index ebbd56557af..6725fdf35b7 100644 --- a/bsp/lpc824/project.ewp +++ b/bsp/lpc824/project.ewp @@ -1,2035 +1,2040 @@ - - 2 - - Debug - - ARM - - 1 - - General - 3 - - 21 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 28 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 8 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 14 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - - - Release - - ARM - - 0 - - General - 3 - - 21 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 28 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 8 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 0 - - - - - - - - - CUSTOM - 3 - - - - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 14 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 0 - - - - - - - BILINK - 0 - - - - - Drivers - - $PROJ_DIR$\drivers/board.c - - - $PROJ_DIR$\drivers/usart.c - - - - Applications - - $PROJ_DIR$\applications/application.c - - - $PROJ_DIR$\applications/startup.c - - - - Libraries - - $PROJ_DIR$\Libraries/peri_driver/acmp/acmp_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/adc/adc_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/crc/crc_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/dma/dma_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/gpio/gpio_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/i2c/i2c_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/iap/iap.c - - - $PROJ_DIR$\Libraries/peri_driver/mrt/stopwatch.c - - - $PROJ_DIR$\Libraries/peri_driver/pinint/pinint_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/pmu/pmu_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/sctimer/sct_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/sctimer/sct_pwm_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/spi/spi_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/uart/ring_buffer.c - - - $PROJ_DIR$\Libraries/peri_driver/uart/uart_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/wkt/wkt_8xx.c - - - $PROJ_DIR$\Libraries/peri_driver/wwdt/wwdt_8xx.c - - - $PROJ_DIR$\Libraries/common/board/board_lpc.c - - - $PROJ_DIR$\Libraries/common/chip/clock_8xx.c - - - $PROJ_DIR$\Libraries/common/chip/ioswm_8xx.c - - - $PROJ_DIR$\Libraries/common/chip/syscon_8xx.c - - - $PROJ_DIR$\Libraries/common/chip/sysinit_8xx.c - - - $PROJ_DIR$\Libraries/common/startup/iar_startup_lpc82x.s - - - - Kernel - - $PROJ_DIR$\../../src/clock.c - - - $PROJ_DIR$\../../src/components.c - - - $PROJ_DIR$\../../src/device.c - - - $PROJ_DIR$\../../src/idle.c - - - $PROJ_DIR$\../../src/ipc.c - - - $PROJ_DIR$\../../src/irq.c - - - $PROJ_DIR$\../../src/kservice.c - - - $PROJ_DIR$\../../src/mem.c - - - $PROJ_DIR$\../../src/object.c - - - $PROJ_DIR$\../../src/scheduler.c - - - $PROJ_DIR$\../../src/signal.c - - - $PROJ_DIR$\../../src/thread.c - - - $PROJ_DIR$\../../src/timer.c - - - - CORTEX-M0 - - $PROJ_DIR$\../../libcpu/arm/cortex-m0/cpuport.c - - - $PROJ_DIR$\../../libcpu/arm/cortex-m0/context_iar.S - - - $PROJ_DIR$\../../libcpu/arm/common/backtrace.c - - - $PROJ_DIR$\../../libcpu/arm/common/div0.c - - - $PROJ_DIR$\../../libcpu/arm/common/showmem.c - - - - DeviceDrivers - - $PROJ_DIR$\../../components/drivers/src/completion.c - - - $PROJ_DIR$\../../components/drivers/src/dataqueue.c - - - $PROJ_DIR$\../../components/drivers/src/pipe.c - - - $PROJ_DIR$\../../components/drivers/src/ringbuffer.c - - - $PROJ_DIR$\../../components/drivers/src/waitqueue.c - - - $PROJ_DIR$\../../components/drivers/src/workqueue.c - - - - finsh - - $PROJ_DIR$\../../components/finsh/shell.c - - - $PROJ_DIR$\../../components/finsh/symbol.c - - - $PROJ_DIR$\../../components/finsh/cmd.c - - - $PROJ_DIR$\../../components/finsh/msh.c - - - $PROJ_DIR$\../../components/finsh/msh_cmd.c - - - $PROJ_DIR$\../../components/finsh/msh_file.c - - - + + 2 + + Debug + + ARM + + 1 + + General + 3 + + 21 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 28 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 14 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Release + + ARM + + 0 + + General + 3 + + 21 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 28 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 8 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 0 + + + + + + + + + CUSTOM + 3 + + + + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 14 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 0 + + + + + + + BILINK + 0 + + + + + Applications + + $PROJ_DIR$\applications\application.c + + + $PROJ_DIR$\applications\startup.c + + + + CPU + + $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c + + + $PROJ_DIR$\..\..\libcpu\arm\common\div0.c + + + $PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c + + + $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\context_iar.S + + + $PROJ_DIR$\..\..\libcpu\arm\cortex-m0\cpuport.c + + + + DeviceDrivers + + $PROJ_DIR$\..\..\components\drivers\src\pipe.c + + + $PROJ_DIR$\..\..\components\drivers\src\workqueue.c + + + $PROJ_DIR$\..\..\components\drivers\src\waitqueue.c + + + $PROJ_DIR$\..\..\components\drivers\src\ringblk_buf.c + + + $PROJ_DIR$\..\..\components\drivers\src\completion.c + + + $PROJ_DIR$\..\..\components\drivers\src\dataqueue.c + + + $PROJ_DIR$\..\..\components\drivers\src\ringbuffer.c + + + + Drivers + + $PROJ_DIR$\drivers\board.c + + + $PROJ_DIR$\drivers\usart.c + + + + Finsh + + $PROJ_DIR$\..\..\components\finsh\msh.c + + + $PROJ_DIR$\..\..\components\finsh\shell.c + + + + Kernel + + $PROJ_DIR$\..\..\src\object.c + + + $PROJ_DIR$\..\..\src\timer.c + + + $PROJ_DIR$\..\..\src\device.c + + + $PROJ_DIR$\..\..\src\components.c + + + $PROJ_DIR$\..\..\src\kservice.c + + + $PROJ_DIR$\..\..\src\ipc.c + + + $PROJ_DIR$\..\..\src\irq.c + + + $PROJ_DIR$\..\..\src\thread.c + + + $PROJ_DIR$\..\..\src\idle.c + + + $PROJ_DIR$\..\..\src\mem.c + + + $PROJ_DIR$\..\..\src\clock.c + + + $PROJ_DIR$\..\..\src\scheduler.c + + + + libc + + + Libraries + + $PROJ_DIR$\Libraries\peri_driver\dma\dma_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\adc\adc_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\pinint\pinint_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\crc\crc_8xx.c + + + $PROJ_DIR$\Libraries\common\chip\sysinit_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\sctimer\sct_pwm_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\i2c\i2c_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\wwdt\wwdt_8xx.c + + + $PROJ_DIR$\Libraries\common\chip\syscon_8xx.c + + + $PROJ_DIR$\Libraries\common\startup\iar_startup_lpc82x.s + + + $PROJ_DIR$\Libraries\peri_driver\pmu\pmu_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\spi\spi_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\sctimer\sct_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\wkt\wkt_8xx.c + + + $PROJ_DIR$\Libraries\common\chip\ioswm_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\mrt\stopwatch.c + + + $PROJ_DIR$\Libraries\peri_driver\gpio\gpio_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\acmp\acmp_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\uart\ring_buffer.c + + + $PROJ_DIR$\Libraries\common\chip\clock_8xx.c + + + $PROJ_DIR$\Libraries\peri_driver\iap\iap.c + + + $PROJ_DIR$\Libraries\peri_driver\uart\uart_8xx.c + + + $PROJ_DIR$\Libraries\common\board\board_lpc.c + + + + POSIX + + + utestcases + + diff --git a/bsp/lpc824/project.eww b/bsp/lpc824/project.eww index faa93f37cdf..c2cb02eb1e8 100644 --- a/bsp/lpc824/project.eww +++ b/bsp/lpc824/project.eww @@ -1,10 +1,10 @@ - - - - - $WS_DIR$\project.ewp - - - - - + + + + + $WS_DIR$\project.ewp + + + + + diff --git a/bsp/lpc824/project.uvprojx b/bsp/lpc824/project.uvprojx index c0fc7365157..4c7e2abe973 100644 --- a/bsp/lpc824/project.uvprojx +++ b/bsp/lpc824/project.uvprojx @@ -330,9 +330,9 @@ 0 - CORE_M0PLUS + __CLK_TCK=RT_TICK_PER_SECOND, CORE_M0PLUS, __RTTHREAD__ - drivers;applications;.;Libraries/peri_driver;Libraries/common/board;Libraries/common/chip;Libraries/common/CMSIS;../../components/CMSIS/Include;../../include;../../libcpu/arm/cortex-m0;../../libcpu/arm/common;../../components/drivers/include;../../components/finsh + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;Libraries\peri_driver;Libraries\common\board;Libraries\common\chip;Libraries\common\CMSIS;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -366,430 +366,402 @@ .\lpc824_rom.sct - --keep *.o(.rti_fn.*) --keep *.o(FSymTab) + - - Drivers - - - board.c - 1 - drivers/board.c - - - - - usart.c - 1 - drivers/usart.c - - - Applications application.c 1 - applications/application.c + applications\application.c startup.c 1 - applications/startup.c + applications\startup.c - Libraries + CPU - acmp_8xx.c + showmem.c 1 - Libraries/peri_driver/acmp/acmp_8xx.c + ..\..\libcpu\arm\common\showmem.c - adc_8xx.c + div0.c 1 - Libraries/peri_driver/adc/adc_8xx.c + ..\..\libcpu\arm\common\div0.c - crc_8xx.c + backtrace.c 1 - Libraries/peri_driver/crc/crc_8xx.c + ..\..\libcpu\arm\common\backtrace.c - dma_8xx.c + cpuport.c 1 - Libraries/peri_driver/dma/dma_8xx.c + ..\..\libcpu\arm\cortex-m0\cpuport.c - gpio_8xx.c - 1 - Libraries/peri_driver/gpio/gpio_8xx.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m0\context_rvds.S + + + DeviceDrivers - i2c_8xx.c + workqueue.c 1 - Libraries/peri_driver/i2c/i2c_8xx.c + ..\..\components\drivers\src\workqueue.c - iap.c + ringbuffer.c 1 - Libraries/peri_driver/iap/iap.c + ..\..\components\drivers\src\ringbuffer.c - stopwatch.c + ringblk_buf.c 1 - Libraries/peri_driver/mrt/stopwatch.c + ..\..\components\drivers\src\ringblk_buf.c - pinint_8xx.c + completion.c 1 - Libraries/peri_driver/pinint/pinint_8xx.c + ..\..\components\drivers\src\completion.c - pmu_8xx.c + waitqueue.c 1 - Libraries/peri_driver/pmu/pmu_8xx.c + ..\..\components\drivers\src\waitqueue.c - sct_8xx.c + pipe.c 1 - Libraries/peri_driver/sctimer/sct_8xx.c + ..\..\components\drivers\src\pipe.c - sct_pwm_8xx.c + dataqueue.c 1 - Libraries/peri_driver/sctimer/sct_pwm_8xx.c + ..\..\components\drivers\src\dataqueue.c + + + Drivers - spi_8xx.c + usart.c 1 - Libraries/peri_driver/spi/spi_8xx.c + drivers\usart.c - ring_buffer.c + board.c 1 - Libraries/peri_driver/uart/ring_buffer.c + drivers\board.c + + + Finsh - uart_8xx.c + shell.c 1 - Libraries/peri_driver/uart/uart_8xx.c + ..\..\components\finsh\shell.c - wkt_8xx.c + msh.c 1 - Libraries/peri_driver/wkt/wkt_8xx.c + ..\..\components\finsh\msh.c + + + Kernel - wwdt_8xx.c + mem.c 1 - Libraries/peri_driver/wwdt/wwdt_8xx.c + ..\..\src\mem.c - board_lpc.c + clock.c 1 - Libraries/common/board/board_lpc.c + ..\..\src\clock.c - clock_8xx.c + ipc.c 1 - Libraries/common/chip/clock_8xx.c + ..\..\src\ipc.c - ioswm_8xx.c + thread.c 1 - Libraries/common/chip/ioswm_8xx.c + ..\..\src\thread.c - syscon_8xx.c + kservice.c 1 - Libraries/common/chip/syscon_8xx.c + ..\..\src\kservice.c - sysinit_8xx.c + timer.c 1 - Libraries/common/chip/sysinit_8xx.c + ..\..\src\timer.c - keil_startup_lpc82x.s - 2 - Libraries/common/startup/keil_startup_lpc82x.s + irq.c + 1 + ..\..\src\irq.c - - - Kernel - clock.c + device.c 1 - ../../src/clock.c + ..\..\src\device.c components.c 1 - ../../src/components.c + ..\..\src\components.c - device.c + scheduler.c 1 - ../../src/device.c + ..\..\src\scheduler.c idle.c 1 - ../../src/idle.c + ..\..\src\idle.c - ipc.c - 1 - ../../src/ipc.c - - - - - irq.c + object.c 1 - ../../src/irq.c + ..\..\src\object.c + + + Libraries - kservice.c + iap.c 1 - ../../src/kservice.c + Libraries\peri_driver\iap\iap.c - mem.c + syscon_8xx.c 1 - ../../src/mem.c + Libraries\common\chip\syscon_8xx.c - object.c + dma_8xx.c 1 - ../../src/object.c + Libraries\peri_driver\dma\dma_8xx.c - scheduler.c + ring_buffer.c 1 - ../../src/scheduler.c + Libraries\peri_driver\uart\ring_buffer.c - signal.c + sct_8xx.c 1 - ../../src/signal.c + Libraries\peri_driver\sctimer\sct_8xx.c - thread.c + clock_8xx.c 1 - ../../src/thread.c + Libraries\common\chip\clock_8xx.c - timer.c + sct_pwm_8xx.c 1 - ../../src/timer.c + Libraries\peri_driver\sctimer\sct_pwm_8xx.c - - - CORTEX-M0 - cpuport.c + board_lpc.c 1 - ../../libcpu/arm/cortex-m0/cpuport.c + Libraries\common\board\board_lpc.c - context_rvds.S - 2 - ../../libcpu/arm/cortex-m0/context_rvds.S - - - - - backtrace.c + sysinit_8xx.c 1 - ../../libcpu/arm/common/backtrace.c + Libraries\common\chip\sysinit_8xx.c - div0.c + pinint_8xx.c 1 - ../../libcpu/arm/common/div0.c + Libraries\peri_driver\pinint\pinint_8xx.c - showmem.c + acmp_8xx.c 1 - ../../libcpu/arm/common/showmem.c + Libraries\peri_driver\acmp\acmp_8xx.c - - - DeviceDrivers - completion.c + wkt_8xx.c 1 - ../../components/drivers/src/completion.c + Libraries\peri_driver\wkt\wkt_8xx.c - dataqueue.c + pmu_8xx.c 1 - ../../components/drivers/src/dataqueue.c + Libraries\peri_driver\pmu\pmu_8xx.c - pipe.c + i2c_8xx.c 1 - ../../components/drivers/src/pipe.c + Libraries\peri_driver\i2c\i2c_8xx.c - ringbuffer.c + ioswm_8xx.c 1 - ../../components/drivers/src/ringbuffer.c + Libraries\common\chip\ioswm_8xx.c - waitqueue.c + adc_8xx.c 1 - ../../components/drivers/src/waitqueue.c + Libraries\peri_driver\adc\adc_8xx.c - workqueue.c + uart_8xx.c 1 - ../../components/drivers/src/workqueue.c + Libraries\peri_driver\uart\uart_8xx.c - - - finsh - shell.c + gpio_8xx.c 1 - ../../components/finsh/shell.c + Libraries\peri_driver\gpio\gpio_8xx.c - symbol.c + stopwatch.c 1 - ../../components/finsh/symbol.c + Libraries\peri_driver\mrt\stopwatch.c - cmd.c + wwdt_8xx.c 1 - ../../components/finsh/cmd.c + Libraries\peri_driver\wwdt\wwdt_8xx.c - msh.c + spi_8xx.c 1 - ../../components/finsh/msh.c + Libraries\peri_driver\spi\spi_8xx.c - msh_cmd.c - 1 - ../../components/finsh/msh_cmd.c + keil_startup_lpc82x.s + 2 + Libraries\common\startup\keil_startup_lpc82x.s - msh_file.c + crc_8xx.c 1 - ../../components/finsh/msh_file.c + Libraries\peri_driver\crc\crc_8xx.c diff --git a/bsp/ls1bdev/.config b/bsp/ls1bdev/.config index 3653275ca79..59aca5a01ce 100644 --- a/bsp/ls1bdev/.config +++ b/bsp/ls1bdev/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -136,7 +140,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -190,10 +193,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -356,7 +366,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -378,10 +388,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -396,13 +413,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -460,9 +470,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -472,7 +489,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -487,6 +503,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -511,8 +528,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -520,6 +535,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/ls1bdev/rtconfig.h b/bsp/ls1bdev/rtconfig.h index 9c3c85f54ac..38089b529c3 100644 --- a/bsp/ls1bdev/rtconfig.h +++ b/bsp/ls1bdev/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -112,6 +112,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -197,6 +204,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/ls1cdev/.config b/bsp/ls1cdev/.config index 95ba00afd96..e059c7c784c 100644 --- a/bsp/ls1cdev/.config +++ b/bsp/ls1cdev/.config @@ -59,13 +59,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # @@ -218,6 +223,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_POSIX_MMAP is not set +# CONFIG_RT_USING_POSIX_TERMIOS is not set +# CONFIG_RT_USING_POSIX_AIO is not set CONFIG_RT_USING_PTHREADS=y CONFIG_PTHREAD_NUM_MAX=8 @@ -423,7 +431,7 @@ CONFIG_RT_LWIP_USING_PING=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_libsodium is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -519,15 +527,15 @@ CONFIG_RT_LWIP_USING_PING=y # # -# enhanced kernel services +# rt_kprintf: enhanced rt_kprintf packages # -# CONFIG_PKG_USING_RT_MEMCPY_CM is not set # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set # # acceleration: Assembly language or algorithmic acceleration packages # +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set diff --git a/bsp/ls1cdev/rtconfig.h b/bsp/ls1cdev/rtconfig.h index 59a4f714e31..1604a276fd7 100644 --- a/bsp/ls1cdev/rtconfig.h +++ b/bsp/ls1cdev/rtconfig.h @@ -33,8 +33,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* Kernel Device Object */ @@ -232,7 +234,7 @@ /* system packages */ -/* enhanced kernel services */ +/* rt_kprintf: enhanced rt_kprintf packages */ /* acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/ls2kdev/.config b/bsp/ls2kdev/.config index c984c9aa883..5533a4ad844 100644 --- a/bsp/ls2kdev/.config +++ b/bsp/ls2kdev/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -162,7 +166,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 CONFIG_RT_USING_SYSTEM_WORKQUEUE=y CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=16384 CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=5 @@ -223,10 +226,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -470,7 +480,7 @@ CONFIG_RT_LWIP_USING_PING=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -492,10 +502,17 @@ CONFIG_RT_LWIP_USING_PING=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -510,13 +527,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -574,9 +584,16 @@ CONFIG_RT_LWIP_USING_PING=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -586,7 +603,6 @@ CONFIG_RT_LWIP_USING_PING=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -601,6 +617,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -625,8 +642,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -634,6 +649,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/ls2kdev/rtconfig.h b/bsp/ls2kdev/rtconfig.h index 774e2c40630..e4247b39f97 100644 --- a/bsp/ls2kdev/rtconfig.h +++ b/bsp/ls2kdev/rtconfig.h @@ -34,6 +34,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -107,7 +108,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SYSTEM_WORKQUEUE #define RT_SYSTEM_WORKQUEUE_STACKSIZE 16384 #define RT_SYSTEM_WORKQUEUE_PRIORITY 5 @@ -131,6 +131,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -280,6 +287,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/maxim/MAX32660_EVSYS/.config b/bsp/maxim/MAX32660_EVSYS/.config index 72c2cbcf8a9..12c594fa175 100644 --- a/bsp/maxim/MAX32660_EVSYS/.config +++ b/bsp/maxim/MAX32660_EVSYS/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -126,7 +130,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -177,10 +180,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -343,7 +353,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -365,10 +375,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -383,13 +400,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -447,9 +457,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -459,7 +476,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -474,6 +490,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -498,8 +515,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -507,6 +522,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/maxim/MAX32660_EVSYS/project.uvprojx b/bsp/maxim/MAX32660_EVSYS/project.uvprojx index 911e03e0870..364810f717b 100644 --- a/bsp/maxim/MAX32660_EVSYS/project.uvprojx +++ b/bsp/maxim/MAX32660_EVSYS/project.uvprojx @@ -335,7 +335,7 @@ TARGET=32660, TARGET_REV=0x4131, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\HAL_Drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MAX32660PeriphDriver\CMSIS\Device\Maxim\MAX32660\Include;..\libraries\MAX32660PeriphDriver\CMSIS\Core\Include;..\libraries\MAX32660PeriphDriver\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\HAL_Drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\MAX32660PeriphDriver\CMSIS\Device\Maxim\MAX32660\Include;..\libraries\MAX32660PeriphDriver\CMSIS\Core\Include;..\libraries\MAX32660PeriphDriver\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,13 +388,6 @@ CPU - - - div0.c - 1 - ..\..\..\libcpu\arm\common\div0.c - - backtrace.c @@ -411,9 +404,9 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c @@ -423,6 +416,13 @@ ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + DeviceDrivers @@ -442,51 +442,51 @@ - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -549,93 +549,93 @@ Kernel - timer.c + ipc.c 1 - ..\..\..\src\timer.c + ..\..\..\src\ipc.c - device.c + mem.c 1 - ..\..\..\src\device.c + ..\..\..\src\mem.c - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c - mem.c + irq.c 1 - ..\..\..\src\mem.c + ..\..\..\src\irq.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - idle.c + thread.c 1 - ..\..\..\src\idle.c + ..\..\..\src\thread.c - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c diff --git a/bsp/maxim/MAX32660_EVSYS/rtconfig.h b/bsp/maxim/MAX32660_EVSYS/rtconfig.h index da12068775e..161d6172dfc 100644 --- a/bsp/maxim/MAX32660_EVSYS/rtconfig.h +++ b/bsp/maxim/MAX32660_EVSYS/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -102,6 +102,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -187,6 +194,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/mb9bf506r/project.ewp b/bsp/mb9bf506r/project.ewp index 6c93b234074..0b2fb1b198d 100644 --- a/bsp/mb9bf506r/project.ewp +++ b/bsp/mb9bf506r/project.ewp @@ -155,6 +155,7 @@ - - + - + - + - + - + - diff --git a/bsp/ra6m4-cpk/rtconfig.h b/bsp/ra6m4-cpk/rtconfig.h index 8edbb7d1e82..ca3141c3636 100644 --- a/bsp/ra6m4-cpk/rtconfig.h +++ b/bsp/ra6m4-cpk/rtconfig.h @@ -37,6 +37,7 @@ /* Memory Management */ #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V2 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ @@ -242,6 +253,7 @@ /* Board extended module Drivers */ +/* end of Board extended module Drivers */ /* end of Hardware Drivers Config */ #define SOC_FAMILY_RENESAS diff --git a/bsp/raspberry-pi/raspi2/.config b/bsp/raspberry-pi/raspi2/.config index b5b3b3f8d90..1f4495d60a2 100644 --- a/bsp/raspberry-pi/raspi2/.config +++ b/bsp/raspberry-pi/raspi2/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +134,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -182,10 +185,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -350,7 +360,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -372,10 +382,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -390,13 +407,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -454,9 +464,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -466,7 +483,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -481,6 +497,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -506,8 +523,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -515,6 +530,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/raspberry-pi/raspi2/rtconfig.h b/bsp/raspberry-pi/raspi2/rtconfig.h index 1d8971208ae..58005be03e4 100644 --- a/bsp/raspberry-pi/raspi2/rtconfig.h +++ b/bsp/raspberry-pi/raspi2/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +89,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/raspberry-pi/raspi3-32/.config b/bsp/raspberry-pi/raspi3-32/.config index abcaf930bf2..52e55682fbd 100644 --- a/bsp/raspberry-pi/raspi3-32/.config +++ b/bsp/raspberry-pi/raspi3-32/.config @@ -58,13 +58,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_MEMTRACE=y +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -167,7 +172,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -236,10 +240,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -404,7 +415,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -426,10 +437,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -444,13 +462,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -508,9 +519,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -520,7 +538,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -535,6 +552,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -560,8 +578,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -569,6 +585,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/raspberry-pi/raspi3-32/rtconfig.h b/bsp/raspberry-pi/raspi3-32/rtconfig.h index b87ab060200..65fdd44d28b 100644 --- a/bsp/raspberry-pi/raspi3-32/rtconfig.h +++ b/bsp/raspberry-pi/raspi3-32/rtconfig.h @@ -37,8 +37,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_MEMTRACE #define RT_USING_HEAP /* end of Memory Management */ @@ -117,7 +119,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -147,6 +148,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -232,6 +240,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/raspberry-pi/raspi3-64/.config b/bsp/raspberry-pi/raspi3-64/.config index 7a48b994383..40f3d7a56f7 100644 --- a/bsp/raspberry-pi/raspi3-64/.config +++ b/bsp/raspberry-pi/raspi3-64/.config @@ -7,6 +7,7 @@ # RT-Thread Kernel # CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_BIG_ENDIAN is not set # CONFIG_RT_USING_ARCH_DATA_TYPE is not set # CONFIG_RT_USING_SMP is not set CONFIG_RT_ALIGN_SIZE=4 @@ -30,6 +31,9 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=2048 # CONFIG_RT_KSERVICE_USING_STDLIB is not set # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set # CONFIG_RT_USING_ASM_MEMCPY is not set +# CONFIG_RT_USING_ASM_MEMSET is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set CONFIG_RT_DEBUG=y CONFIG_RT_DEBUG_COLOR=y # CONFIG_RT_DEBUG_INIT_CONFIG is not set @@ -57,13 +61,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_MEMTRACE=y +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # @@ -75,8 +84,7 @@ CONFIG_RT_USING_DEVICE_OPS=y CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=512 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1" -# CONFIG_RT_PRINTF_LONGLONG is not set -CONFIG_RT_VER_NUM=0x40004 +CONFIG_RT_VER_NUM=0x40100 CONFIG_ARCH_CPU_64BIT=y # CONFIG_RT_USING_CPU_FFS is not set CONFIG_ARCH_ARMV8=y @@ -89,6 +97,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y CONFIG_RT_USING_USER_MAIN=y CONFIG_RT_MAIN_THREAD_STACK_SIZE=4096 CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set # # C++ features @@ -118,6 +127,7 @@ CONFIG_FINSH_ARG_MAX=10 # Device virtual file system # CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y CONFIG_DFS_USING_WORKDIR=y CONFIG_DFS_FILESYSTEMS_MAX=2 CONFIG_DFS_FILESYSTEM_TYPES_MAX=2 @@ -145,6 +155,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2 CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 # CONFIG_RT_DFS_ELM_USE_ERASE is not set CONFIG_RT_DFS_ELM_REENTRANT=y +CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 CONFIG_RT_USING_DFS_DEVFS=y # CONFIG_RT_USING_DFS_ROMFS is not set # CONFIG_RT_USING_DFS_RAMFS is not set @@ -201,6 +212,7 @@ CONFIG_RT_USING_WDT=y # # Using USB # +# CONFIG_RT_USING_USB is not set # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set @@ -208,14 +220,21 @@ CONFIG_RT_USING_WDT=y # POSIX layer and C standard library # CONFIG_RT_USING_LIBC=y -# CONFIG_RT_USING_PTHREADS is not set -CONFIG_RT_USING_POSIX=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set # CONFIG_RT_USING_POSIX_MMAP is not set # CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_GETLINE is not set # CONFIG_RT_USING_POSIX_AIO is not set -# CONFIG_RT_USING_MODULE is not set -CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 +# CONFIG_RT_USING_PTHREADS is not set # # Network @@ -252,6 +271,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_RYM is not set # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set # CONFIG_RT_USING_RT_LINK is not set # @@ -348,7 +368,11 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_AGILE_FTP is not set # CONFIG_PKG_USING_EMBEDDEDPROTO is not set # CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set # CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set # # security packages @@ -370,6 +394,18 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # multimedia packages # + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -382,6 +418,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_NUEMWIN is not set # CONFIG_PKG_USING_MP3PLAYER is not set # CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set # # tools packages @@ -424,11 +467,18 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_MEM_SANDBOX is not set # CONFIG_PKG_USING_SOLAR_TERMS is not set # CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set # # system packages # +# +# rt_kprintf: enhanced rt_kprintf packages +# +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set + # # acceleration: Assembly language or algorithmic acceleration packages # @@ -437,6 +487,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_5_AUX is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set + # # Micrium: Micrium software products porting for RT-Thread # @@ -454,8 +511,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_FLASHDB is not set # CONFIG_PKG_USING_SQLITE is not set # CONFIG_PKG_USING_RTI is not set -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set -# CONFIG_PKG_USING_CMSIS is not set # CONFIG_PKG_USING_DFS_YAFFS is not set # CONFIG_PKG_USING_LITTLEFS is not set # CONFIG_PKG_USING_DFS_JFFS2 is not set @@ -472,13 +527,14 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set # CONFIG_PKG_USING_ARM_2D is not set # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # # peripheral libraries and drivers @@ -490,7 +546,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set -# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_BUTTON is not set # CONFIG_PKG_USING_PCF8574 is not set # CONFIG_PKG_USING_SX12XX is not set @@ -552,6 +607,10 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_MCP23008 is not set # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set # # AI packages diff --git a/bsp/raspberry-pi/raspi3-64/rtconfig.h b/bsp/raspberry-pi/raspi3-64/rtconfig.h index f321e212075..766a36dcf8a 100644 --- a/bsp/raspberry-pi/raspi3-64/rtconfig.h +++ b/bsp/raspberry-pi/raspi3-64/rtconfig.h @@ -36,8 +36,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_MEMTRACE #define RT_USING_HEAP @@ -48,7 +50,7 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 512 #define RT_CONSOLE_DEVICE_NAME "uart1" -#define RT_VER_NUM 0x40004 +#define RT_VER_NUM 0x40100 #define ARCH_CPU_64BIT #define ARCH_ARMV8 @@ -81,6 +83,7 @@ /* Device virtual file system */ #define RT_USING_DFS +#define DFS_USING_POSIX #define DFS_USING_WORKDIR #define DFS_FILESYSTEMS_MAX 2 #define DFS_FILESYSTEM_TYPES_MAX 2 @@ -99,6 +102,7 @@ #define RT_DFS_ELM_DRIVES 2 #define RT_DFS_ELM_MAX_SECTOR_SIZE 512 #define RT_DFS_ELM_REENTRANT +#define RT_DFS_ELM_MUTEX_TIMEOUT 3000 #define RT_USING_DFS_DEVFS /* Device Drivers */ @@ -129,9 +133,12 @@ /* POSIX layer and C standard library */ #define RT_USING_LIBC -#define RT_USING_POSIX +#define RT_LIBC_USING_TIME #define RT_LIBC_DEFAULT_TIMEZONE 8 +/* POSIX (Portable Operating System Interface) layer */ + + /* Network */ /* Socket abstraction layer */ @@ -179,15 +186,29 @@ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + + +/* u8g2: a monochrome graphic library */ + + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + /* tools packages */ /* system packages */ +/* rt_kprintf: enhanced rt_kprintf packages */ + + /* acceleration: Assembly language or algorithmic acceleration packages */ +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + + /* Micrium: Micrium software products porting for RT-Thread */ diff --git a/bsp/raspberry-pi/raspi4-32/.config b/bsp/raspberry-pi/raspi4-32/.config index 670259ce0df..dd16da59beb 100644 --- a/bsp/raspberry-pi/raspi4-32/.config +++ b/bsp/raspberry-pi/raspi4-32/.config @@ -61,12 +61,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # @@ -230,11 +234,11 @@ CONFIG_RT_USING_POSIX_FS=y # CONFIG_RT_USING_POSIX_DEVIO is not set CONFIG_RT_USING_POSIX_POLL=y CONFIG_RT_USING_POSIX_SELECT=y -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set -# CONFIG_RT_USING_POSIX_MMAP is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_POSIX_MMAP is not set +# CONFIG_RT_USING_POSIX_TERMIOS is not set +# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set # @@ -469,8 +473,14 @@ CONFIG_RT_LWIP_USING_PING=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -485,12 +495,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -544,6 +548,12 @@ CONFIG_RT_LWIP_USING_PING=y # system packages # +# +# rt_kprintf: enhanced rt_kprintf packages +# +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set + # # acceleration: Assembly language or algorithmic acceleration packages # @@ -592,8 +602,6 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -601,6 +609,7 @@ CONFIG_RT_LWIP_USING_PING=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # # peripheral libraries and drivers diff --git a/bsp/raspberry-pi/raspi4-32/rtconfig.h b/bsp/raspberry-pi/raspi4-32/rtconfig.h index 9ada92a09d3..d2dc005fb3a 100644 --- a/bsp/raspberry-pi/raspi4-32/rtconfig.h +++ b/bsp/raspberry-pi/raspi4-32/rtconfig.h @@ -36,6 +36,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* Kernel Device Object */ @@ -254,6 +255,9 @@ /* system packages */ +/* rt_kprintf: enhanced rt_kprintf packages */ + + /* acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/raspberry-pi/raspi4-64/.config b/bsp/raspberry-pi/raspi4-64/.config index 377ddb93bd2..542378eee65 100644 --- a/bsp/raspberry-pi/raspi4-64/.config +++ b/bsp/raspberry-pi/raspi4-64/.config @@ -7,6 +7,7 @@ # RT-Thread Kernel # CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_BIG_ENDIAN is not set # CONFIG_RT_USING_ARCH_DATA_TYPE is not set # CONFIG_RT_USING_SMP is not set CONFIG_RT_ALIGN_SIZE=4 @@ -30,6 +31,9 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=2048 # CONFIG_RT_KSERVICE_USING_STDLIB is not set # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set # CONFIG_RT_USING_ASM_MEMCPY is not set +# CONFIG_RT_USING_ASM_MEMSET is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set CONFIG_RT_DEBUG=y # CONFIG_RT_DEBUG_COLOR is not set # CONFIG_RT_DEBUG_INIT_CONFIG is not set @@ -57,12 +61,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # @@ -74,8 +82,7 @@ CONFIG_RT_USING_DEVICE=y CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" -# CONFIG_RT_PRINTF_LONGLONG is not set -CONFIG_RT_VER_NUM=0x40004 +CONFIG_RT_VER_NUM=0x40100 CONFIG_ARCH_CPU_64BIT=y # CONFIG_RT_USING_CPU_FFS is not set CONFIG_ARCH_ARMV8=y @@ -88,6 +95,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y CONFIG_RT_USING_USER_MAIN=y CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set # # C++ features @@ -117,6 +125,7 @@ CONFIG_FINSH_ARG_MAX=10 # Device virtual file system # CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y CONFIG_DFS_USING_WORKDIR=y CONFIG_DFS_FILESYSTEMS_MAX=2 CONFIG_DFS_FILESYSTEM_TYPES_MAX=2 @@ -144,6 +153,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2 CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 # CONFIG_RT_DFS_ELM_USE_ERASE is not set CONFIG_RT_DFS_ELM_REENTRANT=y +CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 CONFIG_RT_USING_DFS_DEVFS=y # CONFIG_RT_USING_DFS_ROMFS is not set # CONFIG_RT_USING_DFS_RAMFS is not set @@ -197,6 +207,7 @@ CONFIG_RT_MMCSD_MAX_PARTITION=16 # # Using USB # +# CONFIG_RT_USING_USB is not set # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set @@ -204,14 +215,21 @@ CONFIG_RT_MMCSD_MAX_PARTITION=16 # POSIX layer and C standard library # CONFIG_RT_USING_LIBC=y -# CONFIG_RT_USING_PTHREADS is not set -CONFIG_RT_USING_POSIX=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set # CONFIG_RT_USING_POSIX_MMAP is not set # CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_GETLINE is not set # CONFIG_RT_USING_POSIX_AIO is not set -# CONFIG_RT_USING_MODULE is not set -CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 +# CONFIG_RT_USING_PTHREADS is not set # # Network @@ -321,6 +339,7 @@ CONFIG_RT_USING_RYM=y CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set # CONFIG_RT_USING_RT_LINK is not set # @@ -417,7 +436,11 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_AGILE_FTP is not set # CONFIG_PKG_USING_EMBEDDEDPROTO is not set # CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set # CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set # # security packages @@ -439,6 +462,18 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # # multimedia packages # + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -451,6 +486,13 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_NUEMWIN is not set # CONFIG_PKG_USING_MP3PLAYER is not set # CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set # # tools packages @@ -493,11 +535,18 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_MEM_SANDBOX is not set # CONFIG_PKG_USING_SOLAR_TERMS is not set # CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set # # system packages # +# +# rt_kprintf: enhanced rt_kprintf packages +# +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set + # # acceleration: Assembly language or algorithmic acceleration packages # @@ -506,6 +555,13 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_5_AUX is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set + # # Micrium: Micrium software products porting for RT-Thread # @@ -523,8 +579,6 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_FLASHDB is not set # CONFIG_PKG_USING_SQLITE is not set # CONFIG_PKG_USING_RTI is not set -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set -# CONFIG_PKG_USING_CMSIS is not set # CONFIG_PKG_USING_DFS_YAFFS is not set # CONFIG_PKG_USING_LITTLEFS is not set # CONFIG_PKG_USING_DFS_JFFS2 is not set @@ -541,13 +595,14 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set # CONFIG_PKG_USING_ARM_2D is not set # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # # peripheral libraries and drivers @@ -559,7 +614,6 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set -# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_BUTTON is not set # CONFIG_PKG_USING_PCF8574 is not set # CONFIG_PKG_USING_SX12XX is not set @@ -621,6 +675,10 @@ CONFIG_YMODEM_USING_FILE_TRANSFER=y # CONFIG_PKG_USING_MCP23008 is not set # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set # # AI packages diff --git a/bsp/raspberry-pi/raspi4-64/rtconfig.h b/bsp/raspberry-pi/raspi4-64/rtconfig.h index 652022c06cd..18d4bd441e0 100644 --- a/bsp/raspberry-pi/raspi4-64/rtconfig.h +++ b/bsp/raspberry-pi/raspi4-64/rtconfig.h @@ -36,6 +36,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* Kernel Device Object */ @@ -44,7 +45,7 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x40004 +#define RT_VER_NUM 0x40100 #define ARCH_CPU_64BIT #define ARCH_ARMV8 @@ -77,6 +78,7 @@ /* Device virtual file system */ #define RT_USING_DFS +#define DFS_USING_POSIX #define DFS_USING_WORKDIR #define DFS_FILESYSTEMS_MAX 2 #define DFS_FILESYSTEM_TYPES_MAX 2 @@ -95,6 +97,7 @@ #define RT_DFS_ELM_DRIVES 2 #define RT_DFS_ELM_MAX_SECTOR_SIZE 512 #define RT_DFS_ELM_REENTRANT +#define RT_DFS_ELM_MUTEX_TIMEOUT 3000 #define RT_USING_DFS_DEVFS /* Device Drivers */ @@ -124,9 +127,12 @@ /* POSIX layer and C standard library */ #define RT_USING_LIBC -#define RT_USING_POSIX +#define RT_LIBC_USING_TIME #define RT_LIBC_DEFAULT_TIMEZONE 8 +/* POSIX (Portable Operating System Interface) layer */ + + /* Network */ /* Socket abstraction layer */ @@ -231,15 +237,29 @@ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + + +/* u8g2: a monochrome graphic library */ + + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + /* tools packages */ /* system packages */ +/* rt_kprintf: enhanced rt_kprintf packages */ + + /* acceleration: Assembly language or algorithmic acceleration packages */ +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + + /* Micrium: Micrium software products porting for RT-Thread */ diff --git a/bsp/raspberry-pico/.config b/bsp/raspberry-pico/.config index 8857d27f6a2..01e32ed11e8 100644 --- a/bsp/raspberry-pico/.config +++ b/bsp/raspberry-pico/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -503,8 +520,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -512,6 +527,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/raspberry-pico/rtconfig.h b/bsp/raspberry-pico/rtconfig.h index a4ff43b2cfa..86c561b332b 100644 --- a/bsp/raspberry-pico/rtconfig.h +++ b/bsp/raspberry-pico/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/rv32m1_vega/ri5cy/.config b/bsp/rv32m1_vega/ri5cy/.config index 87c26c15b7e..66acbf15830 100644 --- a/bsp/rv32m1_vega/ri5cy/.config +++ b/bsp/rv32m1_vega/ri5cy/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -160,7 +164,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -216,10 +219,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -408,7 +418,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -497,10 +507,17 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -515,13 +532,6 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -579,9 +589,16 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -591,7 +608,6 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -606,6 +622,7 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -630,8 +647,6 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -639,6 +654,7 @@ CONFIG_PKG_MICROPYTHON_VER_NUM=0x99999 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/rv32m1_vega/ri5cy/rtconfig.h b/bsp/rv32m1_vega/ri5cy/rtconfig.h index 45ccc7b3571..19fcf89a760 100644 --- a/bsp/rv32m1_vega/ri5cy/rtconfig.h +++ b/bsp/rv32m1_vega/ri5cy/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -107,7 +108,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -128,6 +128,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -258,6 +265,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/sam7x/project.uvproj b/bsp/sam7x/project.uvproj index d63427427a8..e7fd36f93c3 100644 --- a/bsp/sam7x/project.uvproj +++ b/bsp/sam7x/project.uvproj @@ -341,9 +341,9 @@ 0 - + __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;..\..\include;applications;.;drivers;..\..\libcpu\arm\common;..\..\libcpu\arm\AT91SAM7X;..\..\components\finsh;..\..\components\libc\compilers\common;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\net\lwip-2.0.2\src\include\posix + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\AT91SAM7X;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\net\lwip-2.0.3\src;..\..\components\net\lwip-2.0.3\src\include;..\..\components\net\lwip-2.0.3\src\include\ipv4;..\..\components\net\lwip-2.0.3\src\arch\include;..\..\components\net\lwip-2.0.3\src\include\netif;..\..\components\net\lwip-2.0.3\src\include\posix;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -381,127 +381,85 @@ - Kernel - - - clock.c - 1 - ..\..\src\clock.c - - - - - components.c - 1 - ..\..\src\components.c - - - - - cpu.c - 1 - ..\..\src\cpu.c - - - - - device.c - 1 - ..\..\src\device.c - - - - - idle.c - 1 - ..\..\src\idle.c - - - - - ipc.c - 1 - ..\..\src\ipc.c - - + Applications - irq.c + startup.c 1 - ..\..\src\irq.c + applications\startup.c - kservice.c + application.c 1 - ..\..\src\kservice.c + applications\application.c + + + CPU - mem.c + backtrace.c 1 - ..\..\src\mem.c + ..\..\libcpu\arm\common\backtrace.c - mempool.c + div0.c 1 - ..\..\src\mempool.c + ..\..\libcpu\arm\common\div0.c - object.c + showmem.c 1 - ..\..\src\object.c + ..\..\libcpu\arm\common\showmem.c - scheduler.c + stack.c 1 - ..\..\src\scheduler.c + ..\..\libcpu\arm\AT91SAM7X\stack.c - signal.c + cpu.c 1 - ..\..\src\signal.c + ..\..\libcpu\arm\AT91SAM7X\cpu.c - thread.c + interrupt.c 1 - ..\..\src\thread.c + ..\..\libcpu\arm\AT91SAM7X\interrupt.c - timer.c + trap.c 1 - ..\..\src\timer.c + ..\..\libcpu\arm\AT91SAM7X\trap.c - - - Applications - application.c - 1 - applications\application.c + context_rvds.S + 2 + ..\..\libcpu\arm\AT91SAM7X\context_rvds.S - startup.c - 1 - applications\startup.c + start_rvds.S + 2 + ..\..\libcpu\arm\AT91SAM7X\start_rvds.S @@ -530,155 +488,113 @@ - cpu - - - backtrace.c - 1 - ..\..\libcpu\arm\common\backtrace.c - - - - - div0.c - 1 - ..\..\libcpu\arm\common\div0.c - - - - - showmem.c - 1 - ..\..\libcpu\arm\common\showmem.c - - - - - AT91SAM7X_cpu.c - 1 - ..\..\libcpu\arm\AT91SAM7X\cpu.c - - + Finsh - interrupt.c + shell.c 1 - ..\..\libcpu\arm\AT91SAM7X\interrupt.c + ..\..\components\finsh\shell.c - stack.c + msh.c 1 - ..\..\libcpu\arm\AT91SAM7X\stack.c + ..\..\components\finsh\msh.c + + + Kernel - trap.c + scheduler.c 1 - ..\..\libcpu\arm\AT91SAM7X\trap.c - - - - - context_rvds.S - 2 - ..\..\libcpu\arm\AT91SAM7X\context_rvds.S - - - - - start_rvds.S - 2 - ..\..\libcpu\arm\AT91SAM7X\start_rvds.S + ..\..\src\scheduler.c - - - finsh - shell.c + irq.c 1 - ..\..\components\finsh\shell.c + ..\..\src\irq.c - cmd.c + device.c 1 - ..\..\components\finsh\cmd.c + ..\..\src\device.c - finsh_compiler.c + thread.c 1 - ..\..\components\finsh\finsh_compiler.c + ..\..\src\thread.c - finsh_error.c + idle.c 1 - ..\..\components\finsh\finsh_error.c + ..\..\src\idle.c - finsh_heap.c + object.c 1 - ..\..\components\finsh\finsh_heap.c + ..\..\src\object.c - finsh_init.c + clock.c 1 - ..\..\components\finsh\finsh_init.c + ..\..\src\clock.c - finsh_node.c + timer.c 1 - ..\..\components\finsh\finsh_node.c + ..\..\src\timer.c - finsh_ops.c + ipc.c 1 - ..\..\components\finsh\finsh_ops.c + ..\..\src\ipc.c - finsh_parser.c + mempool.c 1 - ..\..\components\finsh\finsh_parser.c + ..\..\src\mempool.c - finsh_var.c + mem.c 1 - ..\..\components\finsh\finsh_var.c + ..\..\src\mem.c - finsh_vm.c + components.c 1 - ..\..\components\finsh\finsh_vm.c + ..\..\src\components.c - finsh_token.c + kservice.c 1 - ..\..\components\finsh\finsh_token.c + ..\..\src\kservice.c @@ -686,254 +602,254 @@ lwIP - sys_arch.c + netdb.c 1 - ..\..\components\net\lwip-2.0.2\src\arch\sys_arch.c + ..\..\components\net\lwip-2.0.3\src\api\netdb.c - api_lib.c + ip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\api_lib.c + ..\..\components\net\lwip-2.0.3\src\core\ip.c - api_msg.c + autoip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\api_msg.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\autoip.c - err.c + ethernet.c 1 - ..\..\components\net\lwip-2.0.2\src\api\err.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernet.c - netbuf.c + netif.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netbuf.c + ..\..\components\net\lwip-2.0.3\src\core\netif.c - netdb.c + sys.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netdb.c + ..\..\components\net\lwip-2.0.3\src\core\sys.c - netifapi.c + sockets.c 1 - ..\..\components\net\lwip-2.0.2\src\api\netifapi.c + ..\..\components\net\lwip-2.0.3\src\api\sockets.c - sockets.c + netifapi.c 1 - ..\..\components\net\lwip-2.0.2\src\api\sockets.c + ..\..\components\net\lwip-2.0.3\src\api\netifapi.c tcpip.c 1 - ..\..\components\net\lwip-2.0.2\src\api\tcpip.c + ..\..\components\net\lwip-2.0.3\src\api\tcpip.c - def.c + ip4_addr.c 1 - ..\..\components\net\lwip-2.0.2\src\core\def.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_addr.c - dns.c + dhcp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\dns.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\dhcp.c - inet_chksum.c + init.c 1 - ..\..\components\net\lwip-2.0.2\src\core\inet_chksum.c + ..\..\components\net\lwip-2.0.3\src\core\init.c - init.c + ethernetif.c 1 - ..\..\components\net\lwip-2.0.2\src\core\init.c + ..\..\components\net\lwip-2.0.3\src\netif\ethernetif.c - ip.c + etharp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ip.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\etharp.c memp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\memp.c + ..\..\components\net\lwip-2.0.3\src\core\memp.c - netif.c + ip4.c 1 - ..\..\components\net\lwip-2.0.2\src\core\netif.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4.c - pbuf.c + netbuf.c 1 - ..\..\components\net\lwip-2.0.2\src\core\pbuf.c + ..\..\components\net\lwip-2.0.3\src\api\netbuf.c raw.c 1 - ..\..\components\net\lwip-2.0.2\src\core\raw.c + ..\..\components\net\lwip-2.0.3\src\core\raw.c - stats.c + ip4_frag.c 1 - ..\..\components\net\lwip-2.0.2\src\core\stats.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\ip4_frag.c - sys.c + tcp_out.c 1 - ..\..\components\net\lwip-2.0.2\src\core\sys.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_out.c - tcp.c + lowpan6.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp.c + ..\..\components\net\lwip-2.0.3\src\netif\lowpan6.c - tcp_in.c + icmp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp_in.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\icmp.c - tcp_out.c + api_lib.c 1 - ..\..\components\net\lwip-2.0.2\src\core\tcp_out.c + ..\..\components\net\lwip-2.0.3\src\api\api_lib.c - timeouts.c + inet_chksum.c 1 - ..\..\components\net\lwip-2.0.2\src\core\timeouts.c + ..\..\components\net\lwip-2.0.3\src\core\inet_chksum.c - udp.c + stats.c 1 - ..\..\components\net\lwip-2.0.2\src\core\udp.c + ..\..\components\net\lwip-2.0.3\src\core\stats.c - ethernet.c + err.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\ethernet.c + ..\..\components\net\lwip-2.0.3\src\api\err.c - ethernetif.c + tcp_in.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\ethernetif.c + ..\..\components\net\lwip-2.0.3\src\core\tcp_in.c - lowpan6.c + dns.c 1 - ..\..\components\net\lwip-2.0.2\src\netif\lowpan6.c + ..\..\components\net\lwip-2.0.3\src\core\dns.c - autoip.c + sys_arch.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\autoip.c + ..\..\components\net\lwip-2.0.3\src\arch\sys_arch.c - dhcp.c + timeouts.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\dhcp.c + ..\..\components\net\lwip-2.0.3\src\core\timeouts.c - etharp.c + igmp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\etharp.c + ..\..\components\net\lwip-2.0.3\src\core\ipv4\igmp.c - icmp.c + udp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\icmp.c + ..\..\components\net\lwip-2.0.3\src\core\udp.c - igmp.c + pbuf.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\igmp.c + ..\..\components\net\lwip-2.0.3\src\core\pbuf.c - ip4.c + def.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4.c + ..\..\components\net\lwip-2.0.3\src\core\def.c - ip4_addr.c + api_msg.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_addr.c + ..\..\components\net\lwip-2.0.3\src\api\api_msg.c - ip4_frag.c + tcp.c 1 - ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_frag.c + ..\..\components\net\lwip-2.0.3\src\core\tcp.c diff --git a/bsp/samd21/project.uvprojx b/bsp/samd21/project.uvprojx index 05e81177d39..c50cdf9fc5d 100644 --- a/bsp/samd21/project.uvprojx +++ b/bsp/samd21/project.uvprojx @@ -329,9 +329,9 @@ 0 - __SAMD21J18A__, DEBUG, EXTINT_CALLBACK_MODE=true, RTC_COUNT_ASYNC=true, USART_CALLBACK_MODE=false + DEBUG, EXTINT_CALLBACK_MODE=true, USART_CALLBACK_MODE=false, __SAMD21J18A__, __CLK_TCK=RT_TICK_PER_SECOND, RTC_COUNT_ASYNC=true, __RTTHREAD__ - board;asflib_config;asflib_config/clock_samd21_r21_da_ha1;applications;.;sam_d2x_asflib/CMSIS/Include;sam_d2x_asflib/common/utils;sam_d2x_asflib/common/utils/interrupt;sam_d2x_asflib/common/boards;sam_d2x_asflib/common2/services/delay;sam_d2x_asflib/common2/services/delay/sam0;sam_d2x_asflib/sam0;sam_d2x_asflib/sam0/utils;sam_d2x_asflib/sam0/utils/preprocessor;sam_d2x_asflib/sam0/utils/header_files;sam_d2x_asflib/sam0/utils/cmsis/samd21/include;sam_d2x_asflib/sam0/utils/cmsis/samd21/source;sam_d2x_asflib/sam0/drivers/system;sam_d2x_asflib/sam0/drivers/system/pinmux;sam_d2x_asflib/sam0/drivers/system/power/power_sam_d_r_h;sam_d2x_asflib/sam0/drivers/system/reset/reset_sam_d_r_h;sam_d2x_asflib/sam0/drivers/system/clock;sam_d2x_asflib/sam0/drivers/system/interrupt;sam_d2x_asflib/sam0/drivers/system/interrupt/system_interrupt_samd21;sam_d2x_asflib/sam0/drivers/system/clock/clock_samd21_r21_da_ha1;sam_d2x_asflib/sam0/drivers/sercom;sam_d2x_asflib/sam0/drivers/sercom/usart;sam_d2x_asflib/sam0/drivers/port;sam_d2x_asflib/sam0/drivers/rtc;sam_d2x_asflib/sam0/drivers/extint;sam_d2x_asflib/sam0/drivers/extint/extint_sam_d_r_h;../../include;../../libcpu/arm/cortex-m0;../../libcpu/arm/common;../../components/drivers/include;../../components/drivers/include + applications;.;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m0;..\..\components\drivers\include;..\..\components\drivers\include;board;asflib_config;asflib_config\clock_samd21_r21_da_ha1;sam_d2x_asflib\CMSIS\Include;sam_d2x_asflib\common\utils;sam_d2x_asflib\common\utils\interrupt;sam_d2x_asflib\common\boards;sam_d2x_asflib\common2\services\delay;sam_d2x_asflib\common2\services\delay\sam0;sam_d2x_asflib\sam0;sam_d2x_asflib\sam0\utils;sam_d2x_asflib\sam0\utils\preprocessor;sam_d2x_asflib\sam0\utils\header_files;sam_d2x_asflib\sam0\utils\cmsis\samd21\include;sam_d2x_asflib\sam0\utils\cmsis\samd21\source;sam_d2x_asflib\sam0\drivers\system;sam_d2x_asflib\sam0\drivers\system\pinmux;sam_d2x_asflib\sam0\drivers\system\power\power_sam_d_r_h;sam_d2x_asflib\sam0\drivers\system\reset\reset_sam_d_r_h;sam_d2x_asflib\sam0\drivers\system\clock;sam_d2x_asflib\sam0\drivers\system\interrupt;sam_d2x_asflib\sam0\drivers\system\interrupt\system_interrupt_samd21;sam_d2x_asflib\sam0\drivers\system\clock\clock_samd21_r21_da_ha1;sam_d2x_asflib\sam0\drivers\sercom;sam_d2x_asflib\sam0\drivers\sercom\usart;sam_d2x_asflib\sam0\drivers\port;sam_d2x_asflib\sam0\drivers\rtc;sam_d2x_asflib\sam0\drivers\extint;sam_d2x_asflib\sam0\drivers\extint\extint_sam_d_r_h;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -373,328 +373,332 @@ - Board + Applications - board.c + startup.c 1 - board/board.c + applications\startup.c - sleep_timer.c + application.c 1 - board/sleep_timer.c + applications\application.c + + + CPU - uart.c + div0.c 1 - board/uart.c + ..\..\libcpu\arm\common\div0.c - - - Application - application.c + showmem.c 1 - applications/application.c + ..\..\libcpu\arm\common\showmem.c - startup.c + backtrace.c 1 - applications/startup.c + ..\..\libcpu\arm\common\backtrace.c - - - Drivers - interrupt_sam_nvic.c - 1 - sam_d2x_asflib/common/utils/interrupt/interrupt_sam_nvic.c + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m0\context_rvds.S - system_samd21.c + cpuport.c 1 - sam_d2x_asflib/sam0/utils/cmsis/samd21/source/system_samd21.c + ..\..\libcpu\arm\cortex-m0\cpuport.c + + + DeviceDrivers - startup_SAMD21.s - 2 - sam_d2x_asflib/sam0/utils/cmsis/samd21/source/arm/startup_SAMD21.s + serial.c + 1 + ..\..\components\drivers\serial\serial.c - system.c + dataqueue.c 1 - sam_d2x_asflib/sam0/drivers/system/system.c + ..\..\components\drivers\src\dataqueue.c - pinmux.c + workqueue.c 1 - sam_d2x_asflib/sam0/drivers/system/pinmux/pinmux.c + ..\..\components\drivers\src\workqueue.c - system_interrupt.c + ringbuffer.c 1 - sam_d2x_asflib/sam0/drivers/system/interrupt/system_interrupt.c + ..\..\components\drivers\src\ringbuffer.c - clock.c + ringblk_buf.c 1 - sam_d2x_asflib/sam0/drivers/system/clock/clock_samd21_r21_da_ha1/clock.c + ..\..\components\drivers\src\ringblk_buf.c - gclk.c + waitqueue.c 1 - sam_d2x_asflib/sam0/drivers/system/clock/clock_samd21_r21_da_ha1/gclk.c + ..\..\components\drivers\src\waitqueue.c - sercom.c + completion.c 1 - sam_d2x_asflib/sam0/drivers/sercom/sercom.c + ..\..\components\drivers\src\completion.c - usart.c + pipe.c 1 - sam_d2x_asflib/sam0/drivers/sercom/usart/usart.c + ..\..\components\drivers\src\pipe.c + + + Drivers - port.c + sleep_timer.c 1 - sam_d2x_asflib/sam0/drivers/port/port.c + board\sleep_timer.c - rtc_count.c + board.c 1 - sam_d2x_asflib/sam0/drivers/rtc/rtc_sam_d_r_h/rtc_count.c + board\board.c - rtc_count_interrupt.c + uart.c 1 - sam_d2x_asflib/sam0/drivers/rtc/rtc_sam_d_r_h/rtc_count_interrupt.c + board\uart.c - extint_callback.c + system_interrupt.c 1 - sam_d2x_asflib/sam0/drivers/extint/extint_callback.c + sam_d2x_asflib\sam0\drivers\system\interrupt\system_interrupt.c - extint.c + interrupt_sam_nvic.c 1 - sam_d2x_asflib/sam0/drivers/extint/extint_sam_d_r_h/extint.c + sam_d2x_asflib\common\utils\interrupt\interrupt_sam_nvic.c - - - Kernel - src_clock.c + port.c 1 - ../../src/clock.c + sam_d2x_asflib\sam0\drivers\port\port.c - device.c + rtc_count.c 1 - ../../src/device.c + sam_d2x_asflib\sam0\drivers\rtc\rtc_sam_d_r_h\rtc_count.c - idle.c + startup_SAMD21.s + 2 + sam_d2x_asflib\sam0\utils\cmsis\samd21\source\arm\startup_SAMD21.s + + + + + rtc_count_interrupt.c 1 - ../../src/idle.c + sam_d2x_asflib\sam0\drivers\rtc\rtc_sam_d_r_h\rtc_count_interrupt.c - ipc.c + system.c 1 - ../../src/ipc.c + sam_d2x_asflib\sam0\drivers\system\system.c - irq.c + usart.c 1 - ../../src/irq.c + sam_d2x_asflib\sam0\drivers\sercom\usart\usart.c - kservice.c + extint_callback.c 1 - ../../src/kservice.c + sam_d2x_asflib\sam0\drivers\extint\extint_callback.c - mem.c + pinmux.c 1 - ../../src/mem.c + sam_d2x_asflib\sam0\drivers\system\pinmux\pinmux.c - object.c + clock.c 1 - ../../src/object.c + sam_d2x_asflib\sam0\drivers\system\clock\clock_samd21_r21_da_ha1\clock.c - scheduler.c + extint.c 1 - ../../src/scheduler.c + sam_d2x_asflib\sam0\drivers\extint\extint_sam_d_r_h\extint.c - signal.c + gclk.c 1 - ../../src/signal.c + sam_d2x_asflib\sam0\drivers\system\clock\clock_samd21_r21_da_ha1\gclk.c - thread.c + system_samd21.c 1 - ../../src/thread.c + sam_d2x_asflib\sam0\utils\cmsis\samd21\source\system_samd21.c - timer.c + sercom.c 1 - ../../src/timer.c + sam_d2x_asflib\sam0\drivers\sercom\sercom.c - CORTEX-M0 + Kernel - cpuport.c + timer.c 1 - ../../libcpu/arm/cortex-m0/cpuport.c + ..\..\src\timer.c - context_rvds.S - 2 - ../../libcpu/arm/cortex-m0/context_rvds.S + mem.c + 1 + ..\..\src\mem.c - backtrace.c + object.c 1 - ../../libcpu/arm/common/backtrace.c + ..\..\src\object.c - div0.c + idle.c 1 - ../../libcpu/arm/common/div0.c + ..\..\src\idle.c - showmem.c + scheduler.c 1 - ../../libcpu/arm/common/showmem.c + ..\..\src\scheduler.c - - - DeviceDrivers - serial.c + ipc.c 1 - ../../components/drivers/serial/serial.c + ..\..\src\ipc.c - completion.c + components.c 1 - ../../components/drivers/src/completion.c + ..\..\src\components.c - dataqueue.c + kservice.c 1 - ../../components/drivers/src/dataqueue.c + ..\..\src\kservice.c - pipe.c + thread.c 1 - ../../components/drivers/src/pipe.c + ..\..\src\thread.c - ringbuffer.c + src_clock.c 1 - ../../components/drivers/src/ringbuffer.c + ..\..\src\clock.c - waitqueue.c + irq.c 1 - ../../components/drivers/src/waitqueue.c + ..\..\src\irq.c - workqueue.c + device.c 1 - ../../components/drivers/src/workqueue.c + ..\..\src\device.c diff --git a/bsp/simulator/.config b/bsp/simulator/.config index 7f4a88db5a5..da2c1039f2a 100644 --- a/bsp/simulator/.config +++ b/bsp/simulator/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -158,7 +162,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -210,10 +213,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -376,7 +386,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -398,10 +408,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -416,13 +433,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -480,9 +490,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -492,7 +509,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -507,6 +523,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -531,8 +548,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -540,6 +555,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h index 5f24c3605da..ffb8bed62e7 100755 --- a/bsp/simulator/rtconfig.h +++ b/bsp/simulator/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -106,7 +107,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -124,6 +124,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -209,6 +216,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/smartfusion2/.config b/bsp/smartfusion2/.config new file mode 100644 index 00000000000..af3dc8989dc --- /dev/null +++ b/bsp/smartfusion2/.config @@ -0,0 +1,704 @@ +# Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) + +# +# RT-Thread Kernel +# +CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_ARCH_DATA_TYPE is not set +# CONFIG_RT_USING_SMP is not set +CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set +CONFIG_RT_THREAD_PRIORITY_MAX=32 +CONFIG_RT_TICK_PER_SECOND=100 +CONFIG_RT_USING_OVERFLOW_CHECK=y +CONFIG_RT_USING_HOOK=y +CONFIG_RT_USING_IDLE_HOOK=y +CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 +CONFIG_IDLE_THREAD_STACK_SIZE=256 +CONFIG_RT_USING_TIMER_SOFT=y +CONFIG_RT_TIMER_THREAD_PRIO=4 +CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set +# CONFIG_RT_USING_TINY_FFS is not set +# CONFIG_RT_PRINTF_LONGLONG is not set +# end of kservice optimization + +CONFIG_RT_DEBUG=y +# CONFIG_RT_DEBUG_COLOR is not set +# CONFIG_RT_DEBUG_INIT_CONFIG is not set +# CONFIG_RT_DEBUG_THREAD_CONFIG is not set +# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set +# CONFIG_RT_DEBUG_IPC_CONFIG is not set +# CONFIG_RT_DEBUG_TIMER_CONFIG is not set +# CONFIG_RT_DEBUG_IRQ_CONFIG is not set +# CONFIG_RT_DEBUG_MEM_CONFIG is not set +# CONFIG_RT_DEBUG_SLAB_CONFIG is not set +# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set +# CONFIG_RT_DEBUG_MODULE_CONFIG is not set + +# +# Inter-Thread communication +# +CONFIG_RT_USING_SEMAPHORE=y +CONFIG_RT_USING_MUTEX=y +CONFIG_RT_USING_EVENT=y +CONFIG_RT_USING_MAILBOX=y +CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication + +# +# Memory Management +# +CONFIG_RT_USING_MEMPOOL=y +CONFIG_RT_USING_SMALL_MEM=y +# CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set +# CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set +# CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set +CONFIG_RT_USING_HEAP=y +# end of Memory Management + +# +# Kernel Device Object +# +CONFIG_RT_USING_DEVICE=y +# CONFIG_RT_USING_DEVICE_OPS is not set +# CONFIG_RT_USING_INTERRUPT_INFO is not set +CONFIG_RT_USING_CONSOLE=y +CONFIG_RT_CONSOLEBUF_SIZE=128 +CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" +# end of Kernel Device Object + +CONFIG_RT_VER_NUM=0x40100 +# end of RT-Thread Kernel + +# +# RT-Thread Components +# +CONFIG_RT_USING_COMPONENTS_INIT=y +CONFIG_RT_USING_USER_MAIN=y +CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 +CONFIG_RT_MAIN_THREAD_PRIORITY=10 +# CONFIG_RT_USING_LEGACY is not set + +# +# C++ features +# +# CONFIG_RT_USING_CPLUSPLUS is not set +# end of C++ features + +# +# Command shell +# +CONFIG_RT_USING_FINSH=y +CONFIG_RT_USING_MSH=y +CONFIG_FINSH_USING_MSH=y +CONFIG_FINSH_THREAD_NAME="tshell" +CONFIG_FINSH_THREAD_PRIORITY=20 +CONFIG_FINSH_THREAD_STACK_SIZE=4096 +CONFIG_FINSH_USING_HISTORY=y +CONFIG_FINSH_HISTORY_LINES=5 +CONFIG_FINSH_USING_SYMTAB=y +CONFIG_FINSH_CMD_SIZE=80 +CONFIG_MSH_USING_BUILT_IN_COMMANDS=y +CONFIG_FINSH_USING_DESCRIPTION=y +# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set +# CONFIG_FINSH_USING_AUTH is not set +CONFIG_FINSH_ARG_MAX=10 +# end of Command shell + +# +# Device virtual file system +# +# CONFIG_RT_USING_DFS is not set +# end of Device virtual file system + +# +# Device Drivers +# +CONFIG_RT_USING_DEVICE_IPC=y +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set +CONFIG_RT_USING_SERIAL=y +CONFIG_RT_USING_SERIAL_V1=y +# CONFIG_RT_USING_SERIAL_V2 is not set +CONFIG_RT_SERIAL_USING_DMA=y +CONFIG_RT_SERIAL_RB_BUFSZ=64 +# CONFIG_RT_USING_CAN is not set +# CONFIG_RT_USING_HWTIMER is not set +# CONFIG_RT_USING_CPUTIME is not set +# CONFIG_RT_USING_I2C is not set +# CONFIG_RT_USING_PHY is not set +CONFIG_RT_USING_PIN=y +# CONFIG_RT_USING_ADC is not set +# CONFIG_RT_USING_DAC is not set +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_MTD_NOR is not set +# CONFIG_RT_USING_MTD_NAND is not set +# CONFIG_RT_USING_PM is not set +# CONFIG_RT_USING_RTC is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set +# CONFIG_RT_USING_WDT is not set +# CONFIG_RT_USING_AUDIO is not set +# CONFIG_RT_USING_SENSOR is not set +# CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_HWCRYPTO is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB +# end of Device Drivers + +# +# POSIX layer and C standard library +# +CONFIG_RT_USING_LIBC=y +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_LIBC_USING_FILEIO is not set +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 + +# +# POSIX (Portable Operating System Interface) layer +# +# CONFIG_RT_USING_POSIX_FS is not set +# CONFIG_RT_USING_POSIX_DELAY is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer +# end of POSIX layer and C standard library + +# +# Network +# + +# +# Socket abstraction layer +# +# CONFIG_RT_USING_SAL is not set +# end of Socket abstraction layer + +# +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +# end of Network interface device + +# +# light weight TCP/IP stack +# +# CONFIG_RT_USING_LWIP is not set +# end of light weight TCP/IP stack + +# +# AT commands +# +# CONFIG_RT_USING_AT is not set +# end of AT commands +# end of Network + +# +# VBUS(Virtual Software BUS) +# +# CONFIG_RT_USING_VBUS is not set +# end of VBUS(Virtual Software BUS) + +# +# Utilities +# +# CONFIG_RT_USING_RYM is not set +# CONFIG_RT_USING_ULOG is not set +# CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_RT_LINK is not set +# end of Utilities +# end of RT-Thread Components + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases + +# +# RT-Thread online packages +# + +# +# IoT - internet of things +# +# CONFIG_PKG_USING_LORAWAN_DRIVER is not set +# CONFIG_PKG_USING_PAHOMQTT is not set +# CONFIG_PKG_USING_UMQTT is not set +# CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_WEBNET is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_MYMQTT is not set +# CONFIG_PKG_USING_KAWAII_MQTT is not set +# CONFIG_PKG_USING_BC28_MQTT is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_JSMN is not set +# CONFIG_PKG_USING_LIBMODBUS is not set +# CONFIG_PKG_USING_FREEMODBUS is not set +# CONFIG_PKG_USING_LJSON is not set +# CONFIG_PKG_USING_EZXML is not set +# CONFIG_PKG_USING_NANOPB is not set + +# +# Wi-Fi +# + +# +# Marvell WiFi +# +# CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi + +# +# Wiced WiFi +# +# CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + +# CONFIG_PKG_USING_RW007 is not set +# end of Wi-Fi + +# CONFIG_PKG_USING_COAP is not set +# CONFIG_PKG_USING_NOPOLL is not set +# CONFIG_PKG_USING_NETUTILS is not set +# CONFIG_PKG_USING_CMUX is not set +# CONFIG_PKG_USING_PPP_DEVICE is not set +# CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set +# CONFIG_PKG_USING_WIZNET is not set +# CONFIG_PKG_USING_ZB_COORDINATOR is not set + +# +# IoT Cloud +# +# CONFIG_PKG_USING_ONENET is not set +# CONFIG_PKG_USING_GAGENT_CLOUD is not set +# CONFIG_PKG_USING_ALI_IOTKIT is not set +# CONFIG_PKG_USING_AZURE is not set +# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set +# CONFIG_PKG_USING_JIOT-C-SDK is not set +# CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set +# CONFIG_PKG_USING_JOYLINK is not set +# end of IoT Cloud + +# CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_OTA_DOWNLOADER is not set +# CONFIG_PKG_USING_IPMSG is not set +# CONFIG_PKG_USING_LSSDP is not set +# CONFIG_PKG_USING_AIRKISS_OPEN is not set +# CONFIG_PKG_USING_LIBRWS is not set +# CONFIG_PKG_USING_TCPSERVER is not set +# CONFIG_PKG_USING_PROTOBUF_C is not set +# CONFIG_PKG_USING_DLT645 is not set +# CONFIG_PKG_USING_QXWZ is not set +# CONFIG_PKG_USING_SMTP_CLIENT is not set +# CONFIG_PKG_USING_ABUP_FOTA is not set +# CONFIG_PKG_USING_LIBCURL2RTT is not set +# CONFIG_PKG_USING_CAPNP is not set +# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set +# CONFIG_PKG_USING_AGILE_TELNET is not set +# CONFIG_PKG_USING_NMEALIB is not set +# CONFIG_PKG_USING_AGILE_JSMN is not set +# CONFIG_PKG_USING_PDULIB is not set +# CONFIG_PKG_USING_BTSTACK is not set +# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set +# CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set +# CONFIG_PKG_USING_HM is not set +# CONFIG_PKG_USING_SMALL_MODBUS is not set +# end of IoT - internet of things + +# +# security packages +# +# CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_LIBSODIUM is not set +# CONFIG_PKG_USING_TINYCRYPT is not set +# CONFIG_PKG_USING_TFM is not set +# CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages + +# +# language packages +# +# CONFIG_PKG_USING_LUA is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set +# CONFIG_PKG_USING_PIKASCRIPT is not set +# end of language packages + +# +# multimedia packages +# + +# +# LVGL: powerful and easy-to-use embedded GUI library +# +# CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set +# end of LVGL: powerful and easy-to-use embedded GUI library + +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + +# CONFIG_PKG_USING_OPENMV is not set +# CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set +# CONFIG_PKG_USING_WAVPLAYER is not set +# CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set +# CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# PainterEngine: A cross-platform graphics application framework written in C language +# +# CONFIG_PKG_USING_PAINTERENGINE is not set +# CONFIG_PKG_USING_PAINTERENGINE_AUX is not set +# end of PainterEngine: A cross-platform graphics application framework written in C language +# end of multimedia packages + +# +# tools packages +# +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYFLASH is not set +# CONFIG_PKG_USING_EASYLOGGER is not set +# CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set +# CONFIG_PKG_USING_RDB is not set +# CONFIG_PKG_USING_QRCODE is not set +# CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set +# CONFIG_PKG_USING_ADBD is not set +# CONFIG_PKG_USING_COREMARK is not set +# CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set +# CONFIG_PKG_USING_NR_MICRO_SHELL is not set +# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set +# CONFIG_PKG_USING_LUNAR_CALENDAR is not set +# CONFIG_PKG_USING_BS8116A is not set +# CONFIG_PKG_USING_GPS_RMC is not set +# CONFIG_PKG_USING_URLENCODE is not set +# CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set +# CONFIG_PKG_USING_FDT is not set +# end of tools packages + +# +# system packages +# + +# +# enhanced kernel services +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages + +# +# CMSIS: ARM Cortex-M Microcontroller Software Interface Standard +# +# CONFIG_PKG_USING_CMSIS_5 is not set +# CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + +# CONFIG_RT_USING_ARDUINO is not set +# CONFIG_PKG_USING_GUIENGINE is not set +# CONFIG_PKG_USING_CAIRO is not set +# CONFIG_PKG_USING_PIXMAN is not set +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_FAL is not set +# CONFIG_PKG_USING_FLASHDB is not set +# CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set +# CONFIG_PKG_USING_DFS_YAFFS is not set +# CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set +# CONFIG_PKG_USING_THREAD_POOL is not set +# CONFIG_PKG_USING_ROBOTS is not set +# CONFIG_PKG_USING_EV is not set +# CONFIG_PKG_USING_SYSWATCH is not set +# CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set +# CONFIG_PKG_USING_PLCCORE is not set +# CONFIG_PKG_USING_RAMDISK is not set +# CONFIG_PKG_USING_MININI is not set +# CONFIG_PKG_USING_QBOOT is not set +# CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set +# CONFIG_PKG_USING_ARM_2D is not set +# CONFIG_PKG_USING_WCWIDTH is not set +# CONFIG_PKG_USING_MCUBOOT is not set +# CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set +# end of system packages + +# +# peripheral libraries and drivers +# +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set +# CONFIG_PKG_USING_REALTEK_AMEBA is not set +# CONFIG_PKG_USING_SHT2X is not set +# CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set +# CONFIG_PKG_USING_STM32_SDIO is not set +# CONFIG_PKG_USING_ICM20608 is not set +# CONFIG_PKG_USING_BUTTON is not set +# CONFIG_PKG_USING_PCF8574 is not set +# CONFIG_PKG_USING_SX12XX is not set +# CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# CONFIG_PKG_USING_LITTLED is not set +# CONFIG_PKG_USING_LKDGUI is not set +# CONFIG_PKG_USING_NRF5X_SDK is not set +# CONFIG_PKG_USING_NRFX is not set +# CONFIG_PKG_USING_WM_LIBRARIES is not set +# CONFIG_PKG_USING_KENDRYTE_SDK is not set +# CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_AGILE_BUTTON is not set +# CONFIG_PKG_USING_AGILE_LED is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set +# CONFIG_PKG_USING_NRF24L01 is not set +# CONFIG_PKG_USING_TOUCH_DRIVERS is not set +# CONFIG_PKG_USING_MAX17048 is not set +# CONFIG_PKG_USING_RPLIDAR is not set +# CONFIG_PKG_USING_AS608 is not set +# CONFIG_PKG_USING_RC522 is not set +# CONFIG_PKG_USING_WS2812B is not set +# CONFIG_PKG_USING_EMBARC_BSP is not set +# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set +# CONFIG_PKG_USING_MULTI_RTIMER is not set +# CONFIG_PKG_USING_MAX7219 is not set +# CONFIG_PKG_USING_BEEP is not set +# CONFIG_PKG_USING_EASYBLINK is not set +# CONFIG_PKG_USING_PMS_SERIES is not set +# CONFIG_PKG_USING_CAN_YMODEM is not set +# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set +# CONFIG_PKG_USING_QLED is not set +# CONFIG_PKG_USING_PAJ7620 is not set +# CONFIG_PKG_USING_AGILE_CONSOLE is not set +# CONFIG_PKG_USING_LD3320 is not set +# CONFIG_PKG_USING_WK2124 is not set +# CONFIG_PKG_USING_LY68L6400 is not set +# CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set +# CONFIG_PKG_USING_MCP23008 is not set +# CONFIG_PKG_USING_BLUETRUM_SDK is not set +# CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set +# CONFIG_PKG_USING_SOFT_SERIAL is not set +# CONFIG_PKG_USING_MB85RS16 is not set +# end of peripheral libraries and drivers + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set +# end of AI packages + +# +# miscellaneous packages +# + +# +# samples: kernel and components samples +# +# CONFIG_PKG_USING_KERNEL_SAMPLES is not set +# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set +# CONFIG_PKG_USING_NETWORK_SAMPLES is not set +# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples + +# +# entertainment: terminal games and other interesting software packages +# +# CONFIG_PKG_USING_CMATRIX is not set +# CONFIG_PKG_USING_SL is not set +# CONFIG_PKG_USING_CAL is not set +# CONFIG_PKG_USING_ACLOCK is not set +# CONFIG_PKG_USING_THREES is not set +# CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# end of entertainment: terminal games and other interesting software packages + +# CONFIG_PKG_USING_LIBCSV is not set +# CONFIG_PKG_USING_OPTPARSE is not set +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set +# CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set +# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set +# CONFIG_PKG_USING_CANFESTIVAL is not set +# CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_DSTR is not set +# CONFIG_PKG_USING_TINYFRAME is not set +# CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set +# CONFIG_PKG_USING_UPACKER is not set +# CONFIG_PKG_USING_UPARAM is not set +# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_KI is not set +# CONFIG_PKG_USING_ARMv7M_DWT is not set +# CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_UKAL is not set +# CONFIG_PKG_USING_CRCLIB is not set +# CONFIG_PKG_USING_LWGPS is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set +# CONFIG_PKG_USING_TERMBOX is not set +# end of miscellaneous packages +# end of RT-Thread online packages + +# +# Hardware Drivers Config +# + +# +# On-chip Peripheral Drivers +# + +# +# UART Drivers +# +CONFIG_BSP_USING_UART0=y +CONFIG_BSP_USING_UART1=y +# end of UART Drivers + +# +# GPIO Drivers +# +CONFIG_BSP_USING_GPIO=y +# end of GPIO Drivers +# end of On-chip Peripheral Drivers +# end of Hardware Drivers Config + +CONFIG_SOC_SF2_M2S010=y diff --git a/bsp/smartfusion2/project.uvproj b/bsp/smartfusion2/project.uvproj index 8f53c376971..76f9741b3fc 100644 --- a/bsp/smartfusion2/project.uvproj +++ b/bsp/smartfusion2/project.uvproj @@ -359,7 +359,7 @@ RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;board;CMSIS;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;libraries\sys_config;libraries\mss_gpio;libraries\mss_uart;..\..\examples\utest\testcases\kernel + applications;board;CMSIS;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;libraries\sys_config;libraries\mss_gpio;libraries\mss_uart;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -427,16 +427,16 @@ CMSIS - system_m2sxxx.c - 1 - CMSIS\system_m2sxxx.c + startup_m2sxxx.s + 2 + CMSIS\startup_arm\startup_m2sxxx.s - startup_m2sxxx.s - 2 - CMSIS\startup_arm\startup_m2sxxx.s + system_m2sxxx.c + 1 + CMSIS\system_m2sxxx.c @@ -451,9 +451,9 @@ CPU - backtrace.c + div0.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\libcpu\arm\common\div0.c @@ -465,9 +465,9 @@ - div0.c + backtrace.c 1 - ..\..\libcpu\arm\common\div0.c + ..\..\libcpu\arm\common\backtrace.c @@ -503,9 +503,9 @@ - waitqueue.c + pipe.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\pipe.c @@ -517,9 +517,9 @@ - workqueue.c + dataqueue.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\dataqueue.c @@ -531,23 +531,23 @@ - dataqueue.c + waitqueue.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\waitqueue.c - pipe.c + completion.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\completion.c - completion.c + workqueue.c 1 - ..\..\components\drivers\src\completion.c + ..\..\components\drivers\src\workqueue.c @@ -584,28 +584,28 @@ ..\..\components\finsh\msh.c - - - Kernel - thread.c + cmd.c 1 - ..\..\src\thread.c + ..\..\components\finsh\cmd.c + + + Kernel - kservice.c + timer.c 1 - ..\..\src\kservice.c + ..\..\src\timer.c - irq.c + device.c 1 - ..\..\src\irq.c + ..\..\src\device.c @@ -624,58 +624,65 @@ - components.c + irq.c 1 - ..\..\src\components.c + ..\..\src\irq.c - scheduler.c + thread.c 1 - ..\..\src\scheduler.c + ..\..\src\thread.c - object.c + clock.c 1 - ..\..\src\object.c + ..\..\src\clock.c - mem.c + ipc.c 1 - ..\..\src\mem.c + ..\..\src\ipc.c - device.c + kservice.c 1 - ..\..\src\device.c + ..\..\src\kservice.c - timer.c + scheduler.c 1 - ..\..\src\timer.c + ..\..\src\scheduler.c - clock.c + components.c 1 - ..\..\src\clock.c + ..\..\src\components.c - ipc.c + mem.c 1 - ..\..\src\ipc.c + ..\..\src\mem.c + + + + + object.c + 1 + ..\..\src\object.c @@ -683,23 +690,23 @@ libc - syscalls.c + mem_std.c 1 - ..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\components\libc\compilers\armlibc\mem_std.c - libc.c + syscalls.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\syscalls.c - mem_std.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\components\libc\compilers\armlibc\libc_syms.c @@ -721,23 +728,23 @@ Libraries - mss_gpio.c + sys_config.c 1 - libraries\mss_gpio\mss_gpio.c + libraries\sys_config\sys_config.c - sys_config.c + mss_uart.c 1 - libraries\sys_config\sys_config.c + libraries\mss_uart\mss_uart.c - mss_uart.c + mss_gpio.c 1 - libraries\mss_uart\mss_uart.c + libraries\mss_gpio\mss_gpio.c diff --git a/bsp/smartfusion2/project.uvprojx b/bsp/smartfusion2/project.uvprojx index 2fa52c8dd12..b5637fcf1ef 100644 --- a/bsp/smartfusion2/project.uvprojx +++ b/bsp/smartfusion2/project.uvprojx @@ -336,7 +336,7 @@ RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;board;CMSIS;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;libraries\sys_config;libraries\mss_gpio;libraries\mss_uart;..\..\examples\utest\testcases\kernel + applications;board;CMSIS;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;libraries\sys_config;libraries\mss_gpio;libraries\mss_uart;..\..\components\libc\posix\io\poll;..\..\examples\utest\testcases\kernel @@ -403,6 +403,13 @@ CMSIS + + + core_cm3.c + 1 + CMSIS\core_cm3.c + + startup_m2sxxx.s @@ -417,13 +424,6 @@ CMSIS\system_m2sxxx.c - - - core_cm3.c - 1 - CMSIS\core_cm3.c - - CPU @@ -436,16 +436,16 @@ - backtrace.c + showmem.c 1 - ..\..\libcpu\arm\common\backtrace.c + ..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\libcpu\arm\common\showmem.c + ..\..\libcpu\arm\common\backtrace.c @@ -481,9 +481,9 @@ - pipe.c + ringblk_buf.c 1 - ..\..\components\drivers\src\pipe.c + ..\..\components\drivers\src\ringblk_buf.c @@ -495,23 +495,23 @@ - dataqueue.c + pipe.c 1 - ..\..\components\drivers\src\dataqueue.c + ..\..\components\drivers\src\pipe.c - ringbuffer.c + waitqueue.c 1 - ..\..\components\drivers\src\ringbuffer.c + ..\..\components\drivers\src\waitqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\components\drivers\src\waitqueue.c + ..\..\components\drivers\src\ringbuffer.c @@ -523,9 +523,9 @@ - ringblk_buf.c + dataqueue.c 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\dataqueue.c @@ -562,49 +562,56 @@ ..\..\components\finsh\msh.c + + + cmd.c + 1 + ..\..\components\finsh\cmd.c + + Kernel - mem.c + irq.c 1 - ..\..\src\mem.c + ..\..\src\irq.c - irq.c + scheduler.c 1 - ..\..\src\irq.c + ..\..\src\scheduler.c - device.c + thread.c 1 - ..\..\src\device.c + ..\..\src\thread.c - idle.c + mempool.c 1 - ..\..\src\idle.c + ..\..\src\mempool.c - scheduler.c + device.c 1 - ..\..\src\scheduler.c + ..\..\src\device.c - timer.c + object.c 1 - ..\..\src\timer.c + ..\..\src\object.c @@ -623,37 +630,37 @@ - thread.c + clock.c 1 - ..\..\src\thread.c + ..\..\src\clock.c - mempool.c + idle.c 1 - ..\..\src\mempool.c + ..\..\src\idle.c - object.c + timer.c 1 - ..\..\src\object.c + ..\..\src\timer.c - components.c + mem.c 1 - ..\..\src\components.c + ..\..\src\mem.c - clock.c + components.c 1 - ..\..\src\clock.c + ..\..\src\components.c @@ -661,9 +668,9 @@ libc - syscalls.c + libc_syms.c 1 - ..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\components\libc\compilers\armlibc\libc_syms.c @@ -675,9 +682,9 @@ - libc.c + syscalls.c 1 - ..\..\components\libc\compilers\armlibc\libc.c + ..\..\components\libc\compilers\armlibc\syscalls.c @@ -699,23 +706,23 @@ Libraries - mss_gpio.c + sys_config.c 1 - libraries\mss_gpio\mss_gpio.c + libraries\sys_config\sys_config.c - sys_config.c + mss_uart.c 1 - libraries\sys_config\sys_config.c + libraries\mss_uart\mss_uart.c - mss_uart.c + mss_gpio.c 1 - libraries\mss_uart\mss_uart.c + libraries\mss_gpio\mss_gpio.c diff --git a/bsp/smartfusion2/rtconfig.h b/bsp/smartfusion2/rtconfig.h index 998d3aefffc..cfab0bcf9f3 100644 --- a/bsp/smartfusion2/rtconfig.h +++ b/bsp/smartfusion2/rtconfig.h @@ -1,8 +1,7 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Configuration */ +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ /* RT-Thread Kernel */ @@ -19,6 +18,10 @@ #define RT_USING_TIMER_SOFT #define RT_TIMER_THREAD_PRIO 4 #define RT_TIMER_THREAD_STACK_SIZE 512 + +/* kservice optimization */ + +/* end of kservice optimization */ #define RT_DEBUG /* Inter-Thread communication */ @@ -28,12 +31,15 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ /* Kernel Device Object */ @@ -41,7 +47,9 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x40003 +/* end of Kernel Device Object */ +#define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ /* RT-Thread Components */ @@ -52,61 +60,92 @@ /* C++ features */ +/* end of C++ features */ /* Command shell */ #define RT_USING_FINSH +#define RT_USING_MSH +#define FINSH_USING_MSH #define FINSH_THREAD_NAME "tshell" +#define FINSH_THREAD_PRIORITY 20 +#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB -#define FINSH_USING_DESCRIPTION -#define FINSH_THREAD_PRIORITY 20 -#define FINSH_THREAD_STACK_SIZE 1024 #define FINSH_CMD_SIZE 80 -#define FINSH_USING_MSH -#define FINSH_USING_MSH_DEFAULT -#define FINSH_USING_MSH_ONLY +#define MSH_USING_BUILT_IN_COMMANDS +#define FINSH_USING_DESCRIPTION #define FINSH_ARG_MAX 10 +/* end of Command shell */ /* Device virtual file system */ +/* end of Device virtual file system */ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL +#define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_PIN /* Using USB */ +/* end of Using USB */ +/* end of Device Drivers */ /* POSIX layer and C standard library */ #define RT_USING_LIBC +#define RT_LIBC_USING_TIME +#define RT_LIBC_DEFAULT_TIMEZONE 8 + +/* POSIX (Portable Operating System Interface) layer */ + + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ /* Network */ /* Socket abstraction layer */ +/* end of Socket abstraction layer */ /* Network interface device */ +/* end of Network interface device */ /* light weight TCP/IP stack */ +/* end of light weight TCP/IP stack */ /* AT commands */ +/* end of AT commands */ +/* end of Network */ /* VBUS(Virtual Software BUS) */ +/* end of VBUS(Virtual Software BUS) */ /* Utilities */ +/* end of Utilities */ +/* end of RT-Thread Components */ + +/* RT-Thread Utestcases */ + +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -117,36 +156,83 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ +/* end of language packages */ /* multimedia packages */ +/* LVGL: powerful and easy-to-use embedded GUI library */ + +/* end of LVGL: powerful and easy-to-use embedded GUI library */ + +/* u8g2: a monochrome graphic library */ + +/* end of u8g2: a monochrome graphic library */ + +/* PainterEngine: A cross-platform graphics application framework written in C language */ + +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + +/* acceleration: Assembly language or algorithmic acceleration packages */ + +/* end of acceleration: Assembly language or algorithmic acceleration packages */ + +/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ + +/* Micrium: Micrium software products porting for RT-Thread */ + +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ /* peripheral libraries and drivers */ +/* end of peripheral libraries and drivers */ -/* miscellaneous packages */ +/* AI packages */ +/* end of AI packages */ + +/* miscellaneous packages */ /* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ + +/* entertainment: terminal games and other interesting software packages */ + +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ /* Hardware Drivers Config */ @@ -156,10 +242,14 @@ #define BSP_USING_UART0 #define BSP_USING_UART1 +/* end of UART Drivers */ /* GPIO Drivers */ #define BSP_USING_GPIO +/* end of GPIO Drivers */ +/* end of On-chip Peripheral Drivers */ +/* end of Hardware Drivers Config */ #define SOC_SF2_M2S010 #endif diff --git a/bsp/stm32/stm32f072-st-nucleo/.config b/bsp/stm32/stm32f072-st-nucleo/.config index 87a3e7a36fa..fe10ad8feb0 100644 --- a/bsp/stm32/stm32f072-st-nucleo/.config +++ b/bsp/stm32/stm32f072-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -503,8 +520,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -512,6 +527,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f072-st-nucleo/project.ewp b/bsp/stm32/stm32f072-st-nucleo/project.ewp index 3e7218ce0cb..27c7d186492 100644 --- a/bsp/stm32/stm32f072-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f072-st-nucleo/project.ewp @@ -365,6 +365,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include $PROJ_DIR$\..\..\..\include @@ -1420,6 +1421,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include $PROJ_DIR$\..\..\..\include @@ -2119,19 +2121,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\context_iar.S @@ -2143,10 +2145,10 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c @@ -2158,10 +2160,10 @@ $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2200,43 +2202,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\components.c - - - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\object.c $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\device.c + + + $PROJ_DIR$\..\..\..\src\timer.c @@ -2311,6 +2313,9 @@ $PROJ_DIR$\..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Src\stm32f0xx_ll_dma.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f072-st-nucleo/project.uvproj b/bsp/stm32/stm32f072-st-nucleo/project.uvproj index 81fe98cec19..df91c39165f 100644 --- a/bsp/stm32/stm32f072-st-nucleo/project.uvproj +++ b/bsp/stm32/stm32f072-st-nucleo/project.uvproj @@ -359,7 +359,7 @@ STM32F072xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include;..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Inc;..\libraries\STM32F0xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include;..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Inc;..\libraries\STM32F0xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,23 +413,23 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -465,51 +465,51 @@ - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -586,86 +586,86 @@ Kernel - idle.c + mempool.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mempool.c - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c - ipc.c + kservice.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\kservice.c - clock.c + thread.c 1 - ..\..\..\src\clock.c + ..\..\..\src\thread.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - components.c + clock.c 1 - ..\..\..\src\components.c + ..\..\..\src\clock.c - device.c + mem.c 1 - ..\..\..\src\device.c + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f072-st-nucleo/project.uvprojx b/bsp/stm32/stm32f072-st-nucleo/project.uvprojx index aca4324c6af..78ecf13a4f5 100644 --- a/bsp/stm32/stm32f072-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f072-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ STM32F072xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include;..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Inc;..\libraries\STM32F0xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include;..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Inc;..\libraries\STM32F0xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -395,13 +395,6 @@ ..\..\..\libcpu\arm\common\div0.c - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - showmem.c @@ -411,9 +404,9 @@ - cpuport.c + backtrace.c 1 - ..\..\..\libcpu\arm\cortex-m0\cpuport.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -423,6 +416,13 @@ ..\..\..\libcpu\arm\cortex-m0\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m0\cpuport.c + + DeviceDrivers @@ -442,51 +442,51 @@ - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -570,86 +570,86 @@ - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - kservice.c + object.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\object.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - device.c + scheduler.c 1 - ..\..\..\src\device.c + ..\..\..\src\scheduler.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - clock.c + idle.c 1 - ..\..\..\src\clock.c + ..\..\..\src\idle.c - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c - thread.c + kservice.c 1 - ..\..\..\src\thread.c + ..\..\..\src\kservice.c diff --git a/bsp/stm32/stm32f072-st-nucleo/rtconfig.h b/bsp/stm32/stm32f072-st-nucleo/rtconfig.h index 77ef12ba407..d42b4ef828e 100644 --- a/bsp/stm32/stm32f072-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f072-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -104,6 +104,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -189,6 +196,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f091-st-nucleo/.config b/bsp/stm32/stm32f091-st-nucleo/.config index be014c0cba0..31d6708afa8 100644 --- a/bsp/stm32/stm32f091-st-nucleo/.config +++ b/bsp/stm32/stm32f091-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -503,8 +520,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -512,6 +527,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f091-st-nucleo/project.ewp b/bsp/stm32/stm32f091-st-nucleo/project.ewp index 4e8137608b6..64c9c6da1fe 100644 --- a/bsp/stm32/stm32f091-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f091-st-nucleo/project.ewp @@ -357,6 +357,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include $PROJ_DIR$\..\..\..\include @@ -1392,6 +1393,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include $PROJ_DIR$\..\..\..\include @@ -2079,13 +2081,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\cpuport.c @@ -2103,22 +2105,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c @@ -2160,40 +2162,40 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\device.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\thread.c $PROJ_DIR$\..\..\..\src\mempool.c @@ -2271,6 +2273,9 @@ $PROJ_DIR$\..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Src\stm32f0xx_ll_dma.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f091-st-nucleo/project.uvprojx b/bsp/stm32/stm32f091-st-nucleo/project.uvprojx index 0d97579a1be..0c5dcba0448 100644 --- a/bsp/stm32/stm32f091-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f091-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ STM32F091xC, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\ports;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include;..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Inc;..\libraries\STM32F0xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\ports;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F0xx_HAL\CMSIS\Device\ST\STM32F0xx\Include;..\libraries\STM32F0xx_HAL\STM32F0xx_HAL_Driver\Inc;..\libraries\STM32F0xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,23 +390,23 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -442,51 +442,51 @@ - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c @@ -563,23 +563,30 @@ Kernel - ipc.c + device.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\device.c - mempool.c + thread.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\thread.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c + + + + + components.c + 1 + ..\..\..\src\components.c @@ -598,16 +605,16 @@ - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c @@ -619,23 +626,23 @@ - device.c + ipc.c 1 - ..\..\..\src\device.c + ..\..\..\src\ipc.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - kservice.c + object.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\object.c @@ -645,13 +652,6 @@ ..\..\..\src\scheduler.c - - - object.c - 1 - ..\..\..\src\object.c - - libc diff --git a/bsp/stm32/stm32f091-st-nucleo/rtconfig.h b/bsp/stm32/stm32f091-st-nucleo/rtconfig.h index 84b7a6ec290..69de5568f19 100644 --- a/bsp/stm32/stm32f091-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f091-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-atk-nano/.config b/bsp/stm32/stm32f103-atk-nano/.config index 601ef9a3458..c3be5ff661f 100644 --- a/bsp/stm32/stm32f103-atk-nano/.config +++ b/bsp/stm32/stm32f103-atk-nano/.config @@ -56,13 +56,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +135,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -182,10 +186,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -350,7 +361,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -372,10 +383,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -390,13 +408,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -454,9 +465,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -466,7 +484,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -481,6 +498,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -505,8 +523,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +530,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-atk-nano/project.ewp b/bsp/stm32/stm32f103-atk-nano/project.ewp index 5d0cdfd504f..7ef63d6ebba 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.ewp +++ b/bsp/stm32/stm32f103-atk-nano/project.ewp @@ -358,6 +358,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1393,6 +1394,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2079,19 +2081,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -2106,34 +2108,34 @@ $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2160,46 +2162,46 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\thread.c @@ -2250,6 +2252,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-atk-nano/project.uvproj b/bsp/stm32/stm32f103-atk-nano/project.uvproj index 36567003f56..7944f2c77f4 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.uvproj +++ b/bsp/stm32/stm32f103-atk-nano/project.uvproj @@ -359,7 +359,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -418,6 +418,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c + + div0.c @@ -427,9 +434,9 @@ - backtrace.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -439,13 +446,6 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c - - DeviceDrivers @@ -465,51 +465,51 @@ - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -586,100 +586,100 @@ Kernel - irq.c + device.c 1 - ..\..\..\src\irq.c + ..\..\..\src\device.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - components.c + clock.c 1 - ..\..\..\src\components.c + ..\..\..\src\clock.c - device.c + object.c 1 - ..\..\..\src\device.c + ..\..\..\src\object.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - thread.c + memheap.c 1 - ..\..\..\src\thread.c + ..\..\..\src\memheap.c - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c - idle.c + thread.c 1 - ..\..\..\src\idle.c + ..\..\..\src\thread.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - clock.c + kservice.c 1 - ..\..\..\src\clock.c + ..\..\..\src\kservice.c - memheap.c + timer.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\timer.c - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c - mempool.c + mem.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f103-atk-nano/project.uvprojx b/bsp/stm32/stm32f103-atk-nano/project.uvprojx index cfef49c473a..9893ddee9e8 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.uvprojx +++ b/bsp/stm32/stm32f103-atk-nano/project.uvprojx @@ -334,7 +334,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,23 +389,23 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -441,51 +441,51 @@ - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c @@ -562,30 +562,30 @@ Kernel - clock.c + kservice.c 1 - ..\..\..\src\clock.c + ..\..\..\src\kservice.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c - irq.c + thread.c 1 - ..\..\..\src\irq.c + ..\..\..\src\thread.c - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c @@ -597,65 +597,65 @@ - components.c + memheap.c 1 - ..\..\..\src\components.c + ..\..\..\src\memheap.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c - memheap.c + device.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\device.c - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - idle.c + mem.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f103-atk-nano/rtconfig.h b/bsp/stm32/stm32f103-atk-nano/rtconfig.h index 41ee85b78b2..00f6505a7d1 100644 --- a/bsp/stm32/stm32f103-atk-nano/rtconfig.h +++ b/bsp/stm32/stm32f103-atk-nano/rtconfig.h @@ -34,8 +34,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-atk-warshipv3/.config b/bsp/stm32/stm32f103-atk-warshipv3/.config index ce8d1a44f64..a4bd4d6236f 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/.config +++ b/bsp/stm32/stm32f103-atk-warshipv3/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-atk-warshipv3/project.ewp b/bsp/stm32/stm32f103-atk-warshipv3/project.ewp index 340f3d46a1e..ffd828b8a02 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/project.ewp +++ b/bsp/stm32/stm32f103-atk-warshipv3/project.ewp @@ -358,6 +358,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1393,6 +1394,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2079,19 +2081,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S @@ -2103,25 +2105,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2160,43 +2162,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\kservice.c - - - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\object.c $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\mempool.c + + + $PROJ_DIR$\..\..\..\src\timer.c @@ -2247,6 +2249,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-atk-warshipv3/project.uvproj b/bsp/stm32/stm32f103-atk-warshipv3/project.uvproj index 6a87f7e4ec6..55da1a9dd58 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/project.uvproj +++ b/bsp/stm32/stm32f103-atk-warshipv3/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,23 +413,23 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -465,16 +465,16 @@ - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -486,35 +486,42 @@ - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -586,30 +586,37 @@ Kernel - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - mem.c + components.c 1 - ..\..\..\src\mem.c + ..\..\..\src\components.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c + + + + + ipc.c + 1 + ..\..\..\src\ipc.c @@ -621,30 +628,30 @@ - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - ipc.c + irq.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\irq.c - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c - mempool.c + mem.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\mem.c @@ -656,9 +663,9 @@ - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c @@ -668,13 +675,6 @@ ..\..\..\src\kservice.c - - - components.c - 1 - ..\..\..\src\components.c - - libc diff --git a/bsp/stm32/stm32f103-atk-warshipv3/project.uvprojx b/bsp/stm32/stm32f103-atk-warshipv3/project.uvprojx index 825776f6d2e..6334799f1ea 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/project.uvprojx +++ b/bsp/stm32/stm32f103-atk-warshipv3/project.uvprojx @@ -362,7 +362,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -416,9 +416,9 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -430,23 +430,23 @@ - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -468,56 +468,63 @@ - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -532,13 +539,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -594,6 +594,13 @@ ..\..\..\src\idle.c + + + device.c + 1 + ..\..\..\src\device.c + + mem.c @@ -610,9 +617,9 @@ - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c @@ -624,23 +631,23 @@ - mempool.c + timer.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\timer.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c @@ -652,30 +659,23 @@ - ipc.c - 1 - ..\..\..\src\ipc.c - - - - - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c diff --git a/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.h b/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.h index f1fe6eba72f..fb2473f92e4 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.h +++ b/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.h @@ -34,6 +34,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-blue-pill/.config b/bsp/stm32/stm32f103-blue-pill/.config index d03d550f54b..f75ee783036 100644 --- a/bsp/stm32/stm32f103-blue-pill/.config +++ b/bsp/stm32/stm32f103-blue-pill/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-blue-pill/project.ewp b/bsp/stm32/stm32f103-blue-pill/project.ewp index 8c0a8bfc9b5..8b55f3a605f 100644 --- a/bsp/stm32/stm32f103-blue-pill/project.ewp +++ b/bsp/stm32/stm32f103-blue-pill/project.ewp @@ -357,6 +357,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1391,6 +1392,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2086,10 +2088,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S @@ -2101,7 +2103,7 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -2110,28 +2112,28 @@ $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2158,43 +2160,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\object.c @@ -2245,6 +2247,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-blue-pill/project.uvproj b/bsp/stm32/stm32f103-blue-pill/project.uvproj index 098292ff33e..26cf66ccf75 100644 --- a/bsp/stm32/stm32f103-blue-pill/project.uvproj +++ b/bsp/stm32/stm32f103-blue-pill/project.uvproj @@ -359,7 +359,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,9 +413,9 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -427,9 +427,9 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -465,51 +465,51 @@ - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c @@ -586,16 +586,16 @@ Kernel - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c @@ -607,72 +607,72 @@ - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - clock.c + mem.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f103-blue-pill/project.uvprojx b/bsp/stm32/stm32f103-blue-pill/project.uvprojx index 88f017d84dc..1ea9abd5a4f 100644 --- a/bsp/stm32/stm32f103-blue-pill/project.uvprojx +++ b/bsp/stm32/stm32f103-blue-pill/project.uvprojx @@ -333,7 +333,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,23 +388,23 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -440,9 +440,16 @@ - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c + + + + + ringblk_buf.c + 1 + ..\..\..\components\drivers\src\ringblk_buf.c @@ -454,9 +461,9 @@ - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -473,13 +480,6 @@ ..\..\..\components\drivers\src\workqueue.c - - - completion.c - 1 - ..\..\..\components\drivers\src\completion.c - - pipe.c @@ -561,58 +561,58 @@ Kernel - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c - object.c + mempool.c 1 - ..\..\..\src\object.c + ..\..\..\src\mempool.c - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - mempool.c + timer.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\timer.c - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c @@ -624,30 +624,30 @@ - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c diff --git a/bsp/stm32/stm32f103-blue-pill/rtconfig.h b/bsp/stm32/stm32f103-blue-pill/rtconfig.h index 6ae0346203f..79ff72a17c2 100644 --- a/bsp/stm32/stm32f103-blue-pill/rtconfig.h +++ b/bsp/stm32/stm32f103-blue-pill/rtconfig.h @@ -34,6 +34,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-dofly-M3S/.config b/bsp/stm32/stm32f103-dofly-M3S/.config index 1915f2ff973..0082cfe2524 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/.config +++ b/bsp/stm32/stm32f103-dofly-M3S/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-dofly-M3S/project.ewp b/bsp/stm32/stm32f103-dofly-M3S/project.ewp index cd7dcda144e..da00e487e83 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/project.ewp +++ b/bsp/stm32/stm32f103-dofly-M3S/project.ewp @@ -358,6 +358,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1393,6 +1394,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2091,10 +2093,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -2106,25 +2108,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2163,19 +2165,19 @@ Kernel - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\components.c @@ -2184,22 +2186,22 @@ $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\mem.c @@ -2250,6 +2252,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-dofly-M3S/project.uvproj b/bsp/stm32/stm32f103-dofly-M3S/project.uvproj index 25dad32b42d..148198b60e2 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/project.uvproj +++ b/bsp/stm32/stm32f103-dofly-M3S/project.uvproj @@ -373,7 +373,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -442,16 +442,16 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -487,56 +487,63 @@ - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -551,13 +558,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -608,51 +608,51 @@ Kernel - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c @@ -664,37 +664,37 @@ - mem.c + ipc.c 1 - ..\..\..\src\mem.c + ..\..\..\src\ipc.c - idle.c + thread.c 1 - ..\..\..\src\idle.c + ..\..\..\src\thread.c - irq.c + timer.c 1 - ..\..\..\src\irq.c + ..\..\..\src\timer.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - components.c + device.c 1 - ..\..\..\src\components.c + ..\..\..\src\device.c diff --git a/bsp/stm32/stm32f103-dofly-M3S/project.uvprojx b/bsp/stm32/stm32f103-dofly-M3S/project.uvprojx index e7211f9b444..e93a8e28014 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/project.uvprojx +++ b/bsp/stm32/stm32f103-dofly-M3S/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -380,16 +380,16 @@ Applications - main.c + nrf24l01_init.c 1 - applications\main.c + applications\nrf24l01_init.c - nrf24l01_init.c + main.c 1 - applications\nrf24l01_init.c + applications\main.c @@ -402,6 +402,13 @@ ..\..\..\libcpu\arm\common\div0.c + + + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c + + showmem.c @@ -411,9 +418,9 @@ - backtrace.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -423,13 +430,6 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c - - DeviceDrivers @@ -449,30 +449,30 @@ - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c @@ -484,21 +484,28 @@ - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -513,13 +520,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -570,23 +570,23 @@ Kernel - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - device.c + mem.c 1 - ..\..\..\src\device.c + ..\..\..\src\mem.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c @@ -598,65 +598,65 @@ - idle.c + mempool.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mempool.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - components.c + kservice.c 1 - ..\..\..\src\components.c + ..\..\..\src\kservice.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c - mem.c + irq.c 1 - ..\..\..\src\mem.c + ..\..\..\src\irq.c - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - thread.c + object.c 1 - ..\..\..\src\thread.c + ..\..\..\src\object.c - scheduler.c + timer.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\timer.c diff --git a/bsp/stm32/stm32f103-dofly-M3S/rtconfig.h b/bsp/stm32/stm32f103-dofly-M3S/rtconfig.h index e6bc2352f44..3e5bd91f41c 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/rtconfig.h +++ b/bsp/stm32/stm32f103-dofly-M3S/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-dofly-lyc8/.config b/bsp/stm32/stm32f103-dofly-lyc8/.config index 096fd4b654b..a01986a46b5 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/.config +++ b/bsp/stm32/stm32f103-dofly-lyc8/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-dofly-lyc8/project.ewp b/bsp/stm32/stm32f103-dofly-lyc8/project.ewp index e7f97566e5c..b78ce9b5934 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/project.ewp +++ b/bsp/stm32/stm32f103-dofly-lyc8/project.ewp @@ -366,6 +366,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1413,6 +1414,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2103,10 +2105,10 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c @@ -2127,37 +2129,37 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2184,43 +2186,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2271,6 +2273,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-dofly-lyc8/project.uvproj b/bsp/stm32/stm32f103-dofly-lyc8/project.uvproj index 430c4327d88..a648f872c0f 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/project.uvproj +++ b/bsp/stm32/stm32f103-dofly-lyc8/project.uvproj @@ -359,7 +359,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,9 +413,9 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -427,23 +427,23 @@ - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S @@ -465,16 +465,16 @@ - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -486,9 +486,9 @@ - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c @@ -500,16 +500,16 @@ - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -586,79 +586,79 @@ Kernel - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c - components.c + ipc.c 1 - ..\..\..\src\components.c + ..\..\..\src\ipc.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - idle.c + kservice.c 1 - ..\..\..\src\idle.c + ..\..\..\src\kservice.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c - irq.c + timer.c 1 - ..\..\..\src\irq.c + ..\..\..\src\timer.c - kservice.c + components.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\components.c - ipc.c + mempool.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mempool.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - thread.c + clock.c 1 - ..\..\..\src\thread.c + ..\..\..\src\clock.c @@ -670,9 +670,9 @@ - clock.c + idle.c 1 - ..\..\..\src\clock.c + ..\..\..\src\idle.c diff --git a/bsp/stm32/stm32f103-dofly-lyc8/project.uvprojx b/bsp/stm32/stm32f103-dofly-lyc8/project.uvprojx index d4f07a31ef0..0c17490bbbe 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/project.uvprojx +++ b/bsp/stm32/stm32f103-dofly-lyc8/project.uvprojx @@ -331,7 +331,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,13 +390,6 @@ ..\..\..\libcpu\arm\common\showmem.c - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - div0.c @@ -406,9 +399,9 @@ - cpuport.c + backtrace.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -418,6 +411,13 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + DeviceDrivers @@ -437,51 +437,51 @@ - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -558,9 +558,9 @@ Kernel - components.c + thread.c 1 - ..\..\..\src\components.c + ..\..\..\src\thread.c @@ -572,9 +572,9 @@ - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c @@ -586,65 +586,65 @@ - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c - ipc.c + mempool.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mempool.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c diff --git a/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.h b/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.h index 5eec6ff6085..36bcbc0556c 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.h +++ b/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-fire-arbitrary/.config b/bsp/stm32/stm32f103-fire-arbitrary/.config index b272137470d..f305b8fd483 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/.config +++ b/bsp/stm32/stm32f103-fire-arbitrary/.config @@ -56,13 +56,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +135,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -184,10 +188,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -352,7 +363,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -374,10 +385,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -392,13 +410,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -456,9 +467,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -468,7 +486,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -483,6 +500,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -507,8 +525,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +532,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.ewp b/bsp/stm32/stm32f103-fire-arbitrary/project.ewp index 63be17ab246..c879740e8a8 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.ewp +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.ewp @@ -357,9 +357,9 @@ $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1394,9 +1394,9 @@ $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2083,13 +2083,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -2107,25 +2107,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c @@ -2164,88 +2164,82 @@ Kernel - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mem.c libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c @@ -2290,6 +2284,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj b/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj index 5d9e6b01cae..f4c048e2840 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,16 +413,16 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -434,16 +434,16 @@ - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -465,56 +465,63 @@ - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -593,16 +593,23 @@ - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - timer.c + mem.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mem.c + + + + + scheduler.c + 1 + ..\..\..\src\scheduler.c @@ -621,9 +628,9 @@ - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c @@ -642,37 +649,30 @@ - mempool.c - 1 - ..\..\..\src\mempool.c - - - - - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c - mem.c + object.c 1 - ..\..\..\src\mem.c + ..\..\..\src\object.c @@ -701,23 +701,23 @@ - libc.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx b/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx index 682ec8bafbc..01a658f6585 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,9 +389,9 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -403,23 +403,23 @@ - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -441,9 +441,9 @@ - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c @@ -455,42 +455,49 @@ - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -505,13 +512,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -562,100 +562,100 @@ Kernel - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - memheap.c + components.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\components.c - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c - device.c + idle.c 1 - ..\..\..\src\device.c + ..\..\..\src\idle.c - components.c + thread.c 1 - ..\..\..\src\components.c + ..\..\..\src\thread.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - kservice.c + memheap.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\memheap.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - idle.c + scheduler.c 1 - ..\..\..\src\idle.c + ..\..\..\src\scheduler.c @@ -663,9 +663,9 @@ libc - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c @@ -677,23 +677,23 @@ - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c diff --git a/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.h b/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.h index 4898bb6c41a..1abe3a9d653 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.h +++ b/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.h @@ -34,8 +34,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -108,6 +109,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +201,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/.config b/bsp/stm32/stm32f103-gizwits-gokitv21/.config index 5678624f05d..ffa2f6d11d9 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/.config +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -503,8 +520,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -512,6 +527,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp b/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp index 972e42bd4b6..2ac9b58d35d 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp @@ -366,6 +366,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1421,6 +1422,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2119,13 +2121,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S @@ -2143,22 +2145,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2167,13 +2169,13 @@ Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2203,40 +2205,40 @@ $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c @@ -2284,6 +2286,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj index d68b9fcfa1f..6fac3d0c39b 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj @@ -359,7 +359,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -465,51 +465,51 @@ - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -586,9 +586,9 @@ Kernel - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c @@ -600,65 +600,65 @@ - object.c + timer.c 1 - ..\..\..\src\object.c + ..\..\..\src\timer.c - timer.c + kservice.c 1 - ..\..\..\src\timer.c + ..\..\..\src\kservice.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c - mem.c + ipc.c 1 - ..\..\..\src\mem.c + ..\..\..\src\ipc.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - mempool.c + idle.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\idle.c diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx index b3727e75ba5..858f3dd8a6d 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx @@ -335,7 +335,7 @@ STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,16 +390,16 @@ CPU - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -411,16 +411,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S @@ -442,51 +442,51 @@ - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c @@ -561,13 +561,6 @@ Kernel - - - device.c - 1 - ..\..\..\src\device.c - - clock.c @@ -577,37 +570,37 @@ - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - mem.c + device.c 1 - ..\..\..\src\mem.c + ..\..\..\src\device.c - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c - thread.c + scheduler.c 1 - ..\..\..\src\thread.c + ..\..\..\src\scheduler.c @@ -626,30 +619,37 @@ - mempool.c + components.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\components.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - ipc.c + irq.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\irq.c + + + + + mem.c + 1 + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.h b/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.h index b0cc95acfd6..98a6e365ab9 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.h +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -103,6 +103,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -188,6 +195,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-hw100k-ibox/.config b/bsp/stm32/stm32f103-hw100k-ibox/.config index 1e67490e040..e228d655099 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/.config +++ b/bsp/stm32/stm32f103-hw100k-ibox/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -183,10 +186,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +361,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +383,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +408,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +465,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +484,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +498,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -506,8 +523,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -515,6 +530,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.ewp b/bsp/stm32/stm32f103-hw100k-ibox/project.ewp index 72c6660f16d..64399e88d66 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.ewp +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.ewp @@ -366,9 +366,9 @@ $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1440,9 +1440,9 @@ $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2181,25 +2181,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c @@ -2238,85 +2238,79 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\thread.c libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c @@ -2361,6 +2355,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj b/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj index ae86401954b..f01052dafb5 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj @@ -372,7 +372,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -427,9 +427,9 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -441,23 +441,23 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S @@ -484,13 +484,6 @@ ..\..\..\components\drivers\src\ringblk_buf.c - - - completion.c - 1 - ..\..\..\components\drivers\src\completion.c - - workqueue.c @@ -500,9 +493,9 @@ - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -521,14 +514,28 @@ - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c + + + + + dataqueue.c + 1 + ..\..\..\components\drivers\src\dataqueue.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -543,13 +550,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -600,37 +600,37 @@ Kernel - mem.c + clock.c 1 - ..\..\..\src\mem.c + ..\..\..\src\clock.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - object.c + mem.c 1 - ..\..\..\src\object.c + ..\..\..\src\mem.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - mempool.c + thread.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\thread.c @@ -642,37 +642,37 @@ - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c - device.c + scheduler.c 1 - ..\..\..\src\device.c + ..\..\..\src\scheduler.c - components.c + device.c 1 - ..\..\..\src\components.c + ..\..\..\src\device.c - scheduler.c + object.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\object.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c @@ -684,9 +684,9 @@ - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c @@ -694,16 +694,16 @@ libc - mem_std.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - libc.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx b/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx index df7d7c52347..89ec110495c 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -387,13 +387,6 @@ CPU - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - div0.c @@ -410,9 +403,9 @@ - cpuport.c + backtrace.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -422,6 +415,13 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + DeviceDrivers @@ -448,23 +448,23 @@ - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -476,9 +476,9 @@ - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c @@ -491,6 +491,13 @@ Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -505,13 +512,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -562,93 +562,93 @@ Kernel - mem.c + device.c 1 - ..\..\..\src\mem.c + ..\..\..\src\device.c - clock.c + kservice.c 1 - ..\..\..\src\clock.c + ..\..\..\src\kservice.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - object.c + ipc.c 1 - ..\..\..\src\object.c + ..\..\..\src\ipc.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - timer.c + clock.c 1 - ..\..\..\src\timer.c + ..\..\..\src\clock.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c @@ -656,9 +656,9 @@ libc - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c @@ -670,9 +670,9 @@ - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c diff --git a/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.h b/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.h index 14df600ab56..d6458f32e98 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.h +++ b/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-onenet-nbiot/.config b/bsp/stm32/stm32f103-onenet-nbiot/.config index 5f2663dbc1e..1561ae145a4 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/.config +++ b/bsp/stm32/stm32f103-onenet-nbiot/.config @@ -56,13 +56,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +135,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -182,10 +186,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -350,7 +361,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -372,10 +383,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -390,13 +408,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -454,9 +465,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -466,7 +484,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -481,6 +498,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -505,8 +523,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +530,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-onenet-nbiot/project.ewp b/bsp/stm32/stm32f103-onenet-nbiot/project.ewp index 6ef9656a8fb..d02c42e8cff 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/project.ewp +++ b/bsp/stm32/stm32f103-onenet-nbiot/project.ewp @@ -357,6 +357,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1391,6 +1392,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2077,13 +2079,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -2101,25 +2103,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -2158,46 +2160,46 @@ Kernel - $PROJ_DIR$\..\..\..\src\memheap.c - - - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\scheduler.c + + + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\kservice.c @@ -2248,6 +2250,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj b/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj index 89f9b8540b2..348545603e7 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj +++ b/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -411,13 +411,6 @@ CPU - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - backtrace.c @@ -434,9 +427,9 @@ - cpuport.c + showmem.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\libcpu\arm\common\showmem.c @@ -446,6 +439,13 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + DeviceDrivers @@ -465,37 +465,37 @@ - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c @@ -507,14 +507,21 @@ - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -586,44 +586,44 @@ Kernel - thread.c + clock.c 1 - ..\..\..\src\thread.c + ..\..\..\src\clock.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - ipc.c + components.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\components.c - kservice.c + memheap.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\memheap.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c @@ -642,44 +642,44 @@ - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c - memheap.c + thread.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\thread.c - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx b/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx index 97066fb21aa..2dbfd333e70 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx +++ b/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx @@ -362,7 +362,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -421,13 +421,6 @@ ..\..\..\libcpu\arm\common\showmem.c - - - div0.c - 1 - ..\..\..\libcpu\arm\common\div0.c - - backtrace.c @@ -437,9 +430,9 @@ - cpuport.c + div0.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\libcpu\arm\common\div0.c @@ -449,6 +442,13 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + DeviceDrivers @@ -468,56 +468,63 @@ - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -532,13 +539,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -589,23 +589,23 @@ Kernel - kservice.c + mempool.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mempool.c - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c @@ -617,16 +617,16 @@ - memheap.c + scheduler.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\scheduler.c - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c @@ -638,9 +638,9 @@ - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c @@ -652,9 +652,9 @@ - irq.c + timer.c 1 - ..\..\..\src\irq.c + ..\..\..\src\timer.c @@ -666,23 +666,23 @@ - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c - timer.c + memheap.c 1 - ..\..\..\src\timer.c + ..\..\..\src\memheap.c diff --git a/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.h b/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.h index 41ee85b78b2..00f6505a7d1 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.h +++ b/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.h @@ -34,8 +34,10 @@ /* Memory Management */ #define RT_USING_MEMPOOL -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f103-yf-ufun/.config b/bsp/stm32/stm32f103-yf-ufun/.config index a2385d6c2bc..9066c880449 100644 --- a/bsp/stm32/stm32f103-yf-ufun/.config +++ b/bsp/stm32/stm32f103-yf-ufun/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f103-yf-ufun/project.ewp b/bsp/stm32/stm32f103-yf-ufun/project.ewp index c646e4a64d8..039d41e706e 100644 --- a/bsp/stm32/stm32f103-yf-ufun/project.ewp +++ b/bsp/stm32/stm32f103-yf-ufun/project.ewp @@ -366,6 +366,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1421,6 +1422,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2119,10 +2121,10 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c @@ -2146,22 +2148,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -2200,43 +2202,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c - - - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mem.c $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\components.c + + + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\ipc.c @@ -2287,6 +2289,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f103-yf-ufun/project.uvproj b/bsp/stm32/stm32f103-yf-ufun/project.uvproj index 8d0423c715e..0ce7be7d2ba 100644 --- a/bsp/stm32/stm32f103-yf-ufun/project.uvproj +++ b/bsp/stm32/stm32f103-yf-ufun/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,9 +413,9 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -427,23 +427,23 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m3\cpuport.c @@ -465,16 +465,16 @@ - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -493,9 +493,9 @@ - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c @@ -507,14 +507,21 @@ - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -586,93 +586,93 @@ Kernel - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - clock.c + mem.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mem.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - ipc.c + kservice.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\kservice.c - thread.c + scheduler.c 1 - ..\..\..\src\thread.c + ..\..\..\src\scheduler.c - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32f103-yf-ufun/project.uvprojx b/bsp/stm32/stm32f103-yf-ufun/project.uvprojx index c3b2e5be48d..398883294e3 100644 --- a/bsp/stm32/stm32f103-yf-ufun/project.uvprojx +++ b/bsp/stm32/stm32f103-yf-ufun/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F103xE - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,9 +390,9 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -404,9 +404,9 @@ - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -442,23 +442,23 @@ - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -470,28 +470,35 @@ - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c Drivers + + + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + stm32f1xx_hal_msp.c @@ -506,13 +513,6 @@ board\board.c - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - drv_gpio.c @@ -570,58 +570,58 @@ - clock.c + components.c 1 - ..\..\..\src\clock.c + ..\..\..\src\components.c - ipc.c + mempool.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mempool.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - device.c + scheduler.c 1 - ..\..\..\src\device.c + ..\..\..\src\scheduler.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c @@ -633,23 +633,23 @@ - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - components.c + mem.c 1 - ..\..\..\src\components.c + ..\..\..\src\mem.c - irq.c + thread.c 1 - ..\..\..\src\irq.c + ..\..\..\src\thread.c diff --git a/bsp/stm32/stm32f103-yf-ufun/rtconfig.h b/bsp/stm32/stm32f103-yf-ufun/rtconfig.h index b0b2b393ebd..b7ac9f3dd5b 100644 --- a/bsp/stm32/stm32f103-yf-ufun/rtconfig.h +++ b/bsp/stm32/stm32f103-yf-ufun/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f107-uc-eval/.config b/bsp/stm32/stm32f107-uc-eval/.config index 33c22901e29..dc977cf9930 100644 --- a/bsp/stm32/stm32f107-uc-eval/.config +++ b/bsp/stm32/stm32f107-uc-eval/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -504,8 +521,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f107-uc-eval/project.ewp b/bsp/stm32/stm32f107-uc-eval/project.ewp index 60b8435522d..dd7995ebe97 100644 --- a/bsp/stm32/stm32f107-uc-eval/project.ewp +++ b/bsp/stm32/stm32f107-uc-eval/project.ewp @@ -357,6 +357,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1391,6 +1392,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2077,13 +2079,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S @@ -2101,22 +2103,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2158,43 +2160,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c @@ -2245,6 +2247,9 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f107-uc-eval/project.uvproj b/bsp/stm32/stm32f107-uc-eval/project.uvproj index 419b62e2e9f..6d7b4aabe47 100644 --- a/bsp/stm32/stm32f107-uc-eval/project.uvproj +++ b/bsp/stm32/stm32f107-uc-eval/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, STM32F107xC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -411,13 +411,6 @@ CPU - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - showmem.c @@ -434,9 +427,9 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c @@ -446,6 +439,13 @@ ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + DeviceDrivers @@ -465,44 +465,44 @@ - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c @@ -515,6 +515,13 @@ Drivers + + + startup_stm32f107xc.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f107xc.s + + stm32f1xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f107xc.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f107xc.s - - drv_gpio.c @@ -586,93 +586,93 @@ Kernel - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c - object.c + timer.c 1 - ..\..\..\src\object.c + ..\..\..\src\timer.c - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - mempool.c + components.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\components.c - ipc.c + irq.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\irq.c - thread.c + scheduler.c 1 - ..\..\..\src\thread.c + ..\..\..\src\scheduler.c - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - components.c + kservice.c 1 - ..\..\..\src\components.c + ..\..\..\src\kservice.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - idle.c + mempool.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mempool.c diff --git a/bsp/stm32/stm32f107-uc-eval/project.uvprojx b/bsp/stm32/stm32f107-uc-eval/project.uvprojx index 701614ae6f1..310bc1e8edf 100644 --- a/bsp/stm32/stm32f107-uc-eval/project.uvprojx +++ b/bsp/stm32/stm32f107-uc-eval/project.uvprojx @@ -333,7 +333,7 @@ USE_HAL_DRIVER, STM32F107xC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -386,6 +386,13 @@ CPU + + + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c + + backtrace.c @@ -402,9 +409,9 @@ - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S @@ -414,13 +421,6 @@ ..\..\..\libcpu\arm\cortex-m3\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - DeviceDrivers @@ -440,16 +440,16 @@ - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -461,16 +461,16 @@ - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -482,14 +482,21 @@ - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c Drivers + + + startup_stm32f107xc.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f107xc.s + + stm32f1xx_hal_msp.c @@ -504,13 +511,6 @@ board\board.c - - - startup_stm32f107xc.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f107xc.s - - drv_gpio.c @@ -561,93 +561,93 @@ Kernel - thread.c + components.c 1 - ..\..\..\src\thread.c + ..\..\..\src\components.c - kservice.c + timer.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\timer.c - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - device.c + mempool.c 1 - ..\..\..\src\device.c + ..\..\..\src\mempool.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - mem.c + ipc.c 1 - ..\..\..\src\mem.c + ..\..\..\src\ipc.c - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c - mempool.c + mem.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\mem.c - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c diff --git a/bsp/stm32/stm32f107-uc-eval/rtconfig.h b/bsp/stm32/stm32f107-uc-eval/rtconfig.h index 760b2c5c076..8637da4ddf3 100644 --- a/bsp/stm32/stm32f107-uc-eval/rtconfig.h +++ b/bsp/stm32/stm32f107-uc-eval/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f302-st-nucleo/.config b/bsp/stm32/stm32f302-st-nucleo/.config index 0e674b77539..f5f442b38d4 100644 --- a/bsp/stm32/stm32f302-st-nucleo/.config +++ b/bsp/stm32/stm32f302-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f302-st-nucleo/project.ewp b/bsp/stm32/stm32f302-st-nucleo/project.ewp index da5f2983c77..98494378620 100644 --- a/bsp/stm32/stm32f302-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f302-st-nucleo/project.ewp @@ -348,7 +348,6 @@ $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\libcpu\arm\common $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4 - $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\drivers\include $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. @@ -357,8 +356,9 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc - $PROJ_DIR$\..\..\..\components\drivers\spi + $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers $PROJ_DIR$\..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Include @@ -1382,7 +1382,6 @@ $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\libcpu\arm\common $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4 - $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\drivers\include $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. @@ -1391,8 +1390,9 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc - $PROJ_DIR$\..\..\..\components\drivers\spi + $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers $PROJ_DIR$\..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Include @@ -2080,27 +2080,21 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + DeviceDrivers - - $PROJ_DIR$\..\..\..\components\drivers\hwtimer\hwtimer.c - - - $PROJ_DIR$\..\..\..\components\drivers\misc\rt_drv_pwm.c - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c @@ -2108,17 +2102,14 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\spi\spi_core.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\spi\spi_dev.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2131,9 +2122,6 @@ $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - Drivers @@ -2149,21 +2137,12 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_spi.c - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_pwm.c - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_hwtimer.c - Finsh @@ -2180,43 +2159,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\kservice.c $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\device.c @@ -2228,75 +2207,63 @@ Libraries - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_spi.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Source\Templates\system_stm32f3xx.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_hrtim.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart_ex.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cec.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_gpio.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr_ex.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc_ex.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_gpio.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_dma.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc_ex.c $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart_ex.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Source\Templates\system_stm32f3xx.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc_ex.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cortex.c $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_exti.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_tim.c - - - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_tim_ex.c - - - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_sram.c - - - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart.c - - - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart_ex.c - - - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cec.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc_ex.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr_ex.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cortex.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_spi_ex.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_dma.c - $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr.c + $PROJ_DIR$\..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_sram.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f302-st-nucleo/project.uvprojx b/bsp/stm32/stm32f302-st-nucleo/project.uvprojx index 5ea3673fbd9..164c3910ea1 100644 --- a/bsp/stm32/stm32f302-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f302-st-nucleo/project.uvprojx @@ -336,7 +336,7 @@ STM32F302x8, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Inc;..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Include;..\libraries\STM32F3xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Inc;..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Include;..\libraries\STM32F3xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -410,13 +410,6 @@ ..\..\..\libcpu\arm\common\backtrace.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - cpuport.c @@ -424,23 +417,16 @@ ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - - DeviceDrivers - hwtimer.c - 1 - ..\..\..\components\drivers\hwtimer\hwtimer.c - - - - - rt_drv_pwm.c - 1 - ..\..\..\components\drivers\misc\rt_drv_pwm.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + DeviceDrivers pin.c @@ -457,30 +443,23 @@ - spi_core.c - 1 - ..\..\..\components\drivers\spi\spi_core.c - - - - - spi_dev.c + ringbuffer.c 1 - ..\..\..\components\drivers\spi\spi_dev.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c @@ -499,9 +478,9 @@ - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -511,35 +490,9 @@ ..\..\..\components\drivers\src\pipe.c - - - completion.c - 1 - ..\..\..\components\drivers\src\completion.c - - - - - - - - - - - - - - Drivers - - - startup_stm32f302x8.s - 2 - ..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Source\Templates\arm\startup_stm32f302x8.s - - stm32f3xx_hal_msp.c @@ -556,23 +509,16 @@ - drv_gpio.c - 1 - ..\libraries\HAL_Drivers\drv_gpio.c - - - - - drv_spi.c - 1 - ..\libraries\HAL_Drivers\drv_spi.c + startup_stm32f302x8.s + 2 + ..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Source\Templates\arm\startup_stm32f302x8.s - drv_pwm.c + drv_gpio.c 1 - ..\libraries\HAL_Drivers\drv_pwm.c + ..\libraries\HAL_Drivers\drv_gpio.c @@ -589,13 +535,6 @@ ..\libraries\HAL_Drivers\drv_common.c - - - drv_hwtimer.c - 1 - ..\libraries\HAL_Drivers\drv_hwtimer.c - - Finsh @@ -623,20 +562,6 @@ Kernel - - - idle.c - 1 - ..\..\..\src\idle.c - - - - - thread.c - 1 - ..\..\..\src\thread.c - - components.c @@ -660,16 +585,9 @@ - clock.c - 1 - ..\..\..\src\clock.c - - - - - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c @@ -681,16 +599,9 @@ - mem.c - 1 - ..\..\..\src\mem.c - - - - - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c @@ -700,13 +611,6 @@ ..\..\..\src\scheduler.c - - - kservice.c - 1 - ..\..\..\src\kservice.c - - ipc.c @@ -714,178 +618,178 @@ ..\..\..\src\ipc.c - - - libc - time.c + object.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\src\object.c - - - Libraries - stm32f3xx_hal_spi.c + mem.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_spi.c + ..\..\..\src\mem.c - stm32f3xx_hal.c + clock.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal.c + ..\..\..\src\clock.c - system_stm32f3xx.c + idle.c 1 - ..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Source\Templates\system_stm32f3xx.c + ..\..\..\src\idle.c - stm32f3xx_hal_rcc.c + timer.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc.c + ..\..\..\src\timer.c + + + libc - stm32f3xx_hal_hrtim.c + time.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_hrtim.c + ..\..\..\components\libc\compilers\common\time.c + + + Libraries - stm32f3xx_hal_uart.c + stm32f3xx_hal_crc.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc.c - stm32f3xx_hal_gpio.c + stm32f3xx_hal_uart.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_gpio.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart.c - stm32f3xx_hal_crc_ex.c + stm32f3xx_hal_usart.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart.c - stm32f3xx_hal_dma.c + stm32f3xx_hal.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_dma.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal.c - stm32f3xx_hal_usart_ex.c + stm32f3xx_hal_uart_ex.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart_ex.c - stm32f3xx_hal_crc.c + stm32f3xx_hal_cec.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cec.c - stm32f3xx_hal_rcc_ex.c + stm32f3xx_hal_pwr_ex.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr_ex.c - stm32f3xx_hal_exti.c + stm32f3xx_hal_gpio.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_exti.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_gpio.c - stm32f3xx_hal_tim.c + stm32f3xx_hal_rcc_ex.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_tim.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc_ex.c - stm32f3xx_hal_tim_ex.c + stm32f3xx_hal_usart_ex.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_tim_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart_ex.c - stm32f3xx_hal_sram.c + system_stm32f3xx.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_sram.c + ..\libraries\STM32F3xx_HAL\CMSIS\Device\ST\STM32F3xx\Source\Templates\system_stm32f3xx.c - stm32f3xx_hal_usart.c + stm32f3xx_hal_cortex.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_usart.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cortex.c - stm32f3xx_hal_uart_ex.c + stm32f3xx_hal_exti.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_uart_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_exti.c - stm32f3xx_hal_cec.c + stm32f3xx_hal_crc_ex.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cec.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_crc_ex.c - stm32f3xx_hal_pwr_ex.c + stm32f3xx_hal_rcc.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_rcc.c - stm32f3xx_hal_cortex.c + stm32f3xx_hal_pwr.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_cortex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr.c - stm32f3xx_hal_spi_ex.c + stm32f3xx_hal_dma.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_spi_ex.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_dma.c - stm32f3xx_hal_pwr.c + stm32f3xx_hal_sram.c 1 - ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_pwr.c + ..\libraries\STM32F3xx_HAL\STM32F3xx_HAL_Driver\Src\stm32f3xx_hal_sram.c diff --git a/bsp/stm32/stm32f302-st-nucleo/rtconfig.h b/bsp/stm32/stm32f302-st-nucleo/rtconfig.h index a552abe2dca..1b031194eed 100644 --- a/bsp/stm32/stm32f302-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f302-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f401-st-nucleo/.config b/bsp/stm32/stm32f401-st-nucleo/.config index da4ed25f5f1..fdd075a6f35 100644 --- a/bsp/stm32/stm32f401-st-nucleo/.config +++ b/bsp/stm32/stm32f401-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f401-st-nucleo/project.ewp b/bsp/stm32/stm32f401-st-nucleo/project.ewp index 489bda4f479..7d3509f7c2e 100644 --- a/bsp/stm32/stm32f401-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f401-st-nucleo/project.ewp @@ -359,6 +359,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1397,6 +1398,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2109,25 +2111,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2166,16 +2168,16 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\device.c @@ -2184,25 +2186,25 @@ $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\mem.c @@ -2265,6 +2267,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f401-st-nucleo/project.uvprojx b/bsp/stm32/stm32f401-st-nucleo/project.uvprojx index 9d0589e3653..8222ddaa600 100644 --- a/bsp/stm32/stm32f401-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f401-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ STM32F401xE, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -397,16 +397,16 @@ - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -440,13 +440,6 @@ ..\..\..\components\drivers\serial\serial.c - - - ringbuffer.c - 1 - ..\..\..\components\drivers\src\ringbuffer.c - - workqueue.c @@ -456,16 +449,16 @@ - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -489,16 +482,16 @@ ..\..\..\components\drivers\src\ringblk_buf.c - - - Drivers - startup_stm32f401xe.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f401xe.s + ringbuffer.c + 1 + ..\..\..\components\drivers\src\ringbuffer.c + + + Drivers stm32f4xx_hal_msp.c @@ -506,6 +499,13 @@ board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + + + startup_stm32f401xe.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f401xe.s + + board.c @@ -563,30 +563,30 @@ Kernel - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c - components.c + mem.c 1 - ..\..\..\src\components.c + ..\..\..\src\mem.c - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c @@ -598,44 +598,44 @@ - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c @@ -647,9 +647,9 @@ - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c diff --git a/bsp/stm32/stm32f401-st-nucleo/rtconfig.h b/bsp/stm32/stm32f401-st-nucleo/rtconfig.h index 348ff040249..6399f393a55 100644 --- a/bsp/stm32/stm32f401-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f401-st-nucleo/rtconfig.h @@ -34,6 +34,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/.config b/bsp/stm32/stm32f405-smdz-breadfruit/.config index 9612535e759..9f59dcb9273 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/.config +++ b/bsp/stm32/stm32f405-smdz-breadfruit/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/project.ewp b/bsp/stm32/stm32f405-smdz-breadfruit/project.ewp index ddbb729b2af..7fb16506de5 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/project.ewp +++ b/bsp/stm32/stm32f405-smdz-breadfruit/project.ewp @@ -355,6 +355,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1388,6 +1389,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2085,10 +2087,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2100,19 +2102,19 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2127,10 +2129,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f405xx.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f405xx.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2157,43 +2159,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\object.c - - - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\thread.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\clock.c - - - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\device.c $PROJ_DIR$\..\..\..\src\irq.c + + $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\clock.c + + + $PROJ_DIR$\..\..\..\src\mem.c @@ -2256,6 +2258,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/project.uvproj b/bsp/stm32/stm32f405-smdz-breadfruit/project.uvproj index aef5bbc50db..d1ed3e15cef 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/project.uvproj +++ b/bsp/stm32/stm32f405-smdz-breadfruit/project.uvproj @@ -359,7 +359,7 @@ STM32F405xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -418,6 +418,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c + + div0.c @@ -427,9 +434,9 @@ - backtrace.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -439,13 +446,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -470,13 +470,6 @@ ..\..\..\components\drivers\src\pipe.c - - - waitqueue.c - 1 - ..\..\..\components\drivers\src\waitqueue.c - - completion.c @@ -486,9 +479,9 @@ - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c @@ -505,6 +498,13 @@ ..\..\..\components\drivers\src\ringblk_buf.c + + + ringbuffer.c + 1 + ..\..\..\components\drivers\src\ringbuffer.c + + dataqueue.c @@ -517,16 +517,16 @@ Drivers - stm32f4xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + startup_stm32f405xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f405xx.s - startup_stm32f405xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f405xx.s + stm32f4xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32f4xx_hal_msp.c @@ -586,93 +586,93 @@ Kernel - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - object.c + mem.c 1 - ..\..\..\src\object.c + ..\..\..\src\mem.c - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/project.uvprojx b/bsp/stm32/stm32f405-smdz-breadfruit/project.uvprojx index d72b6583ab2..46822ee17fe 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/project.uvprojx +++ b/bsp/stm32/stm32f405-smdz-breadfruit/project.uvprojx @@ -361,7 +361,7 @@ STM32F405xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,6 +413,13 @@ CPU + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + showmem.c @@ -429,9 +436,9 @@ - div0.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -441,13 +448,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -467,51 +467,51 @@ - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -519,16 +519,16 @@ Drivers - stm32f4xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + startup_stm32f405xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f405xx.s - startup_stm32f405xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f405xx.s + stm32f4xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32f4xx_hal_msp.c @@ -588,16 +588,23 @@ Kernel - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - mem.c + irq.c 1 - ..\..\..\src\mem.c + ..\..\..\src\irq.c + + + + + components.c + 1 + ..\..\..\src\components.c @@ -609,23 +616,23 @@ - thread.c + kservice.c 1 - ..\..\..\src\thread.c + ..\..\..\src\kservice.c - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c @@ -644,37 +651,30 @@ - device.c - 1 - ..\..\..\src\device.c - - - - - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c - object.c + mem.c 1 - ..\..\..\src\object.c + ..\..\..\src\mem.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - clock.c + thread.c 1 - ..\..\..\src\clock.c + ..\..\..\src\thread.c diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.h b/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.h index 9626774e031..5724ee3fd28 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.h +++ b/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f407-armfly-v5/.config b/bsp/stm32/stm32f407-armfly-v5/.config index 58c7b6c1e18..c4c400de5a4 100644 --- a/bsp/stm32/stm32f407-armfly-v5/.config +++ b/bsp/stm32/stm32f407-armfly-v5/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f407-armfly-v5/project.ewp b/bsp/stm32/stm32f407-armfly-v5/project.ewp index beb39ebedd0..b0bf20768e5 100644 --- a/bsp/stm32/stm32f407-armfly-v5/project.ewp +++ b/bsp/stm32/stm32f407-armfly-v5/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1390,6 +1391,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2077,15 +2079,15 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2102,25 +2104,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2129,10 +2131,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s + $PROJ_DIR$\board\board.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2159,43 +2161,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c @@ -2258,6 +2260,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f407-armfly-v5/project.uvproj b/bsp/stm32/stm32f407-armfly-v5/project.uvproj index 9859932f300..556f57803eb 100644 --- a/bsp/stm32/stm32f407-armfly-v5/project.uvproj +++ b/bsp/stm32/stm32f407-armfly-v5/project.uvproj @@ -374,7 +374,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -427,13 +427,6 @@ CPU - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - backtrace.c @@ -450,9 +443,9 @@ - cpuport.c + showmem.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\libcpu\arm\common\showmem.c @@ -462,6 +455,13 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + DeviceDrivers @@ -481,56 +481,63 @@ - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -545,13 +552,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -602,93 +602,93 @@ Kernel - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - object.c + idle.c 1 - ..\..\..\src\object.c + ..\..\..\src\idle.c - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - irq.c + timer.c 1 - ..\..\..\src\irq.c + ..\..\..\src\timer.c - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c diff --git a/bsp/stm32/stm32f407-armfly-v5/project.uvprojx b/bsp/stm32/stm32f407-armfly-v5/project.uvprojx index 5b955c712b8..c4534f43630 100644 --- a/bsp/stm32/stm32f407-armfly-v5/project.uvprojx +++ b/bsp/stm32/stm32f407-armfly-v5/project.uvprojx @@ -336,7 +336,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -398,16 +398,16 @@ - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -443,9 +443,9 @@ - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c @@ -457,23 +457,23 @@ - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c @@ -485,14 +485,21 @@ - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -507,13 +514,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -564,9 +564,9 @@ Kernel - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c @@ -578,16 +578,16 @@ - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c @@ -599,58 +599,58 @@ - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - clock.c + mem.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mem.c - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c - idle.c + kservice.c 1 - ..\..\..\src\idle.c + ..\..\..\src\kservice.c - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c diff --git a/bsp/stm32/stm32f407-armfly-v5/rtconfig.h b/bsp/stm32/stm32f407-armfly-v5/rtconfig.h index 3f6d02d5c49..35f20f3ea13 100644 --- a/bsp/stm32/stm32f407-armfly-v5/rtconfig.h +++ b/bsp/stm32/stm32f407-armfly-v5/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f407-atk-explorer/.config b/bsp/stm32/stm32f407-atk-explorer/.config index 825c8c9d014..70699e4d800 100644 --- a/bsp/stm32/stm32f407-atk-explorer/.config +++ b/bsp/stm32/stm32f407-atk-explorer/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f407-atk-explorer/project.ewp b/bsp/stm32/stm32f407-atk-explorer/project.ewp index 47edd3e7f11..9ce305de1e8 100644 --- a/bsp/stm32/stm32f407-atk-explorer/project.ewp +++ b/bsp/stm32/stm32f407-atk-explorer/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1390,6 +1391,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2078,13 +2080,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2105,22 +2107,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2129,10 +2131,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s + $PROJ_DIR$\board\board.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2159,43 +2161,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c @@ -2258,6 +2260,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f407-atk-explorer/project.uvproj b/bsp/stm32/stm32f407-atk-explorer/project.uvproj index 1da2cd2e4a0..d402dbdad4f 100644 --- a/bsp/stm32/stm32f407-atk-explorer/project.uvproj +++ b/bsp/stm32/stm32f407-atk-explorer/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -418,13 +418,6 @@ ..\..\..\libcpu\arm\common\backtrace.c - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - div0.c @@ -434,9 +427,9 @@ - cpuport.c + showmem.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\libcpu\arm\common\showmem.c @@ -446,6 +439,13 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + DeviceDrivers @@ -465,30 +465,30 @@ - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c @@ -500,21 +500,28 @@ - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -586,23 +586,23 @@ Kernel - thread.c + kservice.c 1 - ..\..\..\src\thread.c + ..\..\..\src\kservice.c - timer.c + idle.c 1 - ..\..\..\src\timer.c + ..\..\..\src\idle.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c @@ -614,37 +614,37 @@ - mem.c + thread.c 1 - ..\..\..\src\mem.c + ..\..\..\src\thread.c - ipc.c + device.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\device.c - idle.c + scheduler.c 1 - ..\..\..\src\idle.c + ..\..\..\src\scheduler.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c @@ -656,23 +656,23 @@ - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - kservice.c + timer.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\timer.c diff --git a/bsp/stm32/stm32f407-atk-explorer/project.uvprojx b/bsp/stm32/stm32f407-atk-explorer/project.uvprojx index 1db8fe74df7..0eeb9d9fd05 100644 --- a/bsp/stm32/stm32f407-atk-explorer/project.uvprojx +++ b/bsp/stm32/stm32f407-atk-explorer/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,16 +389,16 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -410,16 +410,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -441,37 +441,37 @@ - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c @@ -483,14 +483,21 @@ - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -505,13 +512,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -562,93 +562,93 @@ Kernel - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - mempool.c + mem.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\mem.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - object.c + clock.c 1 - ..\..\..\src\object.c + ..\..\..\src\clock.c - timer.c + kservice.c 1 - ..\..\..\src\timer.c + ..\..\..\src\kservice.c - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - device.c + mempool.c 1 - ..\..\..\src\device.c + ..\..\..\src\mempool.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - thread.c + device.c 1 - ..\..\..\src\thread.c + ..\..\..\src\device.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c diff --git a/bsp/stm32/stm32f407-atk-explorer/rtconfig.h b/bsp/stm32/stm32f407-atk-explorer/rtconfig.h index f62fab4c4f9..e37219da05a 100644 --- a/bsp/stm32/stm32f407-atk-explorer/rtconfig.h +++ b/bsp/stm32/stm32f407-atk-explorer/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f407-robomaster-c/.config b/bsp/stm32/stm32f407-robomaster-c/.config index 2d74ee39f22..ecc360985ea 100644 --- a/bsp/stm32/stm32f407-robomaster-c/.config +++ b/bsp/stm32/stm32f407-robomaster-c/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f407-robomaster-c/project.ewp b/bsp/stm32/stm32f407-robomaster-c/project.ewp index 747e4f30a19..65c6b224435 100644 --- a/bsp/stm32/stm32f407-robomaster-c/project.ewp +++ b/bsp/stm32/stm32f407-robomaster-c/project.ewp @@ -364,6 +364,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1419,6 +1420,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2118,6 +2120,9 @@ CPU + + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c @@ -2125,14 +2130,11 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - DeviceDrivers @@ -2143,25 +2145,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2170,10 +2172,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s + $PROJ_DIR$\board\board.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2200,43 +2202,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\kservice.c $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mempool.c @@ -2299,6 +2301,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f407-robomaster-c/project.uvproj b/bsp/stm32/stm32f407-robomaster-c/project.uvproj index da960ef08a0..1ad01243c9a 100644 --- a/bsp/stm32/stm32f407-robomaster-c/project.uvproj +++ b/bsp/stm32/stm32f407-robomaster-c/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,9 +413,9 @@ CPU - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -427,9 +427,9 @@ - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -465,30 +465,30 @@ - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c @@ -500,21 +500,28 @@ - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -586,93 +586,93 @@ Kernel - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - device.c + irq.c 1 - ..\..\..\src\device.c + ..\..\..\src\irq.c - thread.c + mem.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mem.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - mem.c + mempool.c 1 - ..\..\..\src\mem.c + ..\..\..\src\mempool.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c diff --git a/bsp/stm32/stm32f407-robomaster-c/project.uvprojx b/bsp/stm32/stm32f407-robomaster-c/project.uvprojx index 578b9dc5fd7..00938a2a1dc 100644 --- a/bsp/stm32/stm32f407-robomaster-c/project.uvprojx +++ b/bsp/stm32/stm32f407-robomaster-c/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -395,13 +395,6 @@ ..\..\..\libcpu\arm\common\backtrace.c - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - div0.c @@ -411,9 +404,9 @@ - cpuport.c + showmem.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\libcpu\arm\common\showmem.c @@ -423,6 +416,13 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + DeviceDrivers @@ -442,56 +442,63 @@ - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -506,13 +513,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -563,37 +563,37 @@ Kernel - mem.c + components.c 1 - ..\..\..\src\mem.c + ..\..\..\src\components.c - timer.c + clock.c 1 - ..\..\..\src\timer.c + ..\..\..\src\clock.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c @@ -605,51 +605,51 @@ - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - kservice.c + thread.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\thread.c - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - scheduler.c + timer.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\timer.c - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - device.c + mempool.c 1 - ..\..\..\src\device.c + ..\..\..\src\mempool.c diff --git a/bsp/stm32/stm32f407-robomaster-c/rtconfig.h b/bsp/stm32/stm32f407-robomaster-c/rtconfig.h index c4a045bc6ae..7681583801f 100644 --- a/bsp/stm32/stm32f407-robomaster-c/rtconfig.h +++ b/bsp/stm32/stm32f407-robomaster-c/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f407-st-discovery/.config b/bsp/stm32/stm32f407-st-discovery/.config index 66609152fd5..9d9e640c4c8 100644 --- a/bsp/stm32/stm32f407-st-discovery/.config +++ b/bsp/stm32/stm32f407-st-discovery/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f407-st-discovery/project.ewp b/bsp/stm32/stm32f407-st-discovery/project.ewp index 4c656758c9e..ac43a090ba5 100644 --- a/bsp/stm32/stm32f407-st-discovery/project.ewp +++ b/bsp/stm32/stm32f407-st-discovery/project.ewp @@ -355,6 +355,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1388,6 +1389,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2076,19 +2078,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2100,13 +2102,10 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2115,11 +2114,14 @@ $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + Drivers @@ -2127,10 +2129,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s + $PROJ_DIR$\board\board.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f407xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2157,44 +2159,44 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c - - - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\idle.c $PROJ_DIR$\..\..\..\src\mempool.c - - $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\thread.c + + $PROJ_DIR$\..\..\..\src\object.c + + + $PROJ_DIR$\..\..\..\src\irq.c + libc @@ -2256,6 +2258,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f407-st-discovery/project.uvproj b/bsp/stm32/stm32f407-st-discovery/project.uvproj index 643a5cae79c..a7a86862e73 100644 --- a/bsp/stm32/stm32f407-st-discovery/project.uvproj +++ b/bsp/stm32/stm32f407-st-discovery/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -434,16 +434,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -465,9 +465,9 @@ - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -479,30 +479,30 @@ - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -515,6 +515,13 @@ Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -593,16 +593,16 @@ - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - device.c + mempool.c 1 - ..\..\..\src\device.c + ..\..\..\src\mempool.c @@ -614,44 +614,44 @@ - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - kservice.c + thread.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\thread.c - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c @@ -663,9 +663,9 @@ - idle.c + mem.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mem.c diff --git a/bsp/stm32/stm32f407-st-discovery/project.uvprojx b/bsp/stm32/stm32f407-st-discovery/project.uvprojx index 20bae90ee8a..4ebe875afea 100644 --- a/bsp/stm32/stm32f407-st-discovery/project.uvprojx +++ b/bsp/stm32/stm32f407-st-discovery/project.uvprojx @@ -332,7 +332,7 @@ USE_HAL_DRIVER, STM32F407xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -408,16 +408,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -439,16 +439,16 @@ - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c @@ -467,9 +467,9 @@ - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -481,14 +481,21 @@ - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c Drivers + + + startup_stm32f407xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + + stm32f4xx_hal_msp.c @@ -503,13 +510,6 @@ board\board.c - - - startup_stm32f407xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s - - drv_gpio.c @@ -560,23 +560,23 @@ Kernel - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c @@ -588,9 +588,9 @@ - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c @@ -602,30 +602,30 @@ - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - thread.c + components.c 1 - ..\..\..\src\thread.c + ..\..\..\src\components.c @@ -637,16 +637,16 @@ - object.c + mem.c 1 - ..\..\..\src\object.c + ..\..\..\src\mem.c - mempool.c + ipc.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32f407-st-discovery/rtconfig.h b/bsp/stm32/stm32f407-st-discovery/rtconfig.h index 3b5b5cb3b3b..75c4fface76 100644 --- a/bsp/stm32/stm32f407-st-discovery/rtconfig.h +++ b/bsp/stm32/stm32f407-st-discovery/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f410-st-nucleo/.config b/bsp/stm32/stm32f410-st-nucleo/.config index a4a2e0af5a5..87894c19815 100644 --- a/bsp/stm32/stm32f410-st-nucleo/.config +++ b/bsp/stm32/stm32f410-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f410-st-nucleo/project.ewp b/bsp/stm32/stm32f410-st-nucleo/project.ewp index d4ae458ce17..3de21ec64bb 100644 --- a/bsp/stm32/stm32f410-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f410-st-nucleo/project.ewp @@ -355,6 +355,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1389,6 +1390,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2076,9 +2078,6 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c @@ -2086,11 +2085,14 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + DeviceDrivers @@ -2101,25 +2103,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2158,43 +2160,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2257,6 +2259,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f410-st-nucleo/project.uvprojx b/bsp/stm32/stm32f410-st-nucleo/project.uvprojx index f4fa514742f..48d6943b2da 100644 --- a/bsp/stm32/stm32f410-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f410-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ STM32F410Rx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,16 +390,16 @@ CPU - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -411,16 +411,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -442,9 +442,9 @@ - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -456,16 +456,16 @@ - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c @@ -477,16 +477,16 @@ - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c @@ -501,16 +501,16 @@ - startup_stm32f410rx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f410rx.s + board.c + 1 + board\board.c - board.c - 1 - board\board.c + startup_stm32f410rx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f410rx.s @@ -563,79 +563,79 @@ Kernel - timer.c + kservice.c 1 - ..\..\..\src\timer.c + ..\..\..\src\kservice.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - mem.c + clock.c 1 - ..\..\..\src\mem.c + ..\..\..\src\clock.c - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c @@ -647,9 +647,9 @@ - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c diff --git a/bsp/stm32/stm32f410-st-nucleo/rtconfig.h b/bsp/stm32/stm32f410-st-nucleo/rtconfig.h index 4ef23774e32..2935cdc6262 100644 --- a/bsp/stm32/stm32f410-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f410-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f411-atk-nano/.config b/bsp/stm32/stm32f411-atk-nano/.config index ff3599277ea..fa3e4d5e856 100644 --- a/bsp/stm32/stm32f411-atk-nano/.config +++ b/bsp/stm32/stm32f411-atk-nano/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -198,10 +201,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -366,7 +376,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -388,10 +398,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -406,13 +423,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -470,9 +480,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -482,7 +499,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -497,6 +513,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -522,8 +539,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -531,6 +546,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f411-atk-nano/project.ewp b/bsp/stm32/stm32f411-atk-nano/project.ewp index 4dddb22b4b2..d0c60d1d0c9 100644 --- a/bsp/stm32/stm32f411-atk-nano/project.ewp +++ b/bsp/stm32/stm32f411-atk-nano/project.ewp @@ -357,9 +357,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\components\drivers\spi @@ -1395,9 +1395,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\components\drivers\spi @@ -2086,19 +2086,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2137,25 +2137,25 @@ $PROJ_DIR$\..\..\..\components\drivers\spi\spi_dev.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c @@ -2164,10 +2164,10 @@ Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f411xe.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f411xe.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c @@ -2203,37 +2203,37 @@ $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\kservice.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\clock.c $PROJ_DIR$\..\..\..\src\mempool.c @@ -2248,37 +2248,31 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c @@ -2359,6 +2353,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f411-atk-nano/project.uvprojx b/bsp/stm32/stm32f411-atk-nano/project.uvprojx index 27b8587a62f..ce301964876 100644 --- a/bsp/stm32/stm32f411-atk-nano/project.uvprojx +++ b/bsp/stm32/stm32f411-atk-nano/project.uvprojx @@ -333,7 +333,7 @@ USE_HAL_DRIVER, STM32F411xE, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\spi\sfud\inc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\spi\sfud\inc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,23 +388,23 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -503,51 +503,51 @@ - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c @@ -572,6 +572,13 @@ Drivers + + + startup_stm32f411xe.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s + + stm32f4xx_hal_msp.c @@ -586,13 +593,6 @@ board\board.c - - - startup_stm32f411xe.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s - - drv_gpio.c @@ -650,58 +650,58 @@ Kernel - mempool.c + components.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\components.c - idle.c + kservice.c 1 - ..\..\..\src\idle.c + ..\..\..\src\kservice.c - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - thread.c + scheduler.c 1 - ..\..\..\src\thread.c + ..\..\..\src\scheduler.c - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - timer.c + ipc.c 1 - ..\..\..\src\timer.c + ..\..\..\src\ipc.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - mem.c + mempool.c 1 - ..\..\..\src\mem.c + ..\..\..\src\mempool.c @@ -713,30 +713,30 @@ - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - object.c + timer.c 1 - ..\..\..\src\object.c + ..\..\..\src\timer.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c @@ -744,37 +744,37 @@ libc - libc.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - mem_std.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c diff --git a/bsp/stm32/stm32f411-atk-nano/rtconfig.h b/bsp/stm32/stm32f411-atk-nano/rtconfig.h index b65991a786f..351c2b697b7 100644 --- a/bsp/stm32/stm32f411-atk-nano/rtconfig.h +++ b/bsp/stm32/stm32f411-atk-nano/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -116,6 +116,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -201,6 +208,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f411-st-nucleo/.config b/bsp/stm32/stm32f411-st-nucleo/.config index 08dd4c00e84..f902a9c1508 100644 --- a/bsp/stm32/stm32f411-st-nucleo/.config +++ b/bsp/stm32/stm32f411-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f411-st-nucleo/project.ewp b/bsp/stm32/stm32f411-st-nucleo/project.ewp index 752de1cb2e2..358321cfba8 100644 --- a/bsp/stm32/stm32f411-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f411-st-nucleo/project.ewp @@ -355,6 +355,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1389,6 +1390,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2086,10 +2088,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2101,34 +2103,34 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f411xe.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f411xe.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c @@ -2158,43 +2160,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\device.c $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\thread.c - - - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\idle.c $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\kservice.c + + + $PROJ_DIR$\..\..\..\src\mempool.c @@ -2257,6 +2259,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f411-st-nucleo/project.uvprojx b/bsp/stm32/stm32f411-st-nucleo/project.uvprojx index 0e60cb9e39b..0287e0a9461 100644 --- a/bsp/stm32/stm32f411-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f411-st-nucleo/project.uvprojx @@ -333,7 +333,7 @@ USE_HAL_DRIVER, STM32F411xE, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,23 +388,23 @@ CPU - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -440,56 +440,63 @@ - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c Drivers + + + startup_stm32f411xe.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s + + stm32f4xx_hal_msp.c @@ -504,13 +511,6 @@ board\board.c - - - startup_stm32f411xe.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s - - drv_gpio.c @@ -561,93 +561,93 @@ Kernel - device.c + object.c 1 - ..\..\..\src\device.c + ..\..\..\src\object.c - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - mempool.c + components.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\components.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - ipc.c + mempool.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mempool.c diff --git a/bsp/stm32/stm32f411-st-nucleo/rtconfig.h b/bsp/stm32/stm32f411-st-nucleo/rtconfig.h index 5908b8affc0..68ebae1f672 100644 --- a/bsp/stm32/stm32f411-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f411-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f411-weact-MiniF4/.config b/bsp/stm32/stm32f411-weact-MiniF4/.config index d0d394f478f..2ec1e77423f 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/.config +++ b/bsp/stm32/stm32f411-weact-MiniF4/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f411-weact-MiniF4/project.ewp b/bsp/stm32/stm32f411-weact-MiniF4/project.ewp index bc67b01548a..9d7c4f62cc3 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/project.ewp +++ b/bsp/stm32/stm32f411-weact-MiniF4/project.ewp @@ -365,6 +365,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1437,6 +1438,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2153,10 +2155,10 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c @@ -2177,7 +2179,7 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2189,22 +2191,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f411xe.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f411xe.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c @@ -2234,43 +2236,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\components.c @@ -2333,6 +2335,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx b/bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx index 207df30a20a..219190ef691 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx +++ b/bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, STM32F411xE, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,16 +389,16 @@ CPU - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -448,49 +448,56 @@ - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c Drivers + + + startup_stm32f411xe.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s + + stm32f4xx_hal_msp.c @@ -505,13 +512,6 @@ board\board.c - - - startup_stm32f411xe.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s - - drv_gpio.c @@ -562,23 +562,23 @@ Kernel - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c @@ -590,30 +590,30 @@ - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - device.c + object.c 1 - ..\..\..\src\device.c + ..\..\..\src\object.c - kservice.c + components.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\components.c @@ -625,30 +625,30 @@ - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h index 2793c55696c..a1246e6ce84 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h +++ b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f412-st-nucleo/.config b/bsp/stm32/stm32f412-st-nucleo/.config index d3b7acae78b..748be21f7bf 100644 --- a/bsp/stm32/stm32f412-st-nucleo/.config +++ b/bsp/stm32/stm32f412-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f412-st-nucleo/project.ewp b/bsp/stm32/stm32f412-st-nucleo/project.ewp index af093ed25ce..7c9ad25e42c 100644 --- a/bsp/stm32/stm32f412-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f412-st-nucleo/project.ewp @@ -364,6 +364,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1419,6 +1420,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2119,13 +2121,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2143,38 +2145,38 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c Drivers - - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f412zx.s - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c + + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f412zx.s + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2200,43 +2202,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\irq.c @@ -2299,6 +2301,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f412-st-nucleo/project.uvprojx b/bsp/stm32/stm32f412-st-nucleo/project.uvprojx index 6dd97cfdb2a..25b32131cb5 100644 --- a/bsp/stm32/stm32f412-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f412-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32F412Zx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -397,16 +397,16 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -442,9 +442,9 @@ - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c @@ -456,37 +456,37 @@ - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -501,16 +501,16 @@ - board.c - 1 - board\board.c + startup_stm32f412zx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f412zx.s - startup_stm32f412zx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f412zx.s + board.c + 1 + board\board.c @@ -563,72 +563,72 @@ Kernel - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - mem.c + clock.c 1 - ..\..\..\src\mem.c + ..\..\..\src\clock.c - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - timer.c + kservice.c 1 - ..\..\..\src\timer.c + ..\..\..\src\kservice.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c @@ -640,9 +640,9 @@ - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c diff --git a/bsp/stm32/stm32f412-st-nucleo/rtconfig.h b/bsp/stm32/stm32f412-st-nucleo/rtconfig.h index 0a691fd7008..c700c0f95be 100644 --- a/bsp/stm32/stm32f412-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f412-st-nucleo/rtconfig.h @@ -34,6 +34,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -104,6 +104,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -189,6 +196,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f413-st-nucleo/.config b/bsp/stm32/stm32f413-st-nucleo/.config index fd1d2e02a30..bfbc329af76 100644 --- a/bsp/stm32/stm32f413-st-nucleo/.config +++ b/bsp/stm32/stm32f413-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f413-st-nucleo/project.ewp b/bsp/stm32/stm32f413-st-nucleo/project.ewp index 70cf3fa24de..a1b88560991 100644 --- a/bsp/stm32/stm32f413-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f413-st-nucleo/project.ewp @@ -355,6 +355,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1388,6 +1389,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2079,10 +2081,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2103,22 +2105,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c @@ -2127,10 +2129,10 @@ Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f413xx.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f413xx.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c @@ -2160,43 +2162,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\device.c $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2265,6 +2267,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f413-st-nucleo/project.uvproj b/bsp/stm32/stm32f413-st-nucleo/project.uvproj index 99600200154..58d9e146622 100644 --- a/bsp/stm32/stm32f413-st-nucleo/project.uvproj +++ b/bsp/stm32/stm32f413-st-nucleo/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, STM32F413xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -418,6 +418,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + backtrace.c @@ -427,9 +434,9 @@ - div0.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -439,13 +446,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -465,51 +465,51 @@ - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -593,9 +593,9 @@ Kernel - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c @@ -607,9 +607,9 @@ - object.c + ipc.c 1 - ..\..\..\src\object.c + ..\..\..\src\ipc.c @@ -621,65 +621,65 @@ - kservice.c + thread.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\thread.c - ipc.c + components.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\components.c - scheduler.c + object.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\object.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - thread.c + device.c 1 - ..\..\..\src\thread.c + ..\..\..\src\device.c - timer.c + idle.c 1 - ..\..\..\src\timer.c + ..\..\..\src\idle.c - device.c + scheduler.c 1 - ..\..\..\src\device.c + ..\..\..\src\scheduler.c - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c diff --git a/bsp/stm32/stm32f413-st-nucleo/project.uvprojx b/bsp/stm32/stm32f413-st-nucleo/project.uvprojx index c04d9ef97dc..eba0a18a9a2 100644 --- a/bsp/stm32/stm32f413-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f413-st-nucleo/project.uvprojx @@ -336,7 +336,7 @@ USE_HAL_DRIVER, STM32F413xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -391,23 +391,23 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -443,16 +443,16 @@ - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -464,30 +464,30 @@ - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -571,93 +571,93 @@ Kernel - mem.c + scheduler.c 1 - ..\..\..\src\mem.c + ..\..\..\src\scheduler.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - components.c + ipc.c 1 - ..\..\..\src\components.c + ..\..\..\src\ipc.c - thread.c + device.c 1 - ..\..\..\src\thread.c + ..\..\..\src\device.c - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - irq.c + timer.c 1 - ..\..\..\src\irq.c + ..\..\..\src\timer.c - ipc.c + irq.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\irq.c - idle.c + mem.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mem.c - kservice.c + components.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\components.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c - device.c + idle.c 1 - ..\..\..\src\device.c + ..\..\..\src\idle.c diff --git a/bsp/stm32/stm32f413-st-nucleo/rtconfig.h b/bsp/stm32/stm32f413-st-nucleo/rtconfig.h index 062a09dd400..616d73eadb5 100644 --- a/bsp/stm32/stm32f413-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f413-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f427-robomaster-a/.config b/bsp/stm32/stm32f427-robomaster-a/.config index 6190ece3d58..16f520f0f68 100644 --- a/bsp/stm32/stm32f427-robomaster-a/.config +++ b/bsp/stm32/stm32f427-robomaster-a/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f427-robomaster-a/project.ewp b/bsp/stm32/stm32f427-robomaster-a/project.ewp index 8e8e206dd37..81764f47ec7 100644 --- a/bsp/stm32/stm32f427-robomaster-a/project.ewp +++ b/bsp/stm32/stm32f427-robomaster-a/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1390,6 +1391,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2087,10 +2089,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2102,22 +2104,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c @@ -2126,10 +2128,10 @@ Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f427xx.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f427xx.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c @@ -2159,44 +2161,44 @@ Kernel - $PROJ_DIR$\..\..\..\src\device.c - - - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\idle.c $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\thread.c + + $PROJ_DIR$\..\..\..\src\clock.c + libc @@ -2258,6 +2260,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f427-robomaster-a/project.uvproj b/bsp/stm32/stm32f427-robomaster-a/project.uvproj index 9a9c189aac9..b5b006c5283 100644 --- a/bsp/stm32/stm32f427-robomaster-a/project.uvproj +++ b/bsp/stm32/stm32f427-robomaster-a/project.uvproj @@ -359,7 +359,7 @@ STM32F427xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -434,16 +434,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -465,16 +465,16 @@ - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -486,9 +486,9 @@ - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -500,28 +500,21 @@ - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c Drivers - - - startup_stm32f427xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f427xx.s - - stm32f4xx_hal_msp.c @@ -536,6 +529,13 @@ board\board.c + + + startup_stm32f427xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f427xx.s + + drv_gpio.c @@ -584,13 +584,6 @@ Kernel - - - kservice.c - 1 - ..\..\..\src\kservice.c - - components.c @@ -607,30 +600,30 @@ - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - scheduler.c + object.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\object.c - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - object.c + mem.c 1 - ..\..\..\src\object.c + ..\..\..\src\mem.c @@ -642,37 +635,44 @@ - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c - mem.c + irq.c 1 - ..\..\..\src\mem.c + ..\..\..\src\irq.c - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c - idle.c + clock.c 1 - ..\..\..\src\idle.c + ..\..\..\src\clock.c + + + + + thread.c + 1 + ..\..\..\src\thread.c diff --git a/bsp/stm32/stm32f427-robomaster-a/project.uvprojx b/bsp/stm32/stm32f427-robomaster-a/project.uvprojx index 21dbfd49d75..a7ab07629a5 100644 --- a/bsp/stm32/stm32f427-robomaster-a/project.uvprojx +++ b/bsp/stm32/stm32f427-robomaster-a/project.uvprojx @@ -332,7 +332,7 @@ STM32F427xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -392,6 +392,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + backtrace.c @@ -401,9 +408,9 @@ - div0.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -413,13 +420,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -439,23 +439,23 @@ - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c @@ -467,16 +467,16 @@ - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c @@ -489,13 +489,6 @@ Drivers - - - startup_stm32f427xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f427xx.s - - stm32f4xx_hal_msp.c @@ -510,6 +503,13 @@ board\board.c + + + startup_stm32f427xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f427xx.s + + drv_gpio.c @@ -560,93 +560,93 @@ Kernel - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - thread.c + object.c 1 - ..\..\..\src\thread.c + ..\..\..\src\object.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - mem.c + thread.c 1 - ..\..\..\src\mem.c + ..\..\..\src\thread.c - idle.c + kservice.c 1 - ..\..\..\src\idle.c + ..\..\..\src\kservice.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c - components.c + mem.c 1 - ..\..\..\src\components.c + ..\..\..\src\mem.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - timer.c + device.c 1 - ..\..\..\src\timer.c + ..\..\..\src\device.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32f427-robomaster-a/rtconfig.h b/bsp/stm32/stm32f427-robomaster-a/rtconfig.h index 2afc7f24fc1..4314b72d92a 100644 --- a/bsp/stm32/stm32f427-robomaster-a/rtconfig.h +++ b/bsp/stm32/stm32f427-robomaster-a/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f429-armfly-v6/.config b/bsp/stm32/stm32f429-armfly-v6/.config index d422c6c08a4..97d00eb1d6a 100644 --- a/bsp/stm32/stm32f429-armfly-v6/.config +++ b/bsp/stm32/stm32f429-armfly-v6/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -183,10 +187,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +362,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +384,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +409,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +466,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +485,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +499,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -507,8 +525,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +532,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f429-armfly-v6/project.ewp b/bsp/stm32/stm32f429-armfly-v6/project.ewp index 588bc5d766f..31f7b30687d 100644 --- a/bsp/stm32/stm32f429-armfly-v6/project.ewp +++ b/bsp/stm32/stm32f429-armfly-v6/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1390,6 +1391,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2081,10 +2083,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2102,41 +2104,41 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c Drivers - - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\board\ports\drv_ext_io.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f429xx.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c $PROJ_DIR$\board\board.c + + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f429xx.s + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2162,40 +2164,40 @@ Kernel - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\idle.c @@ -2270,6 +2272,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f429-armfly-v6/project.uvproj b/bsp/stm32/stm32f429-armfly-v6/project.uvproj index a0b161e4afa..5aaf8e1ad4e 100644 --- a/bsp/stm32/stm32f429-armfly-v6/project.uvproj +++ b/bsp/stm32/stm32f429-armfly-v6/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F429xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -411,6 +411,13 @@ CPU + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + showmem.c @@ -427,9 +434,9 @@ - div0.c - 1 - ..\..\..\libcpu\arm\common\div0.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -439,13 +446,6 @@ ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - DeviceDrivers @@ -463,6 +463,13 @@ ..\..\..\components\drivers\serial\serial.c + + + pipe.c + 1 + ..\..\..\components\drivers\src\pipe.c + + waitqueue.c @@ -479,9 +486,9 @@ - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c @@ -493,16 +500,9 @@ - pipe.c - 1 - ..\..\..\components\drivers\src\pipe.c - - - - - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c @@ -515,6 +515,13 @@ Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -536,13 +543,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -593,9 +593,9 @@ Kernel - components.c + memheap.c 1 - ..\..\..\src\components.c + ..\..\..\src\memheap.c @@ -607,79 +607,79 @@ - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c - memheap.c + thread.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\thread.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c - thread.c + components.c 1 - ..\..\..\src\thread.c + ..\..\..\src\components.c - scheduler.c + timer.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\timer.c - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c diff --git a/bsp/stm32/stm32f429-armfly-v6/project.uvprojx b/bsp/stm32/stm32f429-armfly-v6/project.uvprojx index 0ee9ff9adb5..830818c1c30 100644 --- a/bsp/stm32/stm32f429-armfly-v6/project.uvprojx +++ b/bsp/stm32/stm32f429-armfly-v6/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F429xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,23 +389,23 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -448,9 +448,9 @@ - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -462,35 +462,42 @@ - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -512,13 +519,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -569,93 +569,93 @@ Kernel - irq.c + device.c 1 - ..\..\..\src\irq.c + ..\..\..\src\device.c - device.c + object.c 1 - ..\..\..\src\device.c + ..\..\..\src\object.c - object.c + mempool.c 1 - ..\..\..\src\object.c + ..\..\..\src\mempool.c - timer.c + clock.c 1 - ..\..\..\src\timer.c + ..\..\..\src\clock.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c - components.c + ipc.c 1 - ..\..\..\src\components.c + ..\..\..\src\ipc.c - memheap.c + thread.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\thread.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - clock.c + timer.c 1 - ..\..\..\src\clock.c + ..\..\..\src\timer.c - scheduler.c + irq.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\irq.c - thread.c + memheap.c 1 - ..\..\..\src\thread.c + ..\..\..\src\memheap.c diff --git a/bsp/stm32/stm32f429-armfly-v6/rtconfig.h b/bsp/stm32/stm32f429-armfly-v6/rtconfig.h index 224bf211848..0904ea9eb56 100644 --- a/bsp/stm32/stm32f429-armfly-v6/rtconfig.h +++ b/bsp/stm32/stm32f429-armfly-v6/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -108,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f429-atk-apollo/.config b/bsp/stm32/stm32f429-atk-apollo/.config index b69e63bb6c5..2d0c15ece5e 100644 --- a/bsp/stm32/stm32f429-atk-apollo/.config +++ b/bsp/stm32/stm32f429-atk-apollo/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -183,10 +187,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +362,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +384,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +409,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +466,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +485,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +499,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -507,8 +525,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +532,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f429-atk-apollo/project.ewp b/bsp/stm32/stm32f429-atk-apollo/project.ewp index b2ec0e37674..43c4f0c0e18 100644 --- a/bsp/stm32/stm32f429-atk-apollo/project.ewp +++ b/bsp/stm32/stm32f429-atk-apollo/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1391,6 +1392,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2079,13 +2081,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2103,25 +2105,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -2130,10 +2132,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f429xx.s + $PROJ_DIR$\board\board.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f429xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2160,40 +2162,40 @@ Kernel - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\thread.c $PROJ_DIR$\..\..\..\src\object.c - - $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\ipc.c + + + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\irq.c @@ -2259,6 +2261,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f429-atk-apollo/project.uvproj b/bsp/stm32/stm32f429-atk-apollo/project.uvproj index 741e2e0a6f2..7d2e3c42b5e 100644 --- a/bsp/stm32/stm32f429-atk-apollo/project.uvproj +++ b/bsp/stm32/stm32f429-atk-apollo/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F429xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -418,6 +418,13 @@ ..\..\..\libcpu\arm\common\backtrace.c + + + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c + + div0.c @@ -427,9 +434,9 @@ - showmem.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -439,13 +446,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -465,56 +465,63 @@ - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -593,86 +593,86 @@ - mempool.c + idle.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\idle.c - kservice.c + timer.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\timer.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - thread.c + clock.c 1 - ..\..\..\src\thread.c + ..\..\..\src\clock.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - object.c + ipc.c 1 - ..\..\..\src\object.c + ..\..\..\src\ipc.c - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - memheap.c + device.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\device.c - ipc.c + memheap.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\memheap.c diff --git a/bsp/stm32/stm32f429-atk-apollo/project.uvprojx b/bsp/stm32/stm32f429-atk-apollo/project.uvprojx index 4c02890c829..0dbd294a1c3 100644 --- a/bsp/stm32/stm32f429-atk-apollo/project.uvprojx +++ b/bsp/stm32/stm32f429-atk-apollo/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F429xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -394,6 +394,13 @@ ..\..\..\libcpu\arm\common\backtrace.c + + + div0.c + 1 + ..\..\..\libcpu\arm\common\div0.c + + showmem.c @@ -403,9 +410,9 @@ - div0.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -415,13 +422,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -441,37 +441,37 @@ - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -483,14 +483,21 @@ - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -505,13 +512,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -562,9 +562,9 @@ Kernel - ipc.c + components.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\components.c @@ -576,72 +576,72 @@ - clock.c + kservice.c 1 - ..\..\..\src\clock.c + ..\..\..\src\kservice.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - components.c + memheap.c 1 - ..\..\..\src\components.c + ..\..\..\src\memheap.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - memheap.c + clock.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\clock.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c diff --git a/bsp/stm32/stm32f429-atk-apollo/rtconfig.h b/bsp/stm32/stm32f429-atk-apollo/rtconfig.h index fe254f755d2..6213e371ecc 100644 --- a/bsp/stm32/stm32f429-atk-apollo/rtconfig.h +++ b/bsp/stm32/stm32f429-atk-apollo/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -108,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f429-fire-challenger/.config b/bsp/stm32/stm32f429-fire-challenger/.config index a6f58eed614..690957baf99 100644 --- a/bsp/stm32/stm32f429-fire-challenger/.config +++ b/bsp/stm32/stm32f429-fire-challenger/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -183,10 +187,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +362,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +384,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +409,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +466,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +485,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +499,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -507,8 +525,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +532,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f429-fire-challenger/project.ewp b/bsp/stm32/stm32f429-fire-challenger/project.ewp index 37e4a28deaf..0eed370dc12 100644 --- a/bsp/stm32/stm32f429-fire-challenger/project.ewp +++ b/bsp/stm32/stm32f429-fire-challenger/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1391,6 +1392,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2079,10 +2081,10 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c @@ -2102,24 +2104,24 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2130,10 +2132,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f429xx.s + $PROJ_DIR$\board\board.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f429xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2163,40 +2165,40 @@ $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\thread.c $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\kservice.c @@ -2259,6 +2261,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f429-fire-challenger/project.uvproj b/bsp/stm32/stm32f429-fire-challenger/project.uvproj index e9b9c90fd1b..1b427c5050f 100644 --- a/bsp/stm32/stm32f429-fire-challenger/project.uvproj +++ b/bsp/stm32/stm32f429-fire-challenger/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F429xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -413,23 +413,23 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -463,13 +463,6 @@ ..\..\..\components\drivers\serial\serial.c - - - workqueue.c - 1 - ..\..\..\components\drivers\src\workqueue.c - - waitqueue.c @@ -479,9 +472,9 @@ - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c @@ -500,21 +493,35 @@ - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c + + + + + pipe.c + 1 + ..\..\..\components\drivers\src\pipe.c Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -529,13 +536,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -586,30 +586,30 @@ Kernel - components.c + kservice.c 1 - ..\..\..\src\components.c + ..\..\..\src\kservice.c - ipc.c + memheap.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\memheap.c - timer.c + idle.c 1 - ..\..\..\src\timer.c + ..\..\..\src\idle.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c @@ -621,58 +621,58 @@ - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - memheap.c + mempool.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\mempool.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c - scheduler.c + timer.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\timer.c - clock.c + thread.c 1 - ..\..\..\src\clock.c + ..\..\..\src\thread.c - object.c + clock.c 1 - ..\..\..\src\object.c + ..\..\..\src\clock.c - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c - thread.c + components.c 1 - ..\..\..\src\thread.c + ..\..\..\src\components.c diff --git a/bsp/stm32/stm32f429-fire-challenger/project.uvprojx b/bsp/stm32/stm32f429-fire-challenger/project.uvprojx index 9d5047161e5..ebfa50e26c0 100644 --- a/bsp/stm32/stm32f429-fire-challenger/project.uvprojx +++ b/bsp/stm32/stm32f429-fire-challenger/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32F429xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,9 +389,9 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -403,9 +403,9 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -441,56 +441,63 @@ - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -505,13 +512,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -562,16 +562,16 @@ Kernel - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - thread.c + memheap.c 1 - ..\..\..\src\thread.c + ..\..\..\src\memheap.c @@ -583,9 +583,9 @@ - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c @@ -597,58 +597,58 @@ - ipc.c + thread.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\thread.c - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - memheap.c + idle.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\idle.c - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32f429-fire-challenger/rtconfig.h b/bsp/stm32/stm32f429-fire-challenger/rtconfig.h index fe254f755d2..6213e371ecc 100644 --- a/bsp/stm32/stm32f429-fire-challenger/rtconfig.h +++ b/bsp/stm32/stm32f429-fire-challenger/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -108,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f429-st-disco/.config b/bsp/stm32/stm32f429-st-disco/.config index 8ccb1102152..abebb7b980d 100644 --- a/bsp/stm32/stm32f429-st-disco/.config +++ b/bsp/stm32/stm32f429-st-disco/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_SIGNALS=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -141,7 +146,6 @@ CONFIG_RT_USING_DFS_DEVFS=y # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -203,10 +207,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -371,7 +382,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -393,10 +404,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -411,13 +429,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -475,9 +486,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -487,7 +505,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -502,6 +519,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -527,8 +545,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -536,6 +552,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f429-st-disco/project.uvproj b/bsp/stm32/stm32f429-st-disco/project.uvproj index ca8d028a90b..49196493903 100644 --- a/bsp/stm32/stm32f429-st-disco/project.uvproj +++ b/bsp/stm32/stm32f429-st-disco/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F429xx - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -420,23 +420,23 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -507,51 +507,51 @@ - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c @@ -569,6 +569,13 @@ Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -590,13 +597,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -651,16 +651,9 @@ - dfs_poll.c - 1 - ..\..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\..\components\dfs\src\dfs_file.c + ..\..\..\components\dfs\src\dfs_fs.c @@ -672,16 +665,9 @@ - dfs_fs.c - 1 - ..\..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\..\components\dfs\src\dfs_select.c + ..\..\..\components\dfs\src\dfs_file.c @@ -734,44 +720,37 @@ - mempool.c - 1 - ..\..\..\src\mempool.c - - - - - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - memheap.c + signal.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\signal.c - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - signal.c + clock.c 1 - ..\..\..\src\signal.c + ..\..\..\src\clock.c - object.c + mempool.c 1 - ..\..\..\src\object.c + ..\..\..\src\mempool.c @@ -783,37 +762,37 @@ - device.c + irq.c 1 - ..\..\..\src\device.c + ..\..\..\src\irq.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - clock.c + memheap.c 1 - ..\..\..\src\clock.c + ..\..\..\src\memheap.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c - thread.c + kservice.c 1 - ..\..\..\src\thread.c + ..\..\..\src\kservice.c @@ -823,21 +802,21 @@ ..\..\..\src\scheduler.c - - - libc - stdio.c + timer.c 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c + ..\..\..\src\timer.c + + + libc - libc.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -854,13 +833,6 @@ ..\..\..\components\libc\compilers\armlibc\mem_std.c - - - time.c - 1 - ..\..\..\components\libc\compilers\common\time.c - - stdlib.c @@ -870,16 +842,9 @@ - unistd.c - 1 - ..\..\..\components\libc\compilers\common\unistd.c - - - - - delay.c + time.c 1 - ..\..\..\components\libc\compilers\common\delay.c + ..\..\..\components\libc\compilers\common\time.c diff --git a/bsp/stm32/stm32f429-st-disco/project.uvprojx b/bsp/stm32/stm32f429-st-disco/project.uvprojx index 8a088030543..b677c8e161c 100644 --- a/bsp/stm32/stm32f429-st-disco/project.uvprojx +++ b/bsp/stm32/stm32f429-st-disco/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F429xx - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -397,23 +397,23 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -482,6 +482,13 @@ ..\..\..\components\drivers\spi\spi_dev.c + + + ringbuffer.c + 1 + ..\..\..\components\drivers\src\ringbuffer.c + + workqueue.c @@ -491,16 +498,16 @@ - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -512,9 +519,9 @@ - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c @@ -524,13 +531,6 @@ ..\..\..\components\drivers\src\ringblk_buf.c - - - completion.c - 1 - ..\..\..\components\drivers\src\completion.c - - @@ -546,6 +546,13 @@ Drivers + + + startup_stm32f429xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s + + stm32f4xx_hal_msp.c @@ -567,13 +574,6 @@ board\board.c - - - startup_stm32f429xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f429xx.s - - drv_gpio.c @@ -628,16 +628,9 @@ - dfs_poll.c - 1 - ..\..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\..\components\dfs\src\dfs_file.c + ..\..\..\components\dfs\src\dfs_fs.c @@ -649,16 +642,9 @@ - dfs_fs.c - 1 - ..\..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\..\components\dfs\src\dfs_select.c + ..\..\..\components\dfs\src\dfs_file.c @@ -704,65 +690,65 @@ Kernel - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c - signal.c + irq.c 1 - ..\..\..\src\signal.c + ..\..\..\src\irq.c - ipc.c + components.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\components.c - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - memheap.c + timer.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\timer.c - mempool.c + clock.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\clock.c - kservice.c + thread.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\thread.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c @@ -774,30 +760,30 @@ - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - object.c + memheap.c 1 - ..\..\..\src\object.c + ..\..\..\src\memheap.c - clock.c + signal.c 1 - ..\..\..\src\clock.c + ..\..\..\src\signal.c @@ -805,16 +791,16 @@ libc - stdio.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - libc.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c @@ -826,9 +812,9 @@ - mem_std.c + time.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\common\time.c @@ -838,27 +824,6 @@ ..\..\..\components\libc\compilers\common\stdlib.c - - - delay.c - 1 - ..\..\..\components\libc\compilers\common\delay.c - - - - - unistd.c - 1 - ..\..\..\components\libc\compilers\common\unistd.c - - - - - time.c - 1 - ..\..\..\components\libc\compilers\common\time.c - - Libraries diff --git a/bsp/stm32/stm32f429-st-disco/rtconfig.h b/bsp/stm32/stm32f429-st-disco/rtconfig.h index 97560a00d5f..3d129162d6c 100644 --- a/bsp/stm32/stm32f429-st-disco/rtconfig.h +++ b/bsp/stm32/stm32f429-st-disco/rtconfig.h @@ -36,8 +36,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -97,7 +98,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -120,6 +120,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -205,6 +212,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f446-st-nucleo/.config b/bsp/stm32/stm32f446-st-nucleo/.config index 36e1826e5ed..d71bdb328ee 100644 --- a/bsp/stm32/stm32f446-st-nucleo/.config +++ b/bsp/stm32/stm32f446-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f446-st-nucleo/project.ewp b/bsp/stm32/stm32f446-st-nucleo/project.ewp index fa654ccc86a..8f95c622b65 100644 --- a/bsp/stm32/stm32f446-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f446-st-nucleo/project.ewp @@ -359,6 +359,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1397,6 +1398,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2085,13 +2087,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2112,22 +2114,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c @@ -2166,43 +2168,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\irq.c - - $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\device.c + + + $PROJ_DIR$\..\..\..\src\idle.c @@ -2265,6 +2267,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f446-st-nucleo/project.uvprojx b/bsp/stm32/stm32f446-st-nucleo/project.uvprojx index 1d0ca7c0471..bfdde3d2b84 100644 --- a/bsp/stm32/stm32f446-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f446-st-nucleo/project.uvprojx @@ -362,7 +362,7 @@ USE_HAL_DRIVER, __RTTHREAD__, STM32F446xx, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -416,9 +416,9 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -430,23 +430,23 @@ - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -466,13 +466,6 @@ ..\..\..\components\drivers\serial\serial.c - - - waitqueue.c - 1 - ..\..\..\components\drivers\src\waitqueue.c - - ringblk_buf.c @@ -482,9 +475,9 @@ - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c @@ -496,35 +489,35 @@ - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - - - Drivers - stm32f4xx_hal_msp.c + waitqueue.c 1 - board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + ..\..\..\components\drivers\src\waitqueue.c + + + Drivers startup_stm32f446xx.s @@ -532,6 +525,13 @@ ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f446xx.s + + + stm32f4xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + + board.c @@ -589,93 +589,93 @@ Kernel - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - mem.c + object.c 1 - ..\..\..\src\mem.c + ..\..\..\src\object.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - object.c + idle.c 1 - ..\..\..\src\object.c + ..\..\..\src\idle.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c diff --git a/bsp/stm32/stm32f446-st-nucleo/rtconfig.h b/bsp/stm32/stm32f446-st-nucleo/rtconfig.h index 153b00e1c3c..0019da67724 100644 --- a/bsp/stm32/stm32f446-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32f446-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f469-st-disco/.config b/bsp/stm32/stm32f469-st-disco/.config index e401a11ba35..30321a49fba 100644 --- a/bsp/stm32/stm32f469-st-disco/.config +++ b/bsp/stm32/stm32f469-st-disco/.config @@ -58,14 +58,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -133,7 +138,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +189,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +364,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +386,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +411,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +468,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +487,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +501,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +527,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +534,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f469-st-disco/project.ewp b/bsp/stm32/stm32f469-st-disco/project.ewp index 3e484e8c680..d61590b91e6 100644 --- a/bsp/stm32/stm32f469-st-disco/project.ewp +++ b/bsp/stm32/stm32f469-st-disco/project.ewp @@ -356,6 +356,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -1390,6 +1391,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\..\..\..\include @@ -2081,19 +2083,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2107,17 +2109,14 @@ $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2125,6 +2124,9 @@ $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + Drivers @@ -2132,10 +2134,10 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f469xx.s - $PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f469xx.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2161,44 +2163,44 @@ Kernel - - $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\thread.c + + + $PROJ_DIR$\..\..\..\src\object.c @@ -2261,6 +2263,9 @@ $PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f469-st-disco/project.uvproj b/bsp/stm32/stm32f469-st-disco/project.uvproj index 971eba71253..926c4d2c900 100644 --- a/bsp/stm32/stm32f469-st-disco/project.uvproj +++ b/bsp/stm32/stm32f469-st-disco/project.uvproj @@ -357,9 +357,9 @@ 0 - USE_HAL_DRIVER, STM32F469xx, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND + USE_HAL_DRIVER, STM32F469xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -418,6 +418,13 @@ CPU + + + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c + + backtrace.c @@ -434,9 +441,9 @@ - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -446,13 +453,6 @@ ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - DeviceDrivers @@ -463,48 +463,6 @@ ..\..\..\components\drivers\misc\pin.c - - - mtd_nor.c - 1 - ..\..\..\components\drivers\mtd\mtd_nor.c - - - - - mmc.c - 1 - ..\..\..\components\drivers\sdio\mmc.c - - - - - sd.c - 1 - ..\..\..\components\drivers\sdio\sd.c - - - - - block_dev.c - 1 - ..\..\..\components\drivers\sdio\block_dev.c - - - - - sdio.c - 1 - ..\..\..\components\drivers\sdio\sdio.c - - - - - mmcsd_core.c - 1 - ..\..\..\components\drivers\sdio\mmcsd_core.c - - serial.c @@ -514,9 +472,9 @@ - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c @@ -528,16 +486,16 @@ - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -549,16 +507,16 @@ - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -566,16 +524,16 @@ Drivers - startup_stm32f469xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f469xx.s + stm32f4xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - stm32f4xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + startup_stm32f469xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f469xx.s @@ -607,79 +565,6 @@ - - Filesystem - - - dfs_posix.c - 1 - ..\..\..\components\dfs\src\dfs_posix.c - - - - - dfs_poll.c - 1 - ..\..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c - 1 - ..\..\..\components\dfs\src\dfs_file.c - - - - - dfs.c - 1 - ..\..\..\components\dfs\src\dfs.c - - - - - dfs_fs.c - 1 - ..\..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c - 1 - ..\..\..\components\dfs\src\dfs_select.c - - - - - devfs.c - 1 - ..\..\..\components\dfs\filesystems\devfs\devfs.c - - - - - ff.c - 1 - ..\..\..\components\dfs\filesystems\elmfat\ff.c - - - - - ffunicode.c - 1 - ..\..\..\components\dfs\filesystems\elmfat\ffunicode.c - - - - - dfs_elm.c - 1 - ..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c - - - Finsh @@ -696,13 +581,6 @@ ..\..\..\components\finsh\msh.c - - - msh_file.c - 1 - ..\..\..\components\finsh\msh_file.c - - cmd.c @@ -713,13 +591,6 @@ Kernel - - - device.c - 1 - ..\..\..\src\device.c - - ipc.c @@ -736,37 +607,9 @@ - irq.c - 1 - ..\..\..\src\irq.c - - - - - clock.c - 1 - ..\..\..\src\clock.c - - - - - kservice.c - 1 - ..\..\..\src\kservice.c - - - - - memheap.c - 1 - ..\..\..\src\memheap.c - - - - - object.c + scheduler.c 1 - ..\..\..\src\object.c + ..\..\..\src\scheduler.c @@ -776,20 +619,6 @@ ..\..\..\src\thread.c - - - idle.c - 1 - ..\..\..\src\idle.c - - - - - scheduler.c - 1 - ..\..\..\src\scheduler.c - - components.c @@ -804,63 +633,63 @@ ..\..\..\src\mempool.c - - - libc - libc.c + kservice.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\src\kservice.c - syscalls.c + device.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\src\device.c - mem_std.c + object.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\src\object.c - stdio.c + clock.c 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c + ..\..\..\src\clock.c - time.c + memheap.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\src\memheap.c - unistd.c + irq.c 1 - ..\..\..\components\libc\compilers\common\unistd.c + ..\..\..\src\irq.c - stdlib.c + idle.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\src\idle.c + + + libc - delay.c + time.c 1 - ..\..\..\components\libc\compilers\common\delay.c + ..\..\..\components\libc\compilers\common\time.c @@ -908,13 +737,6 @@ ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c - - - stm32f4xx_hal_sd.c - 1 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c - - stm32f4xx_hal_rcc_ex.c @@ -943,13 +765,6 @@ ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c - - - stm32f4xx_ll_sdmmc.c - 1 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c - - stm32f4xx_hal_dma_ex.c @@ -985,13 +800,6 @@ ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c - - - stm32f4xx_hal_nor.c - 1 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c - - stm32f4xx_hal_cryp.c diff --git a/bsp/stm32/stm32f469-st-disco/project.uvprojx b/bsp/stm32/stm32f469-st-disco/project.uvprojx index 19895be4be9..ebaae251d1b 100644 --- a/bsp/stm32/stm32f469-st-disco/project.uvprojx +++ b/bsp/stm32/stm32f469-st-disco/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32F469xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -397,16 +397,16 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -418,16 +418,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -449,51 +449,51 @@ - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -501,16 +501,16 @@ Drivers - startup_stm32f469xx.s - 2 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f469xx.s + stm32f4xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - stm32f4xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + startup_stm32f469xx.s + 2 + ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f469xx.s @@ -570,23 +570,23 @@ Kernel - object.c + ipc.c 1 - ..\..\..\src\object.c + ..\..\..\src\ipc.c - kservice.c + thread.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\thread.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c @@ -598,37 +598,37 @@ - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - thread.c + scheduler.c 1 - ..\..\..\src\thread.c + ..\..\..\src\scheduler.c - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c @@ -640,23 +640,23 @@ - ipc.c + mempool.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mempool.c - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c diff --git a/bsp/stm32/stm32f469-st-disco/rtconfig.h b/bsp/stm32/stm32f469-st-disco/rtconfig.h index 3d739b2675c..7fb4813a20e 100644 --- a/bsp/stm32/stm32f469-st-disco/rtconfig.h +++ b/bsp/stm32/stm32f469-st-disco/rtconfig.h @@ -38,8 +38,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -111,6 +111,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -196,6 +203,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f746-st-disco/.config b/bsp/stm32/stm32f746-st-disco/.config index cfa62a058cd..8be3ef4b046 100644 --- a/bsp/stm32/stm32f746-st-disco/.config +++ b/bsp/stm32/stm32f746-st-disco/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f746-st-disco/project.ewp b/bsp/stm32/stm32f746-st-disco/project.ewp index 70293985424..518885de71f 100644 --- a/bsp/stm32/stm32f746-st-disco/project.ewp +++ b/bsp/stm32/stm32f746-st-disco/project.ewp @@ -354,6 +354,7 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc @@ -1388,6 +1389,7 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc @@ -2087,13 +2089,13 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c @@ -2108,22 +2110,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2168,43 +2170,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c @@ -2288,6 +2290,9 @@ $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f746-st-disco/project.uvprojx b/bsp/stm32/stm32f746-st-disco/project.uvprojx index c6819615b32..1ae21c18632 100644 --- a/bsp/stm32/stm32f746-st-disco/project.uvprojx +++ b/bsp/stm32/stm32f746-st-disco/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32F746xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,13 +388,6 @@ CPU - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - div0.c @@ -404,16 +397,16 @@ - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - cpuport.c + backtrace.c 1 - ..\..\..\libcpu\arm\cortex-m7\cpuport.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -430,6 +423,13 @@ ..\..\..\libcpu\arm\cortex-m7\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m7\cpuport.c + + DeviceDrivers @@ -456,51 +456,51 @@ - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -508,16 +508,16 @@ Drivers - board.c - 1 - board\board.c + startup_stm32f746xx.s + 2 + ..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\arm\startup_stm32f746xx.s - startup_stm32f746xx.s - 2 - ..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\arm\startup_stm32f746xx.s + board.c + 1 + board\board.c @@ -584,16 +584,16 @@ Kernel - components.c + mem.c 1 - ..\..\..\src\components.c + ..\..\..\src\mem.c - kservice.c + components.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\components.c @@ -605,65 +605,65 @@ - mempool.c + ipc.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\ipc.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - mem.c + device.c 1 - ..\..\..\src\mem.c + ..\..\..\src\device.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c - ipc.c + clock.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\clock.c - device.c + idle.c 1 - ..\..\..\src\device.c + ..\..\..\src\idle.c - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c diff --git a/bsp/stm32/stm32f746-st-disco/rtconfig.h b/bsp/stm32/stm32f746-st-disco/rtconfig.h index 2a1ba5b885c..38f321a7d1f 100644 --- a/bsp/stm32/stm32f746-st-disco/rtconfig.h +++ b/bsp/stm32/stm32f746-st-disco/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f746-st-nucleo/project.ewp b/bsp/stm32/stm32f746-st-nucleo/project.ewp index 893b8818f40..a7340f746db 100644 --- a/bsp/stm32/stm32f746-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f746-st-nucleo/project.ewp @@ -1,2422 +1,2543 @@ - - 3 - - rt-thread - - ARM - - 1 - - General - 3 - - 31 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 35 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 22 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - - - Release - - ARM - - 0 - - General - 3 - - 31 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 35 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 0 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 22 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 0 - - - - - - - BILINK - 0 - - - - - Applications - - $PROJ_DIR$\applications\main.c - - - - cpu - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S - - - - DeviceDrivers - - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - - - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - - - - dlib - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - - - - Drivers - - $PROJ_DIR$\board\board.c - - - $PROJ_DIR$\board\CubeMX_Config\Src\stm32f7xx_hal_msp.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\iar\startup_stm32f746xx.s - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart.c - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c - - - - Filesystem - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs_file.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs_fs.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs_posix.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\poll.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\select.c - - - $PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs\devfs.c - - - - finsh - - $PROJ_DIR$\..\..\..\components\finsh\shell.c - - - $PROJ_DIR$\..\..\..\components\finsh\cmd.c - - - $PROJ_DIR$\..\..\..\components\finsh\msh.c - - - $PROJ_DIR$\..\..\..\components\finsh\msh_file.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_compiler.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_error.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_heap.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_init.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_node.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_ops.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_parser.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_var.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_vm.c - - - $PROJ_DIR$\..\..\..\components\finsh\finsh_token.c - - - - Kernel - - $PROJ_DIR$\..\..\..\src\clock.c - - - $PROJ_DIR$\..\..\..\src\components.c - - - $PROJ_DIR$\..\..\..\src\device.c - - - $PROJ_DIR$\..\..\..\src\idle.c - - - $PROJ_DIR$\..\..\..\src\ipc.c - - - $PROJ_DIR$\..\..\..\src\irq.c - - - $PROJ_DIR$\..\..\..\src\kservice.c - - - $PROJ_DIR$\..\..\..\src\mem.c - - - $PROJ_DIR$\..\..\..\src\mempool.c - - - $PROJ_DIR$\..\..\..\src\object.c - - - $PROJ_DIR$\..\..\..\src\scheduler.c - - - $PROJ_DIR$\..\..\..\src\signal.c - - - $PROJ_DIR$\..\..\..\src\thread.c - - - $PROJ_DIR$\..\..\..\src\timer.c - - - - libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\unistd.c - - - - STM32_HAL - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\system_stm32f7xx.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cec.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cortex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc_ex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cryp.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cryp_ex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_exti.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_dma.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_dma_ex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_pwr.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_pwr_ex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rcc.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rcc_ex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rng.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_sram.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_gpio.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_uart.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_uart_ex.c - - - $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_usart.c - - - + + 3 + + rt-thread + + ARM + + 1 + + General + 3 + + 31 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 35 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 22 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Release + + ARM + + 0 + + General + 3 + + 31 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 35 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 0 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 22 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 0 + + + + + + + BILINK + 0 + + + + + Applications + + $PROJ_DIR$\applications\main.c + + + + CPU + + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + + + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + + + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpuport.c + + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S + + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c + + + + DeviceDrivers + + $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + + + $PROJ_DIR$\..\..\..\components\drivers\rtc\soft_rtc.c + + + $PROJ_DIR$\..\..\..\components\drivers\rtc\rtc.c + + + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + + + $PROJ_DIR$\..\..\..\components\drivers\spi\spi_core.c + + + $PROJ_DIR$\..\..\..\components\drivers\spi\spi_dev.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + + + + Drivers + + $PROJ_DIR$\board\CubeMX_Config\Src\stm32f7xx_hal_msp.c + + + $PROJ_DIR$\board\board.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\iar\startup_stm32f746xx.s + + + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c + + + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart.c + + + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c + + + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_spi.c + + + + Filesystem + + $PROJ_DIR$\..\..\..\components\dfs\src\dfs_fs.c + + + $PROJ_DIR$\..\..\..\components\dfs\src\dfs.c + + + $PROJ_DIR$\..\..\..\components\dfs\src\dfs_file.c + + + $PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs\devfs.c + + + + Finsh + + $PROJ_DIR$\..\..\..\components\finsh\shell.c + + + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + + Kernel + + $PROJ_DIR$\..\..\..\src\idle.c + + + $PROJ_DIR$\..\..\..\src\object.c + + + $PROJ_DIR$\..\..\..\src\device.c + + + $PROJ_DIR$\..\..\..\src\components.c + + + $PROJ_DIR$\..\..\..\src\kservice.c + + + $PROJ_DIR$\..\..\..\src\scheduler.c + + + $PROJ_DIR$\..\..\..\src\ipc.c + + + $PROJ_DIR$\..\..\..\src\clock.c + + + $PROJ_DIR$\..\..\..\src\irq.c + + + $PROJ_DIR$\..\..\..\src\mempool.c + + + $PROJ_DIR$\..\..\..\src\timer.c + + + $PROJ_DIR$\..\..\..\src\thread.c + + + $PROJ_DIR$\..\..\..\src\mem.c + + + + libc + + $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + + + + Libraries + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_uart_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_pwr.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_sram.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rcc_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_spi_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_usart.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rcc.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cec.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cryp.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_gpio.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rtc_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_exti.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rtc.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cryp_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_dma_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_qspi.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_cortex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_dma.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_spi.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\system_stm32f7xx.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_uart.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_pwr_ex.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_rng.c + + + $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc_ex.c + + + + lwIP + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\netdb.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ip.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\autoip.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\netif\ethernet.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\netif.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\sys.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\sockets.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\altcp_alloc.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\netifapi.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\tcpip.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\ip4_addr.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\dhcp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\init.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\netif\ethernetif.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\etharp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\memp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\ip4.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\netbuf.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\raw.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\ip4_frag.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\tcp_out.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\netif\lowpan6.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\icmp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\api_lib.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\inet_chksum.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\stats.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\err.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\altcp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\tcp_in.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\dns.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\arch\sys_arch.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\timeouts.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\ipv4\igmp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\udp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\altcp_tcp.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\pbuf.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\def.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\api_msg.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\apps\ping\ping.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\api\if_api.c + + + $PROJ_DIR$\..\..\..\components\net\lwip-2.1.2\src\core\tcp.c + + + + POSIX + + + utestcases + + diff --git a/bsp/stm32/stm32f746-st-nucleo/project.eww b/bsp/stm32/stm32f746-st-nucleo/project.eww index faa93f37cdf..c2cb02eb1e8 100644 --- a/bsp/stm32/stm32f746-st-nucleo/project.eww +++ b/bsp/stm32/stm32f746-st-nucleo/project.eww @@ -1,10 +1,10 @@ - - - - - $WS_DIR$\project.ewp - - - - - + + + + + $WS_DIR$\project.ewp + + + + + diff --git a/bsp/stm32/stm32f746-st-nucleo/project.uvprojx b/bsp/stm32/stm32f746-st-nucleo/project.uvprojx index 9964425e47d..2a261f6e042 100644 --- a/bsp/stm32/stm32f746-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32f746-st-nucleo/project.uvprojx @@ -336,7 +336,7 @@ RT_USING_ARM_LIBC, USE_HAL_DRIVER, STM32F746xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\components\net\lwip-2.1.2\src;..\..\..\components\net\lwip-2.1.2\src\include;..\..\..\components\net\lwip-2.1.2\src\arch\include;..\..\..\components\net\lwip-2.1.2\src\include\netif;..\..\..\components\net\lwip-2.1.2\src\include\compat\posix;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\components\net\lwip-2.1.2\src;..\..\..\components\net\lwip-2.1.2\src\include;..\..\..\components\net\lwip-2.1.2\src\arch\include;..\..\..\components\net\lwip-2.1.2\src\include\netif;..\..\..\components\net\lwip-2.1.2\src\include\compat\posix;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,6 +389,13 @@ CPU + + + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c + + backtrace.c @@ -405,9 +412,9 @@ - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m7\context_rvds.S @@ -417,13 +424,6 @@ ..\..\..\libcpu\arm\cortex-m7\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m7\context_rvds.S - - cpu_cache.c @@ -478,51 +478,51 @@ - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -542,9 +542,9 @@ Drivers - stm32f7xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32f7xx_hal_msp.c + startup_stm32f746xx.s + 2 + ..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\arm\startup_stm32f746xx.s @@ -556,9 +556,9 @@ - startup_stm32f746xx.s - 2 - ..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Source\Templates\arm\startup_stm32f746xx.s + stm32f7xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32f7xx_hal_msp.c @@ -594,23 +594,9 @@ Filesystem - dfs_posix.c - 1 - ..\..\..\components\dfs\src\dfs_posix.c - - - - - dfs_poll.c - 1 - ..\..\..\components\dfs\src\dfs_poll.c - - - - - dfs_file.c + dfs_fs.c 1 - ..\..\..\components\dfs\src\dfs_file.c + ..\..\..\components\dfs\src\dfs_fs.c @@ -622,16 +608,9 @@ - dfs_fs.c - 1 - ..\..\..\components\dfs\src\dfs_fs.c - - - - - dfs_select.c + dfs_file.c 1 - ..\..\..\components\dfs\src\dfs_select.c + ..\..\..\components\dfs\src\dfs_file.c @@ -658,105 +637,98 @@ ..\..\..\components\finsh\msh.c - - - msh_file.c - 1 - ..\..\..\components\finsh\msh_file.c - - Kernel - mempool.c + ipc.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\ipc.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - thread.c + device.c 1 - ..\..\..\src\thread.c + ..\..\..\src\device.c - ipc.c + clock.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\clock.c - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c - irq.c + timer.c 1 - ..\..\..\src\irq.c + ..\..\..\src\timer.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - object.c + scheduler.c 1 - ..\..\..\src\object.c + ..\..\..\src\scheduler.c - clock.c + idle.c 1 - ..\..\..\src\clock.c + ..\..\..\src\idle.c - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c @@ -764,16 +736,9 @@ libc - stdio.c - 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c - - - - - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c @@ -785,9 +750,9 @@ - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -797,13 +762,6 @@ ..\..\..\components\libc\compilers\common\stdlib.c - - - delay.c - 1 - ..\..\..\components\libc\compilers\common\delay.c - - time.c @@ -811,13 +769,6 @@ ..\..\..\components\libc\compilers\common\time.c - - - unistd.c - 1 - ..\..\..\components\libc\compilers\common\unistd.c - - Libraries diff --git a/bsp/stm32/stm32f767-atk-apollo/.config b/bsp/stm32/stm32f767-atk-apollo/.config index 7e888e66552..9c9faf9cddb 100644 --- a/bsp/stm32/stm32f767-atk-apollo/.config +++ b/bsp/stm32/stm32f767-atk-apollo/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -183,10 +187,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +362,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +384,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +409,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +466,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +485,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +499,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -507,8 +525,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +532,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f767-atk-apollo/project.ewp b/bsp/stm32/stm32f767-atk-apollo/project.ewp index 457591c75fd..4b6a1572fdb 100644 --- a/bsp/stm32/stm32f767-atk-apollo/project.ewp +++ b/bsp/stm32/stm32f767-atk-apollo/project.ewp @@ -363,6 +363,7 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc @@ -1419,6 +1420,7 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc @@ -2121,13 +2123,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\cpu_cache.c @@ -2148,25 +2150,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -2211,43 +2213,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\clock.c $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c @@ -2340,6 +2342,9 @@ $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f767-atk-apollo/project.uvprojx b/bsp/stm32/stm32f767-atk-apollo/project.uvprojx index 3fe84278321..d984bde6275 100644 --- a/bsp/stm32/stm32f767-atk-apollo/project.uvprojx +++ b/bsp/stm32/stm32f767-atk-apollo/project.uvprojx @@ -334,7 +334,7 @@ STM32F767xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -389,16 +389,16 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -417,16 +417,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m7\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m7\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m7\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m7\context_rvds.S @@ -448,30 +448,30 @@ - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -483,16 +483,16 @@ - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c @@ -590,9 +590,9 @@ - clock.c + memheap.c 1 - ..\..\..\src\clock.c + ..\..\..\src\memheap.c @@ -604,30 +604,30 @@ - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - irq.c + device.c 1 - ..\..\..\src\irq.c + ..\..\..\src\device.c - idle.c + clock.c 1 - ..\..\..\src\idle.c + ..\..\..\src\clock.c - memheap.c + irq.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\irq.c @@ -639,37 +639,37 @@ - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c - thread.c + idle.c 1 - ..\..\..\src\thread.c + ..\..\..\src\idle.c - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - device.c + mempool.c 1 - ..\..\..\src\device.c + ..\..\..\src\mempool.c - scheduler.c + components.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\components.c diff --git a/bsp/stm32/stm32f767-atk-apollo/rtconfig.h b/bsp/stm32/stm32f767-atk-apollo/rtconfig.h index 5f179af5e9c..3808a1426d5 100644 --- a/bsp/stm32/stm32f767-atk-apollo/rtconfig.h +++ b/bsp/stm32/stm32f767-atk-apollo/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -108,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/.config b/bsp/stm32/stm32f767-fire-challenger-v1/.config index 30d8afa3288..f4f49f822f9 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/.config +++ b/bsp/stm32/stm32f767-fire-challenger-v1/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -188,10 +192,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -356,7 +367,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -378,10 +389,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -396,13 +414,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -460,9 +471,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -472,7 +490,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -487,6 +504,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -512,8 +530,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -521,6 +537,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/project.ewp b/bsp/stm32/stm32f767-fire-challenger-v1/project.ewp index 930ca6472a8..25a7258e203 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/project.ewp +++ b/bsp/stm32/stm32f767-fire-challenger-v1/project.ewp @@ -355,6 +355,7 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc @@ -1390,6 +1391,7 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc @@ -2080,13 +2082,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m7\context_iar.S @@ -2113,25 +2115,25 @@ $PROJ_DIR$\..\..\..\components\drivers\spi\spi_dev.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2173,16 +2175,13 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c - - - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\components.c @@ -2191,26 +2190,29 @@ $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\ipc.c + + $PROJ_DIR$\..\..\..\src\object.c + libc @@ -2293,6 +2295,9 @@ $PROJ_DIR$\..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Src\stm32f7xx_hal_crc_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/project.uvprojx b/bsp/stm32/stm32f767-fire-challenger-v1/project.uvprojx index 831510fa45c..20b0c691ecf 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/project.uvprojx +++ b/bsp/stm32/stm32f767-fire-challenger-v1/project.uvprojx @@ -335,7 +335,7 @@ STM32F767xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m7;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F7xx_HAL\STM32F7xx_HAL_Driver\Inc;..\libraries\STM32F7xx_HAL\CMSIS\Device\ST\STM32F7xx\Include;..\libraries\STM32F7xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -409,6 +409,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m7\context_rvds.S + + cpu_cache.c @@ -423,13 +430,6 @@ ..\..\..\libcpu\arm\cortex-m7\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m7\context_rvds.S - - DeviceDrivers @@ -463,51 +463,51 @@ - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -603,30 +603,30 @@ Kernel - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c - kservice.c + thread.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\thread.c - scheduler.c + idle.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\idle.c @@ -638,58 +638,58 @@ - mempool.c + timer.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\timer.c - timer.c + memheap.c 1 - ..\..\..\src\timer.c + ..\..\..\src\memheap.c - device.c + ipc.c 1 - ..\..\..\src\device.c + ..\..\..\src\ipc.c - memheap.c + kservice.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\kservice.c - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c - components.c + clock.c 1 - ..\..\..\src\components.c + ..\..\..\src\clock.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.h b/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.h index e0110446383..6707a593812 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.h +++ b/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -108,6 +108,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -193,6 +200,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32f767-st-nucleo/project.ewp b/bsp/stm32/stm32f767-st-nucleo/project.ewp index fdbc4a0268e..084e6b2bcbf 100644 --- a/bsp/stm32/stm32f767-st-nucleo/project.ewp +++ b/bsp/stm32/stm32f767-st-nucleo/project.ewp @@ -224,9 +224,9 @@ - - - - + + + - diff --git a/bsp/stm32/stm32g474-st-nucleo/rtconfig.h b/bsp/stm32/stm32g474-st-nucleo/rtconfig.h index 2e776a1bd68..5fe24a71d7f 100644 --- a/bsp/stm32/stm32g474-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32g474-st-nucleo/rtconfig.h @@ -1,8 +1,7 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Configuration */ +/* Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib) */ /* RT-Thread Kernel */ @@ -19,6 +18,7 @@ /* kservice optimization */ +/* end of kservice optimization */ #define RT_DEBUG #define RT_DEBUG_COLOR @@ -29,12 +29,15 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ /* Kernel Device Object */ @@ -42,7 +45,9 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "lpuart1" +/* end of Kernel Device Object */ #define RT_VER_NUM 0x40100 +/* end of RT-Thread Kernel */ #define ARCH_ARM #define RT_USING_CPU_FFS #define ARCH_ARM_CORTEX_M @@ -57,6 +62,7 @@ /* C++ features */ +/* end of C++ features */ /* Command shell */ @@ -73,14 +79,15 @@ #define MSH_USING_BUILT_IN_COMMANDS #define FINSH_USING_DESCRIPTION #define FINSH_ARG_MAX 10 +/* end of Command shell */ /* Device virtual file system */ +/* end of Device virtual file system */ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -89,6 +96,8 @@ /* Using USB */ +/* end of Using USB */ +/* end of Device Drivers */ /* POSIX layer and C standard library */ @@ -98,28 +107,46 @@ /* POSIX (Portable Operating System Interface) layer */ +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of POSIX layer and C standard library */ + /* Network */ /* Socket abstraction layer */ +/* end of Socket abstraction layer */ /* Network interface device */ +/* end of Network interface device */ /* light weight TCP/IP stack */ +/* end of light weight TCP/IP stack */ /* AT commands */ +/* end of AT commands */ +/* end of Network */ /* VBUS(Virtual Software BUS) */ +/* end of VBUS(Virtual Software BUS) */ /* Utilities */ +/* end of Utilities */ +/* end of RT-Thread Components */ /* RT-Thread Utestcases */ +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -130,60 +157,83 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ +/* end of language packages */ /* multimedia packages */ /* LVGL: powerful and easy-to-use embedded GUI library */ +/* end of LVGL: powerful and easy-to-use embedded GUI library */ /* u8g2: a monochrome graphic library */ +/* end of u8g2: a monochrome graphic library */ /* PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of PainterEngine: A cross-platform graphics application framework written in C language */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ /* enhanced kernel services */ +/* end of enhanced kernel services */ /* acceleration: Assembly language or algorithmic acceleration packages */ +/* end of acceleration: Assembly language or algorithmic acceleration packages */ /* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ /* Micrium: Micrium software products porting for RT-Thread */ +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ /* peripheral libraries and drivers */ +/* end of peripheral libraries and drivers */ /* AI packages */ +/* end of AI packages */ /* miscellaneous packages */ /* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ /* entertainment: terminal games and other interesting software packages */ +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ +/* end of RT-Thread online packages */ #define SOC_FAMILY_STM32 #define SOC_SERIES_STM32G4 @@ -198,8 +248,10 @@ #define BSP_USING_GPIO #define BSP_USING_UART #define BSP_USING_LPUART1 +/* end of On-chip Peripheral Drivers */ /* Board extended module Drivers */ +/* end of Hardware Drivers Config */ #endif diff --git a/bsp/stm32/stm32h743-armfly-V7/.config b/bsp/stm32/stm32h743-armfly-V7/.config index 3fcc67f3051..2449ba38c94 100644 --- a/bsp/stm32/stm32h743-armfly-V7/.config +++ b/bsp/stm32/stm32h743-armfly-V7/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32h743-armfly-V7/project.ewp b/bsp/stm32/stm32h743-armfly-V7/project.ewp index c00f6854f94..928ebdeb96e 100644 --- a/bsp/stm32/stm32h743-armfly-V7/project.ewp +++ b/bsp/stm32/stm32h743-armfly-V7/project.ewp @@ -348,6 +348,7 @@ - - - - + + + - diff --git a/bsp/stm32/stm32h750-artpi-h750/rtconfig.h b/bsp/stm32/stm32h750-artpi-h750/rtconfig.h index 8427b863d48..074d8955050 100644 --- a/bsp/stm32/stm32h750-artpi-h750/rtconfig.h +++ b/bsp/stm32/stm32h750-artpi-h750/rtconfig.h @@ -34,6 +34,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l010-st-nucleo/.config b/bsp/stm32/stm32l010-st-nucleo/.config index 53c4be5c9ba..f684a59474f 100644 --- a/bsp/stm32/stm32l010-st-nucleo/.config +++ b/bsp/stm32/stm32l010-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -503,8 +520,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -512,6 +527,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l010-st-nucleo/project.ewp b/bsp/stm32/stm32l010-st-nucleo/project.ewp index 8a616d03ae1..7e813298b15 100644 --- a/bsp/stm32/stm32l010-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l010-st-nucleo/project.ewp @@ -364,6 +364,7 @@ $PROJ_DIR$\board $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include $PROJ_DIR$\..\..\..\include @@ -1435,6 +1436,7 @@ $PROJ_DIR$\board $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include $PROJ_DIR$\..\..\..\include @@ -2150,6 +2152,9 @@ CPU + + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c @@ -2157,14 +2162,11 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\context_iar.S $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\cpuport.c - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0\context_iar.S - DeviceDrivers @@ -2178,7 +2180,7 @@ $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c @@ -2187,22 +2189,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c Drivers - $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Source\Templates\iar\startup_stm32l053xx.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32l0xx_hal_msp.c - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l0xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Source\Templates\iar\startup_stm32l053xx.s $PROJ_DIR$\board\board.c @@ -2232,43 +2234,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\components.c @@ -2334,6 +2336,9 @@ $PROJ_DIR$\..\libraries\STM32L0xx_HAL\STM32L0xx_HAL_Driver\Src\stm32l0xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l010-st-nucleo/project.uvprojx b/bsp/stm32/stm32l010-st-nucleo/project.uvprojx index ba640b35f79..a692458e836 100644 --- a/bsp/stm32/stm32l010-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l010-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ STM32L053xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L0xx_HAL\STM32L0xx_HAL_Driver\Inc;..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include;..\libraries\STM32L0xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L0xx_HAL\STM32L0xx_HAL_Driver\Inc;..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include;..\libraries\STM32L0xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -397,16 +397,16 @@ - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c @@ -442,9 +442,9 @@ - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c @@ -456,37 +456,37 @@ - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -563,79 +563,79 @@ Kernel - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - device.c + idle.c 1 - ..\..\..\src\device.c + ..\..\..\src\idle.c - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - mempool.c + ipc.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\ipc.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c - thread.c + clock.c 1 - ..\..\..\src\thread.c + ..\..\..\src\clock.c @@ -647,9 +647,9 @@ - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c diff --git a/bsp/stm32/stm32l010-st-nucleo/rtconfig.h b/bsp/stm32/stm32l010-st-nucleo/rtconfig.h index 0dfa11d036f..95dd12ddcea 100644 --- a/bsp/stm32/stm32l010-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l010-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l053-st-nucleo/.config b/bsp/stm32/stm32l053-st-nucleo/.config index 30c6f01def7..c97e5150331 100644 --- a/bsp/stm32/stm32l053-st-nucleo/.config +++ b/bsp/stm32/stm32l053-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -128,7 +132,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -503,8 +520,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -512,6 +527,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l053-st-nucleo/project.ewp b/bsp/stm32/stm32l053-st-nucleo/project.ewp index 188c3ca9bc5..cb029502cb9 100644 --- a/bsp/stm32/stm32l053-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l053-st-nucleo/project.ewp @@ -364,6 +364,7 @@ $PROJ_DIR$\board $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include $PROJ_DIR$\..\..\..\include @@ -1435,6 +1436,7 @@ $PROJ_DIR$\board $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include $PROJ_DIR$\..\..\..\include @@ -2175,22 +2177,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2199,10 +2201,10 @@ Drivers - $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Source\Templates\iar\startup_stm32l053xx.s + $PROJ_DIR$\board\CubeMX_Config\Src\stm32l0xx_hal_msp.c - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l0xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Source\Templates\iar\startup_stm32l053xx.s $PROJ_DIR$\board\board.c @@ -2232,43 +2234,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\ipc.c @@ -2334,6 +2336,9 @@ $PROJ_DIR$\..\libraries\STM32L0xx_HAL\STM32L0xx_HAL_Driver\Src\stm32l0xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l053-st-nucleo/project.uvprojx b/bsp/stm32/stm32l053-st-nucleo/project.uvprojx index d37fa526e8b..eee629e6d04 100644 --- a/bsp/stm32/stm32l053-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l053-st-nucleo/project.uvprojx @@ -332,7 +332,7 @@ STM32L053xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L0xx_HAL\STM32L0xx_HAL_Driver\Inc;..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include;..\libraries\STM32L0xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L0xx_HAL\STM32L0xx_HAL_Driver\Inc;..\libraries\STM32L0xx_HAL\CMSIS\Device\ST\STM32L0xx\Include;..\libraries\STM32L0xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -387,9 +387,9 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -401,23 +401,23 @@ - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m0\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m0\context_rvds.S - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m0\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m0\cpuport.c @@ -446,37 +446,37 @@ - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -560,37 +560,37 @@ Kernel - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c - mempool.c + idle.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\idle.c - irq.c + mempool.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mempool.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c @@ -602,51 +602,51 @@ - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - components.c + mem.c 1 - ..\..\..\src\components.c + ..\..\..\src\mem.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - object.c + clock.c 1 - ..\..\..\src\object.c + ..\..\..\src\clock.c - ipc.c + device.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\device.c - mem.c + object.c 1 - ..\..\..\src\mem.c + ..\..\..\src\object.c diff --git a/bsp/stm32/stm32l053-st-nucleo/rtconfig.h b/bsp/stm32/stm32l053-st-nucleo/rtconfig.h index 55f22ed2497..6d806a47cc5 100644 --- a/bsp/stm32/stm32l053-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l053-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -86,7 +87,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l412-st-nucleo/.config b/bsp/stm32/stm32l412-st-nucleo/.config index 522c30e2012..6d488c26d70 100644 --- a/bsp/stm32/stm32l412-st-nucleo/.config +++ b/bsp/stm32/stm32l412-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +188,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +363,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +385,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +410,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +467,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +486,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +500,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +526,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +533,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l412-st-nucleo/project.ewp b/bsp/stm32/stm32l412-st-nucleo/project.ewp index a532f8eb37f..a4291e365c8 100644 --- a/bsp/stm32/stm32l412-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l412-st-nucleo/project.ewp @@ -356,9 +356,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1391,9 +1391,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2079,9 +2079,6 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c @@ -2089,11 +2086,14 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + DeviceDrivers @@ -2110,22 +2110,22 @@ $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c @@ -2134,13 +2134,13 @@ Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l412xx.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l412xx.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2167,43 +2167,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mempool.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\kservice.c $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\clock.c @@ -2215,13 +2215,7 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c @@ -2230,22 +2224,22 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c @@ -2326,6 +2320,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l412-st-nucleo/project.uvprojx b/bsp/stm32/stm32l412-st-nucleo/project.uvprojx index 0e21fbacf4b..d9b3913ce52 100644 --- a/bsp/stm32/stm32l412-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l412-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32L412xx, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,16 +390,16 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -411,16 +411,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -449,51 +449,51 @@ - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c @@ -577,93 +577,93 @@ Kernel - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c - mem.c + device.c 1 - ..\..\..\src\mem.c + ..\..\..\src\device.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - irq.c + mem.c 1 - ..\..\..\src\irq.c + ..\..\..\src\mem.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c - mempool.c + thread.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\thread.c - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - ipc.c + mempool.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mempool.c - thread.c + irq.c 1 - ..\..\..\src\thread.c + ..\..\..\src\irq.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c @@ -678,16 +678,16 @@ - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c diff --git a/bsp/stm32/stm32l412-st-nucleo/rtconfig.h b/bsp/stm32/stm32l412-st-nucleo/rtconfig.h index 163195d125d..3c03704d3f6 100644 --- a/bsp/stm32/stm32l412-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l412-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -109,6 +109,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -194,6 +201,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l431-BearPi/.config b/bsp/stm32/stm32l431-BearPi/.config index f9379843599..fca6b0a5aa5 100644 --- a/bsp/stm32/stm32l431-BearPi/.config +++ b/bsp/stm32/stm32l431-BearPi/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -190,10 +193,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -358,7 +368,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -380,10 +390,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -398,13 +415,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -462,9 +472,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -474,7 +491,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -489,6 +505,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -514,8 +531,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -523,6 +538,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l431-BearPi/project.ewp b/bsp/stm32/stm32l431-BearPi/project.ewp index a47c47fb80e..84214ce02d8 100644 --- a/bsp/stm32/stm32l431-BearPi/project.ewp +++ b/bsp/stm32/stm32l431-BearPi/project.ewp @@ -361,15 +361,15 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\drivers\include - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Include $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\components\drivers\spi $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1412,15 +1412,15 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\..\..\components\drivers\include - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Include $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\components\drivers\spi $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2114,10 +2114,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2144,25 +2144,25 @@ $PROJ_DIR$\..\..\..\components\drivers\spi\spi_dev.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c @@ -2171,10 +2171,10 @@ Drivers - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l431xx.s + $PROJ_DIR$\board\ports\lcd\drv_lcd.c - $PROJ_DIR$\board\ports\lcd\drv_lcd.c + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l431xx.s $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c @@ -2210,82 +2210,76 @@ Kernel - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\object.c libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c @@ -2378,6 +2372,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l431-BearPi/project.uvprojx b/bsp/stm32/stm32l431-BearPi/project.uvprojx index 604da301fb2..b2210f222c3 100644 --- a/bsp/stm32/stm32l431-BearPi/project.uvprojx +++ b/bsp/stm32/stm32l431-BearPi/project.uvprojx @@ -335,7 +335,7 @@ RT_USING_ARM_LIBC, USE_HAL_DRIVER, __RTTHREAD__, STM32L431xx, __CLK_TCK=RT_TICK_PER_SECOND - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\lcd;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\lcd;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -463,51 +463,51 @@ - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c @@ -534,16 +534,16 @@ Drivers - startup_stm32l431xx.s - 2 - ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l431xx.s + drv_lcd.c + 1 + board\ports\lcd\drv_lcd.c - drv_lcd.c - 1 - board\ports\lcd\drv_lcd.c + startup_stm32l431xx.s + 2 + ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l431xx.s @@ -617,93 +617,93 @@ Kernel - mempool.c + ipc.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\ipc.c - clock.c + timer.c 1 - ..\..\..\src\clock.c + ..\..\..\src\timer.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - ipc.c + kservice.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\kservice.c - timer.c + irq.c 1 - ..\..\..\src\timer.c + ..\..\..\src\irq.c - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c - device.c + components.c 1 - ..\..\..\src\device.c + ..\..\..\src\components.c - thread.c + object.c 1 - ..\..\..\src\thread.c + ..\..\..\src\object.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - kservice.c + mempool.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mempool.c - mem.c + clock.c 1 - ..\..\..\src\mem.c + ..\..\..\src\clock.c @@ -711,23 +711,23 @@ libc - libc.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - mem_std.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c diff --git a/bsp/stm32/stm32l431-BearPi/rtconfig.h b/bsp/stm32/stm32l431-BearPi/rtconfig.h index 9b7ec846f61..d99119a501c 100644 --- a/bsp/stm32/stm32l431-BearPi/rtconfig.h +++ b/bsp/stm32/stm32l431-BearPi/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -110,6 +110,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -195,6 +202,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l432-st-nucleo/.config b/bsp/stm32/stm32l432-st-nucleo/.config index 689d7c5962a..e31d5a1e5cf 100644 --- a/bsp/stm32/stm32l432-st-nucleo/.config +++ b/bsp/stm32/stm32l432-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +188,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +363,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +385,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +410,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +467,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +486,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +500,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +526,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +533,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l432-st-nucleo/project.ewp b/bsp/stm32/stm32l432-st-nucleo/project.ewp index 1a618050e98..e18ac181e8f 100644 --- a/bsp/stm32/stm32l432-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l432-st-nucleo/project.ewp @@ -356,9 +356,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1391,9 +1391,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2080,13 +2080,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2107,25 +2107,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c @@ -2134,13 +2134,13 @@ Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l432xx.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l432xx.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2167,22 +2167,19 @@ Kernel - $PROJ_DIR$\..\..\..\src\ipc.c - - - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\device.c @@ -2190,62 +2187,59 @@ $PROJ_DIR$\..\..\..\src\kservice.c + + $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c libc - - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c @@ -2326,6 +2320,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l432-st-nucleo/project.uvprojx b/bsp/stm32/stm32l432-st-nucleo/project.uvprojx index e412450fd89..173974ec187 100644 --- a/bsp/stm32/stm32l432-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l432-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ RT_USING_ARM_LIBC, USE_HAL_DRIVER, STM32L432xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,23 +390,23 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -449,30 +449,30 @@ - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c @@ -484,16 +484,16 @@ - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c @@ -577,23 +577,23 @@ Kernel - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c @@ -605,16 +605,16 @@ - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c - irq.c + device.c 1 - ..\..\..\src\irq.c + ..\..\..\src\device.c @@ -626,16 +626,16 @@ - object.c + idle.c 1 - ..\..\..\src\object.c + ..\..\..\src\idle.c - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c @@ -647,23 +647,23 @@ - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c - scheduler.c + mempool.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mempool.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c @@ -671,16 +671,16 @@ libc - libc.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -692,16 +692,16 @@ - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c diff --git a/bsp/stm32/stm32l432-st-nucleo/rtconfig.h b/bsp/stm32/stm32l432-st-nucleo/rtconfig.h index 4df7fb416ca..d52fbb3470b 100644 --- a/bsp/stm32/stm32l432-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l432-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -109,6 +109,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -194,6 +201,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l433-st-nucleo/.config b/bsp/stm32/stm32l433-st-nucleo/.config index 410c7d811ca..1d29383fad0 100644 --- a/bsp/stm32/stm32l433-st-nucleo/.config +++ b/bsp/stm32/stm32l433-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -183,10 +186,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -351,7 +361,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -373,10 +383,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -391,13 +408,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -455,9 +465,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -467,7 +484,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -482,6 +498,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -507,8 +524,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -516,6 +531,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l433-st-nucleo/project.ewp b/bsp/stm32/stm32l433-st-nucleo/project.ewp index 9f1984b3674..8391c72de4e 100644 --- a/bsp/stm32/stm32l433-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l433-st-nucleo/project.ewp @@ -356,9 +356,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1391,9 +1391,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2089,10 +2089,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2104,22 +2104,22 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2161,43 +2161,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\object.c $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\components.c @@ -2209,22 +2209,19 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c @@ -2232,14 +2229,11 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c @@ -2308,6 +2302,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l433-st-nucleo/project.uvprojx b/bsp/stm32/stm32l433-st-nucleo/project.uvprojx index 574dc24c655..6625c0be504 100644 --- a/bsp/stm32/stm32l433-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l433-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32L433xx, RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,6 +388,13 @@ CPU + + + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c + + div0.c @@ -404,9 +411,9 @@ - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -416,13 +423,6 @@ ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - DeviceDrivers @@ -449,56 +449,49 @@ - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c Drivers - - - startup_stm32l433xx.s - 2 - ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l433xx.s - - stm32l4xx_hal_msp.c @@ -513,6 +506,13 @@ board\board.c + + + startup_stm32l433xx.s + 2 + ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l433xx.s + + drv_gpio.c @@ -563,44 +563,44 @@ Kernel - mempool.c + idle.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\idle.c - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - timer.c + mem.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mem.c - idle.c + ipc.c 1 - ..\..\..\src\idle.c + ..\..\..\src\ipc.c @@ -612,44 +612,44 @@ - kservice.c + mempool.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mempool.c - mem.c + components.c 1 - ..\..\..\src\mem.c + ..\..\..\src\components.c - thread.c + clock.c 1 - ..\..\..\src\thread.c + ..\..\..\src\clock.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - object.c + device.c 1 - ..\..\..\src\object.c + ..\..\..\src\device.c @@ -657,37 +657,37 @@ libc - libc.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - mem_std.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c diff --git a/bsp/stm32/stm32l433-st-nucleo/rtconfig.h b/bsp/stm32/stm32l433-st-nucleo/rtconfig.h index af7f34b39ef..b30413f971e 100644 --- a/bsp/stm32/stm32l433-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l433-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -107,6 +107,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -192,6 +199,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l452-st-nucleo/.config b/bsp/stm32/stm32l452-st-nucleo/.config index 18c54ed2b04..4ebd600e2d5 100644 --- a/bsp/stm32/stm32l452-st-nucleo/.config +++ b/bsp/stm32/stm32l452-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l452-st-nucleo/project.ewp b/bsp/stm32/stm32l452-st-nucleo/project.ewp index 8cc808b4e36..df79565439f 100644 --- a/bsp/stm32/stm32l452-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l452-st-nucleo/project.ewp @@ -367,6 +367,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1423,6 +1424,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2120,15 +2122,15 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2150,33 +2152,33 @@ $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c Drivers - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l452xx.s - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c $PROJ_DIR$\board\board.c + + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l452xx.s + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2205,16 +2207,19 @@ $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\clock.c + + + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\object.c @@ -2223,22 +2228,19 @@ $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\device.c $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\mempool.c - - - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mem.c @@ -2313,6 +2315,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l452-st-nucleo/project.uvprojx b/bsp/stm32/stm32l452-st-nucleo/project.uvprojx index f3cd97379b7..27c8137463d 100644 --- a/bsp/stm32/stm32l452-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l452-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32L452xx - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,13 +388,6 @@ CPU - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - div0.c @@ -411,9 +404,9 @@ - cpuport.c + showmem.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\libcpu\arm\common\showmem.c @@ -423,6 +416,13 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + DeviceDrivers @@ -442,51 +442,51 @@ - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + completion.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\completion.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -561,6 +561,13 @@ Kernel + + + object.c + 1 + ..\..\..\src\object.c + + thread.c @@ -570,23 +577,23 @@ - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c - ipc.c + kservice.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\kservice.c - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c @@ -598,23 +605,23 @@ - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - object.c + timer.c 1 - ..\..\..\src\object.c + ..\..\..\src\timer.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c @@ -626,30 +633,23 @@ - components.c - 1 - ..\..\..\src\components.c - - - - - kservice.c + idle.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\idle.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32l452-st-nucleo/rtconfig.h b/bsp/stm32/stm32l452-st-nucleo/rtconfig.h index b3043ed4837..8308f9a6e83 100644 --- a/bsp/stm32/stm32l452-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l452-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -105,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -190,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l475-atk-pandora/.config b/bsp/stm32/stm32l475-atk-pandora/.config index e78da4c3b0f..ca8fca20fb1 100644 --- a/bsp/stm32/stm32l475-atk-pandora/.config +++ b/bsp/stm32/stm32l475-atk-pandora/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -180,10 +183,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -348,7 +358,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -370,10 +380,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -388,13 +405,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -452,9 +462,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -464,7 +481,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -479,6 +495,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -504,8 +521,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -513,6 +528,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # @@ -677,6 +693,7 @@ CONFIG_SOC_STM32L475VE=y # Onboard Peripheral Drivers # CONFIG_BSP_USING_STLINK_TO_USART=y +# CONFIG_BSP_USING_ARDUINO is not set # CONFIG_BSP_USING_KEY is not set # CONFIG_BSP_USING_QSPI_FLASH is not set # CONFIG_BSP_USING_SPI_LCD is not set @@ -697,13 +714,9 @@ CONFIG_BSP_USING_UART=y CONFIG_BSP_USING_UART1=y # CONFIG_BSP_UART1_RX_USING_DMA is not set # CONFIG_BSP_UART1_TX_USING_DMA is not set -CONFIG_BSP_UART1_RX_BUFSIZE=256 -CONFIG_BSP_UART1_TX_BUFSIZE=0 CONFIG_BSP_USING_UART2=y CONFIG_BSP_UART2_RX_USING_DMA=y CONFIG_BSP_UART2_TX_USING_DMA=y -CONFIG_BSP_UART2_RX_BUFSIZE=256 -CONFIG_BSP_UART2_TX_BUFSIZE=256 # CONFIG_BSP_USING_ON_CHIP_FLASH is not set # CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_QSPI is not set @@ -725,6 +738,7 @@ CONFIG_BSP_UART2_TX_BUFSIZE=256 # # Board extended module Drivers # +# CONFIG_BSP_USING_AT_ESP8266 is not set # CONFIG_BSP_USING_NRF24L01 is not set # end of Board extended module Drivers # end of Hardware Drivers Config diff --git a/bsp/stm32/stm32l475-atk-pandora/project.ewp b/bsp/stm32/stm32l475-atk-pandora/project.ewp index 1ede27bc0fe..827926d2917 100644 --- a/bsp/stm32/stm32l475-atk-pandora/project.ewp +++ b/bsp/stm32/stm32l475-atk-pandora/project.ewp @@ -347,10 +347,9 @@ $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\libcpu\arm\common $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4 - $PROJ_DIR$\board\ports + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\drivers\include - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. @@ -358,6 +357,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1381,10 +1381,9 @@ $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\libcpu\arm\common $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4 - $PROJ_DIR$\board\ports + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\drivers\include - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc $PROJ_DIR$\..\..\..\examples\utest\testcases\kernel $PROJ_DIR$\. @@ -1392,6 +1391,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2078,19 +2078,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2099,28 +2099,28 @@ $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial_v2.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2138,7 +2138,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart_v2.c + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c @@ -2159,7 +2159,7 @@ Kernel - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\clock.c $PROJ_DIR$\..\..\..\src\mem.c @@ -2168,34 +2168,34 @@ $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2267,6 +2267,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l475-atk-pandora/project.uvprojx b/bsp/stm32/stm32l475-atk-pandora/project.uvprojx index 6ea882f03d6..11e9af42354 100644 --- a/bsp/stm32/stm32l475-atk-pandora/project.uvprojx +++ b/bsp/stm32/stm32l475-atk-pandora/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __RTTHREAD__, STM32L475xx, __CLK_TCK=RT_TICK_PER_SECOND - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -396,16 +396,16 @@ - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -434,58 +434,58 @@ - serial_v2.c + serial.c 1 - ..\..\..\components\drivers\serial\serial_v2.c + ..\..\..\components\drivers\serial\serial.c - ringblk_buf.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c @@ -521,9 +521,9 @@ - drv_usart_v2.c + drv_usart.c 1 - ..\libraries\HAL_Drivers\drv_usart_v2.c + ..\libraries\HAL_Drivers\drv_usart.c @@ -562,16 +562,16 @@ Kernel - components.c + mempool.c 1 - ..\..\..\src\components.c + ..\..\..\src\mempool.c - thread.c + components.c 1 - ..\..\..\src\thread.c + ..\..\..\src\components.c @@ -581,13 +581,6 @@ ..\..\..\src\idle.c - - - ipc.c - 1 - ..\..\..\src\ipc.c - - clock.c @@ -597,9 +590,9 @@ - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c @@ -618,16 +611,16 @@ - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c @@ -639,16 +632,23 @@ - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c + + + + + ipc.c + 1 + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32l475-atk-pandora/rtconfig.h b/bsp/stm32/stm32l475-atk-pandora/rtconfig.h index bdc7fe71dea..11edf2390ba 100644 --- a/bsp/stm32/stm32l475-atk-pandora/rtconfig.h +++ b/bsp/stm32/stm32l475-atk-pandora/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -104,6 +104,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -189,6 +196,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ @@ -238,13 +249,9 @@ #define BSP_USING_GPIO #define BSP_USING_UART #define BSP_USING_UART1 -#define BSP_UART1_RX_BUFSIZE 256 -#define BSP_UART1_TX_BUFSIZE 0 #define BSP_USING_UART2 #define BSP_UART2_RX_USING_DMA #define BSP_UART2_TX_USING_DMA -#define BSP_UART2_RX_BUFSIZE 256 -#define BSP_UART2_TX_BUFSIZE 256 /* end of On-chip Peripheral Drivers */ /* Board extended module Drivers */ diff --git a/bsp/stm32/stm32l475-st-discovery/.config b/bsp/stm32/stm32l475-st-discovery/.config index 967e653eb80..bb7e2ed0768 100644 --- a/bsp/stm32/stm32l475-st-discovery/.config +++ b/bsp/stm32/stm32l475-st-discovery/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l475-st-discovery/project.ewp b/bsp/stm32/stm32l475-st-discovery/project.ewp index 9bb22299c7e..5f3b61a16ef 100644 --- a/bsp/stm32/stm32l475-st-discovery/project.ewp +++ b/bsp/stm32/stm32l475-st-discovery/project.ewp @@ -358,6 +358,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1392,6 +1393,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2078,19 +2080,19 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2102,25 +2104,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2159,43 +2161,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2270,6 +2272,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l475-st-discovery/project.uvprojx b/bsp/stm32/stm32l475-st-discovery/project.uvprojx index e87467c1c5f..a2314a6ebca 100644 --- a/bsp/stm32/stm32l475-st-discovery/project.uvprojx +++ b/bsp/stm32/stm32l475-st-discovery/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, __RTTHREAD__, STM32L475xx, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,16 +390,16 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -442,51 +442,51 @@ - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - pipe.c + workqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\workqueue.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c @@ -563,93 +563,93 @@ Kernel - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - device.c + scheduler.c 1 - ..\..\..\src\device.c + ..\..\..\src\scheduler.c - mempool.c + components.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\components.c - ipc.c + mem.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\mem.c - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c - clock.c + kservice.c 1 - ..\..\..\src\clock.c + ..\..\..\src\kservice.c - kservice.c + mempool.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mempool.c - timer.c + clock.c 1 - ..\..\..\src\timer.c + ..\..\..\src\clock.c - thread.c + object.c 1 - ..\..\..\src\thread.c + ..\..\..\src\object.c - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - irq.c + thread.c 1 - ..\..\..\src\irq.c + ..\..\..\src\thread.c diff --git a/bsp/stm32/stm32l475-st-discovery/rtconfig.h b/bsp/stm32/stm32l475-st-discovery/rtconfig.h index 4eb79949b5b..c18d38a1124 100644 --- a/bsp/stm32/stm32l475-st-discovery/rtconfig.h +++ b/bsp/stm32/stm32l475-st-discovery/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l476-st-nucleo/.config b/bsp/stm32/stm32l476-st-nucleo/.config index a62cd62b29e..d79b1c484ec 100644 --- a/bsp/stm32/stm32l476-st-nucleo/.config +++ b/bsp/stm32/stm32l476-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -148,6 +151,11 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NAND is not set CONFIG_RT_USING_PM=y +CONFIG_PM_TICKLESS_THRESHOLD_TIME=2 +# CONFIG_PM_USING_CUSTOM_CONFIG is not set +# CONFIG_PM_ENABLE_DEBUG is not set +# CONFIG_PM_ENABLE_SUSPEND_SLEEP_MODE is not set +# CONFIG_PM_ENABLE_THRESHOLD_SLEEP_MODE is not set CONFIG_RT_USING_RTC=y # CONFIG_RT_USING_ALARM is not set # CONFIG_RT_USING_SOFT_RTC is not set @@ -185,10 +193,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +368,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +390,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +415,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +472,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +491,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +505,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +531,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +538,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l476-st-nucleo/project.ewp b/bsp/stm32/stm32l476-st-nucleo/project.ewp index fdaef3c1037..dccbd7199b7 100644 --- a/bsp/stm32/stm32l476-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l476-st-nucleo/project.ewp @@ -357,9 +357,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1393,9 +1393,9 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2102,6 +2102,9 @@ $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + + $PROJ_DIR$\..\..\..\components\drivers\pm\lptimer.c + $PROJ_DIR$\..\..\..\components\drivers\pm\pm.c @@ -2115,34 +2118,34 @@ $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c Drivers - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l476xx.s - $PROJ_DIR$\board\board.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l476xx.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2175,83 +2178,77 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\mem.c libc + + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c @@ -2331,6 +2328,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l476-st-nucleo/project.uvprojx b/bsp/stm32/stm32l476-st-nucleo/project.uvprojx index 0f448d6c06f..4fc017dc195 100644 --- a/bsp/stm32/stm32l476-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l476-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ RT_USING_ARM_LIBC, USE_HAL_DRIVER, STM32L476xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -397,16 +397,16 @@ - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c @@ -433,6 +433,13 @@ ..\..\..\components\drivers\misc\pin.c + + + lptimer.c + 1 + ..\..\..\components\drivers\pm\lptimer.c + + pm.c @@ -456,9 +463,9 @@ - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c @@ -470,37 +477,37 @@ - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -591,16 +598,9 @@ Kernel - mempool.c - 1 - ..\..\..\src\mempool.c - - - - - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c @@ -612,9 +612,9 @@ - scheduler.c + irq.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\irq.c @@ -626,16 +626,16 @@ - object.c + idle.c 1 - ..\..\..\src\object.c + ..\..\..\src\idle.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c @@ -647,9 +647,16 @@ - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c + + + + + timer.c + 1 + ..\..\..\src\timer.c @@ -661,23 +668,23 @@ - timer.c + object.c 1 - ..\..\..\src\timer.c + ..\..\..\src\object.c - irq.c + clock.c 1 - ..\..\..\src\irq.c + ..\..\..\src\clock.c - idle.c + device.c 1 - ..\..\..\src\idle.c + ..\..\..\src\device.c @@ -685,23 +692,23 @@ libc - libc.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - syscalls.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c - mem_std.c + syscalls.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\syscalls.c diff --git a/bsp/stm32/stm32l476-st-nucleo/rtconfig.h b/bsp/stm32/stm32l476-st-nucleo/rtconfig.h index db0afcf0bdb..e630b458f4c 100644 --- a/bsp/stm32/stm32l476-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l476-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,13 +88,13 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_PIN #define RT_USING_PM +#define PM_TICKLESS_THRESHOLD_TIME 2 #define RT_USING_RTC /* Using USB */ @@ -109,6 +110,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -194,6 +202,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l496-ali-developer/.config b/bsp/stm32/stm32l496-ali-developer/.config index 2e88c95f2c2..3ee5d1d776f 100644 --- a/bsp/stm32/stm32l496-ali-developer/.config +++ b/bsp/stm32/stm32l496-ali-developer/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l496-ali-developer/project.ewp b/bsp/stm32/stm32l496-ali-developer/project.ewp index 9509ee08509..e6b312820fa 100644 --- a/bsp/stm32/stm32l496-ali-developer/project.ewp +++ b/bsp/stm32/stm32l496-ali-developer/project.ewp @@ -358,6 +358,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1392,6 +1393,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2077,15 +2079,15 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2102,38 +2104,38 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c Drivers - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l496xx.s - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c $PROJ_DIR$\board\board.c + + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l496xx.s + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2159,43 +2161,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\kservice.c - - - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\scheduler.c $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\clock.c $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\irq.c $PROJ_DIR$\..\..\..\src\object.c + + $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\device.c @@ -2270,6 +2272,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l496-ali-developer/project.uvprojx b/bsp/stm32/stm32l496-ali-developer/project.uvprojx index 4f459d4ffe3..4fc78591608 100644 --- a/bsp/stm32/stm32l496-ali-developer/project.uvprojx +++ b/bsp/stm32/stm32l496-ali-developer/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32L496xx - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -394,6 +394,13 @@ ..\..\..\libcpu\arm\common\showmem.c + + + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c + + div0.c @@ -403,9 +410,9 @@ - backtrace.c + cpuport.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -415,13 +422,6 @@ ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - DeviceDrivers @@ -441,51 +441,51 @@ - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + pipe.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -562,30 +562,30 @@ Kernel - thread.c + scheduler.c 1 - ..\..\..\src\thread.c + ..\..\..\src\scheduler.c - ipc.c + kservice.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\kservice.c - timer.c + thread.c 1 - ..\..\..\src\timer.c + ..\..\..\src\thread.c - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c @@ -597,58 +597,58 @@ - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c - device.c + idle.c 1 - ..\..\..\src\device.c + ..\..\..\src\idle.c - mem.c + mempool.c 1 - ..\..\..\src\mem.c + ..\..\..\src\mempool.c - kservice.c + mem.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\mem.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - mempool.c + device.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\device.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c diff --git a/bsp/stm32/stm32l496-ali-developer/rtconfig.h b/bsp/stm32/stm32l496-ali-developer/rtconfig.h index e28e2cc47d0..615ec601d08 100644 --- a/bsp/stm32/stm32l496-ali-developer/rtconfig.h +++ b/bsp/stm32/stm32l496-ali-developer/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l496-st-nucleo/.config b/bsp/stm32/stm32l496-st-nucleo/.config index e309f932e04..8ef2bbb92b4 100644 --- a/bsp/stm32/stm32l496-st-nucleo/.config +++ b/bsp/stm32/stm32l496-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -129,7 +133,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +184,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +359,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +381,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +406,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +463,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +482,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +496,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +522,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +529,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l496-st-nucleo/project.ewp b/bsp/stm32/stm32l496-st-nucleo/project.ewp index 7411ec89930..86f08fc1113 100644 --- a/bsp/stm32/stm32l496-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l496-st-nucleo/project.ewp @@ -358,6 +358,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1392,6 +1393,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2081,10 +2083,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2102,13 +2104,10 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c @@ -2117,23 +2116,26 @@ $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c Drivers - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l496xx.s - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c $PROJ_DIR$\board\board.c + + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l496xx.s + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2159,43 +2161,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\mempool.c - - - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mem.c $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\ipc.c $PROJ_DIR$\..\..\..\src\scheduler.c + + $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\device.c @@ -2270,6 +2272,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l496-st-nucleo/project.uvprojx b/bsp/stm32/stm32l496-st-nucleo/project.uvprojx index 85f30fec3a9..442cd925c06 100644 --- a/bsp/stm32/stm32l496-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l496-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, STM32L496xx - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,16 +390,16 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c @@ -442,9 +442,9 @@ - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c @@ -456,37 +456,37 @@ - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\pipe.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c @@ -563,93 +563,93 @@ Kernel - thread.c + object.c 1 - ..\..\..\src\thread.c + ..\..\..\src\object.c - components.c + mem.c 1 - ..\..\..\src\components.c + ..\..\..\src\mem.c - idle.c + timer.c 1 - ..\..\..\src\idle.c + ..\..\..\src\timer.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - device.c + thread.c 1 - ..\..\..\src\device.c + ..\..\..\src\thread.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c - irq.c + components.c 1 - ..\..\..\src\irq.c + ..\..\..\src\components.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c diff --git a/bsp/stm32/stm32l496-st-nucleo/rtconfig.h b/bsp/stm32/stm32l496-st-nucleo/rtconfig.h index 51e23aba6ab..8414450c6c4 100644 --- a/bsp/stm32/stm32l496-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l496-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -87,7 +88,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l4r5-st-nucleo/.config b/bsp/stm32/stm32l4r5-st-nucleo/.config index 7a3c52246c1..35f3c9eef7b 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/.config +++ b/bsp/stm32/stm32l4r5-st-nucleo/.config @@ -56,13 +56,18 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # # CONFIG_RT_USING_MEMPOOL is not set -CONFIG_RT_USING_MEMHEAP=y -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -130,7 +135,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -181,10 +185,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -349,7 +360,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -371,10 +382,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -389,13 +407,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -453,9 +464,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -465,7 +483,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -480,6 +497,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -505,8 +523,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -514,6 +530,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l4r5-st-nucleo/project.ewp b/bsp/stm32/stm32l4r5-st-nucleo/project.ewp index eb4a053b1e1..c34531b8a5a 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l4r5-st-nucleo/project.ewp @@ -366,6 +366,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1437,6 +1438,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2150,6 +2152,9 @@ CPU + + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c @@ -2157,14 +2162,11 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - DeviceDrivers @@ -2175,25 +2177,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2232,43 +2234,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\mem.c $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c @@ -2340,6 +2342,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx b/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx index 04e5eabd8d2..4bb950c8028 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ STM32L4R5xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -388,13 +388,6 @@ CPU - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - backtrace.c @@ -411,9 +404,9 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + showmem.c + 1 + ..\..\..\libcpu\arm\common\showmem.c @@ -423,6 +416,13 @@ ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + DeviceDrivers @@ -442,63 +442,56 @@ - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - pipe.c + waitqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\waitqueue.c Drivers - - - startup_stm32l4r5xx.s - 2 - ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l4r5xx.s - - stm32l4xx_hal_msp.c @@ -513,6 +506,13 @@ board\board.c + + + startup_stm32l4r5xx.s + 2 + ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l4r5xx.s + + drv_gpio.c @@ -563,9 +563,9 @@ Kernel - memheap.c + device.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\device.c @@ -577,79 +577,79 @@ - device.c + memheap.c 1 - ..\..\..\src\device.c + ..\..\..\src\memheap.c - clock.c + mem.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mem.c - scheduler.c + components.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\components.c - idle.c + scheduler.c 1 - ..\..\..\src\idle.c + ..\..\..\src\scheduler.c - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c - timer.c + clock.c 1 - ..\..\..\src\timer.c + ..\..\..\src\clock.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c - components.c + idle.c 1 - ..\..\..\src\components.c + ..\..\..\src\idle.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c diff --git a/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.h b/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.h index 12ec2e8155e..21394801865 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.h @@ -33,8 +33,10 @@ /* Memory Management */ -#define RT_USING_MEMHEAP #define RT_USING_SMALL_MEM +#define RT_USING_MEMHEAP +#define RT_MEMHEAP_FAST_MODE +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -88,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -104,6 +105,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -189,6 +197,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l4r9-st-eval/.config b/bsp/stm32/stm32l4r9-st-eval/.config index 8130b13d836..5dc6e8f6102 100644 --- a/bsp/stm32/stm32l4r9-st-eval/.config +++ b/bsp/stm32/stm32l4r9-st-eval/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -186,10 +190,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -354,7 +365,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -376,10 +387,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -394,13 +412,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -458,9 +469,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -470,7 +488,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -485,6 +502,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -510,8 +528,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -519,6 +535,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l4r9-st-eval/project.ewp b/bsp/stm32/stm32l4r9-st-eval/project.ewp index 00068a4b7e1..764b1d645cb 100644 --- a/bsp/stm32/stm32l4r9-st-eval/project.ewp +++ b/bsp/stm32/stm32l4r9-st-eval/project.ewp @@ -367,6 +367,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1423,6 +1424,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2124,10 +2126,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2154,25 +2156,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2211,43 +2213,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2328,6 +2330,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l4r9-st-eval/project.uvprojx b/bsp/stm32/stm32l4r9-st-eval/project.uvprojx index d263fb4a651..71b9b62a5f4 100644 --- a/bsp/stm32/stm32l4r9-st-eval/project.uvprojx +++ b/bsp/stm32/stm32l4r9-st-eval/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32L4R9xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -390,23 +390,23 @@ CPU - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -463,37 +463,37 @@ - ringbuffer.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c - completion.c + dataqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c @@ -513,6 +513,13 @@ Drivers + + + startup_stm32l4r9xx.s + 2 + ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l4r9xx.s + + stm32l4xx_hal_msp.c @@ -527,13 +534,6 @@ board\board.c - - - startup_stm32l4r9xx.s - 2 - ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l4r9xx.s - - drv_gpio.c @@ -584,51 +584,51 @@ Kernel - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c - timer.c + components.c 1 - ..\..\..\src\timer.c + ..\..\..\src\components.c - idle.c + thread.c 1 - ..\..\..\src\idle.c + ..\..\..\src\thread.c - memheap.c + ipc.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\ipc.c - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - mempool.c + timer.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\timer.c @@ -640,23 +640,23 @@ - scheduler.c + clock.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\clock.c - object.c + memheap.c 1 - ..\..\..\src\object.c + ..\..\..\src\memheap.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c @@ -668,9 +668,9 @@ - clock.c + idle.c 1 - ..\..\..\src\clock.c + ..\..\..\src\idle.c diff --git a/bsp/stm32/stm32l4r9-st-eval/rtconfig.h b/bsp/stm32/stm32l4r9-st-eval/rtconfig.h index affa3ee1d8a..7486c563f69 100644 --- a/bsp/stm32/stm32l4r9-st-eval/rtconfig.h +++ b/bsp/stm32/stm32l4r9-st-eval/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -110,6 +110,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -195,6 +202,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/.config b/bsp/stm32/stm32l4r9-st-sensortile-box/.config index b41a0da617e..6ce3440be46 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/.config +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -182,10 +186,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -350,7 +361,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -372,10 +383,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -390,13 +408,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -454,9 +465,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -466,7 +484,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -481,6 +498,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -506,8 +524,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -515,6 +531,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/project.ewp b/bsp/stm32/stm32l4r9-st-sensortile-box/project.ewp index 32d23f4f59b..b4fc51d0047 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/project.ewp +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/project.ewp @@ -353,6 +353,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1415,6 +1416,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2142,10 +2144,10 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2166,16 +2168,16 @@ $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c @@ -2184,10 +2186,10 @@ $PROJ_DIR$\board\CubeMX_Config\Core\Src\stm32l4xx_hal_msp.c - $PROJ_DIR$\board\board.c + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l4r9xx.s - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l4r9xx.s + $PROJ_DIR$\board\board.c $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2214,43 +2216,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\object.c $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\idle.c @@ -2322,6 +2324,9 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/project.uvprojx b/bsp/stm32/stm32l4r9-st-sensortile-box/project.uvprojx index e56fa491ecf..28f25101073 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/project.uvprojx +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/project.uvprojx @@ -336,7 +336,7 @@ USE_HAL_DRIVER, STM32L4R9xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Core\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Core\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -391,23 +391,23 @@ CPU - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -443,51 +443,51 @@ - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c - ringblk_buf.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c - waitqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -564,30 +564,30 @@ Kernel - components.c + clock.c 1 - ..\..\..\src\components.c + ..\..\..\src\clock.c - idle.c + object.c 1 - ..\..\..\src\idle.c + ..\..\..\src\object.c - object.c + kservice.c 1 - ..\..\..\src\object.c + ..\..\..\src\kservice.c - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c @@ -599,37 +599,37 @@ - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - device.c + memheap.c 1 - ..\..\..\src\device.c + ..\..\..\src\memheap.c - memheap.c + components.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\components.c - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c @@ -641,16 +641,16 @@ - scheduler.c + irq.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\irq.c - clock.c + ipc.c 1 - ..\..\..\src\clock.c + ..\..\..\src\ipc.c diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.h b/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.h index a23efc10d23..1e42bbbabb8 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.h +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.h @@ -35,8 +35,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -106,6 +106,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -191,6 +198,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32l552-st-nucleo/.config b/bsp/stm32/stm32l552-st-nucleo/.config index b8867aab05e..711c7e0ebef 100644 --- a/bsp/stm32/stm32l552-st-nucleo/.config +++ b/bsp/stm32/stm32l552-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -124,7 +128,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -176,10 +179,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -342,7 +352,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -364,10 +374,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -382,13 +399,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -446,9 +456,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -458,7 +475,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -473,6 +489,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -497,8 +514,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -506,6 +521,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32l552-st-nucleo/project.ewp b/bsp/stm32/stm32l552-st-nucleo/project.ewp index 268f4f0e339..60a7c3134bc 100644 --- a/bsp/stm32/stm32l552-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l552-st-nucleo/project.ewp @@ -10,7 +10,7 @@ General 3 - 29 + 31 1 1 + + ICCARM 2 - 34 + 35 1 1 + @@ -689,7 +707,7 @@ ILINK 0 - 20 + 23 1 1 + + + + + + @@ -1040,7 +1082,7 @@ General 3 - 29 + 31 1 0 + + ICCARM 2 - 34 + 35 1 0 + @@ -1718,7 +1779,7 @@ ILINK 0 - 20 + 23 1 0 + + + + + + @@ -2066,87 +2151,27 @@ - Drivers - - $PROJ_DIR$\board\board.c - - - $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l475xx.s - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart.c - - - $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c - - - - Kernel - - $PROJ_DIR$\..\..\..\src\clock.c - - - $PROJ_DIR$\..\..\..\src\components.c - - - $PROJ_DIR$\..\..\..\src\device.c - - - $PROJ_DIR$\..\..\..\src\idle.c - - - $PROJ_DIR$\..\..\..\src\ipc.c - - - $PROJ_DIR$\..\..\..\src\irq.c - - - $PROJ_DIR$\..\..\..\src\kservice.c - - - $PROJ_DIR$\..\..\..\src\mem.c - - - $PROJ_DIR$\..\..\..\src\mempool.c - - - $PROJ_DIR$\..\..\..\src\object.c - + CPU - $PROJ_DIR$\..\..\..\src\scheduler.c - - - $PROJ_DIR$\..\..\..\src\signal.c - - - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - - - CORTEX-M4 - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\cpuport.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\syscall_iar.S - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\trustzone.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\context_iar.S @@ -2158,16 +2183,13 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - - - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2175,323 +2197,164 @@ $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - finsh + Drivers - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\board\CubeMX_Config\Src\stm32l5xx_hal_msp.c - $PROJ_DIR$\..\..\..\components\finsh\symbol.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Source\Templates\iar\startup_stm32l552xx.s - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\board\board.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c - $PROJ_DIR$\..\..\..\components\finsh\msh_cmd.c + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_usart.c - $PROJ_DIR$\..\..\..\components\finsh\msh_file.c + $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c - STM32_HAL - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_adc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_adc_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_can.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_comp.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_crc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_crc_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dac.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dac_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dcmi.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dfsdm.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dfsdm_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma2d.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dsi.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_firewall.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ramfunc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gfxmmu.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_hash.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_hash_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_hcd.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_irda.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_iwdg.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_lcd.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_lptim.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_ltdc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_ltdc_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_nand.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_nor.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_opamp.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_opamp_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_ospi.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pcd.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pcd_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_qspi.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rng.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rtc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rtc_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_sai.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_sai_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_sd.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_sd_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_smartcard.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_smartcard_ex.c - + Finsh - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_smbus.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi_ex.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c + + + Kernel - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_sram.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_swpmi.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tsc.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_usart.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_usart_ex.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_wwdg.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_adc.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_comp.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_crc.c + $PROJ_DIR$\..\..\..\src\device.c + + + libc - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_crs.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c + + + Libraries - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_dac.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_pwr.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_dma.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_dma_ex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_dma2d.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_gpio.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_exti.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_rcc_ex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_fmc.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_usart.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_gpio.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_uart_ex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_i2c.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_pwr_ex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_lptim.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cryp.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_lpuart.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_usart_ex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_opamp.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_exti.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_pwr.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Source\Templates\system_stm32l5xx.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_rcc.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cortex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_rng.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_rtc.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_rcc.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_sdmmc.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_dma.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_spi.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_uart.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_swpmi.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_comp.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_tim.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_rng.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_usart.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_crc.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_usb.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_crc_ex.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_ll_utils.c + $PROJ_DIR$\..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cryp_ex.c + + POSIX + + + utestcases + diff --git a/bsp/stm32/stm32l552-st-nucleo/project.uvoptx b/bsp/stm32/stm32l552-st-nucleo/project.uvoptx index e03e5af7eb7..3c541387921 100644 --- a/bsp/stm32/stm32l552-st-nucleo/project.uvoptx +++ b/bsp/stm32/stm32l552-st-nucleo/project.uvoptx @@ -128,88 +128,7 @@ UL2V8M(-S0 -C0 -P0 -FD20000000 -FC1000 -FN2 -FF0STM32L5x_512_0C00 -FS0C000000 -FL080000 -FF1STM32L5x_512_0800 -FS18000000 -FL180000 -FP0($$Device:STM32L552ZETxQ$CMSIS\Flash\STM32L5x_512_0C00.FLM) -FP1($$Device:STM32L552ZETxQ$CMSIS\Flash\STM32L5x_512_0800.FLM)) - - - 0 - 0 - 192 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - - - - - 1 - 0 - 197 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - - - - - 2 - 0 - 107 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - - - - - 3 - 0 - 175 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - - - - - 4 - 0 - 90 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32l5xx_hal_msp.c - - - - + 0 @@ -263,799 +182,11 @@ - Applications - 0 - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 0 - 0 - applications\main.c - main.c - 0 - 0 - - - - - CPU - 0 - 0 - 0 - 0 - - 2 - 2 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 2 - 3 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 2 - 4 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 2 - 5 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\syscall_rvds.S - syscall_rvds.S - 0 - 0 - - - 2 - 6 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\trustzone.c - trustzone.c - 0 - 0 - - - 2 - 7 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\context_rvds.S - context_rvds.S - 0 - 0 - - - 2 - 8 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\cpuport.c - cpuport.c - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 3 - 9 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 3 - 10 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 3 - 11 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 3 - 12 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - 3 - 13 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 3 - 14 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 3 - 15 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 3 - 16 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 3 - 17 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - - - Drivers - 0 - 0 - 0 - 0 - - 4 - 18 - 1 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32l5xx_hal_msp.c - stm32l5xx_hal_msp.c - 0 - 0 - - - 4 - 19 - 2 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Source\Templates\arm\startup_stm32l552xx.s - startup_stm32l552xx.s - 0 - 0 - - - 4 - 20 - 1 - 0 - 0 - 0 - board\board.c - board.c - 0 - 0 - - - 4 - 21 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 4 - 22 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 4 - 23 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - Finsh - 1 - 0 - 0 - 0 - - 5 - 24 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 5 - 25 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - 5 - 26 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - - - Kernel - 0 - 0 - 0 - 0 - - 6 - 27 - 1 - 0 - 0 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 6 - 28 - 1 - 0 - 0 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - 6 - 29 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 6 - 30 - 1 - 0 - 0 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 6 - 31 - 1 - 0 - 0 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 6 - 32 - 1 - 0 - 0 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - 6 - 33 - 1 - 0 - 0 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 6 - 34 - 1 - 0 - 0 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 6 - 35 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 6 - 36 - 1 - 0 - 0 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 6 - 37 - 1 - 0 - 0 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 0 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 6 - 39 - 1 - 0 - 0 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 7 - 40 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\time.c - time.c - 0 - 0 - - - - - Libraries + Source Group 1 0 0 0 0 - - 8 - 41 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_pwr.c - STM32l5xx_hal_pwr.c - 0 - 0 - - - 8 - 42 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_dma_ex.c - STM32l5xx_hal_dma_ex.c - 0 - 0 - - - 8 - 43 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_gpio.c - STM32l5xx_hal_gpio.c - 0 - 0 - - - 8 - 44 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_rcc_ex.c - STM32l5xx_hal_rcc_ex.c - 0 - 0 - - - 8 - 45 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_usart.c - STM32l5xx_hal_usart.c - 0 - 0 - - - 8 - 46 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_uart_ex.c - STM32l5xx_hal_uart_ex.c - 0 - 0 - - - 8 - 47 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_pwr_ex.c - STM32l5xx_hal_pwr_ex.c - 0 - 0 - - - 8 - 48 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_cryp.c - STM32l5xx_hal_cryp.c - 0 - 0 - - - 8 - 49 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_usart_ex.c - STM32l5xx_hal_usart_ex.c - 0 - 0 - - - 8 - 50 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_exti.c - STM32l5xx_hal_exti.c - 0 - 0 - - - 8 - 51 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Source\Templates\system_stm32l5xx.c - system_stm32l5xx.c - 0 - 0 - - - 8 - 52 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cortex.c - stm32l5xx_hal_cortex.c - 0 - 0 - - - 8 - 53 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal.c - stm32l5xx_hal.c - 0 - 0 - - - 8 - 54 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_rcc.c - STM32l5xx_hal_rcc.c - 0 - 0 - - - 8 - 55 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_dma.c - STM32l5xx_hal_dma.c - 0 - 0 - - - 8 - 56 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_uart.c - STM32l5xx_hal_uart.c - 0 - 0 - - - 8 - 57 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_comp.c - stm32l5xx_hal_comp.c - 0 - 0 - - - 8 - 58 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_rng.c - STM32l5xx_hal_rng.c - 0 - 0 - - - 8 - 59 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_crc.c - stm32l5xx_hal_crc.c - 0 - 0 - - - 8 - 60 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_crc_ex.c - stm32l5xx_hal_crc_ex.c - 0 - 0 - - - 8 - 61 - 1 - 0 - 0 - 0 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_cryp_ex.c - STM32l5xx_hal_cryp_ex.c - 0 - 0 - diff --git a/bsp/stm32/stm32l552-st-nucleo/project.uvprojx b/bsp/stm32/stm32l552-st-nucleo/project.uvprojx index 17f58b976af..cac51479cde 100644 --- a/bsp/stm32/stm32l552-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l552-st-nucleo/project.uvprojx @@ -1,10 +1,7 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rt-thread @@ -19,28 +16,28 @@ Keil.STM32L5xx_DFP.1.3.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00040000) IRAM2(0x30000000,0x00040000) IROM(0x08000000,0x00080000) IROM2(0x0C000000,0x00080000) CPUTYPE("Cortex-M33") FPU3(SFPU) DSP TZ CLOCK(12000000) ELITTLE - - + + UL2V8M(-S0 -C0 -P0 -FD20000000 -FC1000 -FN2 -FF0STM32L5x_512_0C00 -FS0C000000 -FL080000 -FF1STM32L5x_512_0800 -FS18000000 -FL180000 -FP0($$Device:STM32L552ZETxQ$CMSIS\Flash\STM32L5x_512_0C00.FLM) -FP1($$Device:STM32L552ZETxQ$CMSIS\Flash\STM32L5x_512_0800.FLM)) 0 $$Device:STM32L552ZETxQ$Drivers\CMSIS\Device\ST\STM32L5xx\Include\stm32l5xx.h - - - - - - - - - + + + + + + + + + $$Device:STM32L552ZETxQ$CMSIS\SVD\STM32L552.svd 0 0 - - - - - + + + + + 0 0 @@ -62,8 +59,8 @@ 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -83,14 +80,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -104,15 +101,15 @@ 0 0 3 - - + + 1 - - - - + + + + SARMV8M.DLL -MPU TCM.DLL @@ -138,11 +135,11 @@ 1 BIN\UL2V8M.DLL - - - - - + + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M33" - + 0 0 0 @@ -280,8 +277,8 @@ 1 - 0xc000000 - 0x80000 + 0x0 + 0x0 0 @@ -305,11 +302,11 @@ 0 - 0x30000000 - 0x40000 + 0x0 + 0x0 - + 1 @@ -336,10 +333,10 @@ 0 0 - + STM32L552xx, USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Inc;..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Include;..\libraries\STM32L5xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Inc;..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Include;..\libraries\STM32L5xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -354,10 +351,10 @@ 0 4 - - - - + + + + @@ -369,13 +366,13 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -394,41 +391,53 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c + + div0.c 1 ..\..\..\libcpu\arm\common\div0.c + + - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c - - - syscall_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m33\syscall_rvds.S + ..\..\..\libcpu\arm\common\backtrace.c + + trustzone.c 1 ..\..\..\libcpu\arm\cortex-m33\trustzone.c + + - context_rvds.S + syscall_rvds.S 2 - ..\..\..\libcpu\arm\cortex-m33\context_rvds.S + ..\..\..\libcpu\arm\cortex-m33\syscall_rvds.S + + cpuport.c 1 ..\..\..\libcpu\arm\cortex-m33\cpuport.c + + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m33\context_rvds.S + + DeviceDrivers @@ -438,76 +447,102 @@ 1 ..\..\..\components\drivers\misc\pin.c + + serial.c 1 ..\..\..\components\drivers\serial\serial.c + + - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c + + - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c + + - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c + + - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c + + - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c + + - waitqueue.c + completion.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\completion.c + + - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c Drivers - - stm32l5xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32l5xx_hal_msp.c - startup_stm32l552xx.s 2 ..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Source\Templates\arm\startup_stm32l552xx.s + + + + stm32l5xx_hal_msp.c + 1 + board\CubeMX_Config\Src\stm32l5xx_hal_msp.c + + + board.c 1 board\board.c + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c + + drv_common.c 1 @@ -523,11 +558,15 @@ 1 ..\..\..\components\finsh\shell.c + + msh.c 1 ..\..\..\components\finsh\msh.c + + cmd.c 1 @@ -539,69 +578,93 @@ Kernel - mem.c + kservice.c 1 - ..\..\..\src\mem.c + ..\..\..\src\kservice.c + + - components.c + scheduler.c 1 - ..\..\..\src\components.c + ..\..\..\src\scheduler.c + + - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c + + - mempool.c + thread.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\thread.c + + - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c + + - timer.c + mem.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mem.c + + object.c 1 ..\..\..\src\object.c + + - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c + + - device.c + idle.c 1 - ..\..\..\src\device.c + ..\..\..\src\idle.c + + - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c + + - scheduler.c + device.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\device.c + + - clock.c + irq.c 1 - ..\..\..\src\clock.c + ..\..\..\src\irq.c + + - irq.c + ipc.c 1 - ..\..\..\src\irq.c + ..\..\..\src\ipc.c @@ -619,135 +682,172 @@ Libraries - STM32l5xx_hal_pwr.c + stm32l5xx_hal_pwr.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_pwr.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_pwr.c + + - STM32l5xx_hal_dma_ex.c + stm32l5xx_hal_dma_ex.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_dma_ex.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_dma_ex.c + + - STM32l5xx_hal_gpio.c + stm32l5xx_hal_gpio.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_gpio.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_gpio.c + + - STM32l5xx_hal_rcc_ex.c + stm32l5xx_hal_rcc_ex.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_rcc_ex.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_rcc_ex.c + + - STM32l5xx_hal_usart.c + stm32l5xx_hal_usart.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_usart.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_usart.c + + - STM32l5xx_hal_uart_ex.c + stm32l5xx_hal_uart_ex.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_uart_ex.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_uart_ex.c + + - STM32l5xx_hal_pwr_ex.c + stm32l5xx_hal_pwr_ex.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_pwr_ex.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_pwr_ex.c + + - STM32l5xx_hal_cryp.c + stm32l5xx_hal_cryp.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_cryp.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cryp.c + + - STM32l5xx_hal_usart_ex.c + stm32l5xx_hal_usart_ex.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_usart_ex.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_usart_ex.c + + - STM32l5xx_hal_exti.c + stm32l5xx_hal_exti.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_exti.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_exti.c + + system_stm32l5xx.c 1 ..\libraries\STM32L5xx_HAL\CMSIS\Device\ST\STM32L5xx\Source\Templates\system_stm32l5xx.c + + stm32l5xx_hal_cortex.c 1 ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cortex.c + + stm32l5xx_hal.c 1 ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal.c + + - STM32l5xx_hal_rcc.c + stm32l5xx_hal_rcc.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_rcc.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_rcc.c + + - STM32l5xx_hal_dma.c + stm32l5xx_hal_dma.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_dma.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_dma.c + + - STM32l5xx_hal_uart.c + stm32l5xx_hal_uart.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_uart.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_uart.c + + stm32l5xx_hal_comp.c 1 ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_comp.c + + - STM32l5xx_hal_rng.c + stm32l5xx_hal_rng.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_rng.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_rng.c + + stm32l5xx_hal_crc.c 1 ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_crc.c + + stm32l5xx_hal_crc_ex.c 1 ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_crc_ex.c + + - STM32l5xx_hal_cryp_ex.c + stm32l5xx_hal_cryp_ex.c 1 - ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\STM32l5xx_hal_cryp_ex.c + ..\libraries\STM32L5xx_HAL\STM32L5xx_HAL_Driver\Src\stm32l5xx_hal_cryp_ex.c - - - - + + + - <Project Info> - - - - - + + + + + 0 1 - diff --git a/bsp/stm32/stm32l552-st-nucleo/rtconfig.h b/bsp/stm32/stm32l552-st-nucleo/rtconfig.h index ecb1f17b49a..e70fd38a89b 100644 --- a/bsp/stm32/stm32l552-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32l552-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -83,7 +84,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -102,6 +102,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -187,6 +194,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32mp157a-st-discovery/.config b/bsp/stm32/stm32mp157a-st-discovery/.config index d833b4a71e2..74bcde5caa4 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/.config +++ b/bsp/stm32/stm32mp157a-st-discovery/.config @@ -58,14 +58,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -133,7 +138,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +189,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +364,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +386,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +411,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +468,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +487,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +501,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +527,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +534,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32mp157a-st-discovery/project.ewp b/bsp/stm32/stm32mp157a-st-discovery/project.ewp index 97aa60dd610..8ba58cbf77f 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/project.ewp +++ b/bsp/stm32/stm32mp157a-st-discovery/project.ewp @@ -375,6 +375,7 @@ $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Include $PROJ_DIR$\board\ports\audio $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1455,6 +1456,7 @@ $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Include $PROJ_DIR$\board\ports\audio $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2168,15 +2170,15 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2193,25 +2195,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2253,43 +2255,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\timer.c $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\kservice.c @@ -2373,6 +2375,9 @@ $PROJ_DIR$\..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Src\stm32mp1xx_hal_mdma.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx b/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx index fb8b0a430b7..10cf5f9abf5 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx +++ b/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx @@ -336,7 +336,7 @@ CORE_CM4, __LOG_TRACE_IO_, METAL_MAX_DEVICE_REGIONS=2, VIRTIO_SLAVE_ONLY, NO_ATOMIC_64_SUPPORT, __CLK_TCK=RT_TICK_PER_SECOND, STM32MP157Axx, __RTTHREAD__, METAL_INTERNAL, USE_HAL_DRIVER - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;board\ports\audio;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;board\ports\audio;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -391,23 +391,23 @@ CPU - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c - div0.c + showmem.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\showmem.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -443,16 +443,9 @@ - dataqueue.c - 1 - ..\..\..\components\drivers\src\dataqueue.c - - - - - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c @@ -464,9 +457,9 @@ - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c @@ -478,9 +471,9 @@ - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -490,6 +483,13 @@ ..\..\..\components\drivers\src\completion.c + + + pipe.c + 1 + ..\..\..\components\drivers\src\pipe.c + + Drivers @@ -571,93 +571,93 @@ Kernel - memheap.c + mempool.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\mempool.c - scheduler.c + irq.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\irq.c - device.c + kservice.c 1 - ..\..\..\src\device.c + ..\..\..\src\kservice.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - kservice.c + components.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\components.c - components.c + device.c 1 - ..\..\..\src\components.c + ..\..\..\src\device.c - irq.c + object.c 1 - ..\..\..\src\irq.c + ..\..\..\src\object.c - ipc.c + memheap.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\memheap.c - idle.c + clock.c 1 - ..\..\..\src\idle.c + ..\..\..\src\clock.c - clock.c + scheduler.c 1 - ..\..\..\src\clock.c + ..\..\..\src\scheduler.c - timer.c + idle.c 1 - ..\..\..\src\timer.c + ..\..\..\src\idle.c - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - mempool.c + timer.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\timer.c diff --git a/bsp/stm32/stm32mp157a-st-discovery/rtconfig.h b/bsp/stm32/stm32mp157a-st-discovery/rtconfig.h index 64326e7a604..fc2368aec5d 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/rtconfig.h +++ b/bsp/stm32/stm32mp157a-st-discovery/rtconfig.h @@ -38,8 +38,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -111,6 +111,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -196,6 +203,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32mp157a-st-ev1/.config b/bsp/stm32/stm32mp157a-st-ev1/.config index 538146e7d8f..78531eed1c9 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/.config +++ b/bsp/stm32/stm32mp157a-st-ev1/.config @@ -58,14 +58,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -133,7 +138,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +189,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +364,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +386,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +411,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +468,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +487,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +501,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +527,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +534,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32mp157a-st-ev1/project.ewp b/bsp/stm32/stm32mp157a-st-ev1/project.ewp index 7879bf3d060..460500b6052 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/project.ewp +++ b/bsp/stm32/stm32mp157a-st-ev1/project.ewp @@ -374,6 +374,7 @@ $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -1453,6 +1454,7 @@ $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Include $PROJ_DIR$\..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include $PROJ_DIR$\..\libraries\HAL_Drivers @@ -2167,13 +2169,13 @@ CPU - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S @@ -2194,10 +2196,10 @@ $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c @@ -2206,7 +2208,7 @@ $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c @@ -2251,43 +2253,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\idle.c $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\memheap.c @@ -2371,6 +2373,9 @@ $PROJ_DIR$\..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Src\stm32mp1xx_hal_mdma.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx b/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx index 670540722c5..f7575dbbb17 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx +++ b/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx @@ -336,7 +336,7 @@ CORE_CM4, __LOG_TRACE_IO_, METAL_MAX_DEVICE_REGIONS=2, VIRTIO_SLAVE_ONLY, NO_ATOMIC_64_SUPPORT, __CLK_TCK=RT_TICK_PER_SECOND, STM32MP157Axx, __RTTHREAD__, METAL_INTERNAL, USE_HAL_DRIVER - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -391,23 +391,23 @@ CPU - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -457,37 +457,37 @@ - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - completion.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringblk_buf.c - dataqueue.c + completion.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - ringblk_buf.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\waitqueue.c @@ -495,16 +495,16 @@ Drivers - startup_stm32mp15xx.s - 2 - ..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Source\Templates\arm\startup_stm32mp15xx.s + system_stm32mp1xx.c + 1 + board\CubeMX_Config\Common\System\system_stm32mp1xx.c - system_stm32mp1xx.c - 1 - board\CubeMX_Config\Common\System\system_stm32mp1xx.c + startup_stm32mp15xx.s + 2 + ..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Source\Templates\arm\startup_stm32mp15xx.s @@ -571,93 +571,93 @@ Kernel - irq.c + thread.c 1 - ..\..\..\src\irq.c + ..\..\..\src\thread.c - mempool.c + object.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\object.c - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c - timer.c + idle.c 1 - ..\..\..\src\timer.c + ..\..\..\src\idle.c - memheap.c + clock.c 1 - ..\..\..\src\memheap.c + ..\..\..\src\clock.c - ipc.c + scheduler.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\scheduler.c - thread.c + timer.c 1 - ..\..\..\src\thread.c + ..\..\..\src\timer.c - idle.c + memheap.c 1 - ..\..\..\src\idle.c + ..\..\..\src\memheap.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c - device.c + ipc.c 1 - ..\..\..\src\device.c + ..\..\..\src\ipc.c - scheduler.c + kservice.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\kservice.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c diff --git a/bsp/stm32/stm32mp157a-st-ev1/rtconfig.h b/bsp/stm32/stm32mp157a-st-ev1/rtconfig.h index 64326e7a604..fc2368aec5d 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/rtconfig.h +++ b/bsp/stm32/stm32mp157a-st-ev1/rtconfig.h @@ -38,8 +38,9 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_MEMHEAP_AUTO_BINDING +#define RT_MEMHEAP_FAST_MODE #define RT_USING_MEMHEAP_AS_HEAP +#define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP /* end of Memory Management */ @@ -92,7 +93,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -111,6 +111,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -196,6 +203,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32u575-st-nucleo/.config b/bsp/stm32/stm32u575-st-nucleo/.config index 4a7685d3ba5..8f1f5031a00 100644 --- a/bsp/stm32/stm32u575-st-nucleo/.config +++ b/bsp/stm32/stm32u575-st-nucleo/.config @@ -56,12 +56,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -124,7 +128,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -176,10 +179,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -342,7 +352,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -364,10 +374,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -382,13 +399,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -446,9 +456,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -458,7 +475,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -473,6 +489,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set @@ -497,8 +514,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -506,6 +521,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # @@ -676,7 +692,6 @@ CONFIG_SOC_STM32U575ZI=y CONFIG_BSP_USING_GPIO=y CONFIG_BSP_USING_UART=y CONFIG_BSP_USING_UART1=y -# CONFIG_BSP_UART1_RX_USING_DMA is not set # CONFIG_BSP_USING_UDID is not set # end of On-chip Peripheral Drivers diff --git a/bsp/stm32/stm32u575-st-nucleo/project.ewp b/bsp/stm32/stm32u575-st-nucleo/project.ewp index 23db20653f6..64f1ae12c11 100644 --- a/bsp/stm32/stm32u575-st-nucleo/project.ewp +++ b/bsp/stm32/stm32u575-st-nucleo/project.ewp @@ -364,6 +364,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Inc @@ -1435,6 +1436,7 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\config $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\..\..\include $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Inc @@ -2150,9 +2152,6 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c @@ -2160,7 +2159,7 @@ $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\syscall_iar.S + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\trustzone.c @@ -2171,6 +2170,9 @@ $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\cpuport.c + + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m33\syscall_iar.S + DeviceDrivers @@ -2181,25 +2183,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c @@ -2238,43 +2240,43 @@ Kernel - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\timer.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\object.c $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\components.c $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\scheduler.c @@ -2289,28 +2291,22 @@ $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp_ex.c - - - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\system_stm32u5xx.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr_ex.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc_ex.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_icache.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_comp.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart_ex.c $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal.c - - - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc_ex.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart.c $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr.c @@ -2318,9 +2314,6 @@ $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc.c - - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma_ex.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_gpio.c @@ -2328,26 +2321,41 @@ $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rng.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cortex.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cortex.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp.c + + + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc_ex.c + + + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc_ex.c $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart_ex.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp_ex.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\system_stm32u5xx.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_exti.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr_ex.c - $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart_ex.c + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_comp.c + + + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma_ex.c + + $PROJ_DIR$\..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_exti.c + + + + POSIX utestcases diff --git a/bsp/stm32/stm32u575-st-nucleo/project.uvoptx b/bsp/stm32/stm32u575-st-nucleo/project.uvoptx index 09a817fcc5e..87711a8dfbb 100644 --- a/bsp/stm32/stm32u575-st-nucleo/project.uvoptx +++ b/bsp/stm32/stm32u575-st-nucleo/project.uvoptx @@ -128,56 +128,7 @@ -U003200374741500720383733 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32U5xx_2M_0800.FLM -FS08000000 -FL0200000 -FP0($$Device:STM32U575ZITx$CMSIS\Flash\STM32U5xx_2M_0800.FLM) - - - 0 - 0 - 144 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - rtconfig.h - - - - - 1 - 0 - 271 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\context_rvds.S - - - - - 2 - 0 - 144 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\..\..\src\components.c - - - - + 0 @@ -231,811 +182,11 @@ - Applications - 0 - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 0 - 0 - applications\main.c - main.c - 0 - 0 - - - - - CPU - 0 - 0 - 0 - 0 - - 2 - 2 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 2 - 3 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 2 - 4 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 2 - 5 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\trustzone.c - trustzone.c - 0 - 0 - - - 2 - 6 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\cpuport.c - cpuport.c - 0 - 0 - - - 2 - 7 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\context_rvds.S - context_rvds.S - 0 - 0 - - - 2 - 8 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m33\syscall_rvds.S - syscall_rvds.S - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 3 - 9 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 3 - 10 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 3 - 11 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 3 - 12 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 3 - 13 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 3 - 14 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 3 - 15 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 3 - 16 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 3 - 17 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - - - Drivers - 0 - 0 - 0 - 0 - - 4 - 18 - 2 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\arm\startup_stm32u575xx.s - startup_stm32u575xx.s - 0 - 0 - - - 4 - 19 - 1 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32u5xx_hal_msp.c - stm32u5xx_hal_msp.c - 0 - 0 - - - 4 - 20 - 1 - 0 - 0 - 0 - board\board.c - board.c - 0 - 0 - - - 4 - 21 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 4 - 22 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 4 - 23 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - Finsh - 0 - 0 - 0 - 0 - - 5 - 24 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 5 - 25 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - 5 - 26 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - - - Kernel - 0 - 0 - 0 - 0 - - 6 - 27 - 1 - 0 - 0 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 6 - 28 - 1 - 0 - 0 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 6 - 29 - 1 - 0 - 0 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 6 - 30 - 1 - 0 - 0 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 6 - 31 - 1 - 0 - 0 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 6 - 32 - 1 - 0 - 0 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 6 - 33 - 1 - 0 - 0 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 6 - 34 - 1 - 0 - 0 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - 6 - 35 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 6 - 36 - 1 - 0 - 0 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 6 - 37 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 0 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - 6 - 39 - 1 - 0 - 0 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 7 - 40 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\time.c - time.c - 0 - 0 - - - - - Libraries + Source Group 1 0 0 0 0 - - 8 - 41 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart.c - stm32u5xx_hal_uart.c - 0 - 0 - - - 8 - 42 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal.c - stm32u5xx_hal.c - 0 - 0 - - - 8 - 43 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc.c - stm32u5xx_hal_crc.c - 0 - 0 - - - 8 - 44 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_icache.c - stm32u5xx_hal_icache.c - 0 - 0 - - - 8 - 45 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart_ex.c - stm32u5xx_hal_uart_ex.c - 0 - 0 - - - 8 - 46 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma.c - stm32u5xx_hal_dma.c - 0 - 0 - - - 8 - 47 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart.c - stm32u5xx_hal_usart.c - 0 - 0 - - - 8 - 48 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr.c - stm32u5xx_hal_pwr.c - 0 - 0 - - - 8 - 49 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc.c - stm32u5xx_hal_rcc.c - 0 - 0 - - - 8 - 50 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_gpio.c - stm32u5xx_hal_gpio.c - 0 - 0 - - - 8 - 51 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rng.c - stm32u5xx_hal_rng.c - 0 - 0 - - - 8 - 52 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cortex.c - stm32u5xx_hal_cortex.c - 0 - 0 - - - 8 - 53 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp.c - stm32u5xx_hal_cryp.c - 0 - 0 - - - 8 - 54 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc_ex.c - stm32u5xx_hal_crc_ex.c - 0 - 0 - - - 8 - 55 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc_ex.c - stm32u5xx_hal_rcc_ex.c - 0 - 0 - - - 8 - 56 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart_ex.c - stm32u5xx_hal_usart_ex.c - 0 - 0 - - - 8 - 57 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp_ex.c - stm32u5xx_hal_cryp_ex.c - 0 - 0 - - - 8 - 58 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\system_stm32u5xx.c - system_stm32u5xx.c - 0 - 0 - - - 8 - 59 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr_ex.c - stm32u5xx_hal_pwr_ex.c - 0 - 0 - - - 8 - 60 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_comp.c - stm32u5xx_hal_comp.c - 0 - 0 - - - 8 - 61 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma_ex.c - stm32u5xx_hal_dma_ex.c - 0 - 0 - - - 8 - 62 - 1 - 0 - 0 - 0 - ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_exti.c - stm32u5xx_hal_exti.c - 0 - 0 - diff --git a/bsp/stm32/stm32u575-st-nucleo/project.uvprojx b/bsp/stm32/stm32u575-st-nucleo/project.uvprojx index ed34bfe8f3c..99d656a90d2 100644 --- a/bsp/stm32/stm32u575-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32u575-st-nucleo/project.uvprojx @@ -1,10 +1,7 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rtthread @@ -19,28 +16,28 @@ Keil.STM32U5xx_DFP.1.1.0 http://www.keil.com/pack/ IROM(0x08000000-0x81FFFFF) IRAM(0x20000000-0x200BFFFF) CLOCK(8000000) FPU3(SFPU) CPUTYPE("Cortex-M33") ELITTLE TZ - - - + + + 0 - - - - - - - - - - + + + + + + + + + + $$Device:STM32U575ZITx$CMSIS\SVD\STM32U5xx.svd 0 0 - - - - - + + + + + 0 0 @@ -55,15 +52,15 @@ 0 1 0 - + 1 0 0 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -83,14 +80,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 1 - + 0 @@ -104,15 +101,15 @@ 0 0 3 - - + + 0 - - - - + + + + SARMV8M.DLL -MPU TCM.DLL @@ -139,10 +136,10 @@ 1 BIN\UL2V8M.DLL "" () - - - - + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M33" - + 0 0 0 @@ -309,7 +306,7 @@ 0x0 - + 1 @@ -336,10 +333,10 @@ 0 0 - + USE_HAL_DRIVER, STM32U575xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Inc;..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Include;..\libraries\STM32U5xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Inc;..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Include;..\libraries\STM32U5xx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -354,10 +351,10 @@ 0 4 - - - - + + + + @@ -369,13 +366,13 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -393,42 +390,54 @@ CPU - - div0.c - 1 - ..\..\..\libcpu\arm\common\div0.c - showmem.c 1 ..\..\..\libcpu\arm\common\showmem.c + + backtrace.c 1 ..\..\..\libcpu\arm\common\backtrace.c + + - trustzone.c - 1 - ..\..\..\libcpu\arm\cortex-m33\trustzone.c - - - cpuport.c + div0.c 1 - ..\..\..\libcpu\arm\cortex-m33\cpuport.c + ..\..\..\libcpu\arm\common\div0.c + + context_rvds.S 2 ..\..\..\libcpu\arm\cortex-m33\context_rvds.S + + + + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m33\cpuport.c + + + syscall_rvds.S 2 ..\..\..\libcpu\arm\cortex-m33\syscall_rvds.S + + + trustzone.c + 1 + ..\..\..\libcpu\arm\cortex-m33\trustzone.c + + DeviceDrivers @@ -438,76 +447,102 @@ 1 ..\..\..\components\drivers\misc\pin.c + + serial.c 1 ..\..\..\components\drivers\serial\serial.c + + + + waitqueue.c + 1 + ..\..\..\components\drivers\src\waitqueue.c + + + dataqueue.c 1 ..\..\..\components\drivers\src\dataqueue.c + + - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c + + - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c + + ringblk_buf.c 1 ..\..\..\components\drivers\src\ringblk_buf.c - - ringbuffer.c - 1 - ..\..\..\components\drivers\src\ringbuffer.c - + + pipe.c 1 ..\..\..\components\drivers\src\pipe.c + + - workqueue.c + completion.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\completion.c Drivers - - startup_stm32u575xx.s - 2 - ..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\arm\startup_stm32u575xx.s - stm32u5xx_hal_msp.c 1 board\CubeMX_Config\Src\stm32u5xx_hal_msp.c + + + + startup_stm32u575xx.s + 2 + ..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\arm\startup_stm32u575xx.s + + + board.c 1 board\board.c + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c + + drv_common.c 1 @@ -523,11 +558,15 @@ 1 ..\..\..\components\finsh\shell.c + + msh.c 1 ..\..\..\components\finsh\msh.c + + cmd.c 1 @@ -539,69 +578,93 @@ Kernel - kservice.c + ipc.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\ipc.c + + - mempool.c + kservice.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\kservice.c + + - mem.c + object.c 1 - ..\..\..\src\mem.c + ..\..\..\src\object.c + + - idle.c + irq.c 1 - ..\..\..\src\idle.c + ..\..\..\src\irq.c + + - scheduler.c + thread.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\thread.c + + - clock.c + mempool.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mempool.c + + - ipc.c + device.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\device.c + + - irq.c + idle.c 1 - ..\..\..\src\irq.c + ..\..\..\src\idle.c + + - thread.c + mem.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mem.c + + - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c + + - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c + + - timer.c + scheduler.c 1 - ..\..\..\src\timer.c + ..\..\..\src\scheduler.c + + - components.c + clock.c 1 - ..\..\..\src\components.c + ..\..\..\src\clock.c @@ -623,106 +686,148 @@ 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart.c + + stm32u5xx_hal.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal.c + + stm32u5xx_hal_crc.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc.c + + stm32u5xx_hal_icache.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_icache.c + + stm32u5xx_hal_uart_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_uart_ex.c + + stm32u5xx_hal_dma.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma.c + + stm32u5xx_hal_usart.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart.c + + stm32u5xx_hal_pwr.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr.c + + stm32u5xx_hal_rcc.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc.c + + stm32u5xx_hal_gpio.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_gpio.c + + stm32u5xx_hal_rng.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rng.c + + stm32u5xx_hal_cortex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cortex.c + + stm32u5xx_hal_cryp.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp.c + + stm32u5xx_hal_crc_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_crc_ex.c + + stm32u5xx_hal_rcc_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_rcc_ex.c + + stm32u5xx_hal_usart_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_usart_ex.c + + stm32u5xx_hal_cryp_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_cryp_ex.c + + system_stm32u5xx.c 1 ..\libraries\STM32U5xx_HAL\CMSIS\Device\ST\STM32U5xx\Source\Templates\system_stm32u5xx.c + + stm32u5xx_hal_pwr_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_pwr_ex.c + + stm32u5xx_hal_comp.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_comp.c + + stm32u5xx_hal_dma_ex.c 1 ..\libraries\STM32U5xx_HAL\STM32U5xx_HAL_Driver\Src\stm32u5xx_hal_dma_ex.c + + stm32u5xx_hal_exti.c 1 @@ -733,26 +838,23 @@ - - - - + + + - <Project Info> - - - - - + + + + + 0 1 - diff --git a/bsp/stm32/stm32u575-st-nucleo/rtconfig.h b/bsp/stm32/stm32u575-st-nucleo/rtconfig.h index 2d5bb0e0ed5..89220957496 100644 --- a/bsp/stm32/stm32u575-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32u575-st-nucleo/rtconfig.h @@ -35,6 +35,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -83,7 +84,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -101,6 +101,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -186,6 +193,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32wb55-st-nucleo/.config b/bsp/stm32/stm32wb55-st-nucleo/.config index 1a185842697..e2708e4c6fa 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/.config +++ b/bsp/stm32/stm32wb55-st-nucleo/.config @@ -58,12 +58,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +135,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +188,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +363,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +385,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +410,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +467,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +486,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +500,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +526,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +533,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32wb55-st-nucleo/project.ewp b/bsp/stm32/stm32wb55-st-nucleo/project.ewp index be16e2e3cff..6707d522e8f 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/project.ewp +++ b/bsp/stm32/stm32wb55-st-nucleo/project.ewp @@ -354,10 +354,10 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\libraries\STM32WBxx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Include $PROJ_DIR$\..\..\..\include @@ -1390,10 +1390,10 @@ $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib $PROJ_DIR$\board $PROJ_DIR$\..\libraries\STM32WBxx_HAL\CMSIS\Include $PROJ_DIR$\..\..\..\components\libc\compilers\common + $PROJ_DIR$\..\..\..\components\libc\posix\io\poll $PROJ_DIR$\board\CubeMX_Config\Inc $PROJ_DIR$\..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Include $PROJ_DIR$\..\..\..\include @@ -2081,15 +2081,15 @@ CPU - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c @@ -2106,25 +2106,25 @@ $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2163,52 +2163,52 @@ Kernel - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\src\timer.c libc - $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c + $PROJ_DIR$\..\..\..\components\libc\compilers\common\stdlib.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c @@ -2217,31 +2217,25 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscalls.c - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c @@ -2313,6 +2307,9 @@ $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_comp.c + + POSIX + utestcases diff --git a/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx b/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx index e3b9cfc5b77..db334b2c997 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx @@ -336,7 +336,7 @@ USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARM_LIBC, __RTTHREAD__, STM32WB55xx - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Inc;..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Include;..\libraries\STM32WBxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Inc;..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Include;..\libraries\STM32WBxx_HAL\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\examples\utest\testcases\kernel @@ -391,23 +391,23 @@ CPU - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + div0.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\div0.c - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -443,16 +443,16 @@ - workqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c @@ -464,30 +464,30 @@ - ringblk_buf.c + pipe.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringbuffer.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -564,9 +564,9 @@ Kernel - components.c + irq.c 1 - ..\..\..\src\components.c + ..\..\..\src\irq.c @@ -578,79 +578,79 @@ - scheduler.c + object.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\object.c - mem.c + timer.c 1 - ..\..\..\src\mem.c + ..\..\..\src\timer.c - timer.c + mempool.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mempool.c - irq.c + kservice.c 1 - ..\..\..\src\irq.c + ..\..\..\src\kservice.c - mempool.c + scheduler.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\scheduler.c - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - object.c + components.c 1 - ..\..\..\src\object.c + ..\..\..\src\components.c - idle.c + mem.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mem.c - kservice.c + clock.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\clock.c - thread.c + ipc.c 1 - ..\..\..\src\thread.c + ..\..\..\src\ipc.c - clock.c + thread.c 1 - ..\..\..\src\clock.c + ..\..\..\src\thread.c @@ -658,9 +658,9 @@ libc - mem_std.c + libc_syms.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + ..\..\..\components\libc\compilers\armlibc\libc_syms.c @@ -672,23 +672,23 @@ - libc.c + mem_std.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - time.c + stdlib.c 1 - ..\..\..\components\libc\compilers\common\time.c + ..\..\..\components\libc\compilers\common\stdlib.c - stdlib.c + time.c 1 - ..\..\..\components\libc\compilers\common\stdlib.c + ..\..\..\components\libc\compilers\common\time.c diff --git a/bsp/stm32/stm32wb55-st-nucleo/rtconfig.h b/bsp/stm32/stm32wb55-st-nucleo/rtconfig.h index b8abe9d8ae0..63daeeddbab 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32wb55-st-nucleo/rtconfig.h @@ -37,6 +37,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -89,7 +90,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA @@ -109,6 +109,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -194,6 +201,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32wl55-st-nucleo/.config b/bsp/stm32/stm32wl55-st-nucleo/.config index 73a22b1151e..65aa294e1e4 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/.config +++ b/bsp/stm32/stm32wl55-st-nucleo/.config @@ -45,12 +45,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -118,7 +122,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -169,10 +172,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -337,7 +347,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -359,10 +369,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -377,13 +394,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -441,9 +451,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -453,7 +470,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -468,6 +484,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -493,8 +510,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -502,6 +517,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32wl55-st-nucleo/project.uvprojx b/bsp/stm32/stm32wl55-st-nucleo/project.uvprojx index fa2e2cabfd1..f6e2fb48d11 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32wl55-st-nucleo/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32WLxx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32WLxx_HAL\STM32WLxx_HAL_Driver\Inc;..\libraries\STM32WLxx_HAL\CMSIS\Device\ST\stm32lwxx\Include;..\libraries\STM32WLxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\..\..\components\libc\posix\io\poll;..\libraries\STM32WLxx_HAL\STM32WLxx_HAL_Driver\Inc;..\libraries\STM32WLxx_HAL\CMSIS\Device\ST\stm32lwxx\Include;..\libraries\STM32WLxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel @@ -390,16 +390,16 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c @@ -411,16 +411,16 @@ - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + cpuport.c + 1 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S @@ -442,51 +442,51 @@ - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - completion.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -563,93 +563,93 @@ Kernel - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c - timer.c + kservice.c 1 - ..\..\..\src\timer.c + ..\..\..\src\kservice.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - clock.c + mem.c 1 - ..\..\..\src\clock.c + ..\..\..\src\mem.c - irq.c + thread.c 1 - ..\..\..\src\irq.c + ..\..\..\src\thread.c - object.c + clock.c 1 - ..\..\..\src\object.c + ..\..\..\src\clock.c - mempool.c + irq.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\irq.c - ipc.c + idle.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\idle.c - mem.c + object.c 1 - ..\..\..\src\mem.c + ..\..\..\src\object.c - components.c + timer.c 1 - ..\..\..\src\components.c + ..\..\..\src\timer.c - device.c + scheduler.c 1 - ..\..\..\src\device.c + ..\..\..\src\scheduler.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - thread.c + mempool.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mempool.c diff --git a/bsp/stm32/stm32wl55-st-nucleo/rtconfig.h b/bsp/stm32/stm32wl55-st-nucleo/rtconfig.h index c6c5f26f71b..4c2e045a23e 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/rtconfig.h +++ b/bsp/stm32/stm32wl55-st-nucleo/rtconfig.h @@ -33,6 +33,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -101,6 +101,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -186,6 +193,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/.config b/bsp/stm32/stm32wle5-yizhilian-lm401/.config index 651a55d4535..604f5657f7a 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/.config +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/.config @@ -45,12 +45,16 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -# CONFIG_RT_USING_MEMHEAP is not set -# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP is not set +CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -118,7 +122,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -169,10 +172,17 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -337,7 +347,7 @@ CONFIG_RT_USING_PIN=y # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -359,10 +369,17 @@ CONFIG_RT_USING_PIN=y # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -377,13 +394,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -441,9 +451,16 @@ CONFIG_RT_USING_PIN=y # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -453,7 +470,6 @@ CONFIG_RT_USING_PIN=y # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -468,6 +484,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -493,8 +510,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -502,6 +517,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/project.uvprojx b/bsp/stm32/stm32wle5-yizhilian-lm401/project.uvprojx index 88aa5b88e76..10f6dcb1bfa 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/project.uvprojx +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/project.uvprojx @@ -335,7 +335,7 @@ USE_HAL_DRIVER, STM32WLxx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32WLxx_HAL\STM32WLxx_HAL_Driver\Inc;..\libraries\STM32WLxx_HAL\CMSIS\Device\ST\stm32lwxx\Include;..\libraries\STM32WLxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\..\..\components\libc\posix\io\poll;..\libraries\STM32WLxx_HAL\STM32WLxx_HAL_Driver\Inc;..\libraries\STM32WLxx_HAL\CMSIS\Device\ST\stm32lwxx\Include;..\libraries\STM32WLxx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel @@ -397,16 +397,16 @@ - backtrace.c + showmem.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\showmem.c - showmem.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\libcpu\arm\common\backtrace.c @@ -456,37 +456,37 @@ - completion.c + waitqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\waitqueue.c - dataqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + dataqueue.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\dataqueue.c - waitqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + completion.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\completion.c @@ -561,20 +561,6 @@ Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - - - - idle.c - 1 - ..\..\..\src\idle.c - - timer.c @@ -584,30 +570,30 @@ - components.c + ipc.c 1 - ..\..\..\src\components.c + ..\..\..\src\ipc.c - thread.c + mem.c 1 - ..\..\..\src\thread.c + ..\..\..\src\mem.c - object.c + thread.c 1 - ..\..\..\src\object.c + ..\..\..\src\thread.c - ipc.c + clock.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\clock.c @@ -619,9 +605,9 @@ - scheduler.c + components.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\components.c @@ -638,6 +624,13 @@ ..\..\..\src\device.c + + + scheduler.c + 1 + ..\..\..\src\scheduler.c + + kservice.c @@ -647,9 +640,16 @@ - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c + + + + + object.c + 1 + ..\..\..\src\object.c diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.h b/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.h index 4bf38ecae4f..04c35a3a267 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.h +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.h @@ -33,6 +33,7 @@ #define RT_USING_MEMPOOL #define RT_USING_SMALL_MEM +#define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP /* end of Memory Management */ @@ -85,7 +86,6 @@ /* Device Drivers */ #define RT_USING_DEVICE_IPC -#define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_USING_SERIAL_V1 #define RT_SERIAL_RB_BUFSZ 64 @@ -101,6 +101,13 @@ /* POSIX (Portable Operating System Interface) layer */ + +/* Interprocess Communication (IPC) */ + + +/* Socket is in the 'Network' category */ + +/* end of Interprocess Communication (IPC) */ /* end of POSIX (Portable Operating System Interface) layer */ /* end of POSIX layer and C standard library */ @@ -186,6 +193,10 @@ /* system packages */ +/* enhanced kernel services */ + +/* end of enhanced kernel services */ + /* acceleration: Assembly language or algorithmic acceleration packages */ /* end of acceleration: Assembly language or algorithmic acceleration packages */ diff --git a/bsp/swm320-lq100/.config b/bsp/swm320-lq100/.config index 035b031f9b5..61bf5af7543 100644 --- a/bsp/swm320-lq100/.config +++ b/bsp/swm320-lq100/.config @@ -56,14 +56,19 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # Memory Management # CONFIG_RT_USING_MEMPOOL=y -CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y -# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_SMALL_MEM is not set # CONFIG_RT_USING_SLAB is not set +CONFIG_RT_USING_MEMHEAP=y +CONFIG_RT_MEMHEAP_FAST_MODE=y +# CONFIG_RT_MEMHEAP_BSET_MODE is not set +# CONFIG_RT_USING_SMALL_MEM_AS_HEAP is not set CONFIG_RT_USING_MEMHEAP_AS_HEAP=y +CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y +# CONFIG_RT_USING_SLAB_AS_HEAP is not set # CONFIG_RT_USING_USERHEAP is not set +# CONFIG_RT_USING_NOHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set +# CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y # end of Memory Management @@ -131,7 +136,6 @@ CONFIG_FINSH_ARG_MAX=10 # Device Drivers # CONFIG_RT_USING_DEVICE_IPC=y -CONFIG_RT_PIPE_BUFSZ=512 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_USING_SERIAL_V1=y @@ -185,10 +189,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_POSIX_FS is not set # CONFIG_RT_USING_POSIX_DELAY is not set # CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_AIO is not set # CONFIG_RT_USING_PTHREADS is not set + +# +# Interprocess Communication (IPC) +# +# CONFIG_RT_USING_POSIX_PIPE is not set + +# +# Socket is in the 'Network' category +# +# end of Interprocess Communication (IPC) # end of POSIX (Portable Operating System Interface) layer # end of POSIX layer and C standard library @@ -353,7 +364,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # security packages # # CONFIG_PKG_USING_MBEDTLS is not set -# CONFIG_PKG_USING_libsodium is not set +# CONFIG_PKG_USING_LIBSODIUM is not set # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set @@ -375,10 +386,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # LVGL: powerful and easy-to-use embedded GUI library # -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LVGL is not set +# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # end of LVGL: powerful and easy-to-use embedded GUI library +# +# u8g2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -393,13 +411,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_UGUI is not set -# -# u8g2: a monochrome graphic library -# -# CONFIG_PKG_USING_U8G2_OFFICIAL is not set -# CONFIG_PKG_USING_U8G2 is not set -# end of u8g2: a monochrome graphic library - # # PainterEngine: A cross-platform graphics application framework written in C language # @@ -457,9 +468,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # -# acceleration: Assembly language or algorithmic acceleration packages +# enhanced kernel services # # CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# +# acceleration: Assembly language or algorithmic acceleration packages +# # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set @@ -469,7 +487,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # CONFIG_PKG_USING_CMSIS_5 is not set -# CONFIG_PKG_USING_CMSIS_5_AUX is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set # end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -484,6 +501,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_UC_MODBUS is not set # end of Micrium: Micrium software products porting for RT-Thread +# CONFIG_RT_USING_ARDUINO is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_PERSIMMON is not set # CONFIG_PKG_USING_CAIRO is not set @@ -509,8 +527,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set -# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set -# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -518,6 +534,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set +# CONFIG_PKG_USING_USB_STACK is not set # end of system packages # diff --git a/bsp/swm320-lq100/project.ewp b/bsp/swm320-lq100/project.ewp index 4d09e095967..aa4c1f666ca 100644 --- a/bsp/swm320-lq100/project.ewp +++ b/bsp/swm320-lq100/project.ewp @@ -342,17 +342,17 @@