refactor syscalls for devkitPPC r42

Author: WinterMute

libogc/lock_supp.c

@@ -14,52 +14,60 @@
 #include <gcbool.h>
 
 
-int __libogc_lock_init(int *lock,int recursive)
+static void __libogc_lock_init(_LOCK_T *lock,int recursive)
 {
 	s32 ret;
 	mutex_t retlck = LWP_MUTEX_NULL;
 
-	if(!lock) return -1;
-	
+	if(!lock) return;
+
 	*lock = 0;
 	ret = LWP_MutexInit(&retlck,(recursive?TRUE:FALSE));
-	if(ret==0) *lock = (int)retlck;
+	if(ret==0) *lock = (_LOCK_T)retlck;
+
+}
 
-	return ret;
+void __syscall_lock_init(_LOCK_T *lock)
+{
+	__libogc_lock_init(lock,0);
 }
 
-int __libogc_lock_close(int *lock)
+void __syscall_lock_init_recursive(_LOCK_T *lock)
+{
+	__libogc_lock_init(lock,1);
+}
+
+void __syscall_lock_close(_LOCK_T *lock)
 {
 	s32 ret;
 	mutex_t plock;
-	
-	if(!lock || *lock==0) return -1;
-	
+
+	if(!lock || *lock==0) return;
+
 	plock = (mutex_t)*lock;
 	ret = LWP_MutexDestroy(plock);
 	if(ret==0) *lock = 0;
 
-	return ret;
 }
 
-int __libogc_lock_acquire(int *lock)
+void __syscall_lock_acquire(_LOCK_T *lock)
 {
 	mutex_t plock;
-	
-	if(!lock || *lock==0) return -1;
+
+	if(!lock || *lock==0) return;
 
 	plock = (mutex_t)*lock;
-	return LWP_MutexLock(plock);
+	LWP_MutexLock(plock);
 }
 
 
-int __libogc_lock_release(int *lock)
+void __syscall_lock_release(int *lock)
 {
 	mutex_t plock;
-	
-	if(!lock || *lock==0) return -1;
+
+	if(!lock || *lock==0) return;
 
 	plock = (mutex_t)*lock;
-	return LWP_MutexUnlock(plock);
+	LWP_MutexUnlock(plock);
 }
 

libogc/sbrk.c

@@ -13,7 +13,7 @@
 u32 MALLOC_MEM2 __attribute__((weak)) = 1;
 #endif
 
-void* __libogc_sbrk_r( struct _reent *ptr, ptrdiff_t incr)
+void* _sbrk_r( struct _reent *ptr, ptrdiff_t incr)
 {
 	u32 level;
 	char *heap_end = 0;

libogc/system.c

@@ -209,12 +209,6 @@ extern void __console_init_ex(void *conbuffer,int tgt_xstart,int tgt_ystart,int
 extern void timespec_subtract(const struct timespec *tp_start,const struct timespec *tp_end,struct timespec *result);
 
 
-extern int __libogc_lock_init(int *lock,int recursive);
-extern int __libogc_lock_close(int *lock);
-extern int __libogc_lock_release(int *lock);
-extern int __libogc_lock_acquire(int *lock);
-extern void __libogc_exit(int status);
-extern void * __libogc_sbrk_r(struct _reent *ptr, ptrdiff_t incr);
 extern int __libogc_gettod_r(struct _reent *ptr, struct timeval *tp, struct timezone *tz);
 extern int __libogc_nanosleep(const struct timespec *tb, struct timespec *rem);
 extern u64 gettime(void);
@@ -270,7 +264,7 @@ static __inline__ void __lwp_syswd_free(alarm_st *alarm)
 #define SOFTRESET_ADR *((vu32*)0xCC003024)
 void __reload(void) { SOFTRESET_ADR=0; }
 
-void __libogc_exit(int status)
+void __syscall_exit(int status)
 {
 	SYS_ResetSystem(SYS_SHUTDOWN,0,0);
 	__lwp_thread_stopmultitasking(__reload);
@@ -295,7 +289,7 @@ void __reload(void)
 	SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
 }
 
-void __libogc_exit(int status)
+void __syscall_exit(int status)
 {
 	if(__stub_found()) {
 		SYS_ResetSystem(SYS_SHUTDOWN,0,0);
@@ -307,26 +301,6 @@ void __libogc_exit(int status)
 #endif
 
 
-void *__syscall_sbrk_r(struct _reent *ptr, ptrdiff_t incr) {
-	return __libogc_sbrk_r(ptr, incr);
-}
-
-int __syscall_lock_init(int *lock, int recursive) {
-	return __libogc_lock_init(lock,recursive);
-}
-
-int __syscall_lock_close(int *lock) {
-	return __libogc_lock_close(lock);
-}
-
-int __syscall_lock_release(int *lock) {
-	return __libogc_lock_release(lock);
-}
-
-int __syscall_lock_acquire(int *lock) {
-	return __libogc_lock_acquire(lock);
-}
-
 void __syscall_malloc_lock(struct _reent *ptr) {
 	return __libogc_malloc_lock(ptr);
 }
@@ -335,10 +309,6 @@ void __syscall_malloc_unlock(struct _reent *ptr) {
 	return __libogc_malloc_unlock(ptr);
 }
 
-void __syscall_exit(int rc) {
-	return __libogc_exit(rc);
-}
-
 int  __syscall_gettod_r(struct _reent *ptr, struct timeval *tp, struct timezone *tz){
 	return __libogc_gettod_r(ptr,tp,tz);
 }