PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix board keil compile

Browse Source
This commit is contained in:
daishengdong
2019-10-28 17:20:08 +08:00
parent 7e11e4f009
commit bd613af56e
271 changed files with 158648 additions and 31918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/lwip/port/include/arch/sys_arch.h
View File

@@ -44,13 +44,13 @@
extern "C" {
#endif
#define SYS_MBOX_NULL (k_queue_t*)K_NULL
#define SYS_MBOX_NULL (k_msg_q_t*)K_NULL
#define SYS_SEM_NULL (k_sem_t*)K_NULL
#define SYS_MRTEX_NULL (k_mutex_t*)K_NULL
typedef k_sem_t sys_sem_t;
typedef k_mutex_t sys_mutex_t;
typedef k_queue_t sys_mbox_t;
typedef k_msg_q_t sys_mbox_t;
typedef k_task_t* sys_thread_t;
#ifdef __cplusplus

24
net/lwip/port/src/sys_arch.c
View File

@@ -228,8 +228,15 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn function, void *arg
err_t sys_mbox_new(sys_mbox_t *mbox, int size)
{
k_err_t rc;
void *msg_q_pool;
rc = tos_queue_create(mbox);
#define MBOX_MSG_MAX 32
msg_q_pool = tos_mmheap_alloc(sizeof(void *) * MBOX_MSG_MAX);
if (!msg_q_pool) {
return ERR_MEM;
}
rc = tos_msg_q_create(mbox, msg_q_pool, MBOX_MSG_MAX);
if (rc != K_ERR_NONE) {
printf("Create mbox fail! code : %d \r\n", rc);
return ERR_MEM;
@@ -240,12 +247,13 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int size)
void sys_mbox_free(sys_mbox_t *mbox)
{
tos_queue_destroy(mbox);
tos_mmheap_free(mbox->ring_q.pool);
tos_msg_q_destroy(mbox);
}
int sys_mbox_valid(sys_mbox_t *mbox)
{
return mbox->pend_obj.type == PEND_TYPE_QUEUE;
return mbox->pend_obj.type == PEND_TYPE_MESSAGE_QUEUE;
}
void sys_mbox_set_invalid(sys_mbox_t *mbox)
@@ -255,12 +263,12 @@ void sys_mbox_set_invalid(sys_mbox_t *mbox)
void sys_mbox_post(sys_mbox_t *q, void *msg)
{
tos_queue_post(q, msg, sizeof(void *));
tos_msg_q_post(q, msg);
}
err_t sys_mbox_trypost(sys_mbox_t *q, void *msg)
{
if (tos_queue_post(q, msg, sizeof(void *)) == K_ERR_NONE) {
if (tos_msg_q_post(q, msg) == K_ERR_NONE) {
return ERR_OK;
}
@@ -277,7 +285,6 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *q, void **msg, u32_t timeout)
void *dummyptr;
k_tick_t wait_tick = 0;
k_tick_t start_tick = 0;
size_t size = sizeof(void *);
if (!msg) { // <20><><EFBFBD><EFBFBD><EFBFBD>洢<EFBFBD><E6B4A2>Ϣ<EFBFBD>ĵط<C4B5><D8B7>Ƿ<EFBFBD><C7B7><EFBFBD>Ч
msg = &dummyptr;
@@ -298,7 +305,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *q, void **msg, u32_t timeout)
}
// <20>ȴ<EFBFBD><C8B4>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD>ʱ<EFBFBD>䣬<EFBFBD><E4A3AC><EFBFBD><EFBFBD><EFBFBD>ͱ<EFBFBD>ʾ<EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD>ʱ
if (tos_queue_pend(q,&(*msg),&size, wait_tick) == K_ERR_NONE) {
if (tos_msg_q_pend(q,&(*msg), wait_tick) == K_ERR_NONE) {
return ((sys_now() - start_tick) * (1000 / TOS_CFG_CPU_TICK_PER_SECOND));
}
@@ -310,13 +317,12 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *q, void **msg)
{
void *dummyptr;
size_t size = sizeof(void *);
if (!msg) {
msg = &dummyptr;
}
if (tos_queue_pend(q, &(*msg), &size, 0) == K_ERR_NONE) {
if (tos_msg_q_pend(q, &(*msg), 0) == K_ERR_NONE) {
return ERR_OK;
}