Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-14 08:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

kernel: Simplify sceKernelUuidCreate

Browse source
This commit is contained in:
squidbus 2025-05-12 22:15:04 -07:00
parent 2a3a701115
commit 3a10fda008
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/libraries/kernel/kernel.cpp
View file

@ -152,33 +152,23 @@ struct OrbisKernelUuid {
u8 clockSeqLow; u8 clockSeqLow;
u8 node[6]; u8 node[6];
}; };
static_assert(sizeof(OrbisKernelUuid) == 0x10);
int PS4_SYSV_ABI sceKernelUuidCreate(OrbisKernelUuid* orbisUuid) { int PS4_SYSV_ABI sceKernelUuidCreate(OrbisKernelUuid* orbisUuid) {
if (!orbisUuid) {
return ORBIS_KERNEL_ERROR_EINVAL;
}
#ifdef _WIN64 #ifdef _WIN64
UUID uuid; UUID uuid;
UuidCreate(&uuid); if (UuidCreate(&uuid) != RPC_S_OK) {
orbisUuid->timeLow = uuid.Data1; return ORBIS_KERNEL_ERROR_EFAULT;
orbisUuid->timeMid = uuid.Data2;
orbisUuid->timeHiAndVersion = uuid.Data3;
orbisUuid->clockSeqHiAndReserved = uuid.Data4[0];
orbisUuid->clockSeqLow = uuid.Data4[1];
for (int i = 0; i < 6; i++) {
orbisUuid->node[i] = uuid.Data4[2 + i];
} }
#else #else
uuid_t uuid; uuid_t uuid;
uuid_generate(uuid); uuid_generate(uuid);
orbisUuid->timeLow =
((u32)uuid[0] << 24) | ((u32)uuid[1] << 16) | ((u32)uuid[2] << 8) | (u32)uuid[3];
orbisUuid->timeMid = ((u16)uuid[4] << 8) | uuid[5];
orbisUuid->timeHiAndVersion = ((u16)uuid[6] << 8) | uuid[7];
orbisUuid->clockSeqHiAndReserved = uuid[8];
orbisUuid->clockSeqLow = uuid[9];
for (int i = 0; i < 6; i++) {
orbisUuid->node[i] = uuid[10 + i];
}
#endif #endif
return 0; std::memcpy(orbisUuid, &uuid, sizeof(OrbisKernelUuid));
return ORBIS_OK;
} }
int PS4_SYSV_ABI kernel_ioctl(int fd, u64 cmd, VA_ARGS) { int PS4_SYSV_ABI kernel_ioctl(int fd, u64 cmd, VA_ARGS) {