lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lib][lwip] move lwip init into a LK_INIT_HOOK

Browse Source
This commit is contained in:
Travis Geiselbrecht
2015-10-11 12:08:06 -07:00
parent 8834b12f97
commit aac1a26487
2 changed files with 94 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
lib/lwip/sys_arch.c
View File

@@ -6,6 +6,7 @@
#include <trace.h>
#include <err.h>
#include <stdbool.h>
#include <lk/init.h>
#define LOCAL_TRACE 1
@@ -15,184 +16,192 @@ void sys_init(void)
sys_thread_t sys_thread_new(const char *name, lwip_thread_fn func, void *arg, int stacksize, int prio)
{
thread_t *t = thread_create(name, (void*) func, arg, prio, stacksize);
DEBUG_ASSERT(t);
thread_t *t = thread_create(name, (void*) func, arg, prio, stacksize);
DEBUG_ASSERT(t);
thread_detach(t);
thread_resume(t);
thread_detach(t);
thread_resume(t);
return t;
return t;
}
err_t sys_sem_new(sys_sem_t *sem, u8_t count)
{
sem_init(sem, count);
return ERR_OK;
sem_init(sem, count);
return ERR_OK;
}
void sys_sem_free(sys_sem_t * sem)
{
sem_destroy(sem);
sem_destroy(sem);
}
int sys_sem_valid(sys_sem_t *sem)
{
return sem->magic == SEMAPHORE_MAGIC;
return sem->magic == SEMAPHORE_MAGIC;
}
void sys_sem_set_invalid(sys_sem_t *sem)
{
// sem_destroy() does this
// sem_destroy() does this
}
void sys_sem_signal(sys_sem_t * sem)
{
sem_post(sem, true);
sem_post(sem, true);
}
u32_t sys_arch_sem_wait(sys_sem_t * sem, u32_t timeout)
{
lk_time_t start = current_time();
lk_time_t start = current_time();
status_t err = sem_timedwait(sem, timeout ? timeout : INFINITE_TIME);
if (err == ERR_TIMED_OUT)
return SYS_ARCH_TIMEOUT;
return current_time() - start;
status_t err = sem_timedwait(sem, timeout ? timeout : INFINITE_TIME);
if (err == ERR_TIMED_OUT)
return SYS_ARCH_TIMEOUT;
return current_time() - start;
}
err_t sys_mbox_new(sys_mbox_t * mbox, int size)
{
sem_init(&mbox->empty, size);
sem_init(&mbox->full, 0);
mutex_init(&mbox->lock);
sem_init(&mbox->empty, size);
sem_init(&mbox->full, 0);
mutex_init(&mbox->lock);
mbox->magic = MBOX_MAGIC;
mbox->head = 0;
mbox->tail = 0;
mbox->size = size;
mbox->magic = MBOX_MAGIC;
mbox->head = 0;
mbox->tail = 0;
mbox->size = size;
mbox->queue = calloc(size, sizeof(void *));
if (!mbox->queue)
return ERR_MEM;
mbox->queue = calloc(size, sizeof(void *));
if (!mbox->queue)
return ERR_MEM;
return ERR_OK;
return ERR_OK;
}
void sys_mbox_free(sys_mbox_t *mbox)
{
free(mbox->queue);
mbox->queue = NULL;
free(mbox->queue);
mbox->queue = NULL;
}
void sys_mbox_post(sys_mbox_t * mbox, void *msg)
{
sem_wait(&mbox->empty);
mutex_acquire(&mbox->lock);
sem_wait(&mbox->empty);
mutex_acquire(&mbox->lock);
mbox->queue[mbox->head] = msg;
mbox->head = (mbox->head + 1) % mbox->size;
mbox->queue[mbox->head] = msg;
mbox->head = (mbox->head + 1) % mbox->size;
mutex_release(&mbox->lock);
sem_post(&mbox->full, true);
mutex_release(&mbox->lock);
sem_post(&mbox->full, true);
}
u32_t sys_arch_mbox_tryfetch(sys_mbox_t * mbox, void **msg)
{
//LTRACE_ENTRY;
//LTRACE_ENTRY;
status_t res;
status_t res;
res = sem_trywait(&mbox->full);
if (res == ERR_NOT_READY) {
//LTRACE_EXIT;
return SYS_MBOX_EMPTY;
}
mutex_acquire(&mbox->lock);
res = sem_trywait(&mbox->full);
if (res == ERR_NOT_READY) {
//LTRACE_EXIT;
return SYS_MBOX_EMPTY;
}
*msg = mbox->queue[mbox->tail];
mbox->tail = (mbox->tail + 1) % mbox->size;
mutex_acquire(&mbox->lock);
mutex_release(&mbox->lock);
sem_post(&mbox->empty, true);
*msg = mbox->queue[mbox->tail];
mbox->tail = (mbox->tail + 1) % mbox->size;
//LTRACE_EXIT;
return 0;
mutex_release(&mbox->lock);
sem_post(&mbox->empty, true);
//LTRACE_EXIT;
return 0;
}
u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
{
//LTRACE_ENTRY;
//LTRACE_ENTRY;
status_t res;
lk_time_t start = current_time();
status_t res;
lk_time_t start = current_time();
res = sem_timedwait(&mbox->full, timeout ? timeout : INFINITE_TIME);
if (res == ERR_TIMED_OUT) {
//LTRACE_EXIT;
return SYS_ARCH_TIMEOUT; //timeout ? SYS_ARCH_TIMEOUT : 0;
}
mutex_acquire(&mbox->lock);
res = sem_timedwait(&mbox->full, timeout ? timeout : INFINITE_TIME);
if (res == ERR_TIMED_OUT) {
//LTRACE_EXIT;
return SYS_ARCH_TIMEOUT; //timeout ? SYS_ARCH_TIMEOUT : 0;
}
*msg = mbox->queue[mbox->tail];
mbox->tail = (mbox->tail + 1) % mbox->size;
mutex_acquire(&mbox->lock);
mutex_release(&mbox->lock);
sem_post(&mbox->empty, true);
*msg = mbox->queue[mbox->tail];
mbox->tail = (mbox->tail + 1) % mbox->size;
//LTRACE_EXIT;
return current_time() - start;
mutex_release(&mbox->lock);
sem_post(&mbox->empty, true);
//LTRACE_EXIT;
return current_time() - start;
}
err_t sys_mbox_trypost(sys_mbox_t * mbox, void *msg)
{
status_t res;
status_t res;
res = sem_trywait(&mbox->empty);
if (res == ERR_NOT_READY)
return ERR_TIMEOUT;
mutex_acquire(&mbox->lock);
res = sem_trywait(&mbox->empty);
if (res == ERR_NOT_READY)
return ERR_TIMEOUT;
mbox->queue[mbox->head] = msg;
mbox->head = (mbox->head + 1) % mbox->size;
mutex_acquire(&mbox->lock);
mutex_release(&mbox->lock);
sem_post(&mbox->full, true);
mbox->queue[mbox->head] = msg;
mbox->head = (mbox->head + 1) % mbox->size;
return ERR_OK;
mutex_release(&mbox->lock);
sem_post(&mbox->full, true);
return ERR_OK;
}
int sys_mbox_valid(sys_mbox_t *mbox)
{
return mbox->magic == MBOX_MAGIC;
return mbox->magic == MBOX_MAGIC;
}
void sys_mbox_set_invalid(sys_mbox_t *mbox)
{
mbox->magic = 'xobm';
mbox->magic = 'xobm';
}
err_t sys_mutex_new(sys_mutex_t *mutex)
{
mutex_init(mutex);
return ERR_OK;
mutex_init(mutex);
return ERR_OK;
}
void sys_mutex_lock(sys_mutex_t *mutex)
{
mutex_acquire(mutex);
mutex_acquire(mutex);
}
void sys_mutex_unlock(sys_mutex_t *mutex)
{
mutex_release(mutex);
mutex_release(mutex);
}
void sys_mutex_free(sys_mutex_t *mutex)
{
mutex_destroy(mutex);
mutex_destroy(mutex);
}
/* run lwip init as soon as threads are running */
void lwip_init_hook(uint level)
{
tcpip_init(NULL, NULL);
}
LK_INIT_HOOK(lwip, &lwip_init_hook, LK_INIT_LEVEL_THREADING);

8
target/pc-x86/config.c
View File

@@ -36,10 +36,6 @@
#include <ffs.h>
#endif
#if WITH_LIB_LWIP
#include <lwip/tcpip.h>
#endif
#define LOCAL_TRACE 1
static const struct platform_uart_config uart0_config = {
@@ -66,10 +62,6 @@ void target_init(void) {
device_init(device_get_by_name(ide, ide0));
ffs_mount(0, device_get_by_name(ide, ide0));
#if WITH_LIB_LWIP
tcpip_init(NULL, NULL);
#endif
#endif
}