Permalink
Browse files

Merge branch 'master' of https://github.com/zeldin/PSL1GHT

  • Loading branch information...
2 parents 5dcdcd4 + ff427d5 commit 8d0770658a3d0b0ffe3a82328be9757a7b25f0f3 @phire phire committed Dec 1, 2010
Showing with 5 additions and 4 deletions.
  1. +4 −4 psl1ght/include/sys/thread.h
  2. +1 −0 psl1ght/sprx/liblv2/exports.h
View
8 psl1ght/include/sys/thread.h
@@ -17,8 +17,7 @@ typedef struct sys_ppu_thread_stack_t {
}sys_ppu_thread_stack_t;
typedef struct sys_lwmutex_t {
- u32 owner;
- u32 waiter;
+ u64 lock_var;
u32 attribute;
u32 recursive_count;
u32 sleep_queue;
@@ -102,8 +101,9 @@ s32 sys_ppu_thread_create(sys_ppu_thread_t * threadid, void (*entry) (u64 arg),
s32 sys_ppu_thread_get_id(sys_ppu_thread_t * threadid);
void sys_ppu_thread_exit(u64 val);
s32 sys_lwmutex_create(sys_lwmutex_t *lwmutex, const sys_lwmutex_attribute_t *lwmutex_attr);
-void sys_lwmutex_destroy(sys_lwmutex_t *lwmutex);
+s32 sys_lwmutex_destroy(sys_lwmutex_t *lwmutex);
s32 sys_lwmutex_lock(sys_lwmutex_t *lwmutex, u64 timeout_usec);
-void sys_lwmutex_unlock(sys_lwmutex_t *lwmutex);
+s32 sys_lwmutex_trylock(sys_lwmutex_t *lwmutex);
+s32 sys_lwmutex_unlock(sys_lwmutex_t *lwmutex);
EXTERN_END
View
1 psl1ght/sprx/liblv2/exports.h
@@ -18,6 +18,7 @@ EXPORT(sys_ppu_thread_unregister_atexit, 0xac6fc404);
EXPORT(sys_lwmutex_create, 0x2f85c0ef);
EXPORT(sys_lwmutex_destroy, 0xc3476d0c);
EXPORT(sys_lwmutex_lock, 0x1573dc3f);
+EXPORT(sys_lwmutex_trylock, 0xaeb78725);
EXPORT(sys_lwmutex_unlock, 0x1bc200f4);
EXPORT(sys_initialize_tls, 0x744680a2);
EXPORT(sys_time_get_system_time, 0x8461e528);

0 comments on commit 8d07706

Please sign in to comment.