Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ TARGET := wut
SOURCES := cafe \
libraries/wutcrt \
libraries/wutnewlib \
libraries/wutstdc++ \
libraries/wutmalloc \
libraries/wutdevoptab \
libraries/wutsocket \
Expand Down
6 changes: 0 additions & 6 deletions libraries/wutcrt/wut_crt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@
void
__init_wut_newlib();
void
__init_wut_stdcpp();
void
__init_wut_devoptab();
void __attribute__((weak))
__init_wut_socket();

void
__fini_wut_newlib();
void
__fini_wut_stdcpp();
void
__fini_wut_devoptab();
void __attribute__((weak))
__fini_wut_socket();
Expand All @@ -21,7 +17,6 @@ void __attribute__((weak))
__init_wut()
{
__init_wut_newlib();
__init_wut_stdcpp();
__init_wut_devoptab();
if (&__init_wut_socket) __init_wut_socket();
}
Expand All @@ -31,6 +26,5 @@ __fini_wut()
{
if (&__fini_wut_socket) __fini_wut_socket();
__fini_wut_devoptab();
__fini_wut_stdcpp();
__fini_wut_newlib();
}
4 changes: 2 additions & 2 deletions libraries/wutcrt/wut_preinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
void
__init_wut_sbrk_heap(MEMHeapHandle heapHandle);
void
__init_wut_malloc_lock();
__init_wut_thread();
void
__init_wut_defaultheap();

Expand All @@ -13,6 +13,6 @@ __preinit_user(MEMHeapHandle *mem1,
MEMHeapHandle *mem2)
{
__init_wut_sbrk_heap(*mem2);
__init_wut_malloc_lock();
__init_wut_thread();
__init_wut_defaultheap();
}
80 changes: 0 additions & 80 deletions libraries/wutnewlib/wut_lock.c

This file was deleted.

23 changes: 0 additions & 23 deletions libraries/wutnewlib/wut_malloc_lock.c

This file was deleted.

59 changes: 0 additions & 59 deletions libraries/wutnewlib/wut_newlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,65 +71,6 @@ _sbrk_r(struct _reent *ptr, ptrdiff_t incr)
return __wut_sbrk_r(ptr, incr);
}

void
__syscall_lock_init(int *lock)
{
__wut_lock_init(lock, 0);
}

void
__syscall_lock_acquire(int *lock)
{
__wut_lock_acquire(lock);
}

void
__syscall_lock_release(int *lock)
{
__wut_lock_release(lock);
}

void
__syscall_lock_close(int *lock)
{
__wut_lock_close(lock);
}
void
__syscall_lock_init_recursive(_LOCK_T *lock)
{
__wut_lock_init(lock, 1);
}

void
__syscall_lock_acquire_recursive(int *lock)
{
__wut_lock_acquire(lock);
}

void
__syscall_lock_release_recursive(int *lock)
{
__wut_lock_release(lock);
}

void
__syscall_lock_close_recursive(int *lock)
{
__wut_lock_close(lock);
}

void
__syscall_malloc_lock(struct _reent *ptr)
{
return __wut_malloc_lock(ptr);
}

void
__syscall_malloc_unlock(struct _reent *ptr)
{
return __wut_malloc_unlock(ptr);
}

struct _reent *
__syscall_getreent(void)
{
Expand Down
17 changes: 5 additions & 12 deletions libraries/wutnewlib/wut_newlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,14 @@
#include <sys/reent.h>
#include <sys/time.h>

#define __WUT_MAX_KEYS (128)
#define __WUT_STACK_SIZE (128 * 1024)

#define __WUT_KEY_THREAD_SPECIFIC_ID WUT_THREAD_SPECIFIC_0

void *
__wut_sbrk_r(struct _reent *r, ptrdiff_t incr);
int
__wut_lock_init(int *lock, int recursive);
int
__wut_lock_close(int *lock);
int
__wut_lock_acquire(int *lock);
int
__wut_lock_release(int *lock);
void
__wut_malloc_lock(struct _reent *r);
void
__wut_malloc_unlock(struct _reent *r);
int
__wut_gettod_r(struct _reent *ptr, struct timeval *tp, struct timezone *tz);
int
__wut_clock_gettime(clockid_t clock_id, struct timespec *tp);
Expand Down
Loading