Change code style

This commit is contained in:
plutooo 2018-03-11 21:56:46 +01:00 committed by fincs
parent 9c234d4d40
commit d6dbb59872
18 changed files with 98 additions and 98 deletions

View File

@ -13,14 +13,14 @@ typedef enum {
typedef u64 iova_t; typedef u64 iova_t;
Result nvasCreate(NvAddressSpace* a); Result nvAddressSpaceCreate(NvAddressSpace* a);
void nvasClose(NvAddressSpace* a); void nvAddressSpaceClose(NvAddressSpace* a);
Result nvasReserveAlign(NvAddressSpace* a, NvPageSize align, u32 pages, NvPageSize page_sz, iova_t* iova_out); Result nvAddressSpaceReserveAlign(NvAddressSpace* a, NvPageSize align, u32 pages, NvPageSize page_sz, iova_t* iova_out);
Result nvasReserveAtFixedAddr(NvAddressSpace* a, iova_t addr, u32 pages, NvPageSize page_sz); Result nvAddressSpaceReserveAtFixedAddr(NvAddressSpace* a, iova_t addr, u32 pages, NvPageSize page_sz);
Result nvasReserveFull(NvAddressSpace* a); Result nvAddressSpaceReserveFull(NvAddressSpace* a);
Result nvasMapBuffer(NvAddressSpace* a, NvBuffer* buffer, NvBufferKind kind, iova_t* iova_out); Result nvAddressSpaceMapBuffer(NvAddressSpace* a, NvBuffer* buffer, NvBufferKind kind, iova_t* iova_out);
struct NvChannel; struct NvChannel;
Result nvasBindToChannel(NvAddressSpace* a, struct NvChannel* channel); Result nvAddressSpaceBindToChannel(NvAddressSpace* a, struct NvChannel* channel);

View File

@ -251,12 +251,12 @@ typedef struct {
bool has_init; bool has_init;
} NvBuffer; } NvBuffer;
Result nvbufInit(void); Result nvBufferInit(void);
u32 nvbufGetNvmapFd(void); u32 nvBufferGetNvmapFd(void);
void nvbufExit(void); void nvBufferExit(void);
Result nvbufCreate(NvBuffer* m, size_t size, u32 align, NvBufferKind kind); Result nvBufferCreate(NvBuffer* m, size_t size, u32 align, NvBufferKind kind);
Result nvbufCreateRw(NvBuffer* m, size_t size, u32 align, NvBufferKind kind); Result nvBufferCreateRw(NvBuffer* m, size_t size, u32 align, NvBufferKind kind);
void nvbufFree(NvBuffer* m); void nvBufferFree(NvBuffer* m);
void* nvbufGetAddr(NvBuffer* m); void* nvBufferGetAddr(NvBuffer* m);

View File

@ -6,8 +6,8 @@ typedef struct NvChannel {
bool has_init; bool has_init;
} NvChannel; } NvChannel;
Result nvchannelCreate(NvChannel* c, const char* dev); Result nvChannelCreate(NvChannel* c, const char* dev);
void nvchannelClose(NvChannel* c); void nvChannelClose(NvChannel* c);
Result nvchannelSetPriority(NvChannel* c, NvChannelPriority prio); Result nvChannelSetPriority(NvChannel* c, NvChannelPriority prio);
Result nvchannelSetNvmapFd(NvChannel* c); Result nvChannelSetNvmapFd(NvChannel* c);

View File

@ -5,7 +5,7 @@ typedef struct NvGpu NvGpu;
typedef struct { typedef struct {
NvGpu* parent; NvGpu* parent;
u64 obj_id; u64 obj_id;
} Nv3dContext; } Nv3DContext;
Result nv3dCreate(Nv3dContext* t, NvGpu* parent); Result nv3DContextCreate(Nv3DContext* t, NvGpu* parent);
void nv3dClose(Nv3dContext* t); void nv3DContextClose(Nv3DContext* t);

View File

@ -8,5 +8,5 @@ typedef struct {
bool has_init; bool has_init;
} NvErrorNotifier; } NvErrorNotifier;
Result nverrCreate(NvErrorNotifier* t, NvGpu* parent); Result nvErrorNotifierCreate(NvErrorNotifier* t, NvGpu* parent);
void nverrClose(NvErrorNotifier* t); void nvErrorNotifierClose(NvErrorNotifier* t);

View File

@ -5,10 +5,10 @@ typedef struct {
nvioctl_fence fifo_fence; nvioctl_fence fifo_fence;
} NvGpfifo; } NvGpfifo;
Result nvfifoCreate(NvGpfifo* f, NvChannel* parent); Result nvGpfifoCreate(NvGpfifo* f, NvChannel* parent);
void nvfifoClose(NvGpfifo* f); void nvGpfifoClose(NvGpfifo* f);
#define NV_MAKE_GPFIFO_ENTRY(iova, size) \ #define NV_MAKE_GPFIFO_ENTRY(iova, size) \
((iova) | (((u64)(size)) << 42)) ((iova) | (((u64)(size)) << 42))
Result nvfifoSubmit(NvGpfifo* f, NvCmdList* cmd_list, NvFence* fence_out); Result nvGpfifoSubmit(NvGpfifo* f, NvCmdList* cmd_list, NvFence* fence_out);

View File

@ -5,7 +5,7 @@ typedef struct NvGpu {
NvChannel gpu_channel; NvChannel gpu_channel;
NvGpfifo gpfifo; NvGpfifo gpfifo;
NvZcullContext zcull_ctx; NvZcullContext zcull_ctx;
Nv3dContext _3d_ctx; Nv3DContext _3d_ctx;
NvErrorNotifier error_notifier; NvErrorNotifier error_notifier;
} NvGpu; } NvGpu;

View File

@ -7,5 +7,5 @@ typedef struct {
NvBuffer ctx_buf; NvBuffer ctx_buf;
} NvZcullContext; } NvZcullContext;
Result nvzcullCreate(NvZcullContext* z, NvGpu* parent); Result nvZcullContextCreate(NvZcullContext* z, NvGpu* parent);
void nvzcullClose(NvZcullContext* z); void nvZcullContextClose(NvZcullContext* z);

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
Result nvinfoInit(); Result nvInfoInit();
void nvinfoExit(); void nvInfoExit();
u32 nvinfoGetZcullCtxSize(); u32 nvInfoGetZcullCtxSize();

View File

@ -1,6 +1,6 @@
#include <switch.h> #include <switch.h>
Result nvasCreate(NvAddressSpace* a) Result nvAddressSpaceCreate(NvAddressSpace* a)
{ {
Result rc; Result rc;
@ -15,12 +15,12 @@ Result nvasCreate(NvAddressSpace* a)
rc = nvioctlNvhostAsGpu_InitializeEx(a->fd, 1, 0x10000); rc = nvioctlNvhostAsGpu_InitializeEx(a->fd, 1, 0x10000);
if (R_FAILED(rc)) if (R_FAILED(rc))
nvasClose(a); nvAddressSpaceClose(a);
return rc; return rc;
} }
void nvasClose(NvAddressSpace* a) void nvAddressSpaceClose(NvAddressSpace* a)
{ {
if (!a->has_init) if (!a->has_init)
return; return;
@ -31,23 +31,23 @@ void nvasClose(NvAddressSpace* a)
a->fd = -1; a->fd = -1;
} }
Result nvasReserveAlign(NvAddressSpace* a, NvPageSize align, u32 pages, NvPageSize page_sz, iova_t* iova_out) { Result nvAddressSpaceReserveAlign(NvAddressSpace* a, NvPageSize align, u32 pages, NvPageSize page_sz, iova_t* iova_out) {
return nvioctlNvhostAsGpu_AllocSpace(a->fd, pages, page_sz, 0, align, iova_out); return nvioctlNvhostAsGpu_AllocSpace(a->fd, pages, page_sz, 0, align, iova_out);
} }
Result nvasReserveAtFixedAddr(NvAddressSpace* a, iova_t addr, u32 pages, NvPageSize page_sz) { Result nvAddressSpaceReserveAtFixedAddr(NvAddressSpace* a, iova_t addr, u32 pages, NvPageSize page_sz) {
return nvioctlNvhostAsGpu_AllocSpace(a->fd, pages, page_sz, 1, addr, NULL); return nvioctlNvhostAsGpu_AllocSpace(a->fd, pages, page_sz, 1, addr, NULL);
} }
Result nvasReserveFull(NvAddressSpace* a) { Result nvAddressSpaceReserveFull(NvAddressSpace* a) {
return nvasReserveAlign(a, NvPageSize_64K, 0x10000, NvPageSize_64K, NULL); return nvAddressSpaceReserveAlign(a, NvPageSize_64K, 0x10000, NvPageSize_64K, NULL);
} }
Result nvasMapBuffer(NvAddressSpace* a, NvBuffer* buffer, NvBufferKind kind, iova_t* iova_out) { Result nvAddressSpaceMapBuffer(NvAddressSpace* a, NvBuffer* buffer, NvBufferKind kind, iova_t* iova_out) {
return nvioctlNvhostAsGpu_MapBufferEx( return nvioctlNvhostAsGpu_MapBufferEx(
a->fd, NvMapBufferFlags_IsCachable, kind, buffer->fd, 0x10000, 0, 0, 0, iova_out); a->fd, NvMapBufferFlags_IsCachable, kind, buffer->fd, 0x10000, 0, 0, 0, iova_out);
} }
Result nvasBindToChannel(NvAddressSpace* a, NvChannel* channel) { Result nvAddressSpaceBindToChannel(NvAddressSpace* a, NvChannel* channel) {
return nvioctlNvhostAsGpu_BindChannel(a->fd, channel->fd); return nvioctlNvhostAsGpu_BindChannel(a->fd, channel->fd);
} }

View File

@ -9,7 +9,7 @@
static u32 g_nvmap_fd = -1; static u32 g_nvmap_fd = -1;
static u64 g_refCnt; static u64 g_refCnt;
Result nvbufInit(void) Result nvBufferInit(void)
{ {
Result rc; Result rc;
@ -24,7 +24,7 @@ Result nvbufInit(void)
return rc; return rc;
} }
void nvbufExit(void) void nvBufferExit(void)
{ {
if (atomicDecrement64(&g_refCnt) == 0) if (atomicDecrement64(&g_refCnt) == 0)
{ {
@ -35,11 +35,11 @@ void nvbufExit(void)
} }
} }
u32 nvbufGetNvmapFd(void) { u32 nvBufferGetNvmapFd(void) {
return g_nvmap_fd; return g_nvmap_fd;
} }
static Result _nvbufCreate(NvBuffer* m, size_t size, u32 flags, u32 align, NvBufferKind kind) static Result _nvBufferCreate(NvBuffer* m, size_t size, u32 flags, u32 align, NvBufferKind kind)
{ {
Result rc; Result rc;
@ -63,20 +63,20 @@ static Result _nvbufCreate(NvBuffer* m, size_t size, u32 flags, u32 align, NvBuf
rc = nvioctlNvmap_Alloc(g_nvmap_fd, m->fd, 0, flags | NvBufferFlags_Nintendo, align, kind, m->ptr); rc = nvioctlNvmap_Alloc(g_nvmap_fd, m->fd, 0, flags | NvBufferFlags_Nintendo, align, kind, m->ptr);
if (R_FAILED(rc)) if (R_FAILED(rc))
nvbufFree(m); nvBufferFree(m);
return rc; return rc;
} }
Result nvbufCreate(NvBuffer* m, size_t size, u32 align, NvBufferKind kind) { Result nvBufferCreate(NvBuffer* m, size_t size, u32 align, NvBufferKind kind) {
return _nvbufCreate(m, size, 0, align, kind); return _nvBufferCreate(m, size, 0, align, kind);
} }
Result nvbufCreateRw(NvBuffer* m, size_t size, u32 align, NvBufferKind kind) { Result nvBufferCreateRw(NvBuffer* m, size_t size, u32 align, NvBufferKind kind) {
return _nvbufCreate(m, size, NvBufferFlags_Writable, align, kind); return _nvBufferCreate(m, size, NvBufferFlags_Writable, align, kind);
} }
void nvbufFree(NvBuffer* m) void nvBufferFree(NvBuffer* m)
{ {
if (!m->has_init) if (!m->has_init)
return; return;
@ -90,6 +90,6 @@ void nvbufFree(NvBuffer* m)
m->fd = -1; m->fd = -1;
} }
void* nvbufGetAddr(NvBuffer* m) { void* nvBufferGetAddr(NvBuffer* m) {
return m->ptr; return m->ptr;
} }

View File

@ -1,6 +1,6 @@
#include <switch.h> #include <switch.h>
Result nvchannelCreate(NvChannel* c, const char* dev) Result nvChannelCreate(NvChannel* c, const char* dev)
{ {
Result rc; Result rc;
@ -12,12 +12,12 @@ Result nvchannelCreate(NvChannel* c, const char* dev)
c->fd = -1; c->fd = -1;
if (R_FAILED(rc)) if (R_FAILED(rc))
nvchannelClose(c); nvChannelClose(c);
return rc; return rc;
} }
void nvchannelClose(NvChannel* c) void nvChannelClose(NvChannel* c)
{ {
if (!c->has_init) if (!c->has_init)
return; return;
@ -28,10 +28,10 @@ void nvchannelClose(NvChannel* c)
c->fd = -1; c->fd = -1;
} }
Result nvchannelSetPriority(NvChannel* c, NvChannelPriority prio) { Result nvChannelSetPriority(NvChannel* c, NvChannelPriority prio) {
return nvioctlChannel_SetPriority(c->fd, prio); return nvioctlChannel_SetPriority(c->fd, prio);
} }
Result nvchannelSetNvmapFd(NvChannel* c) { Result nvChannelSetNvmapFd(NvChannel* c) {
return nvioctlChannel_SetNvmapFd(c->fd, nvbufGetNvmapFd()); return nvioctlChannel_SetNvmapFd(c->fd, nvBufferGetNvmapFd());
} }

View File

@ -1,11 +1,11 @@
#include <switch.h> #include <switch.h>
Result nv3dCreate(Nv3dContext* t, NvGpu* parent) Result nv3DContextCreate(Nv3DContext* t, NvGpu* parent)
{ {
t->parent = parent; t->parent = parent;
return nvioctlChannel_AllocObjCtx(parent->gpu_channel.fd, NvClassNumber_3D, 0, &t->obj_id); return nvioctlChannel_AllocObjCtx(parent->gpu_channel.fd, NvClassNumber_3D, 0, &t->obj_id);
} }
void nv3dClose(Nv3dContext* t) { void nv3DContextClose(Nv3DContext* t) {
// Empty // Empty
} }

View File

@ -1,6 +1,6 @@
#include <switch.h> #include <switch.h>
Result nverrCreate(NvErrorNotifier* t, NvGpu* parent) Result nvErrorNotifierCreate(NvErrorNotifier* t, NvGpu* parent)
{ {
Result rc; Result rc;
Handle handle; Handle handle;
@ -20,7 +20,7 @@ Result nverrCreate(NvErrorNotifier* t, NvGpu* parent)
return rc; return rc;
} }
void nverrClose(NvErrorNotifier* t) void nvErrorNotifierClose(NvErrorNotifier* t)
{ {
if (!t->has_init) if (!t->has_init)
return; return;
@ -29,10 +29,10 @@ void nverrClose(NvErrorNotifier* t)
eventClose(&t->event); eventClose(&t->event);
} }
Result nverrWait(NvErrorNotifier* t, u64 timeout) { Result nvErrorNotifierWait(NvErrorNotifier* t, u64 timeout) {
return eventWait(&t->event, timeout); return eventWait(&t->event, timeout);
} }
Result nverrGetError(NvErrorNotifier* t, NvError* out) { Result nvErrorNotifierGetError(NvErrorNotifier* t, NvError* out) {
return nvioctlChannel_GetErrorNotification(t->parent->gpu_channel.fd, out); return nvioctlChannel_GetErrorNotification(t->parent->gpu_channel.fd, out);
} }

View File

@ -2,7 +2,7 @@
#define DEFAULT_FIFO_ENTRIES 0x800 #define DEFAULT_FIFO_ENTRIES 0x800
Result nvfifoCreate(NvGpfifo* f, NvChannel* parent) Result nvGpfifoCreate(NvGpfifo* f, NvChannel* parent)
{ {
f->parent = parent; f->parent = parent;
@ -10,11 +10,11 @@ Result nvfifoCreate(NvGpfifo* f, NvChannel* parent)
parent->fd, DEFAULT_FIFO_ENTRIES, 1, 0, 0, 0, 0, &f->fifo_fence); parent->fd, DEFAULT_FIFO_ENTRIES, 1, 0, 0, 0, 0, &f->fifo_fence);
} }
void nvfifoClose(NvGpfifo* f) { void nvGpfifoClose(NvGpfifo* f) {
/**/ /**/
} }
Result nvfifoSubmit(NvGpfifo* f, NvCmdList* cmd_list, NvFence* fence_out) Result nvGpfifoSubmit(NvGpfifo* f, NvCmdList* cmd_list, NvFence* fence_out)
{ {
Result rc; Result rc;
nvioctl_gpfifo_entry ent; nvioctl_gpfifo_entry ent;

View File

@ -4,42 +4,42 @@ Result nvgpuCreate(NvGpu* g)
{ {
Result rc; Result rc;
if (R_FAILED(nvinfoInit())) if (R_FAILED(nvInfoInit()))
return MAKERESULT(Module_Libnx, LibnxError_NvinfoFailedToInitialize); return MAKERESULT(Module_Libnx, LibnxError_NvinfoFailedToInitialize);
if (R_FAILED(nvbufInit())) { if (R_FAILED(nvBufferInit())) {
nvinfoExit(); nvInfoExit();
return MAKERESULT(Module_Libnx, LibnxError_NvbufFailedToInitialize); return MAKERESULT(Module_Libnx, LibnxError_NvbufFailedToInitialize);
} }
rc = nvchannelCreate(&g->gpu_channel, "/dev/nvhost-gpu"); rc = nvChannelCreate(&g->gpu_channel, "/dev/nvhost-gpu");
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvasCreate(&g->addr_space); rc = nvAddressSpaceCreate(&g->addr_space);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvasReserveFull(&g->addr_space); rc = nvAddressSpaceReserveFull(&g->addr_space);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvasBindToChannel(&g->addr_space, &g->gpu_channel); rc = nvAddressSpaceBindToChannel(&g->addr_space, &g->gpu_channel);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvchannelSetNvmapFd(&g->gpu_channel); rc = nvChannelSetNvmapFd(&g->gpu_channel);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvfifoCreate(&g->gpfifo, &g->gpu_channel); rc = nvGpfifoCreate(&g->gpfifo, &g->gpu_channel);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nv3dCreate(&g->_3d_ctx, g); rc = nv3DContextCreate(&g->_3d_ctx, g);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nverrCreate(&g->error_notifier, g); rc = nvErrorNotifierCreate(&g->error_notifier, g);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvchannelSetPriority(&g->gpu_channel, NvChannelPriority_Medium); rc = nvChannelSetPriority(&g->gpu_channel, NvChannelPriority_Medium);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvzcullCreate(&g->zcull_ctx, g); rc = nvZcullContextCreate(&g->zcull_ctx, g);
if (R_FAILED(rc)) if (R_FAILED(rc))
nvgpuClose(g); nvgpuClose(g);
@ -49,13 +49,13 @@ Result nvgpuCreate(NvGpu* g)
void nvgpuClose(NvGpu* g) void nvgpuClose(NvGpu* g)
{ {
nvbufExit(); nvBufferExit();
nvinfoExit(); nvInfoExit();
nverrClose(&g->error_notifier); nvErrorNotifierClose(&g->error_notifier);
nvzcullClose(&g->zcull_ctx); nvZcullContextClose(&g->zcull_ctx);
nv3dClose(&g->_3d_ctx); nv3DContextClose(&g->_3d_ctx);
nvfifoClose(&g->gpfifo); nvGpfifoClose(&g->gpfifo);
nvasClose(&g->addr_space); nvAddressSpaceClose(&g->addr_space);
nvchannelClose(&g->gpu_channel); nvChannelClose(&g->gpu_channel);
} }

View File

@ -1,20 +1,20 @@
#include <switch.h> #include <switch.h>
Result nvzcullCreate(NvZcullContext* z, NvGpu* parent) Result nvZcullContextCreate(NvZcullContext* z, NvGpu* parent)
{ {
Result rc; Result rc;
z->parent = parent; z->parent = parent;
rc = nvbufCreateRw(&z->ctx_buf, nvinfoGetZcullCtxSize(), 0x20000, NvBufferKind_Pitch); rc = nvBufferCreateRw(&z->ctx_buf, nvInfoGetZcullCtxSize(), 0x20000, NvBufferKind_Pitch);
iova_t iova_out; iova_t iova_out;
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvasMapBuffer(&parent->addr_space, &z->ctx_buf, NvBufferKind_Pitch, &iova_out); rc = nvAddressSpaceMapBuffer(&parent->addr_space, &z->ctx_buf, NvBufferKind_Pitch, &iova_out);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvasMapBuffer(&parent->addr_space, &z->ctx_buf, NvBufferKind_Generic_16BX2, /*&iova_out*/ NULL); rc = nvAddressSpaceMapBuffer(&parent->addr_space, &z->ctx_buf, NvBufferKind_Generic_16BX2, /*&iova_out*/ NULL);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvioctlChannel_ZCullBind(parent->gpu_channel.fd, iova_out, NvZcullConfig_SeparateBuffer); rc = nvioctlChannel_ZCullBind(parent->gpu_channel.fd, iova_out, NvZcullConfig_SeparateBuffer);
@ -22,7 +22,7 @@ Result nvzcullCreate(NvZcullContext* z, NvGpu* parent)
return rc; return rc;
} }
void nvzcullClose(NvZcullContext* z) { void nvZcullContextClose(NvZcullContext* z) {
// TODO: Unmap z->ctx_buf from parent->addr_space? // TODO: Unmap z->ctx_buf from parent->addr_space?
nvbufFree(&z->ctx_buf); nvBufferFree(&z->ctx_buf);
} }

View File

@ -6,7 +6,7 @@ static u64 g_refCnt;
static nvioctl_gpu_characteristics g_gpu_characteristics; static nvioctl_gpu_characteristics g_gpu_characteristics;
static u32 g_zcull_ctx_size; static u32 g_zcull_ctx_size;
Result nvinfoInit() Result nvInfoInit()
{ {
Result rc; Result rc;
@ -25,12 +25,12 @@ Result nvinfoInit()
rc = nvioctlNvhostCtrlGpu_ZCullGetCtxSize(g_ctrlgpu_fd, &g_zcull_ctx_size); rc = nvioctlNvhostCtrlGpu_ZCullGetCtxSize(g_ctrlgpu_fd, &g_zcull_ctx_size);
if (R_FAILED(rc)) if (R_FAILED(rc))
nvinfoExit(); nvInfoExit();
return rc; return rc;
} }
void nvinfoExit() void nvInfoExit()
{ {
if (atomicDecrement64(&g_refCnt) == 0) if (atomicDecrement64(&g_refCnt) == 0)
{ {
@ -41,6 +41,6 @@ void nvinfoExit()
} }
} }
u32 nvinfoGetZcullCtxSize() { u32 nvInfoGetZcullCtxSize() {
return g_zcull_ctx_size; return g_zcull_ctx_size;
} }