shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(sceVideoOut): add nid_postdfix to equeue libkernel exports

This commit is contained in:
boykopovar 2026-09-12 11:21:01 +03:00
parent 497821e94f
commit 31943e9a62
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/libs/prx/libSceVideoOut/src/Event.cpp
View File

@ -14,7 +14,7 @@ static int RegisterVideoOutEvent(int handle, KernelEqueue eq, int16_t eventKind,
if (eq == 0) {
return VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE;
}
if (!EqueuePin(eq)) {
if (!EqueuePin_nid_postfix(eq)) {
return VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE;
}
KernelEqueueEvent event{};
@ -56,7 +56,7 @@ static int RegisterVideoOutEvent(int handle, KernelEqueue eq, int16_t eventKind,
e->event.fflags = 0;
e->event.data = 0;
};
const int result = EqueueAddEvent(eq, event);
const int result = EqueueAddEvent_nid_postfix(eq, event);
return result == EQUEUE_ERROR_EBADF ? VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE : result;
}
@ -64,10 +64,10 @@ static int DeleteVideoOutEvent(int handle, KernelEqueue eq, int16_t eventKind) {
if (!VideoOutDriver::Get().IsOpen(handle)) {
return VIDEO_OUT_ERROR_INVALID_HANDLE;
}
if (eq == 0 || !EqueuePin(eq)) {
if (eq == 0 || !EqueuePin_nid_postfix(eq)) {
return VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE;
}
const int result = EqueueDeleteEvent(eq, static_cast<uintptr_t>(eventKind), EVFILT_VIDEO_OUT);
const int result = EqueueDeleteEvent_nid_postfix(eq, static_cast<uintptr_t>(eventKind), EVFILT_VIDEO_OUT);
if (result == EQUEUE_ERROR_EBADF) {
return VIDEO_OUT_ERROR_INVALID_EVENT_QUEUE;
}

32
core/libs/prx/libkernel/Equeue/Equeue.cpp
View File

@ -234,7 +234,7 @@ int KernelEqueuePrivate::DeleteEvent(uintptr_t ident, int16_t filter) {
return EQUEUE_OK;
}
KernelEqueueRef EqueuePin(KernelEqueue eq) {
KernelEqueueRef EqueuePin_nid_postfix(KernelEqueue eq) {
if (eq == 0) {
return {};
}
@ -243,24 +243,24 @@ KernelEqueueRef EqueuePin(KernelEqueue eq) {
return it != g_equeues.end() ? it->second : KernelEqueueRef{};
}
int APS5_VABI EqueueAddEvent(KernelEqueue eq, const KernelEqueueEvent& event) {
auto owner = EqueuePin(eq);
int APS5_VABI EqueueAddEvent_nid_postfix(KernelEqueue eq, const KernelEqueueEvent& event) {
auto owner = EqueuePin_nid_postfix(eq);
if (!owner) {
return EQUEUE_ERROR_EBADF;
}
return owner->AddEvent(event);
}
int APS5_VABI EqueueTriggerEvent(KernelEqueue eq, uintptr_t ident, int16_t filter, void* triggerData) {
auto owner = EqueuePin(eq);
int APS5_VABI EqueueTriggerEvent_nid_postfix(KernelEqueue eq, uintptr_t ident, int16_t filter, void* triggerData) {
auto owner = EqueuePin_nid_postfix(eq);
if (!owner) {
return EQUEUE_ERROR_EBADF;
}
return owner->TriggerEvent(ident, filter, triggerData);
}
int APS5_VABI EqueueDeleteEvent(KernelEqueue eq, uintptr_t ident, int16_t filter) {
auto owner = EqueuePin(eq);
int APS5_VABI EqueueDeleteEvent_nid_postfix(KernelEqueue eq, uintptr_t ident, int16_t filter) {
auto owner = EqueuePin_nid_postfix(eq);
if (!owner) {
return EQUEUE_ERROR_EBADF;
}
@ -300,7 +300,7 @@ int APS5_VABI sceKernelDeleteEqueue(KernelEqueue eq) {
}
int APS5_VABI sceKernelWaitEqueue(KernelEqueue eq, KernelEvent* ev, int num, int* out, const KernelUseconds* timo) {
auto owner = EqueuePin(eq);
auto owner = EqueuePin_nid_postfix(eq);
if (!owner) {
return EQUEUE_ERROR_EBADF;
}
@ -343,7 +343,7 @@ int APS5_VABI sceKernelAddUserEvent(KernelEqueue eq, int id) {
e->event.data = 0;
}
};
return EqueueAddEvent(eq, event);
return EqueueAddEvent_nid_postfix(eq, event);
}
int APS5_VABI sceKernelAddUserEventEdge(KernelEqueue eq, int id) {
@ -363,15 +363,15 @@ int APS5_VABI sceKernelAddUserEventEdge(KernelEqueue eq, int id) {
e->event.data = 0;
}
};
return EqueueAddEvent(eq, event);
return EqueueAddEvent_nid_postfix(eq, event);
}
int APS5_VABI sceKernelTriggerUserEvent(KernelEqueue eq, int id, void* udata) {
return EqueueTriggerEvent(eq, static_cast<uintptr_t>(id), EVFILT_USER, udata);
return EqueueTriggerEvent_nid_postfix(eq, static_cast<uintptr_t>(id), EVFILT_USER, udata);
}
int APS5_VABI sceKernelDeleteUserEvent(KernelEqueue eq, int id) {
return EqueueDeleteEvent(eq, static_cast<uintptr_t>(id), EVFILT_USER);
return EqueueDeleteEvent_nid_postfix(eq, static_cast<uintptr_t>(id), EVFILT_USER);
}
int APS5_VABI sceKernelAddHRTimerEvent(KernelEqueue eq, int id, const KernelTimespec* ts, void* udata) {
@ -396,11 +396,11 @@ int APS5_VABI sceKernelAddHRTimerEvent(KernelEqueue eq, int id, const KernelTime
event.event.filter = EVFILT_HRTIMER;
event.event.flags = EV_ADD | EV_ONESHOT;
event.event.udata = udata;
return EqueueAddEvent(eq, event);
return EqueueAddEvent_nid_postfix(eq, event);
}
int APS5_VABI sceKernelDeleteHRTimerEvent(KernelEqueue eq, int id) {
return EqueueDeleteEvent(eq, static_cast<uintptr_t>(id), EVFILT_HRTIMER);
return EqueueDeleteEvent_nid_postfix(eq, static_cast<uintptr_t>(id), EVFILT_HRTIMER);
}
int APS5_VABI sceKernelAddAmprEvent(KernelEqueue eq, int id, void* udata) {
@ -429,7 +429,7 @@ int APS5_VABI sceKernelAddAmprEvent(KernelEqueue eq, int id, void* udata) {
e->event.data = 0;
}
};
EqueueAddEvent(eq, event);
EqueueAddEvent_nid_postfix(eq, event);
return EQUEUE_OK;
}
@ -441,7 +441,7 @@ int APS5_VABI sceKernelDeleteAmprEvent(KernelEqueue eq, int id) {
if (eq == 0) {
return EQUEUE_OK;
}
EqueueDeleteEvent(eq, static_cast<uintptr_t>(id), EVFILT_USER);
EqueueDeleteEvent_nid_postfix(eq, static_cast<uintptr_t>(id), EVFILT_USER);
return EQUEUE_OK;
}

8
core/libs/prx/libkernel/Equeue/Equeue.hpp
View File

@ -84,9 +84,9 @@ private:
using KernelEqueueRef = std::shared_ptr<KernelEqueuePrivate>;
KernelEqueueRef EqueuePin(KernelEqueue eq);
int APS5_VABI EqueueAddEvent(KernelEqueue eq, const KernelEqueueEvent& event);
int APS5_VABI EqueueTriggerEvent(KernelEqueue eq, uintptr_t ident, int16_t filter, void* triggerData);
int APS5_VABI EqueueDeleteEvent(KernelEqueue eq, uintptr_t ident, int16_t filter);
KernelEqueueRef EqueuePin_nid_postfix(KernelEqueue eq);
int APS5_VABI EqueueAddEvent_nid_postfix(KernelEqueue eq, const KernelEqueueEvent& event);
int APS5_VABI EqueueTriggerEvent_nid_postfix(KernelEqueue eq, uintptr_t ident, int16_t filter, void* triggerData);
int APS5_VABI EqueueDeleteEvent_nid_postfix(KernelEqueue eq, uintptr_t ident, int16_t filter);
#endif