diff --git a/core/libs/prx/libSceBluetoothHid/Export.cpp b/core/libs/prx/libSceBluetoothHid/Export.cpp index 98a466cddf..5b7a222827 100644 --- a/core/libs/prx/libSceBluetoothHid/Export.cpp +++ b/core/libs/prx/libSceBluetoothHid/Export.cpp @@ -50,8 +50,7 @@ int APS5_VABI sceBluetoothHidSetOutputReport() { } int APS5_VABI sceBluetoothHidDebugGetVersion() { - NotImplemented_nid_no_patch(__func__); - return 0; + return 0x1e; } int APS5_VABI sceBluetoothHidDisconnectDevice() { diff --git a/core/libs/prx/libSceCompanionUtil/Export.cpp b/core/libs/prx/libSceCompanionUtil/Export.cpp index 791221033d..7a208122da 100644 --- a/core/libs/prx/libSceCompanionUtil/Export.cpp +++ b/core/libs/prx/libSceCompanionUtil/Export.cpp @@ -6,27 +6,22 @@ extern "C" { int APS5_VABI sceCompanionUtilGetEvent() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x80AD0008); } int APS5_VABI sceCompanionUtilGetRemoteOskEvent() { - NotImplemented_nid_no_patch(__func__); return 0; } int APS5_VABI sceCompanionUtilInitialize() { - NotImplemented_nid_no_patch(__func__); return 0; } int APS5_VABI sceCompanionUtilOptParamInitialize() { - NotImplemented_nid_no_patch(__func__); return 0; } int APS5_VABI sceCompanionUtilTerminate() { - NotImplemented_nid_no_patch(__func__); return 0; } diff --git a/core/libs/prx/libSceContentSearch/Export.cpp b/core/libs/prx/libSceContentSearch/Export.cpp index a0a7553444..2c9b8a5777 100644 --- a/core/libs/prx/libSceContentSearch/Export.cpp +++ b/core/libs/prx/libSceContentSearch/Export.cpp @@ -142,36 +142,28 @@ int APS5_VABI sceContentSearchTerm(void) { } int APS5_VABI sceContentBinderEnd() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderGetNumOfDifference() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderInitialize() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderIsUpdated() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderReset() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderSearchDifference() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderStart() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentBinderTerminate() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809D000F); } int APS5_VABI sceContentSearchGetApplicationLastUpdateId() { NotImplemented_nid_no_patch(__func__); diff --git a/core/libs/prx/libSceErrorDialog/Export.cpp b/core/libs/prx/libSceErrorDialog/Export.cpp index 4f17a4e50d..d3c922f2b1 100644 --- a/core/libs/prx/libSceErrorDialog/Export.cpp +++ b/core/libs/prx/libSceErrorDialog/Export.cpp @@ -21,6 +21,7 @@ constexpr int kErrOk = 0; constexpr int kErrNotInitialized = static_cast(0x80ED0001u); constexpr int kErrAlreadyInitialized = static_cast(0x80ED0002u); constexpr int kErrParam = static_cast(0x80ED0003u); +constexpr int kErrUnexpectedFatal = static_cast(0x80ED0004u); constexpr int kErrInvalidState = static_cast(0x80ED0005u); constexpr std::size_t kParamSize = 16; @@ -93,13 +94,11 @@ int APS5_VABI sceErrorDialogTerminate(void) { } int APS5_VABI sceErrorDialogOpenDetail() { - NotImplemented_nid_no_patch(__func__); - return 0; + return kErrUnexpectedFatal; } int APS5_VABI sceErrorDialogOpenWithReport() { - NotImplemented_nid_no_patch(__func__); - return 0; + return kErrUnexpectedFatal; } } diff --git a/core/libs/prx/libSceHttpCache/Export.cpp b/core/libs/prx/libSceHttpCache/Export.cpp index f76492fc41..5c78ba9644 100644 --- a/core/libs/prx/libSceHttpCache/Export.cpp +++ b/core/libs/prx/libSceHttpCache/Export.cpp @@ -96,7 +96,6 @@ int APS5_VABI sceHttpCacheSystemInit() { } int APS5_VABI sceHttpCacheSystemSendStatistics() { - NotImplemented_nid_no_patch(__func__); return 0; } @@ -106,7 +105,6 @@ int APS5_VABI sceHttpCacheSystemShutdown() { } int APS5_VABI sceHttpCacheSystemTerm() { - NotImplemented_nid_no_patch(__func__); return 0; } diff --git a/core/libs/prx/libSceImeDialog/Export.cpp b/core/libs/prx/libSceImeDialog/Export.cpp index d05500bcf0..67f09de22d 100644 --- a/core/libs/prx/libSceImeDialog/Export.cpp +++ b/core/libs/prx/libSceImeDialog/Export.cpp @@ -22,6 +22,7 @@ constexpr int ErrorNotInUse = static_cast(0x80bc0107u); constexpr int ErrorInvalidMaxTextLength = static_cast(0x80bc0016u); constexpr int ErrorInvalidInputTextBuffer = static_cast(0x80bc0017u); constexpr int ErrorInvalidAddress = static_cast(0x80bc0031u); +constexpr int ErrorInternal = static_cast(0x80bc00ffu); struct Dialog { int status = StatusNone; @@ -177,8 +178,7 @@ int APS5_VABI sceImeDialogTerm(void) { } int APS5_VABI sceImeDialogForTestFunction() { - NotImplemented_nid_no_patch(__func__); - return 0; + return ErrorInternal; } int APS5_VABI sceImeDialogForceClose(void) { diff --git a/core/libs/prx/libSceMbus/PendingExports.cpp b/core/libs/prx/libSceMbus/PendingExports.cpp index c9296ae891..907eeb12c0 100644 --- a/core/libs/prx/libSceMbus/PendingExports.cpp +++ b/core/libs/prx/libSceMbus/PendingExports.cpp @@ -8,8 +8,7 @@ int APS5_VABI sceMbusAcquireControl() { } int APS5_VABI sceMbusAcquireControlList() { - NotImplemented_nid_no_patch(__func__); - return 0; + return static_cast(0x809B00FF); } int APS5_VABI sceMbusAcquireControlWithState() { @@ -558,7 +557,6 @@ int APS5_VABI sceMbusStopAudioOutSharePlay() { } int APS5_VABI sceMbusTerm() { - NotImplemented_nid_no_patch(__func__); return 0; } diff --git a/core/libs/prx/libSceMoveTracker/Export.cpp b/core/libs/prx/libSceMoveTracker/Export.cpp index 6c660b9787..8b2c497e09 100644 --- a/core/libs/prx/libSceMoveTracker/Export.cpp +++ b/core/libs/prx/libSceMoveTracker/Export.cpp @@ -41,8 +41,7 @@ int APS5_VABI sceMoveTrackerGetState() { } int APS5_VABI sceMoveTrackerGetVersion() { - NotImplemented_nid_no_patch(__func__); - return 0; + return 2; } int APS5_VABI sceMoveTrackerGetWorkingMemorySize() { @@ -86,7 +85,6 @@ int APS5_VABI sceMoveTrackerRecordStart() { } int APS5_VABI sceMoveTrackerRecordStop() { - NotImplemented_nid_no_patch(__func__); return 0; } diff --git a/core/libs/prx/libSceSystemGesture/Export.cpp b/core/libs/prx/libSceSystemGesture/Export.cpp index 516982e980..4d74061f67 100644 --- a/core/libs/prx/libSceSystemGesture/Export.cpp +++ b/core/libs/prx/libSceSystemGesture/Export.cpp @@ -311,8 +311,7 @@ int APS5_VABI sceSystemGestureUpdateTouchRecognizerRectangle(int32_t gesture_han } int APS5_VABI sceSystemGestureDebugGetVersion() { - NotImplemented_nid_no_patch(__func__); - return 0; + return 0x6a00; } } diff --git a/core/libs/tests/GuestBluetoothHid.cpp b/core/libs/tests/GuestBluetoothHid.cpp index 67b25d22c6..e118532944 100644 --- a/core/libs/tests/GuestBluetoothHid.cpp +++ b/core/libs/tests/GuestBluetoothHid.cpp @@ -56,13 +56,7 @@ int main() { threw = true; } Require(threw, "an input report without a device did not throw"); - threw = false; - try { - sceBluetoothHidDebugGetVersion(); - } catch (const std::runtime_error&) { - threw = true; - } - Require(threw, "debug get version did not throw"); + Require(sceBluetoothHidDebugGetVersion() == 0x1e, "debug get version did not return the firmware version"); threw = false; try { sceBluetoothHidGetDeviceInfo();