Merge pull request #215 from shadps4-emu/miscFixAgain

Misc fixes (mostly LLE)

src/core/libraries/audio/audioout.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
+#include <common/assert.h>
 #include <magic_enum.hpp>
 #include "audio_core/sdl_audio.h"
 #include "common/logging/log.h"
@@ -160,8 +161,38 @@ int PS4_SYSV_ABI sceAudioOutGetLastOutputTime() {
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceAudioOutGetPortState() {
-    LOG_ERROR(Lib_AudioOut, "(STUBBED) called");
+int PS4_SYSV_ABI sceAudioOutGetPortState(s32 handle, OrbisAudioOutPortState* state) {
+
+    int type = 0;
+    int channels_num = 0;
+
+    if (!audio->AudioOutGetStatus(handle, &type, &channels_num)) {
+        return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
+    }
+
+    state->rerouteCounter = 0;
+    state->volume = 127; // max volume
+
+    switch (type) {
+    case ORBIS_AUDIO_OUT_PORT_TYPE_MAIN:
+    case ORBIS_AUDIO_OUT_PORT_TYPE_BGM:
+    case ORBIS_AUDIO_OUT_PORT_TYPE_VOICE:
+        state->output = 1;
+        state->channel = (channels_num > 2 ? 2 : channels_num);
+        break;
+    case ORBIS_AUDIO_OUT_PORT_TYPE_PERSONAL:
+    case ORBIS_AUDIO_OUT_PORT_TYPE_PADSPK:
+        state->output = 4;
+        state->channel = 1;
+        break;
+    case ORBIS_AUDIO_OUT_PORT_TYPE_AUX:
+        state->output = 0;
+        state->channel = 0;
+        break;
+    default:
+        UNREACHABLE();
+    }
+
     return ORBIS_OK;
 }
 

src/core/libraries/audio/audioout.h

@@ -34,6 +34,16 @@ struct OrbisAudioOutOutputParam {
     const void* ptr;
 };
 
+struct OrbisAudioOutPortState {
+    u16 output;
+    u8 channel;
+    u8 reserved8_1[1];
+    s16 volume;
+    u16 rerouteCounter;
+    u64 flag;
+    u64 reserved64[2];
+};
+
 int PS4_SYSV_ABI sceAudioOutDeviceIdOpen();
 int PS4_SYSV_ABI sceAudioDeviceControlGet();
 int PS4_SYSV_ABI sceAudioDeviceControlSet();
@@ -55,7 +65,7 @@ int PS4_SYSV_ABI sceAudioOutGetHandleStatusInfo();
 int PS4_SYSV_ABI sceAudioOutGetInfo();
 int PS4_SYSV_ABI sceAudioOutGetInfoOpenNum();
 int PS4_SYSV_ABI sceAudioOutGetLastOutputTime();
-int PS4_SYSV_ABI sceAudioOutGetPortState();
+int PS4_SYSV_ABI sceAudioOutGetPortState(s32 handle, OrbisAudioOutPortState* state);
 int PS4_SYSV_ABI sceAudioOutGetSimulatedBusUsableStatusByBusType();
 int PS4_SYSV_ABI sceAudioOutGetSimulatedHandleStatusInfo();
 int PS4_SYSV_ABI sceAudioOutGetSimulatedHandleStatusInfo2();

src/core/libraries/kernel/file_system.cpp

@@ -105,7 +105,7 @@ int PS4_SYSV_ABI sceKernelOpen(const char* path, int flags, u16 mode) {
 }
 
 int PS4_SYSV_ABI posix_open(const char* path, int flags, /* SceKernelMode*/ u16 mode) {
-    LOG_INFO(Kernel_Fs, "posix open redirect to sceKernelOpen\n");
+    LOG_INFO(Kernel_Fs, "posix open redirect to sceKernelOpen");
     int result = sceKernelOpen(path, flags, mode);
     // Posix calls different only for their return values
     ASSERT(result >= 0);

src/core/libraries/kernel/libkernel.cpp

@@ -88,7 +88,7 @@ int PS4_SYSV_ABI sceKernelMmap(void* addr, u64 len, int prot, int flags, int fd,
 
 void* PS4_SYSV_ABI posix_mmap(void* addr, u64 len, int prot, int flags, int fd, u64 offset) {
     void* ptr;
-    LOG_INFO(Kernel_Vmm, "posix mmap redirect to sceKernelMmap\n");
+    LOG_INFO(Kernel_Vmm, "posix mmap redirect to sceKernelMmap");
     // posix call the difference is that there is a different behaviour when it doesn't return 0 or
     // SCE_OK
     const VAddr ret_addr = (VAddr)__builtin_return_address(0);
@@ -288,9 +288,21 @@ int PS4_SYSV_ABI sceKernelUuidCreate(OrbisKernelUuid* orbisUuid) {
     return 0;
 }
 
+char* PS4_SYSV_ABI sceKernelGetFsSandboxRandomWord() {
+    char* path = "sys";
+    return path;
+}
+
+int PS4_SYSV_ABI posix_connect() {
+    return -1;
+}
+
 void LibKernel_Register(Core::Loader::SymbolsResolver* sym) {
     // obj
     LIB_OBJ("f7uOxY9mM1U", "libkernel", 1, "libkernel", 1, 1, &g_stack_chk_guard);
+    // misc
+    LIB_FUNCTION("JGfTMBOdUJo", "libkernel", 1, "libkernel", 1, 1, sceKernelGetFsSandboxRandomWord);
+    LIB_FUNCTION("XVL8So3QJUk", "libkernel", 1, "libkernel", 1, 1, posix_connect);
     // memory
     LIB_FUNCTION("OMDRKKAZ8I4", "libkernel", 1, "libkernel", 1, 1, sceKernelDebugRaiseException);
     LIB_FUNCTION("rTXw65xmLIA", "libkernel", 1, "libkernel", 1, 1, sceKernelAllocateDirectMemory);

src/core/libraries/libs.cpp

@@ -63,10 +63,7 @@ void InitHLELibs(Core::Loader::SymbolsResolver* sym) {
     Libraries::NpScore::RegisterlibSceNpScore(sym);
     Libraries::NpTrophy::RegisterlibSceNpTrophy(sym);
     Libraries::ScreenShot::RegisterlibSceScreenShot(sym);
-    Libraries::LibcInternal::RegisterlibSceLibcInternal(sym);
     Libraries::AppContent::RegisterlibSceAppContent(sym);
-    Libraries::Rtc::RegisterlibSceRtc(sym);
-    Libraries::DiscMap::RegisterlibSceDiscMap(sym);
     Libraries::PngDec::RegisterlibScePngDec(sym);
     Libraries::PlayGo::RegisterlibScePlayGo(sym);
     Libraries::Usbd::RegisterlibSceUsbd(sym);