mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvQueryEvent: return an Event instead of a raw Handle

Browse Source
This commit is contained in:
fincs 2018-08-30 00:48:17 +02:00
parent 7f8b6af64c
commit 99f37184fb
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nx/include/switch/services/nv.h
View File

@ -6,6 +6,7 @@
*/ */
#pragma once #pragma once
#include "../types.h" #include "../types.h"
#include "../kernel/event.h"
Result nvInitialize(void); Result nvInitialize(void);
void nvExit(void); void nvExit(void);
@ -25,6 +26,6 @@ typedef enum {
Result nvOpen(u32 *fd, const char *devicepath); Result nvOpen(u32 *fd, const char *devicepath);
Result nvIoctl(u32 fd, u32 request, void* argp); Result nvIoctl(u32 fd, u32 request, void* argp);
Result nvClose(u32 fd); Result nvClose(u32 fd);
Result nvQueryEvent(u32 fd, u32 event_id, Handle *handle_out); Result nvQueryEvent(u32 fd, u32 event_id, Event *event_out);
Result nvConvertError(int rc); Result nvConvertError(int rc);

8
nx/source/nvidia/gpu/error_notifier.c
View File

@ -20,15 +20,11 @@
Result nvErrorNotifierCreate(NvErrorNotifier* t, NvGpu* parent) Result nvErrorNotifierCreate(NvErrorNotifier* t, NvGpu* parent)
{ {
Result rc; Result rc;
Handle handle;
rc = nvQueryEvent( rc = nvQueryEvent(parent->gpu_channel.fd, NvEventId_Gpu_ErrorNotifier, &t->event);
parent->gpu_channel.fd, NvEventId_Gpu_ErrorNotifier, &handle);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc))
eventLoadRemote(&t->event, handle, true);
rc = nvioctlChannel_SetErrorNotifier(parent->gpu_channel.fd, 1); rc = nvioctlChannel_SetErrorNotifier(parent->gpu_channel.fd, 1);
}
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
t->parent = parent; t->parent = parent;

4
nx/source/services/nv.c
View File

@ -288,7 +288,7 @@ Result nvClose(u32 fd) {
return rc; return rc;
} }
Result nvQueryEvent(u32 fd, u32 event_id, Handle *handle_out) { Result nvQueryEvent(u32 fd, u32 event_id, Event *event_out) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -323,7 +323,7 @@ Result nvQueryEvent(u32 fd, u32 event_id, Handle *handle_out) {
rc = nvConvertError(resp->error); rc = nvConvertError(resp->error);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
*handle_out = r.Handles[0]; eventLoadRemote(event_out, r.Handles[0], true);
} }
return rc; return rc;