cleanup code

This commit is contained in:
martin 2024-09-05 12:28:25 -05:00
parent 06171971e7
commit 0703367f99

View File

@ -372,30 +372,29 @@ s32 PS4_SYSV_ABI sceGnmAddEqEvent(SceKernelEqueue eq, u64 id, void* udata) {
kernel_event.event.udata = udata; kernel_event.event.udata = udata;
eq->AddEvent(kernel_event); eq->AddEvent(kernel_event);
if (id == 64) { Platform::InterruptId interruptId;
Platform::IrqC::Instance()->Register( GnmEventIdents eventId;
Platform::InterruptId::GfxEop,
[=](Platform::InterruptId irq) {
ASSERT_MSG(irq == Platform::InterruptId::GfxEop,
"An unexpected IRQ occured"); // We need to convert IRQ# to event id and do
// proper filtering in trigger function
eq->TriggerEvent(GnmEventIdents::GfxEop, SceKernelEvent::Filter::GraphicsCore, nullptr);
},
eq);
} else if (id >= 0 && id <= 6) {
auto interruptId = (Platform::InterruptId)id;
Platform::IrqC::Instance()->Register( if (id == 64) {
interruptId, interruptId = Platform::InterruptId::GfxEop;
[=](Platform::InterruptId irq) { eventId = GnmEventIdents::GfxEop;
ASSERT_MSG(irq == interruptId, } else if (id >= 0 && id <= 6) {
"An unexpected IRQ occured"); // We need to convert IRQ# to event id and do interruptId = static_cast<Platform::InterruptId>(id);
// proper filtering in trigger function eventId = static_cast<GnmEventIdents>(id);
eq->TriggerEvent((GnmEventIdents)id, SceKernelEvent::Filter::GraphicsCore, nullptr); } else {
}, LOG_ERROR(Lib_GnmDriver, "unknown id {}", id);
eq); return ORBIS_OK;
} }
Platform::IrqC::Instance()->Register(
interruptId,
[=](Platform::InterruptId irq) {
ASSERT_MSG(irq == interruptId, "An unexpected IRQ occurred");
eq->TriggerEvent(eventId, SceKernelEvent::Filter::GraphicsCore, nullptr);
},
eq
);
return ORBIS_OK; return ORBIS_OK;
} }