Skip to content

update for dka64 r29.1 #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WinterMute merged 1 commit into from
Feb 2, 2026
+4 −15
Merged

update for dka64 r29.1 #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 nx/include/switch/kernel/mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ bool mutexIsLockedByCurrentThread(const Mutex* m);
static inline void rmutexInit(RMutex* m)
{
m->lock = 0;
m->thread_tag = 0;
m->counter = 0;
}

Expand Down
14 changes: 4 additions & 10 deletions nx/source/kernel/mutex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,15 @@ bool mutexIsLockedByCurrentThread(const Mutex* m) {
}

void rmutexLock(RMutex* m) {
if (m->thread_tag != _GetTag()) {
if (!mutexIsLockedByCurrentThread(&m->lock)) {
mutexLock(&m->lock);
m->thread_tag = _GetTag();
m->counter++;
}

m->counter++;
}

bool rmutexTryLock(RMutex* m) {
if (m->thread_tag != _GetTag()) {
if (!mutexTryLock(&m->lock)) {
return false;
}
m->thread_tag = _GetTag();
if (!mutexIsLockedByCurrentThread(&m->lock)) {
return mutexTryLock(&m->lock);
}

m->counter++;
Expand All @@ -161,7 +156,6 @@ bool rmutexTryLock(RMutex* m) {

void rmutexUnlock(RMutex* m) {
if (--m->counter == 0) {
m->thread_tag = 0;
mutexUnlock(&m->lock);
}
}
4 changes: 0 additions & 4 deletions nx/source/runtime/newlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,13 @@ int __syscall_cond_wait(_COND_T *cond, _LOCK_T *lock, uint64_t timeout_ns)

int __syscall_cond_wait_recursive(_COND_T *cond, _LOCK_RECURSIVE_T *lock, uint64_t timeout_ns)
{
uint32_t thread_tag_backup = 0;
if (lock->counter != 1)
return EBADF;

thread_tag_backup = lock->thread_tag;
lock->thread_tag = 0;
lock->counter = 0;

int errcode = errno_from_result(condvarWaitTimeout(cond, &lock->lock, timeout_ns));

lock->thread_tag = thread_tag_backup;
lock->counter = 1;

return errcode;
Expand Down
Loading