diff --git a/nx/include/switch/gfx/ioctl.h b/nx/include/switch/gfx/ioctl.h index 0f4c4344..bde28801 100644 --- a/nx/include/switch/gfx/ioctl.h +++ b/nx/include/switch/gfx/ioctl.h @@ -42,6 +42,6 @@ #define _IOC_NR(nr) (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK) #define _IOC_SIZE(nr) (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK) -#define __in -#define __out -#define __inout +#define _in_ +#define _out_ +#define _inout_ diff --git a/nx/source/gfx/ioctl/channel.c b/nx/source/gfx/ioctl/channel.c index 7b9c7a21..93f38637 100644 --- a/nx/source/gfx/ioctl/channel.c +++ b/nx/source/gfx/ioctl/channel.c @@ -7,7 +7,7 @@ Result nvioctlChannel_SetNvmapFd(u32 fd, u32 nvmap_fd) { struct { - __in u32 fd; + _in_ u32 fd; } data; memset(&data, 0, sizeof(data)); @@ -24,11 +24,11 @@ Result nvioctlChannel_SubmitGpfifo(u32 fd, nvioctl_gpfifo_entry *entries, u32 nu return MAKERESULT(Module_Libnx, LibnxError_OutOfMemory); struct { - __in u64 gpfifo; // (ignored) pointer to gpfifo entry structs - __in u32 num_entries; // number of entries being submitted - __in u32 flags; - __out nvioctl_fence fence_out; // returned new fence object for others to wait on - __in nvioctl_gpfifo_entry entries[num_entries]; // depends on num_entries + _in_ u64 gpfifo; // (ignored) pointer to gpfifo entry structs + _in_ u32 num_entries; // number of entries being submitted + _in_ u32 flags; + _out_ nvioctl_fence fence_out; // returned new fence object for others to wait on + _in_ nvioctl_gpfifo_entry entries[num_entries]; // depends on num_entries } data; @@ -49,9 +49,9 @@ Result nvioctlChannel_SubmitGpfifo(u32 fd, nvioctl_gpfifo_entry *entries, u32 nu Result nvioctlChannel_AllocObjCtx(u32 fd, u32 class_num, u32 flags) { struct { - __in u32 class_num; - __in u32 flags; - __in u64 obj_id; // (ignored) used for FREE_OBJ_CTX ioctl, which is not supported + _in_ u32 class_num; + _in_ u32 flags; + _in_ u64 obj_id; // (ignored) used for FREE_OBJ_CTX ioctl, which is not supported } data; memset(&data, 0, sizeof(data)); @@ -64,9 +64,9 @@ Result nvioctlChannel_AllocObjCtx(u32 fd, u32 class_num, u32 flags) { Result nvioctlChannel_ZCullBind(u32 fd, u64 gpu_va, u32 mode) { struct { - __in u64 gpu_va; - __in u32 mode; - __in u32 padding; + _in_ u64 gpu_va; + _in_ u32 mode; + _in_ u32 padding; } data; memset(&data, 0, sizeof(data)); @@ -78,9 +78,9 @@ Result nvioctlChannel_ZCullBind(u32 fd, u64 gpu_va, u32 mode) { Result nvioctlChannel_SetErrorNotifier(u32 fd, u64 offset, u64 size, u32 nvmap_handle) { struct { - __in u64 offset; - __in u64 size; - __in u32 nvmap_handle; + _in_ u64 offset; + _in_ u64 size; + _in_ u32 nvmap_handle; u32 padding; } data; @@ -94,7 +94,7 @@ Result nvioctlChannel_SetErrorNotifier(u32 fd, u64 offset, u64 size, u32 nvmap_h Result nvioctlChannel_SetPriority(u32 fd, u32 priority) { struct { - __in u32 priority; // 0x32 is low, 0x64 is medium and 0x96 is high + _in_ u32 priority; // 0x32 is low, 0x64 is medium and 0x96 is high } data; memset(&data, 0, sizeof(data)); @@ -107,13 +107,13 @@ Result nvioctlChannel_AllocGpfifoEx2(u32 fd, u32 num_entries, u32 flags, u32 unk Result rc=0; struct { - __in u32 num_entries; - __in u32 flags; - __in u32 unk0; // (1 works) - __out nvioctl_fence fence_out; - __in u32 unk1; - __in u32 unk2; - __in u32 unk3; + _in_ u32 num_entries; + _in_ u32 flags; + _in_ u32 unk0; // (1 works) + _out_ nvioctl_fence fence_out; + _in_ u32 unk1; + _in_ u32 unk2; + _in_ u32 unk3; } data; memset(&data, 0, sizeof(data)); @@ -135,7 +135,7 @@ Result nvioctlChannel_AllocGpfifoEx2(u32 fd, u32 num_entries, u32 flags, u32 unk Result nvioctlChannel_SetUserData(u32 fd, void* addr) { struct { - __in u64 addr; + _in_ u64 addr; } data; memset(&data, 0, sizeof(data)); diff --git a/nx/source/gfx/ioctl/nvhost-as-gpu.c b/nx/source/gfx/ioctl/nvhost-as-gpu.c index e60574e4..0a4152a4 100644 --- a/nx/source/gfx/ioctl/nvhost-as-gpu.c +++ b/nx/source/gfx/ioctl/nvhost-as-gpu.c @@ -7,7 +7,7 @@ Result nvioctlNvhostAsGpu_BindChannel(u32 fd, u32 channel_fd) { struct { - __in u32 fd; + _in_ u32 fd; } data; memset(&data, 0, sizeof(data)); @@ -20,13 +20,13 @@ Result nvioctlNvhostAsGpu_AllocSpace(u32 fd, u32 pages, u32 page_size, u32 flags Result rc = 0; struct { - __in u32 pages; - __in u32 page_size; - __in u32 flags; + _in_ u32 pages; + _in_ u32 page_size; + _in_ u32 flags; u32 pad; union { - __out u64 offset; - __in u64 align; + _out_ u64 offset; + _in_ u64 align; }; } data; @@ -51,13 +51,13 @@ Result nvioctlNvhostAsGpu_MapBufferEx( Result rc = 0; struct { - __in u32 flags; // bit0: fixed_offset, bit2: cacheable - __in u32 kind; // -1 is default - __in u32 nvmap_handle; - __inout u32 page_size; // 0 means don't care - __in u64 buffer_offset; - __in u64 mapping_size; - __inout u64 offset; + _in_ u32 flags; // bit0: fixed_offset, bit2: cacheable + _in_ u32 kind; // -1 is default + _in_ u32 nvmap_handle; + _inout_ u32 page_size; // 0 means don't care + _in_ u64 buffer_offset; + _in_ u64 mapping_size; + _inout_ u64 offset; } data; memset(&data, 0, sizeof(data)); @@ -83,9 +83,9 @@ Result nvioctlNvhostAsGpu_GetVARegions(u32 fd, nvioctl_va_region regions[2]) { struct { u64 not_used; // contained output user ptr on linux, ignored - __inout u32 bufsize; // forced to 2*sizeof(struct va_region) + _inout_ u32 bufsize; // forced to 2*sizeof(struct va_region) u32 pad; - __out nvioctl_va_region regions[2]; + _out_ nvioctl_va_region regions[2]; } data; memset(&data, 0, sizeof(data)); @@ -102,13 +102,13 @@ Result nvioctlNvhostAsGpu_GetVARegions(u32 fd, nvioctl_va_region regions[2]) { Result nvioctlNvhostAsGpu_InitializeEx(u32 fd, u32 big_page_size, u32 flags) { struct { - __in u32 big_page_size; // depends on GPU's available_big_page_sizes; 0=default - __in s32 as_fd; // ignored; passes 0 - __in u32 flags; // ignored; passes 0 - __in u32 reserved; // ignored; passes 0 - __in u64 unk0; - __in u64 unk1; - __in u64 unk2; + _in_ u32 big_page_size; // depends on GPU's available_big_page_sizes; 0=default + _in_ s32 as_fd; // ignored; passes 0 + _in_ u32 flags; // ignored; passes 0 + _in_ u32 reserved; // ignored; passes 0 + _in_ u64 unk0; + _in_ u64 unk1; + _in_ u64 unk2; } data; memset(&data, 0, sizeof(data)); diff --git a/nx/source/gfx/ioctl/nvhost-ctrl-gpu.c b/nx/source/gfx/ioctl/nvhost-ctrl-gpu.c index 3f80cf40..fe02de62 100644 --- a/nx/source/gfx/ioctl/nvhost-ctrl-gpu.c +++ b/nx/source/gfx/ioctl/nvhost-ctrl-gpu.c @@ -9,7 +9,7 @@ Result nvioctlNvhostCtrlGpu_ZCullGetCtxSize(u32 fd, u32 *out) { Result rc = 0; struct { - __out u32 out; + _out_ u32 out; } data; memset(&data, 0, sizeof(data)); @@ -27,7 +27,7 @@ Result nvioctlNvhostCtrlGpu_ZCullGetInfo(u32 fd, u32 out[40>>2]) { Result rc = 0; struct { - __out u32 out[40>>2]; + _out_ u32 out[40>>2]; } data; memset(&data, 0, sizeof(data)); @@ -45,9 +45,9 @@ Result nvioctlNvhostCtrlGpu_GetCharacteristics(u32 fd, gpu_characteristics *out) Result rc = 0; struct { - __in u64 gc_buf_size; // must not be NULL, but gets overwritten with 0xA0=max_size - __in u64 gc_buf_addr; // ignored, but must not be NULL - __out gpu_characteristics gc; + _in_ u64 gc_buf_size; // must not be NULL, but gets overwritten with 0xA0=max_size + _in_ u64 gc_buf_addr; // ignored, but must not be NULL + _out_ gpu_characteristics gc; } data; memset(&data, 0, sizeof(data)); @@ -68,7 +68,7 @@ Result nvioctlNvhostCtrlGpu_GetTpcMasks(u32 fd, u32 inval, u32 out[24>>2]) { // Fixme: This one is wrong. struct { - __inout u32 unk[24>>2]; + _inout_ u32 unk[24>>2]; } data; memset(&data, 0, sizeof(data)); @@ -87,7 +87,7 @@ Result nvioctlNvhostCtrlGpu_GetL2State(u32 fd, nvioctl_l2_state *out) { Result rc = 0; struct { - __out nvioctl_l2_state out; + _out_ nvioctl_l2_state out; } data; memset(&data, 0, sizeof(data)); diff --git a/nx/source/gfx/ioctl/nvhost-ctrl.c b/nx/source/gfx/ioctl/nvhost-ctrl.c index e88b4d69..01af6a05 100644 --- a/nx/source/gfx/ioctl/nvhost-ctrl.c +++ b/nx/source/gfx/ioctl/nvhost-ctrl.c @@ -7,7 +7,7 @@ Result nvioctlNvhostCtrl_EventSignal(u32 fd, u32 event_id) { struct { - __in u32 event_id; + _in_ u32 event_id; } data; memset(&data, 0, sizeof(data)); @@ -21,10 +21,10 @@ Result nvioctlNvhostCtrl_EventWait(u32 fd, u32 syncpt_id, u32 threshold, s32 tim Result rc = 0; struct { - __in u32 syncpt_id; - __in u32 threshold; - __in s32 timeout; - __inout u32 value; + _in_ u32 syncpt_id; + _in_ u32 threshold; + _in_ s32 timeout; + _inout_ u32 value; } data; memset(&data, 0, sizeof(data)); @@ -43,7 +43,7 @@ Result nvioctlNvhostCtrl_EventWait(u32 fd, u32 syncpt_id, u32 threshold, s32 tim Result nvioctlNvhostCtrl_EventRegister(u32 fd, u32 event_id) { struct { - __in u32 event_id; + _in_ u32 event_id; } data; memset(&data, 0, sizeof(data)); diff --git a/nx/source/gfx/ioctl/nvmap.c b/nx/source/gfx/ioctl/nvmap.c index 4ac70979..4ea72c6b 100644 --- a/nx/source/gfx/ioctl/nvmap.c +++ b/nx/source/gfx/ioctl/nvmap.c @@ -9,8 +9,8 @@ Result nvioctlNvmap_Create(u32 fd, u32 size, u32 *nvmap_handle) { Result rc=0; struct { - __in u32 size; - __out u32 handle; + _in_ u32 size; + _out_ u32 handle; } data; memset(&data, 0, sizeof(data)); @@ -29,8 +29,8 @@ Result nvioctlNvmap_FromId(u32 fd, u32 id, u32 *nvmap_handle) { Result rc=0; struct { - __in u32 id; - __out u32 handle; + _in_ u32 id; + _out_ u32 handle; } data; memset(&data, 0, sizeof(data)); @@ -47,13 +47,13 @@ Result nvioctlNvmap_FromId(u32 fd, u32 id, u32 *nvmap_handle) { Result nvioctlNvmap_Alloc(u32 fd, u32 nvmap_handle, u32 heapmask, u32 flags, u32 align, u8 kind, void* addr) { struct { - __in u32 handle; - __in u32 heapmask; - __in u32 flags; // (0=read-only, 1=read-write) - __in u32 align; - __in u8 kind; + _in_ u32 handle; + _in_ u32 heapmask; + _in_ u32 flags; // (0=read-only, 1=read-write) + _in_ u32 align; + _in_ u8 kind; u8 pad[7]; - __in u64 addr; + _in_ u64 addr; } data; memset(&data, 0, sizeof(data)); @@ -71,8 +71,8 @@ Result nvioctlNvmap_GetId(u32 fd, u32 nvmap_handle, u32 *id) { Result rc=0; struct { - __out u32 id; - __in u32 handle; + _out_ u32 id; + _in_ u32 handle; } data; memset(&data, 0, sizeof(data));