diff --git a/src/core/libraries/companion/companion_util.cpp b/src/core/libraries/companion/companion_util.cpp index 2abe179b0..c33db35a2 100644 --- a/src/core/libraries/companion/companion_util.cpp +++ b/src/core/libraries/companion/companion_util.cpp @@ -8,9 +8,9 @@ namespace Libraries::CompanionUtil { -uint32_t PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEvent* outEvent, +u32 PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEvent* outEvent, s32 param_3) { - uint32_t return_var; + u32 return_var; if (outEvent == 0) { return_var = ORBIS_COMPANION_UTIL_INVALID_ARGUMENT; @@ -34,9 +34,9 @@ uint32_t PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEve s32 PS4_SYSV_ABI sceCompanionUtilGetEvent(sceCompanionUtilEvent* outEvent) { sceCompanionUtilContext* ctx = nullptr; - uint32_t ret = getEvent(ctx, outEvent, + u32 ret = getEvent(ctx, outEvent, 1); - uint32_t return_var; + u32 return_var; return_var = ret | 0xad0000; if (-1 < (int)ret) { diff --git a/src/core/libraries/companion/companion_util.h b/src/core/libraries/companion/companion_util.h index 3d7edc377..444d178df 100644 --- a/src/core/libraries/companion/companion_util.h +++ b/src/core/libraries/companion/companion_util.h @@ -11,11 +11,11 @@ class SymbolsResolver; namespace Libraries::CompanionUtil { -static constexpr uint32_t ORBIS_COMPANION_UTIL_OK = 0; +static constexpr u32 ORBIS_COMPANION_UTIL_OK = 0; -static constexpr uint32_t ORBIS_COMPANION_UTIL_INVALID_ARGUMENT = 0x80000004; -static constexpr uint32_t ORBIS_COMPANION_UTIL_INVALID_POINTER = 0x80000006; -static constexpr uint32_t ORBIS_COMPANION_UTIL_NO_EVENT = 0x80000008; +static constexpr u32 ORBIS_COMPANION_UTIL_INVALID_ARGUMENT = 0x80000004; +static constexpr u32 ORBIS_COMPANION_UTIL_INVALID_POINTER = 0x80000006; +static constexpr u32 ORBIS_COMPANION_UTIL_NO_EVENT = 0x80000008; struct sceCompanionUtilEvent { std::uint8_t blob[0x104]{}; /// 0x104 bytes of data, dont know what it is exactly @@ -25,7 +25,7 @@ struct sceCompanionUtilContext { std::uint8_t blob[0x27B]{}; /// 0x27B bytes of data, dont know what it is exactly }; -uint32_t PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEvent* outEvent, +u32 PS4_SYSV_ABI getEvent(sceCompanionUtilContext* ctx, sceCompanionUtilEvent* outEvent, s32 param_3); s32 PS4_SYSV_ABI sceCompanionUtilGetEvent(sceCompanionUtilEvent* outEvent); s32 PS4_SYSV_ABI sceCompanionUtilGetRemoteOskEvent();