mirror of
https://github.com/drasko/open-ameba.git
synced 2024-11-21 21:44:19 +00:00
update
This commit is contained in:
parent
9a5b92c3d1
commit
8f1ce60a14
20 changed files with 2353 additions and 2347 deletions
|
@ -438,7 +438,7 @@ void start_log_service(void)
|
||||||
xTaskHandle CreatedTask;
|
xTaskHandle CreatedTask;
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
#if CONFIG_USE_TCM_HEAP
|
#if 0 // CONFIG_USE_TCM_HEAP
|
||||||
extern void *tcm_heap_malloc(int size);
|
extern void *tcm_heap_malloc(int size);
|
||||||
void *stack_addr = tcm_heap_malloc(STACKSIZE * sizeof(int));
|
void *stack_addr = tcm_heap_malloc(STACKSIZE * sizeof(int));
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,9 @@
|
||||||
|
|
||||||
#if defined(CONFIG_PLATFORM_AMEBA_X)
|
#if defined(CONFIG_PLATFORM_AMEBA_X)
|
||||||
#if !defined(CONFIG_PLATFORM_8711B)
|
#if !defined(CONFIG_PLATFORM_8711B)
|
||||||
|
#ifndef CONFIG_USE_TCM_HEAP
|
||||||
#define CONFIG_USE_TCM_HEAP 1 /* USE TCM HEAP */
|
#define CONFIG_USE_TCM_HEAP 1 /* USE TCM HEAP */
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#define CONFIG_RECV_TASKLET_THREAD
|
#define CONFIG_RECV_TASKLET_THREAD
|
||||||
#define CONFIG_XMIT_TASKLET_THREAD
|
#define CONFIG_XMIT_TASKLET_THREAD
|
||||||
|
|
|
@ -443,6 +443,7 @@ void sys_mutex_unlock(sys_mutex_t *mutex)
|
||||||
thread() function. The id of the new thread is returned. Both the id and
|
thread() function. The id of the new thread is returned. Both the id and
|
||||||
the priority are system dependent.
|
the priority are system dependent.
|
||||||
*/
|
*/
|
||||||
|
#if 0
|
||||||
sys_thread_t sys_thread_new_tcm(const char *name, lwip_thread_fn thread , void *arg, int stacksize, int prio)
|
sys_thread_t sys_thread_new_tcm(const char *name, lwip_thread_fn thread , void *arg, int stacksize, int prio)
|
||||||
{
|
{
|
||||||
xTaskHandle CreatedTask;
|
xTaskHandle CreatedTask;
|
||||||
|
@ -488,6 +489,7 @@ int result;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
// TODO
|
// TODO
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
|
|
|
@ -472,7 +472,7 @@ tcpip_init(tcpip_init_done_fn initfunc, void *arg)
|
||||||
LWIP_ASSERT("failed to create lock_tcpip_core", 0);
|
LWIP_ASSERT("failed to create lock_tcpip_core", 0);
|
||||||
}
|
}
|
||||||
#endif /* LWIP_TCPIP_CORE_LOCKING */
|
#endif /* LWIP_TCPIP_CORE_LOCKING */
|
||||||
#if CONFIG_USE_TCM_HEAP
|
#if 0 // CONFIG_USE_TCM_HEAP
|
||||||
sys_thread_new_tcm(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO);
|
sys_thread_new_tcm(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO);
|
||||||
#else
|
#else
|
||||||
sys_thread_new(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO);
|
sys_thread_new(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO);
|
||||||
|
|
|
@ -222,7 +222,7 @@ void sys_mbox_set_invalid(sys_mbox_t *mbox);
|
||||||
* @param stacksize stack size in bytes for the new thread (may be ignored by ports)
|
* @param stacksize stack size in bytes for the new thread (may be ignored by ports)
|
||||||
* @param prio priority of the new thread (may be ignored by ports) */
|
* @param prio priority of the new thread (may be ignored by ports) */
|
||||||
sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize, int prio);
|
sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize, int prio);
|
||||||
sys_thread_t sys_thread_new_tcm(const char *name, lwip_thread_fn thread , void *arg, int stacksize, int prio);
|
//sys_thread_t sys_thread_new_tcm(const char *name, lwip_thread_fn thread , void *arg, int stacksize, int prio);
|
||||||
|
|
||||||
#endif /* NO_SYS */
|
#endif /* NO_SYS */
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ static void tcpecho_thread(void *arg)
|
||||||
|
|
||||||
void tcpecho_init(void)
|
void tcpecho_init(void)
|
||||||
{
|
{
|
||||||
sys_thread_new("tcpecho_thread", tcpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE, TCPECHO_THREAD_PRIO);
|
sys_thread_new("tcpecho", tcpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE, TCPECHO_THREAD_PRIO);
|
||||||
}
|
}
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ static void udpecho_thread(void *arg)
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
void udpecho_init(void)
|
void udpecho_init(void)
|
||||||
{
|
{
|
||||||
sys_thread_new("udpecho_thread", udpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE,UDPECHO_THREAD_PRIO );
|
sys_thread_new("udpecho", udpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE,UDPECHO_THREAD_PRIO );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* LWIP_NETCONN */
|
#endif /* LWIP_NETCONN */
|
||||||
|
|
|
@ -544,7 +544,7 @@ static int _freertos_create_task(struct task_struct *ptask, const char *name,
|
||||||
|
|
||||||
priority += tskIDLE_PRIORITY + PRIORITIE_OFFSET;
|
priority += tskIDLE_PRIORITY + PRIORITIE_OFFSET;
|
||||||
|
|
||||||
#if CONFIG_USE_TCM_HEAP
|
#if 0 // CONFIG_USE_TCM_HEAP
|
||||||
void *stack_addr = tcm_heap_malloc(stack_size*sizeof(int));
|
void *stack_addr = tcm_heap_malloc(stack_size*sizeof(int));
|
||||||
//void *stack_addr = rtw_malloc(stack_size*sizeof(int));
|
//void *stack_addr = rtw_malloc(stack_size*sizeof(int));
|
||||||
if(stack_addr == NULL){
|
if(stack_addr == NULL){
|
||||||
|
|
|
@ -100,10 +100,10 @@ extern "C" {
|
||||||
//-----------
|
//-----------
|
||||||
#if defined(CONFIG_PLATFORM_8195A)
|
#if defined(CONFIG_PLATFORM_8195A)
|
||||||
#ifndef CONFIG_USE_TCM_HEAP
|
#ifndef CONFIG_USE_TCM_HEAP
|
||||||
#define CONFIG_USE_TCM_HEAP
|
#define CONFIG_USE_TCM_HEAP 1
|
||||||
#endif
|
#endif
|
||||||
#ifndef configUSE_STACK_TCM_HEAP
|
#ifndef configUSE_STACK_TCM_HEAP
|
||||||
#define configUSE_STACK_TCM_HEAP 1
|
#define configUSE_STACK_TCM_HEAP 5 // min priority use tcm
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#undef configUSE_STACK_TCM_HEAP
|
#undef configUSE_STACK_TCM_HEAP
|
||||||
|
|
|
@ -104,10 +104,10 @@ extern "C" {
|
||||||
//-----------
|
//-----------
|
||||||
#if defined(CONFIG_PLATFORM_8195A)
|
#if defined(CONFIG_PLATFORM_8195A)
|
||||||
#ifndef CONFIG_USE_TCM_HEAP
|
#ifndef CONFIG_USE_TCM_HEAP
|
||||||
#define CONFIG_USE_TCM_HEAP
|
#define CONFIG_USE_TCM_HEAP 1
|
||||||
#endif
|
#endif
|
||||||
#ifndef configUSE_STACK_TCM_HEAP
|
#ifndef configUSE_STACK_TCM_HEAP
|
||||||
#define configUSE_STACK_TCM_HEAP 1
|
#define configUSE_STACK_TCM_HEAP 5 // priority
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#undef configUSE_STACK_TCM_HEAP
|
#undef configUSE_STACK_TCM_HEAP
|
||||||
|
|
|
@ -724,10 +724,14 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB ) PRIVILEGED_FUNCTION;
|
||||||
{
|
{
|
||||||
StackType_t *pxStack = puxStackBuffer;
|
StackType_t *pxStack = puxStackBuffer;
|
||||||
#if configUSE_STACK_TCM_HEAP
|
#if configUSE_STACK_TCM_HEAP
|
||||||
if (pxStack == NULL) {
|
if(pxStack == NULL
|
||||||
|
#if 0 // configUSE_STACK_TCM_HEAP > 1
|
||||||
|
&& uxPriority >= configUSE_STACK_TCM_HEAP
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
|
||||||
pxStack = ( StackType_t * ) tcm_heap_malloc((( size_t ) usStackDepth) * sizeof(StackType_t));
|
pxStack = ( StackType_t * ) tcm_heap_malloc((( size_t ) usStackDepth) * sizeof(StackType_t));
|
||||||
if(pxStack == NULL) pxStack = ( StackType_t * ) pvPortMalloc((( size_t ) usStackDepth) * sizeof(StackType_t));
|
if(pxStack == NULL) pxStack = ( StackType_t * ) pvPortMalloc((( size_t ) usStackDepth) * sizeof(StackType_t));
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
/* Allocate space for the stack used by the task being created. */
|
/* Allocate space for the stack used by the task being created. */
|
||||||
pxStack = ( StackType_t * ) pvPortMalloc( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ) ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */
|
pxStack = ( StackType_t * ) pvPortMalloc( ( ( ( size_t ) usStackDepth ) * sizeof( StackType_t ) ) ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */
|
||||||
|
|
|
@ -772,9 +772,9 @@ static u32 _rtx_GetFreeHeapSize(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if CONFIG_USE_TCM_HEAP
|
//#if CONFIG_USE_TCM_HEAP
|
||||||
void *tcm_heap_malloc(int size);
|
//void *tcm_heap_malloc(int size);
|
||||||
#endif
|
//#endif
|
||||||
static int _rtx_create_task(struct task_struct *ptask, const char *name,
|
static int _rtx_create_task(struct task_struct *ptask, const char *name,
|
||||||
u32 stack_size, u32 priority, thread_func_t func, void *thctx)
|
u32 stack_size, u32 priority, thread_func_t func, void *thctx)
|
||||||
{
|
{
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4653
build/obj/build.nmap
4653
build/obj/build.nmap
File diff suppressed because it is too large
Load diff
|
@ -163,7 +163,10 @@ a lot of data that needs to be copied, this should be set high. */
|
||||||
|
|
||||||
/* ---------- ARP options ----------- */
|
/* ---------- ARP options ----------- */
|
||||||
#define LWIP_ARP 1
|
#define LWIP_ARP 1
|
||||||
|
/**
|
||||||
|
* LWIP_AUTOIP==1: Enable AUTOIP module.
|
||||||
|
*/
|
||||||
|
#define LWIP_AUTOIP 0 //Realtek modified (0->1)
|
||||||
/* ---------- DHCP options ---------- */
|
/* ---------- DHCP options ---------- */
|
||||||
/* Define LWIP_DHCP to 1 if you want DHCP configuration of
|
/* Define LWIP_DHCP to 1 if you want DHCP configuration of
|
||||||
interfaces. DHCP is not implemented in lwIP 0.5.1, however, so
|
interfaces. DHCP is not implemented in lwIP 0.5.1, however, so
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
* Target Platform Selection
|
* Target Platform Selection
|
||||||
*/
|
*/
|
||||||
#define CONFIG_WITHOUT_MONITOR 1
|
#define CONFIG_WITHOUT_MONITOR 1
|
||||||
|
#define CONFIG_USE_TCM_HEAP 1
|
||||||
|
#define configUSE_STACK_TCM_HEAP 5 // min priority use tcm ?
|
||||||
|
|
||||||
#undef CONFIG_RTL8195A
|
#undef CONFIG_RTL8195A
|
||||||
#define CONFIG_RTL8195A 1
|
#define CONFIG_RTL8195A 1
|
||||||
|
|
Loading…
Reference in a new issue