diff --git a/.gitmodules b/.gitmodules index 5fc878df0..07d1d4ef7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -101,4 +101,4 @@ shallow = true [submodule "externals/LibAtrac9"] path = externals/LibAtrac9 - url = https://github.com/Vita3K/LibAtrac9 + url = https://github.com/shadps4-emu/ext-LibAtrac9.git diff --git a/src/core/libraries/ajm/ajm.cpp b/src/core/libraries/ajm/ajm.cpp index 859bcb066..80681cbaf 100644 --- a/src/core/libraries/ajm/ajm.cpp +++ b/src/core/libraries/ajm/ajm.cpp @@ -73,7 +73,7 @@ int PS4_SYSV_ABI sceAjmBatchStartBuffer(u32 context_id, u8* p_batch, u32 batch_s int PS4_SYSV_ABI sceAjmBatchWait(const u32 context_id, const u32 batch_id, const u32 timeout, AjmBatchError* const batch_error) { LOG_TRACE(Lib_Ajm, "called context = {}, batch_id = {}, timeout = {}", context_id, batch_id, - timeout); + timeout); return context->BatchWait(batch_id, timeout, batch_error); } diff --git a/src/core/libraries/kernel/thread_management.cpp b/src/core/libraries/kernel/thread_management.cpp index a8cee07c7..39c0eaf80 100644 --- a/src/core/libraries/kernel/thread_management.cpp +++ b/src/core/libraries/kernel/thread_management.cpp @@ -1075,16 +1075,7 @@ ScePthread PThreadPool::Create(const char* name) { } } -#ifdef _WIN64 auto* ret = new PthreadInternal{}; -#else - // TODO: Linux specific hack - static u8* hint_address = reinterpret_cast(0x7FFFFC000ULL); - auto* ret = reinterpret_cast( - mmap(hint_address, sizeof(PthreadInternal), PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); - hint_address += Common::AlignUp(sizeof(PthreadInternal), 4_KB); -#endif ret->is_free = false; ret->is_detached = false; ret->is_almost_done = false; diff --git a/src/core/libraries/network/http.cpp b/src/core/libraries/network/http.cpp index 270d908f9..8e06c76fa 100644 --- a/src/core/libraries/network/http.cpp +++ b/src/core/libraries/network/http.cpp @@ -582,7 +582,7 @@ int PS4_SYSV_ABI sceHttpUriUnescape() { } int PS4_SYSV_ABI sceHttpWaitRequest() { - // LOG_ERROR(Lib_Http, "(STUBBED) called"); + LOG_ERROR(Lib_Http, "(STUBBED) called"); return ORBIS_OK; }