From 579ca50f707bd239db77f114eb5dc103c28b0eff Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 12 Feb 2022 16:08:15 +0100 Subject: [PATCH] WIP: clang_format --- .clang-format | 68 ++ .github/workflows/ci.yml | 12 +- include/arpa/inet.h | 12 +- include/avm/drc.h | 9 +- include/coreinit/alarm.h | 53 +- include/coreinit/atomic.h | 26 +- include/coreinit/atomic64.h | 26 +- include/coreinit/bsp.h | 68 +- include/coreinit/cache.h | 45 +- include/coreinit/codegen.h | 19 +- include/coreinit/condition.h | 18 +- include/coreinit/context.h | 22 +- include/coreinit/core.h | 3 +- include/coreinit/coroutine.h | 12 +- include/coreinit/cosreport.h | 67 +- include/coreinit/debug.h | 61 +- include/coreinit/dynload.h | 49 +- include/coreinit/event.h | 39 +- include/coreinit/exception.h | 42 +- include/coreinit/exit.h | 5 +- include/coreinit/fastcondition.h | 15 +- include/coreinit/fastmutex.h | 16 +- include/coreinit/filesystem.h | 360 ++++--- include/coreinit/foreground.h | 9 +- include/coreinit/internal.h | 3 +- include/coreinit/interrupts.h | 22 +- include/coreinit/ios.h | 92 +- include/coreinit/launch.h | 3 +- include/coreinit/mcp.h | 94 +- include/coreinit/memblockheap.h | 14 +- include/coreinit/memdefaultheap.h | 16 +- include/coreinit/memexpheap.h | 22 +- include/coreinit/memfrmheap.h | 23 +- include/coreinit/memheap.h | 34 +- include/coreinit/memlist.h | 27 +- include/coreinit/memory.h | 42 +- include/coreinit/memorymap.h | 54 +- include/coreinit/memunitheap.h | 10 +- include/coreinit/messagequeue.h | 73 +- include/coreinit/mutex.h | 19 +- include/coreinit/rendezvous.h | 15 +- include/coreinit/scheduler.h | 25 +- include/coreinit/screen.h | 46 +- include/coreinit/semaphore.h | 14 +- include/coreinit/spinlock.h | 33 +- include/coreinit/systeminfo.h | 6 +- include/coreinit/taskqueue.h | 96 +- include/coreinit/thread.h | 135 ++- include/coreinit/threadqueue.h | 8 +- include/coreinit/time.h | 25 +- include/coreinit/title.h | 3 +- include/coreinit/userconfig.h | 130 +-- include/dmae/mem.h | 2 +- include/dmae/sync.h | 3 +- include/erreula/rpl_interface.h | 78 +- include/gx2/clear.h | 58 +- include/gx2/context.h | 18 +- include/gx2/debug.h | 34 +- include/gx2/display.h | 62 +- include/gx2/displaylist.h | 30 +- include/gx2/draw.h | 87 +- include/gx2/enum.h | 782 +++++++-------- include/gx2/event.h | 39 +- include/gx2/mem.h | 9 +- include/gx2/registers.h | 790 +++++++-------- include/gx2/sampler.h | 92 +- include/gx2/shaders.h | 125 +-- include/gx2/state.h | 14 +- include/gx2/surface.h | 72 +- include/gx2/swap.h | 23 +- include/gx2/tessellation.h | 17 +- include/gx2/texture.h | 20 +- include/gx2/utils.h | 26 +- include/gx2r/buffer.h | 51 +- include/gx2r/displaylist.h | 19 +- include/gx2r/draw.h | 28 +- include/gx2r/mem.h | 19 +- include/gx2r/resource.h | 50 +- include/gx2r/surface.h | 35 +- include/h264/stream.h | 20 +- include/netdb.h | 59 +- include/netinet/in.h | 36 +- include/netinet/tcp.h | 10 +- include/nn/ac/ac_c.h | 5 +- include/nn/ac/ac_cpp.h | 171 ++-- include/nn/acp/device.h | 4 +- include/nn/acp/result.h | 167 ++-- include/nn/acp/save.h | 6 +- include/nn/acp/title.h | 233 ++--- include/nn/act/client_cpp.h | 258 ++--- include/nn/ccr/sys_caffeine.h | 9 +- include/nn/cmpt/cmpt.h | 17 +- include/nn/erreula/erreula_cpp.h | 467 +++++---- include/nn/ffl/miidata.h | 19 +- include/nn/pdm/pdm_c.h | 12 +- include/nn/pdm/pdm_cpp.h | 306 +++--- include/nn/result.h | 473 ++++----- include/nn/sl.h | 4 +- include/nn/sl/FileStream.h | 79 +- include/nn/sl/LaunchInfoDatabase.h | 85 +- include/nn/sl/sl_cpp.h | 47 +- include/nn/spm/storage.h | 195 ++-- include/nn/swkbd/swkbd_cpp.h | 720 +++++++------- include/nsyshid/hid.h | 20 +- include/nsysnet/_netdb.h | 46 +- include/nsysnet/_socket.h | 156 ++- include/nsysnet/nssl.h | 372 +++---- include/nsysnet/socket.h | 21 +- include/nsysuhs/uhs.h | 243 ++--- include/nsysuhs/uhs_usbspec.h | 82 +- include/padscore/kpad.h | 8 +- include/padscore/wpad.h | 125 ++- include/poll.h | 20 +- include/proc_ui/procui.h | 51 +- include/sndcore2/core.h | 31 +- include/sndcore2/device.h | 12 +- include/sndcore2/drcvs.h | 2 +- include/sndcore2/result.h | 10 +- include/sndcore2/voice.h | 147 ++- include/swkbd/rpl_interface.h | 117 ++- include/sys/filio.h | 31 +- include/sys/ioccom.h | 35 +- include/sys/socket.h | 156 ++- include/sysapp/launch.h | 31 +- include/sysapp/switch.h | 38 +- include/sysapp/title.h | 29 +- include/vpad/input.h | 398 ++++---- include/wut.h | 2 +- include/wut_structsize.h | 26 +- include/wut_types.h | 14 +- libraries/libgfd/include/gfd.h | 67 +- libraries/libgfd/src/gfd.c | 216 ++-- libraries/libwhb/include/whb/crash.h | 3 +- libraries/libwhb/include/whb/file.h | 8 +- libraries/libwhb/include/whb/gfx.h | 62 +- libraries/libwhb/include/whb/libmanager.h | 4 +- libraries/libwhb/include/whb/log.h | 18 +- libraries/libwhb/include/whb/log_cafe.h | 6 +- libraries/libwhb/include/whb/log_console.h | 12 +- libraries/libwhb/include/whb/log_module.h | 6 +- libraries/libwhb/include/whb/log_udp.h | 6 +- libraries/libwhb/include/whb/proc.h | 12 +- libraries/libwhb/include/whb/sdcard.h | 6 +- libraries/libwhb/src/console.c | 24 +- libraries/libwhb/src/crash.c | 79 +- libraries/libwhb/src/file.c | 30 +- libraries/libwhb/src/gfx.c | 183 ++-- libraries/libwhb/src/gfx_heap.c | 27 +- libraries/libwhb/src/gfx_heap.h | 21 +- libraries/libwhb/src/gfx_shader.c | 122 ++- libraries/libwhb/src/gfx_texture.c | 11 +- libraries/libwhb/src/libmanager.c | 6 +- libraries/libwhb/src/log.c | 36 +- libraries/libwhb/src/log_cafe.c | 13 +- libraries/libwhb/src/log_module.c | 18 +- libraries/libwhb/src/log_udp.c | 26 +- libraries/libwhb/src/proc.c | 22 +- libraries/libwhb/src/sdcard.c | 16 +- libraries/nn_erreula/nn_erreula.cpp | 656 ++++++------- libraries/nn_swkbd/nn_swkbd.cpp | 926 ++++++++---------- libraries/wutdevoptab/devoptab_fs.c | 74 +- libraries/wutdevoptab/devoptab_fs.h | 64 +- libraries/wutdevoptab/devoptab_fs_chdir.c | 5 +- libraries/wutdevoptab/devoptab_fs_chmod.c | 9 +- libraries/wutdevoptab/devoptab_fs_close.c | 7 +- libraries/wutdevoptab/devoptab_fs_dirclose.c | 7 +- libraries/wutdevoptab/devoptab_fs_dirnext.c | 15 +- libraries/wutdevoptab/devoptab_fs_diropen.c | 2 +- libraries/wutdevoptab/devoptab_fs_dirreset.c | 7 +- libraries/wutdevoptab/devoptab_fs_fchmod.c | 7 +- libraries/wutdevoptab/devoptab_fs_fstat.c | 17 +- libraries/wutdevoptab/devoptab_fs_fsync.c | 7 +- libraries/wutdevoptab/devoptab_fs_getmtime.c | 5 +- libraries/wutdevoptab/devoptab_fs_link.c | 7 +- libraries/wutdevoptab/devoptab_fs_mkdir.c | 7 +- libraries/wutdevoptab/devoptab_fs_open.c | 25 +- libraries/wutdevoptab/devoptab_fs_read.c | 50 +- libraries/wutdevoptab/devoptab_fs_rename.c | 7 +- libraries/wutdevoptab/devoptab_fs_rmdir.c | 5 +- libraries/wutdevoptab/devoptab_fs_seek.c | 51 +- libraries/wutdevoptab/devoptab_fs_stat.c | 19 +- libraries/wutdevoptab/devoptab_fs_statvfs.c | 7 +- libraries/wutdevoptab/devoptab_fs_truncate.c | 9 +- libraries/wutdevoptab/devoptab_fs_unlink.c | 5 +- libraries/wutdevoptab/devoptab_fs_utils.c | 79 +- libraries/wutdevoptab/devoptab_fs_write.c | 18 +- libraries/wutmalloc/wut_malloc.c | 24 +- libraries/wutnewlib/wut_clock.c | 29 +- libraries/wutnewlib/wut_clock.h | 18 +- libraries/wutnewlib/wut_gettod_r.c | 15 +- libraries/wutnewlib/wut_lock.c | 24 +- libraries/wutnewlib/wut_malloc_lock.c | 9 +- libraries/wutnewlib/wut_nanosleep.c | 9 +- libraries/wutnewlib/wut_newlib.c | 45 +- libraries/wutnewlib/wut_newlib.h | 34 +- libraries/wutnewlib/wut_sbrk.c | 30 +- libraries/wutsocket/NSSLCreateConnection.c | 12 +- libraries/wutsocket/accept.c | 16 +- libraries/wutsocket/addrinfo.c | 34 +- libraries/wutsocket/bind.c | 8 +- libraries/wutsocket/connect.c | 1 - libraries/wutsocket/fcntl.c | 8 +- libraries/wutsocket/getpeername.c | 8 +- libraries/wutsocket/getsockname.c | 8 +- libraries/wutsocket/getsockopt.c | 12 +- libraries/wutsocket/host.c | 4 +- libraries/wutsocket/hostid.c | 12 +- libraries/wutsocket/inet_addr.c | 2 +- libraries/wutsocket/inet_pton.c | 7 +- libraries/wutsocket/ioctl.c | 19 +- libraries/wutsocket/listen.c | 6 +- libraries/wutsocket/poll.c | 7 +- libraries/wutsocket/recv.c | 3 +- libraries/wutsocket/recvfrom.c | 3 +- libraries/wutsocket/select.c | 13 +- libraries/wutsocket/send.c | 5 +- libraries/wutsocket/sendto.c | 3 +- libraries/wutsocket/setsockopt.c | 12 +- libraries/wutsocket/shutdown.c | 6 +- libraries/wutsocket/sockatmark.c | 2 +- libraries/wutsocket/socket.c | 10 +- libraries/wutsocket/stubs.c | 12 +- libraries/wutsocket/wut_socket.h | 17 +- libraries/wutsocket/wut_socket_close.c | 10 +- libraries/wutsocket/wut_socket_common.c | 140 ++- libraries/wutsocket/wut_socket_open.c | 12 +- libraries/wutsocket/wut_socket_read.c | 7 +- libraries/wutsocket/wut_socket_write.c | 7 +- libraries/wutstdc++/wut_gthread.cpp | 149 +-- libraries/wutstdc++/wut_gthread.h | 124 +-- libraries/wutstdc++/wut_gthread_cond.cpp | 39 +- libraries/wutstdc++/wut_gthread_keys.cpp | 34 +- libraries/wutstdc++/wut_gthread_mutex.cpp | 15 +- libraries/wutstdc++/wut_gthread_once.cpp | 8 +- .../wutstdc++/wut_gthread_recursive_mutex.cpp | 15 +- libraries/wutstdc++/wut_gthread_thread.cpp | 33 +- samples/cmake/custom_default_heap/main.c | 45 +- samples/cmake/erreula/main.cpp | 26 +- samples/cmake/gx2_triangle/main.c | 60 +- samples/cmake/helloworld/main.c | 9 +- samples/cmake/helloworld_cpp/main.cpp | 18 +- samples/cmake/my_first_rpl/my_first_rpl.c | 5 +- samples/cmake/my_first_rpl/my_first_rpl.h | 3 +- samples/cmake/my_first_rpl/my_first_rpx.c | 7 +- samples/cmake/swkbd/main.cpp | 12 +- samples/make/helloworld/source/main.c | 9 +- samples/make/helloworld_cpp/source/main.cpp | 18 +- 247 files changed, 7001 insertions(+), 7796 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 000000000..0778c20b7 --- /dev/null +++ b/.clang-format @@ -0,0 +1,68 @@ +# Generated from CLion C/C++ Code Style settings +BasedOnStyle: LLVM +AccessModifierOffset: -2 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: AcrossEmptyLinesAndComments +AlignConsecutiveMacros: AcrossEmptyLinesAndComments +AlignOperands: Align +AllowAllArgumentsOnNextLine: false +AllowAllConstructorInitializersOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: Always +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Always +AllowShortLambdasOnASingleLine: All +AllowShortLoopsOnASingleLine: true +AlwaysBreakAfterReturnType: None +AlwaysBreakTemplateDeclarations: Yes +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: Never + AfterEnum: true + AfterStruct: true + AfterFunction: true + AfterNamespace: false + AfterUnion: true + BeforeCatch: false + BeforeElse: false + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyRecord: true +BreakBeforeBinaryOperators: None +BreakBeforeTernaryOperators: true +BreakConstructorInitializers: BeforeColon +BreakInheritanceList: BeforeColon +ColumnLimit: 0 +CompactNamespaces: false +ContinuationIndentWidth: 8 +IndentCaseLabels: true +IndentPPDirectives: None +IndentWidth: 3 +KeepEmptyLinesAtTheStartOfBlocks: true +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: All +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PointerAlignment: Right +ReflowComments: false +SpaceAfterCStyleCast: true +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInCStyleCastParentheses: false +SpacesInContainerLiterals: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +TabWidth: 4 +UseTab: Never diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 922bdb971..7baaa8ae3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,18 @@ name: C/C++ CI on: [push, pull_request] jobs: + clang-format: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: clang-format + run: | + docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./samples ./libraries -e *.txt + build: name: ubuntu-18.04 - runs-on: ubuntu-18.04 + runs-on: ubuntu-18.04 + needs: clang-format container: devkitpro/devkitppc:latest steps: @@ -13,7 +22,6 @@ jobs: with: submodules: true - - name: install cmake run: | apt-get install -y cmake diff --git a/include/arpa/inet.h b/include/arpa/inet.h index db0374715..5910118b3 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -21,9 +21,8 @@ ntohs(uint16_t netshort); in_addr_t inet_addr(const char *cp); -int -inet_aton(const char *cp, - struct in_addr *inp); +int inet_aton(const char *cp, + struct in_addr *inp); char * inet_ntoa(struct in_addr in); @@ -38,10 +37,9 @@ inet_ntop(int af, char *dst, socklen_t size); -int -inet_pton(int af, - const char *src, - void *dst); +int inet_pton(int af, + const char *src, + void *dst); #ifdef __cplusplus } diff --git a/include/avm/drc.h b/include/avm/drc.h index 5ef79f50b..e0d149941 100644 --- a/include/avm/drc.h +++ b/include/avm/drc.h @@ -13,14 +13,13 @@ extern "C" { typedef enum AVMDrcScanMode { - AVM_DRC_SCAN_MODE_UNKNOWN_0 = 0, - AVM_DRC_SCAN_MODE_UNKNOWN_1 = 1, - AVM_DRC_SCAN_MODE_UNKNOWN_3 = 3, + AVM_DRC_SCAN_MODE_UNKNOWN_0 = 0, + AVM_DRC_SCAN_MODE_UNKNOWN_1 = 1, + AVM_DRC_SCAN_MODE_UNKNOWN_3 = 3, AVM_DRC_SCAN_MODE_UNKNOWN_255 = 255, } AVMDrcScanMode; -BOOL -AVMGetDRCScanMode(AVMDrcScanMode *outScanMode); +BOOL AVMGetDRCScanMode(AVMDrcScanMode *outScanMode); #ifdef __cplusplus } diff --git a/include/coreinit/alarm.h b/include/coreinit/alarm.h index a623c1b2d..414a07faa 100644 --- a/include/coreinit/alarm.h +++ b/include/coreinit/alarm.h @@ -1,8 +1,8 @@ #pragma once -#include #include "thread.h" #include "threadqueue.h" #include "time.h" +#include /** * \defgroup coreinit_alarms Alarms @@ -123,8 +123,7 @@ WUT_CHECK_SIZE(OSAlarm, 0x58); /** * Cancel an alarm. */ -BOOL -OSCancelAlarm(OSAlarm *alarm); +BOOL OSCancelAlarm(OSAlarm *alarm); /** @@ -132,23 +131,20 @@ OSCancelAlarm(OSAlarm *alarm); * * \param group The alarm tag to cancel. */ -void -OSCancelAlarms(uint32_t group); +void OSCancelAlarms(uint32_t group); /** * Initialise an alarm structure. */ -void -OSCreateAlarm(OSAlarm *alarm); +void OSCreateAlarm(OSAlarm *alarm); /** * Initialise an alarm structure with a name. */ -void -OSCreateAlarmEx(OSAlarm *alarm, - const char *name); +void OSCreateAlarmEx(OSAlarm *alarm, + const char *name); /** @@ -161,16 +157,14 @@ OSGetAlarmUserData(OSAlarm *alarm); /** * Initialise an alarm queue structure. */ -void -OSInitAlarmQueue(OSAlarmQueue *queue); +void OSInitAlarmQueue(OSAlarmQueue *queue); /** * Initialise an alarm queue structure with a name. */ -void -OSInitAlarmQueueEx(OSAlarmQueue *queue, - const char *name); +void OSInitAlarmQueueEx(OSAlarmQueue *queue, + const char *name); /** @@ -180,10 +174,9 @@ OSInitAlarmQueueEx(OSAlarmQueue *queue, * \param time The duration until the alarm should be triggered. * \param callback The alarm callback to call when the alarm is triggered. */ -BOOL -OSSetAlarm(OSAlarm *alarm, - OSTime time, - OSAlarmCallback callback); +BOOL OSSetAlarm(OSAlarm *alarm, + OSTime time, + OSAlarmCallback callback); /** @@ -194,34 +187,30 @@ OSSetAlarm(OSAlarm *alarm, * \param interval The interval between triggers after the first trigger. * \param callback The alarm callback to call when the alarm is triggered. */ -BOOL -OSSetPeriodicAlarm(OSAlarm *alarm, - OSTime start, - OSTime interval, - OSAlarmCallback callback); +BOOL OSSetPeriodicAlarm(OSAlarm *alarm, + OSTime start, + OSTime interval, + OSAlarmCallback callback); /** * Set an alarm tag which is used in OSCancelAlarms for bulk cancellation. */ -void -OSSetAlarmTag(OSAlarm *alarm, - uint32_t group); +void OSSetAlarmTag(OSAlarm *alarm, + uint32_t group); /** * Set alarm user data which is returned by OSGetAlarmUserData. */ -void -OSSetAlarmUserData(OSAlarm *alarm, - void *data); +void OSSetAlarmUserData(OSAlarm *alarm, + void *data); /** * Sleep the current thread until the alarm has been triggered or cancelled. */ -BOOL -OSWaitAlarm(OSAlarm *alarm); +BOOL OSWaitAlarm(OSAlarm *alarm); #ifdef __cplusplus } diff --git a/include/coreinit/atomic.h b/include/coreinit/atomic.h index b6ff335d7..d25facef7 100644 --- a/include/coreinit/atomic.h +++ b/include/coreinit/atomic.h @@ -13,16 +13,14 @@ extern "C" { #endif -BOOL -OSCompareAndSwapAtomic(volatile uint32_t *ptr, - uint32_t compare, - uint32_t value); +BOOL OSCompareAndSwapAtomic(volatile uint32_t *ptr, + uint32_t compare, + uint32_t value); -BOOL -OSCompareAndSwapAtomicEx(volatile uint32_t *ptr, - uint32_t compare, - uint32_t value, - uint32_t *old); +BOOL OSCompareAndSwapAtomicEx(volatile uint32_t *ptr, + uint32_t compare, + uint32_t value, + uint32_t *old); uint32_t OSSwapAtomic(volatile uint32_t *ptr, @@ -44,13 +42,11 @@ uint32_t OSXorAtomic(volatile uint32_t *ptr, uint32_t value); -BOOL -OSTestAndClearAtomic(volatile uint32_t *ptr, - uint32_t bit); +BOOL OSTestAndClearAtomic(volatile uint32_t *ptr, + uint32_t bit); -BOOL -OSTestAndSetAtomic(volatile uint32_t *ptr, - uint32_t bit); +BOOL OSTestAndSetAtomic(volatile uint32_t *ptr, + uint32_t bit); #ifdef __cplusplus } diff --git a/include/coreinit/atomic64.h b/include/coreinit/atomic64.h index 905c72e1d..950f21f57 100644 --- a/include/coreinit/atomic64.h +++ b/include/coreinit/atomic64.h @@ -20,16 +20,14 @@ uint64_t OSSetAtomic64(volatile uint64_t *ptr, uint64_t value); -BOOL -OSCompareAndSwapAtomic64(volatile uint64_t *ptr, - uint64_t compare, - uint64_t value); +BOOL OSCompareAndSwapAtomic64(volatile uint64_t *ptr, + uint64_t compare, + uint64_t value); -BOOL -OSCompareAndSwapAtomicEx64(volatile uint64_t *ptr, - uint64_t compare, - uint64_t value, - uint64_t *old); +BOOL OSCompareAndSwapAtomicEx64(volatile uint64_t *ptr, + uint64_t compare, + uint64_t value, + uint64_t *old); uint64_t OSSwapAtomic64(volatile uint64_t *ptr, @@ -51,13 +49,11 @@ uint64_t OSXorAtomic64(volatile uint64_t *ptr, uint64_t value); -BOOL -OSTestAndClearAtomic64(volatile uint64_t *ptr, - uint32_t bit); +BOOL OSTestAndClearAtomic64(volatile uint64_t *ptr, + uint32_t bit); -BOOL -OSTestAndSetAtomic64(volatile uint64_t *ptr, - uint32_t bit); +BOOL OSTestAndSetAtomic64(volatile uint64_t *ptr, + uint32_t bit); #ifdef __cplusplus } diff --git a/include/coreinit/bsp.h b/include/coreinit/bsp.h index b76de879e..76386412f 100644 --- a/include/coreinit/bsp.h +++ b/include/coreinit/bsp.h @@ -16,52 +16,52 @@ typedef uint32_t BSPHardwareVersion; typedef enum BSPErrors { - BSP_ERROR_OK = 0, - BSP_ERROR_IOS_ERROR = 0x40, - BSP_ERROR_RESPONSE_TOO_LARGE = 0x80, + BSP_ERROR_OK = 0, + BSP_ERROR_IOS_ERROR = 0x40, + BSP_ERROR_RESPONSE_TOO_LARGE = 0x80, } BSPErrors; typedef enum BSPHardwareVersions { - BSP_HARDWARE_VERSION_UNKNOWN = 0x00000000, + BSP_HARDWARE_VERSION_UNKNOWN = 0x00000000, - // vWii Hardware Versions - BSP_HARDWARE_VERSION_HOLLYWOOD_ENG_SAMPLE_1 = 0x00000001, - BSP_HARDWARE_VERSION_HOLLYWOOD_ENG_SAMPLE_2 = 0x10000001, - BSP_HARDWARE_VERSION_HOLLYWOOD_PROD_FOR_WII = 0x10100001, - BSP_HARDWARE_VERSION_HOLLYWOOD_CORTADO = 0x10100008, - BSP_HARDWARE_VERSION_HOLLYWOOD_CORTADO_ESPRESSO = 0x1010000C, - BSP_HARDWARE_VERSION_BOLLYWOOD = 0x20000001, - BSP_HARDWARE_VERSION_BOLLYWOOD_PROD_FOR_WII = 0x20100001, + // vWii Hardware Versions + BSP_HARDWARE_VERSION_HOLLYWOOD_ENG_SAMPLE_1 = 0x00000001, + BSP_HARDWARE_VERSION_HOLLYWOOD_ENG_SAMPLE_2 = 0x10000001, + BSP_HARDWARE_VERSION_HOLLYWOOD_PROD_FOR_WII = 0x10100001, + BSP_HARDWARE_VERSION_HOLLYWOOD_CORTADO = 0x10100008, + BSP_HARDWARE_VERSION_HOLLYWOOD_CORTADO_ESPRESSO = 0x1010000C, + BSP_HARDWARE_VERSION_BOLLYWOOD = 0x20000001, + BSP_HARDWARE_VERSION_BOLLYWOOD_PROD_FOR_WII = 0x20100001, - // WiiU Hardware Versions - BSP_HARDWARE_VERSION_LATTE_A11_EV = 0x21100010, - BSP_HARDWARE_VERSION_LATTE_A11_CAT = 0x21100020, - BSP_HARDWARE_VERSION_LATTE_A12_EV = 0x21200010, - BSP_HARDWARE_VERSION_LATTE_A12_CAT = 0x21200020, - BSP_HARDWARE_VERSION_LATTE_A2X_EV = 0x22100010, - BSP_HARDWARE_VERSION_LATTE_A2X_CAT = 0x22100020, - BSP_HARDWARE_VERSION_LATTE_A3X_EV = 0x23100010, - BSP_HARDWARE_VERSION_LATTE_A3X_CAT = 0x23100020, - BSP_HARDWARE_VERSION_LATTE_A3X_CAFE = 0x23100028, - BSP_HARDWARE_VERSION_LATTE_A4X_EV = 0x24100010, - BSP_HARDWARE_VERSION_LATTE_A4X_CAT = 0x24100020, - BSP_HARDWARE_VERSION_LATTE_A4X_CAFE = 0x24100028, - BSP_HARDWARE_VERSION_LATTE_A5X_EV = 0x25100010, - BSP_HARDWARE_VERSION_LATTE_A5X_EV_Y = 0x25100011, - BSP_HARDWARE_VERSION_LATTE_A5X_CAT = 0x25100020, - BSP_HARDWARE_VERSION_LATTE_A5X_CAFE = 0x25100028, - BSP_HARDWARE_VERSION_LATTE_B1X_EV = 0x26100010, - BSP_HARDWARE_VERSION_LATTE_B1X_EV_Y = 0x26100011, - BSP_HARDWARE_VERSION_LATTE_B1X_CAT = 0x26100020, - BSP_HARDWARE_VERSION_LATTE_B1X_CAFE = 0x26100028 + // WiiU Hardware Versions + BSP_HARDWARE_VERSION_LATTE_A11_EV = 0x21100010, + BSP_HARDWARE_VERSION_LATTE_A11_CAT = 0x21100020, + BSP_HARDWARE_VERSION_LATTE_A12_EV = 0x21200010, + BSP_HARDWARE_VERSION_LATTE_A12_CAT = 0x21200020, + BSP_HARDWARE_VERSION_LATTE_A2X_EV = 0x22100010, + BSP_HARDWARE_VERSION_LATTE_A2X_CAT = 0x22100020, + BSP_HARDWARE_VERSION_LATTE_A3X_EV = 0x23100010, + BSP_HARDWARE_VERSION_LATTE_A3X_CAT = 0x23100020, + BSP_HARDWARE_VERSION_LATTE_A3X_CAFE = 0x23100028, + BSP_HARDWARE_VERSION_LATTE_A4X_EV = 0x24100010, + BSP_HARDWARE_VERSION_LATTE_A4X_CAT = 0x24100020, + BSP_HARDWARE_VERSION_LATTE_A4X_CAFE = 0x24100028, + BSP_HARDWARE_VERSION_LATTE_A5X_EV = 0x25100010, + BSP_HARDWARE_VERSION_LATTE_A5X_EV_Y = 0x25100011, + BSP_HARDWARE_VERSION_LATTE_A5X_CAT = 0x25100020, + BSP_HARDWARE_VERSION_LATTE_A5X_CAFE = 0x25100028, + BSP_HARDWARE_VERSION_LATTE_B1X_EV = 0x26100010, + BSP_HARDWARE_VERSION_LATTE_B1X_EV_Y = 0x26100011, + BSP_HARDWARE_VERSION_LATTE_B1X_CAT = 0x26100020, + BSP_HARDWARE_VERSION_LATTE_B1X_CAFE = 0x26100028 } BSPHardwareVersions; BSPError bspInitializeShimInterface(); BSPError -bspGetHardwareVersion(BSPHardwareVersion* version); +bspGetHardwareVersion(BSPHardwareVersion *version); #ifdef __cplusplus } diff --git a/include/coreinit/cache.h b/include/coreinit/cache.h index ee96b8b94..320b0865d 100644 --- a/include/coreinit/cache.h +++ b/include/coreinit/cache.h @@ -43,9 +43,8 @@ extern "C" { * Unnecessary use of caching functions can have an adverse performance impact. * They should only be used when needed while interfacing with hardware. */ -void -DCInvalidateRange(void *addr, - uint32_t size); +void DCInvalidateRange(void *addr, + uint32_t size); /** * Flushes a range of cached data, in blocks. Equivalent to a loop of PowerPC @@ -65,9 +64,8 @@ DCInvalidateRange(void *addr, * Unnecessary use of caching functions can have an adverse performance impact. * They should only be used when needed while interfacing with hardware. */ -void -DCFlushRange(void *addr, - uint32_t size); +void DCFlushRange(void *addr, + uint32_t size); /** * Stores a range of cached data, in blocks. Equivalent to a loop of PowerPC @@ -88,9 +86,8 @@ DCFlushRange(void *addr, * Unnecessary use of caching functions can have an adverse performance impact. * They should only be used when needed while interfacing with hardware. */ -void -DCStoreRange(void *addr, - uint32_t size); +void DCStoreRange(void *addr, + uint32_t size); /** * Similar to \link DCFlushRange \endlink, though this function will @@ -106,9 +103,8 @@ DCStoreRange(void *addr, * Unnecessary use of caching functions can have an adverse performance impact. * They should only be used when needed while interfacing with hardware. */ -void -DCFlushRangeNoSync(void *addr, - uint32_t size); +void DCFlushRangeNoSync(void *addr, + uint32_t size); /** * Similar to \link DCStoreRange \endlink, though this function will @@ -124,9 +120,8 @@ DCFlushRangeNoSync(void *addr, * Unnecessary use of caching functions can have an adverse performance impact. * They should only be used when needed while interfacing with hardware. */ -void -DCStoreRangeNoSync(void *addr, - uint32_t size); +void DCStoreRangeNoSync(void *addr, + uint32_t size); /** @@ -147,9 +142,8 @@ DCStoreRangeNoSync(void *addr, * \param size * The size of the range to zero. Will be rounded up to the next 0x20. */ -void -DCZeroRange(void *addr, - uint32_t size); +void DCZeroRange(void *addr, + uint32_t size); /** @@ -165,9 +159,8 @@ DCZeroRange(void *addr, * \param size * The size of the range to cache. Will be rounded up to the next 0x20. */ -void -DCTouchRange(void *addr, - uint32_t size); +void DCTouchRange(void *addr, + uint32_t size); /** @@ -188,12 +181,10 @@ DCTouchRange(void *addr, * Unnecessary use of caching functions can have an adverse performance impact. * They should only be used when needed while interfacing with hardware. */ -void -ICInvalidateRange(void *addr, - uint32_t size); - -void -OSMemoryBarrier(); +void ICInvalidateRange(void *addr, + uint32_t size); + +void OSMemoryBarrier(); #ifdef __cplusplus } diff --git a/include/coreinit/codegen.h b/include/coreinit/codegen.h index 893d55d50..a78794f4f 100644 --- a/include/coreinit/codegen.h +++ b/include/coreinit/codegen.h @@ -32,10 +32,10 @@ extern "C" { //! The memory permissions for the codegen area. typedef enum OSCodegenSecMode { - //! The area can be read or written to, but not executed. - CODEGEN_RW_ = 0, - //! The area can be read or executed, but not written to. - CODEGEN_R_X = 1, + //! The area can be read or written to, but not executed. + CODEGEN_RW_ = 0, + //! The area can be read or executed, but not written to. + CODEGEN_R_X = 1, } OSCodegenSecMode; /** @@ -52,9 +52,8 @@ typedef enum OSCodegenSecMode * \sa * - \link OSGetSecCodeGenMode \endlink */ -void -OSCodegenGetVirtAddrRange(uint32_t* outVirtualAddress, - uint32_t* outSize); +void OSCodegenGetVirtAddrRange(uint32_t *outVirtualAddress, + uint32_t *outSize); /** * Gets the CPU core that's allowed to use codegen. @@ -84,8 +83,7 @@ OSGetCodegenMode(); * \c true on success, or \c false on a failure, such as codegen not being * available for this app or CPU core. */ -BOOL -OSSwitchSecCodeGenMode(OSCodegenSecMode mode); +BOOL OSSwitchSecCodeGenMode(OSCodegenSecMode mode); //TODO: online docs imply this returns true if codegen is *enabled*, though the //name would imply it gets rw/rx status. @@ -118,8 +116,7 @@ OSGetSecCodeGenMode(); * * */ -BOOL -OSCodegenCopy(void* dst, void* src, size_t size); +BOOL OSCodegenCopy(void *dst, void *src, size_t size); #ifdef __cplusplus } diff --git a/include/coreinit/condition.h b/include/coreinit/condition.h index 841db2ec9..37866c424 100644 --- a/include/coreinit/condition.h +++ b/include/coreinit/condition.h @@ -1,6 +1,6 @@ #pragma once -#include #include "threadqueue.h" +#include /** * \defgroup coreinit_cond Condition Variable @@ -43,16 +43,14 @@ WUT_CHECK_SIZE(OSCondition, 0x1c); /** * Initialise a condition variable structure. */ -void -OSInitCond(OSCondition *condition); +void OSInitCond(OSCondition *condition); /** * Initialise a condition variable structure with a name. */ -void -OSInitCondEx(OSCondition *condition, - const char *name); +void OSInitCondEx(OSCondition *condition, + const char *name); /** @@ -63,9 +61,8 @@ OSInitCondEx(OSCondition *condition, * * Similar to std::condition_variable::wait. */ -void -OSWaitCond(OSCondition *condition, - OSMutex *mutex); +void OSWaitCond(OSCondition *condition, + OSMutex *mutex); /** @@ -73,8 +70,7 @@ OSWaitCond(OSCondition *condition, * * Similar to std::condition_variable::notify_all. */ -void -OSSignalCond(OSCondition *condition); +void OSSignalCond(OSCondition *condition); #ifdef __cplusplus diff --git a/include/coreinit/context.h b/include/coreinit/context.h index 26acc7916..53ca6de14 100644 --- a/include/coreinit/context.h +++ b/include/coreinit/context.h @@ -76,31 +76,25 @@ WUT_CHECK_OFFSET(OSContext, 0x318, mmcr0); WUT_CHECK_OFFSET(OSContext, 0x31c, mmcr1); WUT_CHECK_SIZE(OSContext, 0x320); -void -OSInitContext(OSContext *context, - void *entry, - void *stack); +void OSInitContext(OSContext *context, + void *entry, + void *stack); -void -OSDumpContext(OSContext *context); +void OSDumpContext(OSContext *context); -void -OSLoadContext(OSContext *context); +void OSLoadContext(OSContext *context); uint32_t OSSaveContext(OSContext *context); -void -OSLoadFPUContext(OSContext *context); +void OSLoadFPUContext(OSContext *context); -void -OSSaveFPUContext(OSContext *context); +void OSSaveFPUContext(OSContext *context); OSContext * OSGetCurrentContext(); -void -OSSetCurrentContext(OSContext *context); +void OSSetCurrentContext(OSContext *context); void * OSSwitchStack(void *stack); diff --git a/include/coreinit/core.h b/include/coreinit/core.h index faa6dc5ad..929d99c06 100644 --- a/include/coreinit/core.h +++ b/include/coreinit/core.h @@ -54,8 +54,7 @@ OSGetMainCoreId(); * \sa *
  • \link OSGetMainCoreId \endlink
*/ -BOOL -OSIsMainCore(); +BOOL OSIsMainCore(); #ifdef __cplusplus diff --git a/include/coreinit/coroutine.h b/include/coreinit/coroutine.h index 4bd063a64..b3b41ce7b 100644 --- a/include/coreinit/coroutine.h +++ b/include/coreinit/coroutine.h @@ -36,10 +36,9 @@ WUT_CHECK_OFFSET(OSCoroutine, 0x60, fpr); WUT_CHECK_OFFSET(OSCoroutine, 0xF0, psr); WUT_CHECK_SIZE(OSCoroutine, 0x180); -void -OSInitCoroutine(OSCoroutine *coroutine, - void *entry, - void *stack); +void OSInitCoroutine(OSCoroutine *coroutine, + void *entry, + void *stack); uint32_t OSLoadCoroutine(OSCoroutine *coroutine, @@ -48,9 +47,8 @@ OSLoadCoroutine(OSCoroutine *coroutine, uint32_t OSSaveCoroutine(OSCoroutine *coroutine); -void -OSSwitchCoroutine(OSCoroutine *from, - OSCoroutine *to); +void OSSwitchCoroutine(OSCoroutine *from, + OSCoroutine *to); #ifdef __cplusplus } diff --git a/include/coreinit/cosreport.h b/include/coreinit/cosreport.h index b9547697b..ed69fdab5 100644 --- a/include/coreinit/cosreport.h +++ b/include/coreinit/cosreport.h @@ -12,45 +12,42 @@ extern "C" { #endif -typedef enum COSReportLevel{ - COS_REPORT_LEVEL_ERROR = 0, - COS_REPORT_LEVEL_WARN = 1, - COS_REPORT_LEVEL_INFO = 2, - COS_REPORT_LEVEL_VERBOSE = 3, +typedef enum COSReportLevel +{ + COS_REPORT_LEVEL_ERROR = 0, + COS_REPORT_LEVEL_WARN = 1, + COS_REPORT_LEVEL_INFO = 2, + COS_REPORT_LEVEL_VERBOSE = 3, } COSReportLevel; -typedef enum COSReportModule{ - COS_REPORT_MODULE_UNKNOWN_0 = 0, - COS_REPORT_MODULE_UNKNOWN_1 = 1, - COS_REPORT_MODULE_UNKNOWN_2 = 2, - COS_REPORT_MODULE_UNKNOWN_5 = 5, +typedef enum COSReportModule +{ + COS_REPORT_MODULE_UNKNOWN_0 = 0, + COS_REPORT_MODULE_UNKNOWN_1 = 1, + COS_REPORT_MODULE_UNKNOWN_2 = 2, + COS_REPORT_MODULE_UNKNOWN_5 = 5, } COSReportModule; -void -COSVReport(COSReportModule module, - COSReportLevel level, - const char* fmt, - ...); - -void -COSError(COSReportModule module, - const char* fmt, - ...); - -void -COSInfo(COSReportModule module, - const char* fmt, - ...); - -void -COSVerbose(COSReportModule module, - const char* fmt, - ...); - -void -COSWarn(COSReportModule module, - const char* fmt, - ...); +void COSVReport(COSReportModule module, + COSReportLevel level, + const char *fmt, + ...); + +void COSError(COSReportModule module, + const char *fmt, + ...); + +void COSInfo(COSReportModule module, + const char *fmt, + ...); + +void COSVerbose(COSReportModule module, + const char *fmt, + ...); + +void COSWarn(COSReportModule module, + const char *fmt, + ...); #ifdef __cplusplus } diff --git a/include/coreinit/debug.h b/include/coreinit/debug.h index 808d68771..207eed99d 100644 --- a/include/coreinit/debug.h +++ b/include/coreinit/debug.h @@ -20,35 +20,28 @@ typedef enum DisassemblePPCFlags } DisassemblePPCFlags; -void -OSConsoleWrite(const char *msg, - uint32_t size); +void OSConsoleWrite(const char *msg, + uint32_t size); -void -OSReport(const char *fmt, ...); +void OSReport(const char *fmt, ...); -void -OSReportVerbose(const char *fmt, ...); +void OSReportVerbose(const char *fmt, ...); -void -OSReportInfo(const char *fmt, ...); +void OSReportInfo(const char *fmt, ...); -void -OSReportWarn(const char *fmt, ...); +void OSReportWarn(const char *fmt, ...); -void -OSPanic(const char *file, - uint32_t line, - const char *fmt, ...); +void OSPanic(const char *file, + uint32_t line, + const char *fmt, ...); -void -OSFatal(const char *msg); +void OSFatal(const char *msg); uint32_t @@ -60,31 +53,25 @@ OSGetSymbolName(uint32_t addr, uint32_t OSGetUPID(); -BOOL -OSIsDebuggerInitialized(); +BOOL OSIsDebuggerInitialized(); -BOOL -OSIsDebuggerPresent(); +BOOL OSIsDebuggerPresent(); -BOOL -OSIsECOBoot(); +BOOL OSIsECOBoot(); -BOOL -OSIsECOMode(); +BOOL OSIsECOMode(); -BOOL -DisassemblePPCOpcode(uint32_t *opcode, - char *buffer, - uint32_t bufferSize, - DisassemblyFindSymbolFn findSymbolFn, - DisassemblePPCFlags flags); +BOOL DisassemblePPCOpcode(uint32_t *opcode, + char *buffer, + uint32_t bufferSize, + DisassemblyFindSymbolFn findSymbolFn, + DisassemblePPCFlags flags); -void -DisassemblePPCRange(void *start, - void *end, - DisassemblyPrintFn printFn, - DisassemblyFindSymbolFn findSymbolFn, - DisassemblePPCFlags flags); +void DisassemblePPCRange(void *start, + void *end, + DisassemblyPrintFn printFn, + DisassemblyFindSymbolFn findSymbolFn, + DisassemblePPCFlags flags); #ifdef __cplusplus } diff --git a/include/coreinit/dynload.h b/include/coreinit/dynload.h index 2e598aaec..5726c14d9 100644 --- a/include/coreinit/dynload.h +++ b/include/coreinit/dynload.h @@ -1,7 +1,7 @@ #pragma once -#include #include "thread.h" #include "time.h" +#include /** * \defgroup coreinit_dynload Dynamic Loading @@ -19,16 +19,16 @@ typedef void *OSDynLoad_Module; typedef enum OSDynLoad_Error { - OS_DYNLOAD_OK = 0, - OS_DYNLOAD_OUT_OF_MEMORY = 0xBAD10002, - OS_DYNLOAD_INVALID_NOTIFY_PTR = 0xBAD1000E, - OS_DYNLOAD_INVALID_MODULE_NAME_PTR = 0xBAD1000F, - OS_DYNLOAD_INVALID_MODULE_NAME = 0xBAD10010, - OS_DYNLOAD_INVALID_ACQUIRE_PTR = 0xBAD10011, - OS_DYNLOAD_EMPTY_MODULE_NAME = 0xBAD10012, - OS_DYNLOAD_INVALID_ALLOCATOR_PTR = 0xBAD10017, - OS_DYNLOAD_OUT_OF_SYSTEM_MEMORY = 0xBAD1002F, - OS_DYNLOAD_TLS_ALLOCATOR_LOCKED = 0xBAD10031, + OS_DYNLOAD_OK = 0, + OS_DYNLOAD_OUT_OF_MEMORY = 0xBAD10002, + OS_DYNLOAD_INVALID_NOTIFY_PTR = 0xBAD1000E, + OS_DYNLOAD_INVALID_MODULE_NAME_PTR = 0xBAD1000F, + OS_DYNLOAD_INVALID_MODULE_NAME = 0xBAD10010, + OS_DYNLOAD_INVALID_ACQUIRE_PTR = 0xBAD10011, + OS_DYNLOAD_EMPTY_MODULE_NAME = 0xBAD10012, + OS_DYNLOAD_INVALID_ALLOCATOR_PTR = 0xBAD10017, + OS_DYNLOAD_OUT_OF_SYSTEM_MEMORY = 0xBAD1002F, + OS_DYNLOAD_TLS_ALLOCATOR_LOCKED = 0xBAD10031, } OSDynLoad_Error; typedef OSDynLoad_Error (*OSDynLoadAllocFn)(int32_t size, int32_t align, void **outAddr); @@ -36,8 +36,8 @@ typedef void (*OSDynLoadFreeFn)(void *addr); typedef enum OSDynLoad_EntryReason { - OS_DYNLOAD_LOADED = 0, - OS_DYNLOAD_UNLOADED = 1, + OS_DYNLOAD_LOADED = 0, + OS_DYNLOAD_UNLOADED = 1, } OSDynLoad_EntryReason; struct OSDynLoad_NotifyData @@ -87,8 +87,8 @@ WUT_CHECK_SIZE(OSDynLoad_LoaderHeapStatistics, 0x18); typedef enum OSDynLoad_NotifyReason { - OS_DYNLOAD_NOTIFY_UNLOADED = 0, - OS_DYNLOAD_NOTIFY_LOADED = 1 + OS_DYNLOAD_NOTIFY_UNLOADED = 0, + OS_DYNLOAD_NOTIFY_LOADED = 1 } OSDynLoad_NotifyReason; typedef void (*OSDynLoadNotifyFunc)(OSDynLoad_Module module, @@ -125,8 +125,7 @@ OSDynLoad_FindExport(OSDynLoad_Module module, * Will decrease reference count and only unload the module if count reaches 0. * Similar to FreeLibrary on Windows. */ -void -OSDynLoad_Release(OSDynLoad_Module module); +void OSDynLoad_Release(OSDynLoad_Module module); /** @@ -199,10 +198,9 @@ OSDynLoad_GetNumberOfRPLs(); * Always returns FALSE on release versions of CafeOS. * Requires OSGetSecurityLevel() > 0. */ -BOOL -OSDynLoad_GetRPLInfo(uint32_t first, - uint32_t count, - OSDynLoad_NotifyData *outInfos); +BOOL OSDynLoad_GetRPLInfo(uint32_t first, + uint32_t count, + OSDynLoad_NotifyData *outInfos); /** * Checks if a module is already loaded. Does not load any modules. @@ -217,14 +215,14 @@ OSDynLoad_IsModuleLoaded(char const *name, * Registers a callback that's called whenever a new .rpl is loaded or unloaded **/ OSDynLoad_Error -OSDynLoad_AddNotifyCallback(OSDynLoadNotifyFunc notifyFn, +OSDynLoad_AddNotifyCallback(OSDynLoadNotifyFunc notifyFn, void *userContext); /** * Removes a previously added a callback **/ OSDynLoad_Error -OSDynLoad_DelNotifyCallback(OSDynLoadNotifyFunc notifyFn, +OSDynLoad_DelNotifyCallback(OSDynLoadNotifyFunc notifyFn, void *userContext); /** @@ -232,9 +230,8 @@ OSDynLoad_DelNotifyCallback(OSDynLoadNotifyFunc notifyFn, * * Use this instead of main when creating .rpl files */ -int -rpl_entry(OSDynLoad_Module module, - OSDynLoad_EntryReason reason); +int rpl_entry(OSDynLoad_Module module, + OSDynLoad_EntryReason reason); #ifdef __cplusplus } diff --git a/include/coreinit/event.h b/include/coreinit/event.h index 7d94397f1..283324a28 100644 --- a/include/coreinit/event.h +++ b/include/coreinit/event.h @@ -1,7 +1,7 @@ #pragma once -#include #include "thread.h" #include "threadqueue.h" +#include /** * \defgroup coreinit_event Event Object @@ -22,10 +22,10 @@ typedef struct OSEvent OSEvent; typedef enum OSEventMode { //! A manual event will only reset when OSResetEvent is called. - OS_EVENT_MODE_MANUAL = 0, + OS_EVENT_MODE_MANUAL = 0, //! An auto event will reset everytime a thread is woken. - OS_EVENT_MODE_AUTO = 1, + OS_EVENT_MODE_AUTO = 1, } OSEventMode; #define OS_EVENT_TAG 0x65566E54u @@ -60,20 +60,18 @@ WUT_CHECK_SIZE(OSEvent, 0x24); /** * Initialise an event object with value and mode. */ -void -OSInitEvent(OSEvent *event, - BOOL value, - OSEventMode mode); +void OSInitEvent(OSEvent *event, + BOOL value, + OSEventMode mode); /** * Initialise an event object with value, mode and name. */ -void -OSInitEventEx(OSEvent *event, - BOOL value, - OSEventMode mode, - char *name); +void OSInitEventEx(OSEvent *event, + BOOL value, + OSEventMode mode, + char *name); /** @@ -89,8 +87,7 @@ OSInitEventEx(OSEvent *event, * * Similar to SetEvent. */ -void -OSSignalEvent(OSEvent *event); +void OSSignalEvent(OSEvent *event); /** * Signals all threads waiting on an event. @@ -103,8 +100,7 @@ OSSignalEvent(OSEvent *event); * If the event mode is OS_EVENT_MODE_AUTO this will wake all waiting threads * and the event will be reset. */ -void -OSSignalEventAll(OSEvent *event); +void OSSignalEventAll(OSEvent *event); /** @@ -117,8 +113,7 @@ OSSignalEventAll(OSEvent *event); * * Similar to WaitForSingleObject. */ -void -OSWaitEvent(OSEvent *event); +void OSWaitEvent(OSEvent *event); /** @@ -126,8 +121,7 @@ OSWaitEvent(OSEvent *event); * * Similar to ResetEvent. */ -void -OSResetEvent(OSEvent *event); +void OSResetEvent(OSEvent *event); /** @@ -135,9 +129,8 @@ OSResetEvent(OSEvent *event); * * Similar to WaitForSingleObject. */ -BOOL -OSWaitEventWithTimeout(OSEvent *event, - OSTime timeout); +BOOL OSWaitEventWithTimeout(OSEvent *event, + OSTime timeout); #ifdef __cplusplus } diff --git a/include/coreinit/exception.h b/include/coreinit/exception.h index 6d17e69b8..58b4f1415 100644 --- a/include/coreinit/exception.h +++ b/include/coreinit/exception.h @@ -1,6 +1,6 @@ #pragma once -#include #include "context.h" +#include /** * \defgroup coreinit_exception Exception Handling @@ -16,30 +16,30 @@ typedef BOOL (*OSExceptionCallbackFn)(OSContext *context); typedef enum OSExceptionMode { - OS_EXCEPTION_MODE_SYSTEM = 0, - OS_EXCEPTION_MODE_THREAD = 1, - OS_EXCEPTION_MODE_GLOBAL = 2, - OS_EXCEPTION_MODE_THREAD_ALL_CORES = 3, - OS_EXCEPTION_MODE_GLOBAL_ALL_CORES = 4, + OS_EXCEPTION_MODE_SYSTEM = 0, + OS_EXCEPTION_MODE_THREAD = 1, + OS_EXCEPTION_MODE_GLOBAL = 2, + OS_EXCEPTION_MODE_THREAD_ALL_CORES = 3, + OS_EXCEPTION_MODE_GLOBAL_ALL_CORES = 4, } OSExceptionMode; typedef enum OSExceptionType { - OS_EXCEPTION_TYPE_SYSTEM_RESET = 0, - OS_EXCEPTION_TYPE_MACHINE_CHECK = 1, - OS_EXCEPTION_TYPE_DSI = 2, - OS_EXCEPTION_TYPE_ISI = 3, - OS_EXCEPTION_TYPE_EXTERNAL_INTERRUPT = 4, - OS_EXCEPTION_TYPE_ALIGNMENT = 5, - OS_EXCEPTION_TYPE_PROGRAM = 6, - OS_EXCEPTION_TYPE_FLOATING_POINT = 7, - OS_EXCEPTION_TYPE_DECREMENTER = 8, - OS_EXCEPTION_TYPE_SYSTEM_CALL = 9, - OS_EXCEPTION_TYPE_TRACE = 10, - OS_EXCEPTION_TYPE_PERFORMANCE_MONITOR = 11, - OS_EXCEPTION_TYPE_BREAKPOINT = 12, - OS_EXCEPTION_TYPE_SYSTEM_INTERRUPT = 13, - OS_EXCEPTION_TYPE_ICI = 14, + OS_EXCEPTION_TYPE_SYSTEM_RESET = 0, + OS_EXCEPTION_TYPE_MACHINE_CHECK = 1, + OS_EXCEPTION_TYPE_DSI = 2, + OS_EXCEPTION_TYPE_ISI = 3, + OS_EXCEPTION_TYPE_EXTERNAL_INTERRUPT = 4, + OS_EXCEPTION_TYPE_ALIGNMENT = 5, + OS_EXCEPTION_TYPE_PROGRAM = 6, + OS_EXCEPTION_TYPE_FLOATING_POINT = 7, + OS_EXCEPTION_TYPE_DECREMENTER = 8, + OS_EXCEPTION_TYPE_SYSTEM_CALL = 9, + OS_EXCEPTION_TYPE_TRACE = 10, + OS_EXCEPTION_TYPE_PERFORMANCE_MONITOR = 11, + OS_EXCEPTION_TYPE_BREAKPOINT = 12, + OS_EXCEPTION_TYPE_SYSTEM_INTERRUPT = 13, + OS_EXCEPTION_TYPE_ICI = 14, } OSExceptionType; OSExceptionCallbackFn diff --git a/include/coreinit/exit.h b/include/coreinit/exit.h index 5dc008790..a56a74ed2 100644 --- a/include/coreinit/exit.h +++ b/include/coreinit/exit.h @@ -12,10 +12,9 @@ extern "C" { #endif void -RPLWRAP(exit)(int code); + RPLWRAP(exit)(int code); -void -_Exit(int code); +void _Exit(int code); #ifdef __cplusplus } diff --git a/include/coreinit/fastcondition.h b/include/coreinit/fastcondition.h index 8757ab743..6ba3df192 100644 --- a/include/coreinit/fastcondition.h +++ b/include/coreinit/fastcondition.h @@ -1,6 +1,6 @@ #pragma once -#include #include "threadqueue.h" +#include /** * \defgroup coreinit_fastcond Fast Condition Variable @@ -32,16 +32,13 @@ WUT_CHECK_OFFSET(OSFastCondition, 0x04, name); WUT_CHECK_OFFSET(OSFastCondition, 0x0c, queue); WUT_CHECK_SIZE(OSFastCondition, 0x1c); -void -OSFastCond_Init(OSFastCondition *condition, - const char *name); +void OSFastCond_Init(OSFastCondition *condition, + const char *name); -void -OSFastCond_Wait(OSFastCondition *condition, - OSFastMutex *mutex); +void OSFastCond_Wait(OSFastCondition *condition, + OSFastMutex *mutex); -void -OSFastCond_Signal(OSFastCondition *condition); +void OSFastCond_Signal(OSFastCondition *condition); #ifdef __cplusplus } diff --git a/include/coreinit/fastmutex.h b/include/coreinit/fastmutex.h index d2d8096f7..e77e8e4a4 100644 --- a/include/coreinit/fastmutex.h +++ b/include/coreinit/fastmutex.h @@ -1,6 +1,6 @@ #pragma once -#include #include "threadqueue.h" +#include /** * \defgroup coreinit_fastmutex Fast Mutex @@ -45,18 +45,14 @@ WUT_CHECK_OFFSET(OSFastMutex, 0x0c, queue); WUT_CHECK_OFFSET(OSFastMutex, 0x14, link); WUT_CHECK_SIZE(OSFastMutex, 0x2c); -void -OSFastMutex_Init(OSFastMutex *mutex, - const char *name); +void OSFastMutex_Init(OSFastMutex *mutex, + const char *name); -void -OSFastMutex_Lock(OSFastMutex *mutex); +void OSFastMutex_Lock(OSFastMutex *mutex); -void -OSFastMutex_Unlock(OSFastMutex *mutex); +void OSFastMutex_Unlock(OSFastMutex *mutex); -BOOL -OSFastMutex_TryLock(OSFastMutex *mutex); +BOOL OSFastMutex_TryLock(OSFastMutex *mutex); #ifdef __cplusplus } diff --git a/include/coreinit/filesystem.h b/include/coreinit/filesystem.h index 4f303021c..5d3419aba 100644 --- a/include/coreinit/filesystem.h +++ b/include/coreinit/filesystem.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup coreinit_fs Filesystem @@ -38,120 +38,120 @@ typedef struct FSVolumeInfo FSVolumeInfo; typedef enum FSErrorFlag { - FS_ERROR_FLAG_NONE = 0x0, - FS_ERROR_FLAG_MAX = 0x1, - FS_ERROR_FLAG_ALREADY_OPEN = 0x2, - FS_ERROR_FLAG_EXISTS = 0x4, - FS_ERROR_FLAG_NOT_FOUND = 0x8, - FS_ERROR_FLAG_NOT_FILE = 0x10, - FS_ERROR_FLAG_NOT_DIR = 0x20, - FS_ERROR_FLAG_ACCESS_ERROR = 0x40, - FS_ERROR_FLAG_PERMISSION_ERROR = 0x80, - FS_ERROR_FLAG_FILE_TOO_BIG = 0x100, - FS_ERROR_FLAG_STORAGE_FULL = 0x200, - FS_ERROR_FLAG_UNSUPPORTED_CMD = 0x400, - FS_ERROR_FLAG_JOURNAL_FULL = 0x800, - FS_ERROR_FLAG_ALL = 0xFFFFFFFF, + FS_ERROR_FLAG_NONE = 0x0, + FS_ERROR_FLAG_MAX = 0x1, + FS_ERROR_FLAG_ALREADY_OPEN = 0x2, + FS_ERROR_FLAG_EXISTS = 0x4, + FS_ERROR_FLAG_NOT_FOUND = 0x8, + FS_ERROR_FLAG_NOT_FILE = 0x10, + FS_ERROR_FLAG_NOT_DIR = 0x20, + FS_ERROR_FLAG_ACCESS_ERROR = 0x40, + FS_ERROR_FLAG_PERMISSION_ERROR = 0x80, + FS_ERROR_FLAG_FILE_TOO_BIG = 0x100, + FS_ERROR_FLAG_STORAGE_FULL = 0x200, + FS_ERROR_FLAG_UNSUPPORTED_CMD = 0x400, + FS_ERROR_FLAG_JOURNAL_FULL = 0x800, + FS_ERROR_FLAG_ALL = 0xFFFFFFFF, } FSErrorFlag; typedef enum FSStatus { - FS_STATUS_OK = 0, - FS_STATUS_CANCELLED = -1, - FS_STATUS_END = -2, - FS_STATUS_MAX = -3, - FS_STATUS_ALREADY_OPEN = -4, - FS_STATUS_EXISTS = -5, - FS_STATUS_NOT_FOUND = -6, - FS_STATUS_NOT_FILE = -7, - FS_STATUS_NOT_DIR = -8, - FS_STATUS_ACCESS_ERROR = -9, - FS_STATUS_PERMISSION_ERROR = -10, - FS_STATUS_FILE_TOO_BIG = -11, - FS_STATUS_STORAGE_FULL = -12, - FS_STATUS_JOURNAL_FULL = -13, - FS_STATUS_UNSUPPORTED_CMD = -14, - FS_STATUS_MEDIA_NOT_READY = -15, - FS_STATUS_MEDIA_ERROR = -17, - FS_STATUS_CORRUPTED = -18, - FS_STATUS_FATAL_ERROR = -0x400, + FS_STATUS_OK = 0, + FS_STATUS_CANCELLED = -1, + FS_STATUS_END = -2, + FS_STATUS_MAX = -3, + FS_STATUS_ALREADY_OPEN = -4, + FS_STATUS_EXISTS = -5, + FS_STATUS_NOT_FOUND = -6, + FS_STATUS_NOT_FILE = -7, + FS_STATUS_NOT_DIR = -8, + FS_STATUS_ACCESS_ERROR = -9, + FS_STATUS_PERMISSION_ERROR = -10, + FS_STATUS_FILE_TOO_BIG = -11, + FS_STATUS_STORAGE_FULL = -12, + FS_STATUS_JOURNAL_FULL = -13, + FS_STATUS_UNSUPPORTED_CMD = -14, + FS_STATUS_MEDIA_NOT_READY = -15, + FS_STATUS_MEDIA_ERROR = -17, + FS_STATUS_CORRUPTED = -18, + FS_STATUS_FATAL_ERROR = -0x400, } FSStatus; typedef enum FSError { - FS_ERROR_NOT_INIT = -0x30001, - FS_ERROR_BUSY = -0x30002, - FS_ERROR_CANCELLED = -0x30003, - FS_ERROR_END_OF_DIR = -0x30004, - FS_ERROR_END_OF_FILE = -0x30005, - FS_ERROR_MAX_MOUNT_POINTS = -0x30010, - FS_ERROR_MAX_VOLUMES = -0x30011, - FS_ERROR_MAX_CLIENTS = -0x30012, - FS_ERROR_MAX_FILES = -0x30013, - FS_ERROR_MAX_DIRS = -0x30014, - FS_ERROR_ALREADY_OPEN = -0x30015, - FS_ERROR_ALREADY_EXISTS = -0x30016, - FS_ERROR_NOT_FOUND = -0x30017, - FS_ERROR_NOT_EMPTY = -0x30018, - FS_ERROR_ACCESS_ERROR = -0x30019, - FS_ERROR_PERMISSION_ERROR = -0x3001A, - FS_ERROR_DATA_CORRUPTED = -0x3001B, - FS_ERROR_STORAGE_FULL = -0x3001C, - FS_ERROR_JOURNAL_FULL = -0x3001D, - FS_ERROR_UNAVAILABLE_COMMAND = -0x3001F, - FS_ERROR_UNSUPPORTED_COMMAND = -0x30020, - FS_ERROR_INVALID_PARAM = -0x30021, - FS_ERROR_INVALID_PATH = -0x30022, - FS_ERROR_INVALID_BUFFER = -0x30023, - FS_ERROR_INVALID_ALIGNMENT = -0x30024, - FS_ERROR_INVALID_CLIENTHANDLE = -0x30025, - FS_ERROR_INVALID_FILEHANDLE = -0x30026, - FS_ERROR_INVALID_DIRHANDLE = -0x30027, - FS_ERROR_NOT_FILE = -0x30028, - FS_ERROR_NOT_DIR = -0x30029, - FS_ERROR_FILE_TOO_BIG = -0x3002A, - FS_ERROR_OUT_OF_RANGE = -0x3002B, - FS_ERROR_OUT_OF_RESOURCES = -0x3002C, - FS_ERROR_MEDIA_NOT_READY = -0x30030, - FS_ERROR_MEDIA_ERROR = -0x30031, - FS_ERROR_WRITE_PROTECTED = -0x30032, - FS_ERROR_INVALID_MEDIA = -0x30033, + FS_ERROR_NOT_INIT = -0x30001, + FS_ERROR_BUSY = -0x30002, + FS_ERROR_CANCELLED = -0x30003, + FS_ERROR_END_OF_DIR = -0x30004, + FS_ERROR_END_OF_FILE = -0x30005, + FS_ERROR_MAX_MOUNT_POINTS = -0x30010, + FS_ERROR_MAX_VOLUMES = -0x30011, + FS_ERROR_MAX_CLIENTS = -0x30012, + FS_ERROR_MAX_FILES = -0x30013, + FS_ERROR_MAX_DIRS = -0x30014, + FS_ERROR_ALREADY_OPEN = -0x30015, + FS_ERROR_ALREADY_EXISTS = -0x30016, + FS_ERROR_NOT_FOUND = -0x30017, + FS_ERROR_NOT_EMPTY = -0x30018, + FS_ERROR_ACCESS_ERROR = -0x30019, + FS_ERROR_PERMISSION_ERROR = -0x3001A, + FS_ERROR_DATA_CORRUPTED = -0x3001B, + FS_ERROR_STORAGE_FULL = -0x3001C, + FS_ERROR_JOURNAL_FULL = -0x3001D, + FS_ERROR_UNAVAILABLE_COMMAND = -0x3001F, + FS_ERROR_UNSUPPORTED_COMMAND = -0x30020, + FS_ERROR_INVALID_PARAM = -0x30021, + FS_ERROR_INVALID_PATH = -0x30022, + FS_ERROR_INVALID_BUFFER = -0x30023, + FS_ERROR_INVALID_ALIGNMENT = -0x30024, + FS_ERROR_INVALID_CLIENTHANDLE = -0x30025, + FS_ERROR_INVALID_FILEHANDLE = -0x30026, + FS_ERROR_INVALID_DIRHANDLE = -0x30027, + FS_ERROR_NOT_FILE = -0x30028, + FS_ERROR_NOT_DIR = -0x30029, + FS_ERROR_FILE_TOO_BIG = -0x3002A, + FS_ERROR_OUT_OF_RANGE = -0x3002B, + FS_ERROR_OUT_OF_RESOURCES = -0x3002C, + FS_ERROR_MEDIA_NOT_READY = -0x30030, + FS_ERROR_MEDIA_ERROR = -0x30031, + FS_ERROR_WRITE_PROTECTED = -0x30032, + FS_ERROR_INVALID_MEDIA = -0x30033, } FSError; typedef enum FSMode { - FS_MODE_READ_OWNER = 0x400, - FS_MODE_WRITE_OWNER = 0x200, - FS_MODE_EXEC_OWNER = 0x100, + FS_MODE_READ_OWNER = 0x400, + FS_MODE_WRITE_OWNER = 0x200, + FS_MODE_EXEC_OWNER = 0x100, - FS_MODE_READ_GROUP = 0x040, - FS_MODE_WRITE_GROUP = 0x020, - FS_MODE_EXEC_GROUP = 0x010, + FS_MODE_READ_GROUP = 0x040, + FS_MODE_WRITE_GROUP = 0x020, + FS_MODE_EXEC_GROUP = 0x010, - FS_MODE_READ_OTHER = 0x004, - FS_MODE_WRITE_OTHER = 0x002, - FS_MODE_EXEC_OTHER = 0x001, + FS_MODE_READ_OTHER = 0x004, + FS_MODE_WRITE_OTHER = 0x002, + FS_MODE_EXEC_OTHER = 0x001, } FSMode; typedef enum FSStatFlags { - FS_STAT_DIRECTORY = 0x80000000, + FS_STAT_DIRECTORY = 0x80000000, } FSStatFlags; typedef enum FSVolumeState { - FS_VOLUME_STATE_INITIAL = 0, - FS_VOLUME_STATE_READY = 1, - FS_VOLUME_STATE_NO_MEDIA = 2, - FS_VOLUME_STATE_INVALID_MEDIA = 3, - FS_VOLUME_STATE_DIRTY_MEDIA = 4, - FS_VOLUME_STATE_WRONG_MEDIA = 5, - FS_VOLUME_STATE_MEDIA_ERROR = 6, - FS_VOLUME_STATE_DATA_CORRUPTED = 7, - FS_VOLUME_STATE_WRITE_PROTECTED = 8, - FS_VOLUME_STATE_JOURNAL_FULL = 9, - FS_VOLUME_STATE_FATAL = 10, - FS_VOLUME_STATE_INVALID = 11, + FS_VOLUME_STATE_INITIAL = 0, + FS_VOLUME_STATE_READY = 1, + FS_VOLUME_STATE_NO_MEDIA = 2, + FS_VOLUME_STATE_INVALID_MEDIA = 3, + FS_VOLUME_STATE_DIRTY_MEDIA = 4, + FS_VOLUME_STATE_WRONG_MEDIA = 5, + FS_VOLUME_STATE_MEDIA_ERROR = 6, + FS_VOLUME_STATE_DATA_CORRUPTED = 7, + FS_VOLUME_STATE_WRITE_PROTECTED = 8, + FS_VOLUME_STATE_JOURNAL_FULL = 9, + FS_VOLUME_STATE_FATAL = 10, + FS_VOLUME_STATE_INVALID = 11, } FSVolumeState; typedef enum FSMountSourceType @@ -160,7 +160,7 @@ typedef enum FSMountSourceType FS_MOUNT_SOURCE_UNK = 1, } FSMountSourceType; -typedef void(*FSAsyncCallback)(FSClient *, FSCmdBlock *, FSStatus, uint32_t); +typedef void (*FSAsyncCallback)(FSClient *, FSCmdBlock *, FSStatus, uint32_t); struct FSClient { @@ -281,11 +281,9 @@ struct WUT_PACKED FSVolumeInfo WUT_CHECK_OFFSET(FSVolumeInfo, 0xAC, volumeId); WUT_CHECK_SIZE(FSVolumeInfo, 444); -void -FSInit(); +void FSInit(); -void -FSShutdown(); +void FSShutdown(); FSStatus FSAddClient(FSClient *client, @@ -298,16 +296,14 @@ FSDelClient(FSClient *client, uint32_t FSGetClientNum(); -void -FSInitCmdBlock(FSCmdBlock *block); +void FSInitCmdBlock(FSCmdBlock *block); FSStatus FSSetCmdPriority(FSCmdBlock *block, FSPriority priority); -void -FSSetStateChangeNotification(FSClient *client, - FSStateChangeInfo *info); +void FSSetStateChangeNotification(FSClient *client, + FSStateChangeInfo *info); FSStatus FSGetCwd(FSClient *client, @@ -349,16 +345,16 @@ FSGetStatAsync(FSClient *client, FSStatus FSRemove(FSClient *client, - FSCmdBlock *block, - const char *path, - FSErrorFlag errorMask); + FSCmdBlock *block, + const char *path, + FSErrorFlag errorMask); FSStatus FSRemoveAsync(FSClient *client, - FSCmdBlock *block, - const char *path, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + const char *path, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSStatus @@ -414,10 +410,10 @@ FSMakeDir(FSClient *client, FSStatus FSMakeDirAsync(FSClient *client, - FSCmdBlock *block, - const char *path, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + const char *path, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSStatus FSReadDir(FSClient *client, @@ -436,9 +432,9 @@ FSReadDirAsync(FSClient *client, FSStatus FSRewindDir(FSClient *client, - FSCmdBlock *block, - FSDirectoryHandle handle, - FSErrorFlag errorMask); + FSCmdBlock *block, + FSDirectoryHandle handle, + FSErrorFlag errorMask); FSStatus FSCloseDir(FSClient *client, @@ -447,18 +443,18 @@ FSCloseDir(FSClient *client, FSErrorFlag errorMask); FSStatus -FSGetVolumeInfo(FSClient *client, - FSCmdBlock *block, - const char *path, - FSVolumeInfo *volumeInfo, - FSErrorFlag errorMask); +FSGetVolumeInfo(FSClient *client, + FSCmdBlock *block, + const char *path, + FSVolumeInfo *volumeInfo, + FSErrorFlag errorMask); FSStatus -FSGetVolumeInfoAsync(FSClient *client, - FSCmdBlock *block, - const char *path, - FSVolumeInfo *volumeInfo, - FSErrorFlag errorMask, +FSGetVolumeInfoAsync(FSClient *client, + FSCmdBlock *block, + const char *path, + FSVolumeInfo *volumeInfo, + FSErrorFlag errorMask, FSAsyncData *asyncData); FSStatus @@ -558,47 +554,47 @@ FSReadFileWithPosAsync(FSClient *client, FSStatus FSWriteFile(FSClient *client, - FSCmdBlock *block, - uint8_t *buffer, - uint32_t size, - uint32_t count, - FSFileHandle handle, - uint32_t unk1, - FSErrorFlag errorMask); + FSCmdBlock *block, + uint8_t *buffer, + uint32_t size, + uint32_t count, + FSFileHandle handle, + uint32_t unk1, + FSErrorFlag errorMask); FSStatus FSWriteFileAsync(FSClient *client, - FSCmdBlock *block, - uint8_t *buffer, - uint32_t size, - uint32_t count, - FSFileHandle handle, - uint32_t unk1, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + uint8_t *buffer, + uint32_t size, + uint32_t count, + FSFileHandle handle, + uint32_t unk1, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSStatus FSWriteFileWithPos(FSClient *client, - FSCmdBlock *block, - uint8_t *buffer, - uint32_t size, - uint32_t count, - uint32_t pos, - FSFileHandle handle, - uint32_t unk1, - FSErrorFlag errorMask); + FSCmdBlock *block, + uint8_t *buffer, + uint32_t size, + uint32_t count, + uint32_t pos, + FSFileHandle handle, + uint32_t unk1, + FSErrorFlag errorMask); FSStatus FSWriteFileWithPosAsync(FSClient *client, - FSCmdBlock *block, - uint8_t *buffer, - uint32_t size, - uint32_t count, - uint32_t pos, - FSFileHandle handle, - uint32_t unk1, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + uint8_t *buffer, + uint32_t size, + uint32_t count, + uint32_t pos, + FSFileHandle handle, + uint32_t unk1, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSStatus FSGetPosFile(FSClient *client, @@ -632,44 +628,44 @@ FSSetPosFileAsync(FSClient *client, FSStatus FSFlushFile(FSClient *client, - FSCmdBlock *block, - FSFileHandle handle, - FSErrorFlag errorMask); + FSCmdBlock *block, + FSFileHandle handle, + FSErrorFlag errorMask); FSStatus FSFlushFileAsync(FSClient *client, - FSCmdBlock *block, - FSFileHandle handle, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + FSFileHandle handle, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSStatus FSTruncateFile(FSClient *client, - FSCmdBlock *block, - FSFileHandle handle, - FSErrorFlag errorMask); + FSCmdBlock *block, + FSFileHandle handle, + FSErrorFlag errorMask); FSStatus FSTruncateFileAsync(FSClient *client, - FSCmdBlock *block, - FSFileHandle handle, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + FSFileHandle handle, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSStatus FSRename(FSClient *client, - FSCmdBlock *block, - const char *oldPath, - const char *newPath, - FSErrorFlag errorMask); + FSCmdBlock *block, + const char *oldPath, + const char *newPath, + FSErrorFlag errorMask); FSStatus FSRenameAsync(FSClient *client, - FSCmdBlock *block, - const char *oldPath, - const char *newPath, - FSErrorFlag errorMask, - FSAsyncData *asyncData); + FSCmdBlock *block, + const char *oldPath, + const char *newPath, + FSErrorFlag errorMask, + FSAsyncData *asyncData); FSVolumeState FSGetVolumeState(FSClient *client); diff --git a/include/coreinit/foreground.h b/include/coreinit/foreground.h index 88eb1b0c2..e14bd7710 100644 --- a/include/coreinit/foreground.h +++ b/include/coreinit/foreground.h @@ -11,14 +11,11 @@ extern "C" { #endif -void -OSEnableForegroundExit(); +void OSEnableForegroundExit(); -void -OSReleaseForeground(); +void OSReleaseForeground(); -void -OSSavesDone_ReadyToRelease(); +void OSSavesDone_ReadyToRelease(); #ifdef __cplusplus } diff --git a/include/coreinit/internal.h b/include/coreinit/internal.h index bd0f08731..a22db6dfa 100644 --- a/include/coreinit/internal.h +++ b/include/coreinit/internal.h @@ -5,8 +5,7 @@ extern "C" { #endif -int -__os_snprintf(char *buf, size_t n, const char *format, ... ); +int __os_snprintf(char *buf, size_t n, const char *format, ...); #ifdef __cplusplus } diff --git a/include/coreinit/interrupts.h b/include/coreinit/interrupts.h index ca0743498..df150893f 100644 --- a/include/coreinit/interrupts.h +++ b/include/coreinit/interrupts.h @@ -28,29 +28,23 @@ typedef enum OSInterruptType OS_INTERRUPT_TYPE_AHB = 12 } OSInterruptType; -typedef void(*OSUserInterruptHandler)(OSInterruptType type, OSContext* interruptedContext); - -BOOL -OSEnableInterrupts(); +typedef void (*OSUserInterruptHandler)(OSInterruptType type, OSContext *interruptedContext); -BOOL -OSDisableInterrupts(); +BOOL OSEnableInterrupts(); -BOOL -OSRestoreInterrupts(BOOL enable); +BOOL OSDisableInterrupts(); -BOOL -OSIsInterruptEnabled(); +BOOL OSRestoreInterrupts(BOOL enable); + +BOOL OSIsInterruptEnabled(); OSUserInterruptHandler __OSSetInterruptHandler(OSInterruptType type, OSUserInterruptHandler handler); -void -__OSClearAndEnableInterrupt(OSInterruptType type); +void __OSClearAndEnableInterrupt(OSInterruptType type); -void -__OSDisableInterrupt(OSInterruptType type); +void __OSDisableInterrupt(OSInterruptType type); #ifdef __cplusplus } diff --git a/include/coreinit/ios.h b/include/coreinit/ios.h index 3716e17f3..ea2a46b23 100644 --- a/include/coreinit/ios.h +++ b/include/coreinit/ios.h @@ -16,56 +16,56 @@ typedef int32_t IOSHandle; typedef enum IOSOpenMode { - IOS_OPEN_READ = 1 << 0, - IOS_OPEN_WRITE = 1 << 1, - IOS_OPEN_READWRITE = IOS_OPEN_READ | IOS_OPEN_WRITE, + IOS_OPEN_READ = 1 << 0, + IOS_OPEN_WRITE = 1 << 1, + IOS_OPEN_READWRITE = IOS_OPEN_READ | IOS_OPEN_WRITE, } IOSOpenMode; typedef enum IOSError { - IOS_ERROR_OK = 0, - IOS_ERROR_ACCESS = -1, - IOS_ERROR_EXISTS = -2, - IOS_ERROR_INTR = -3, - IOS_ERROR_INVALID = -4, - IOS_ERROR_MAX = -5, - IOS_ERROR_NOEXISTS = -6, - IOS_ERROR_QEMPTY = -7, - IOS_ERROR_QFULL = -8, - IOS_ERROR_UNKNOWN = -9, - IOS_ERROR_NOTREADY = -10, - IOS_ERROR_ECC = -11, - IOS_ERROR_ECCCRIT = -12, - IOS_ERROR_BADBLOCK = -13, - IOS_ERROR_INVALIDOBJTYPE = -14, - IOS_ERROR_INVALIDRNG = -15, - IOS_ERROR_INVALIDFLAG = -16, - IOS_ERROR_INVALIDFORMAT = -17, - IOS_ERROR_INVALIDVERSION = -18, - IOS_ERROR_INVALIDSIGNER = -19, - IOS_ERROR_FAILCHECKVALUE = -20, - IOS_ERROR_FAILINTERNAL = -21, - IOS_ERROR_FAILALLOC = -22, - IOS_ERROR_INVALIDSIZE = -23, - IOS_ERROR_NOLINK = -24, - IOS_ERROR_ANFAILED = -25, - IOS_ERROR_MAXSEMCOUNT = -26, - IOS_ERROR_SEMUNAVAILABLE = -27, - IOS_ERROR_INVALIDHANDLE = -28, - IOS_ERROR_INVALIDARG = -29, - IOS_ERROR_NORESOURCE = -30, - IOS_ERROR_BUSY = -31, - IOS_ERROR_TIMEOUT = -32, - IOS_ERROR_ALIGNMENT = -33, - IOS_ERROR_BSP = -34, - IOS_ERROR_DATAPENDING = -35, - IOS_ERROR_EXPIRED = -36, - IOS_ERROR_NOREADACCESS = -37, - IOS_ERROR_NOWRITEACCESS = -38, - IOS_ERROR_NOREADWRITEACCESS = -39, - IOS_ERROR_CLIENTTXNLIMIT = -40, - IOS_ERROR_STALEHANDLE = -41, - IOS_ERROR_UNKNOWNVALUE = -42, + IOS_ERROR_OK = 0, + IOS_ERROR_ACCESS = -1, + IOS_ERROR_EXISTS = -2, + IOS_ERROR_INTR = -3, + IOS_ERROR_INVALID = -4, + IOS_ERROR_MAX = -5, + IOS_ERROR_NOEXISTS = -6, + IOS_ERROR_QEMPTY = -7, + IOS_ERROR_QFULL = -8, + IOS_ERROR_UNKNOWN = -9, + IOS_ERROR_NOTREADY = -10, + IOS_ERROR_ECC = -11, + IOS_ERROR_ECCCRIT = -12, + IOS_ERROR_BADBLOCK = -13, + IOS_ERROR_INVALIDOBJTYPE = -14, + IOS_ERROR_INVALIDRNG = -15, + IOS_ERROR_INVALIDFLAG = -16, + IOS_ERROR_INVALIDFORMAT = -17, + IOS_ERROR_INVALIDVERSION = -18, + IOS_ERROR_INVALIDSIGNER = -19, + IOS_ERROR_FAILCHECKVALUE = -20, + IOS_ERROR_FAILINTERNAL = -21, + IOS_ERROR_FAILALLOC = -22, + IOS_ERROR_INVALIDSIZE = -23, + IOS_ERROR_NOLINK = -24, + IOS_ERROR_ANFAILED = -25, + IOS_ERROR_MAXSEMCOUNT = -26, + IOS_ERROR_SEMUNAVAILABLE = -27, + IOS_ERROR_INVALIDHANDLE = -28, + IOS_ERROR_INVALIDARG = -29, + IOS_ERROR_NORESOURCE = -30, + IOS_ERROR_BUSY = -31, + IOS_ERROR_TIMEOUT = -32, + IOS_ERROR_ALIGNMENT = -33, + IOS_ERROR_BSP = -34, + IOS_ERROR_DATAPENDING = -35, + IOS_ERROR_EXPIRED = -36, + IOS_ERROR_NOREADACCESS = -37, + IOS_ERROR_NOWRITEACCESS = -38, + IOS_ERROR_NOREADWRITEACCESS = -39, + IOS_ERROR_CLIENTTXNLIMIT = -40, + IOS_ERROR_STALEHANDLE = -41, + IOS_ERROR_UNKNOWNVALUE = -42, } IOSError; struct IOSVec diff --git a/include/coreinit/launch.h b/include/coreinit/launch.h index 980a40f96..993b866ca 100644 --- a/include/coreinit/launch.h +++ b/include/coreinit/launch.h @@ -11,8 +11,7 @@ extern "C" { #endif -void -OSForceFullRelaunch(); +void OSForceFullRelaunch(); #ifdef __cplusplus } diff --git a/include/coreinit/mcp.h b/include/coreinit/mcp.h index 031ce8a8a..28bea14fb 100644 --- a/include/coreinit/mcp.h +++ b/include/coreinit/mcp.h @@ -23,65 +23,65 @@ typedef struct MCPTitleListType MCPTitleListType; typedef enum MCPAppType { - MCP_APP_TYPE_GAME_UPDATE = 0x0800001B, - MCP_APP_TYPE_GAME_DLC = 0x0800000E, - MCP_APP_TYPE_BOOT1 = 0x10000009, - MCP_APP_TYPE_SYSTEM_LIBRARIES = 0x1000000A, - MCP_APP_TYPE_BLUETOOTH_FIRMWARE = 0x10000012, - MCP_APP_TYPE_DRH_FIRMWARE = 0x10000013, - MCP_APP_TYPE_DRC_FIRMWARE = 0x10000014, - MCP_APP_TYPE_SYSTEM_VERSION = 0x10000015, - MCP_APP_TYPE_DRC_LANGUAGE = 0x1000001A, - MCP_APP_TYPE_EXCEPTIONS_DATA = 0x18000010, - MCP_APP_TYPE_SHARED_DATA = 0x1800001C, - MCP_APP_TYPE_CERT_STORE = 0x1800001E, - MCP_APP_TYPE_PATCH_MAP_DATA = 0x18000023, - MCP_APP_TYPE_WAGONU_MIGRATION_LIST = 0x18000029, - MCP_APP_TYPE_CAFFEINE_TITLE_LIST = 0x18000030, - MCP_APP_TYPE_MCP_TITLE_LIST = 0x18000031, - MCP_APP_TYPE_GAME = 0x80000000, - MCP_APP_TYPE_GAME_WII = 0x8000002E, - MCP_APP_TYPE_SYSTEM_MENU = 0x90000001, - MCP_APP_TYPE_SYSTEM_UPDATER = 0x9000000B, - MCP_APP_TYPE_SYSTEM_APPS = 0x90000020, - MCP_APP_TYPE_ACCOUNT_APPS = 0x90000021, - MCP_APP_TYPE_SYSTEM_SETTINGS = 0x90000022, - MCP_APP_TYPE_ECO_PROCESS = 0x9000002F, - MCP_APP_TYPE_EMANUAL = 0xD0000003, - MCP_APP_TYPE_HOME_MENU = 0xD0000004, - MCP_APP_TYPE_ERROR_DISPLAY = 0xD0000005, - MCP_APP_TYPE_BROWSER = 0xD0000006, - MCP_APP_TYPE_MIIVERSE_POST = 0xD000000D, - MCP_APP_TYPE_MIIVERSE = 0xD0000016, - MCP_APP_TYPE_ESHOP = 0xD0000017, - MCP_APP_TYPE_FRIEND_LIST = 0xD0000018, - MCP_APP_TYPE_DOWNLOAD_MANAGEMENT = 0xD0000019, - MCP_APP_TYPE_AOC_OVERLAY = 0xD000002C, - MCP_APP_TYPE_AMIIBO_SETTINGS = 0xD0000033, + MCP_APP_TYPE_GAME_UPDATE = 0x0800001B, + MCP_APP_TYPE_GAME_DLC = 0x0800000E, + MCP_APP_TYPE_BOOT1 = 0x10000009, + MCP_APP_TYPE_SYSTEM_LIBRARIES = 0x1000000A, + MCP_APP_TYPE_BLUETOOTH_FIRMWARE = 0x10000012, + MCP_APP_TYPE_DRH_FIRMWARE = 0x10000013, + MCP_APP_TYPE_DRC_FIRMWARE = 0x10000014, + MCP_APP_TYPE_SYSTEM_VERSION = 0x10000015, + MCP_APP_TYPE_DRC_LANGUAGE = 0x1000001A, + MCP_APP_TYPE_EXCEPTIONS_DATA = 0x18000010, + MCP_APP_TYPE_SHARED_DATA = 0x1800001C, + MCP_APP_TYPE_CERT_STORE = 0x1800001E, + MCP_APP_TYPE_PATCH_MAP_DATA = 0x18000023, + MCP_APP_TYPE_WAGONU_MIGRATION_LIST = 0x18000029, + MCP_APP_TYPE_CAFFEINE_TITLE_LIST = 0x18000030, + MCP_APP_TYPE_MCP_TITLE_LIST = 0x18000031, + MCP_APP_TYPE_GAME = 0x80000000, + MCP_APP_TYPE_GAME_WII = 0x8000002E, + MCP_APP_TYPE_SYSTEM_MENU = 0x90000001, + MCP_APP_TYPE_SYSTEM_UPDATER = 0x9000000B, + MCP_APP_TYPE_SYSTEM_APPS = 0x90000020, + MCP_APP_TYPE_ACCOUNT_APPS = 0x90000021, + MCP_APP_TYPE_SYSTEM_SETTINGS = 0x90000022, + MCP_APP_TYPE_ECO_PROCESS = 0x9000002F, + MCP_APP_TYPE_EMANUAL = 0xD0000003, + MCP_APP_TYPE_HOME_MENU = 0xD0000004, + MCP_APP_TYPE_ERROR_DISPLAY = 0xD0000005, + MCP_APP_TYPE_BROWSER = 0xD0000006, + MCP_APP_TYPE_MIIVERSE_POST = 0xD000000D, + MCP_APP_TYPE_MIIVERSE = 0xD0000016, + MCP_APP_TYPE_ESHOP = 0xD0000017, + MCP_APP_TYPE_FRIEND_LIST = 0xD0000018, + MCP_APP_TYPE_DOWNLOAD_MANAGEMENT = 0xD0000019, + MCP_APP_TYPE_AOC_OVERLAY = 0xD000002C, + MCP_APP_TYPE_AMIIBO_SETTINGS = 0xD0000033, } MCPAppType; typedef enum MCPDeviceFlags { - MCP_DEVICE_FLAG_UNK_1 = 0x1, - MCP_DEVICE_FLAG_UNK_2 = 0x2, - MCP_DEVICE_FLAG_UNK_4 = 0x4, - MCP_DEVICE_FLAG_UNK_8 = 0x8, + MCP_DEVICE_FLAG_UNK_1 = 0x1, + MCP_DEVICE_FLAG_UNK_2 = 0x2, + MCP_DEVICE_FLAG_UNK_4 = 0x4, + MCP_DEVICE_FLAG_UNK_8 = 0x8, } MCPDeviceFlags; typedef enum MCPInstallTarget { - MCP_INSTALL_TARGET_MLC = 0, - MCP_INSTALL_TARGET_USB = 1, + MCP_INSTALL_TARGET_MLC = 0, + MCP_INSTALL_TARGET_USB = 1, } MCPInstallTarget; typedef enum MCPRegion { - MCP_REGION_JAPAN = 0x01, - MCP_REGION_USA = 0x02, - MCP_REGION_EUROPE = 0x04, - MCP_REGION_CHINA = 0x10, - MCP_REGION_KOREA = 0x20, - MCP_REGION_TAIWAN = 0x40, + MCP_REGION_JAPAN = 0x01, + MCP_REGION_USA = 0x02, + MCP_REGION_EUROPE = 0x04, + MCP_REGION_CHINA = 0x10, + MCP_REGION_KOREA = 0x20, + MCP_REGION_TAIWAN = 0x40, } MCPRegion; struct WUT_PACKED MCPDevice diff --git a/include/coreinit/memblockheap.h b/include/coreinit/memblockheap.h index 7df56cb03..e7e7e1863 100644 --- a/include/coreinit/memblockheap.h +++ b/include/coreinit/memblockheap.h @@ -1,6 +1,6 @@ #pragma once -#include #include "memheap.h" +#include /** * \defgroup coreinit_memblockheap Block Heap @@ -96,10 +96,9 @@ MEMInitBlockHeap(MEMBlockHeap *heap, void * MEMDestroyBlockHeap(MEMHeapHandle heap); -int -MEMAddBlockHeapTracking(MEMHeapHandle heap, - MEMBlockHeapTracking *tracking, - uint32_t size); +int MEMAddBlockHeapTracking(MEMHeapHandle heap, + MEMBlockHeapTracking *tracking, + uint32_t size); void * MEMAllocFromBlockHeapAt(MEMHeapHandle heap, @@ -111,9 +110,8 @@ MEMAllocFromBlockHeapEx(MEMHeapHandle heap, uint32_t size, int32_t align); -void -MEMFreeToBlockHeap(MEMHeapHandle heap, - void *data); +void MEMFreeToBlockHeap(MEMHeapHandle heap, + void *data); uint32_t MEMGetAllocatableSizeForBlockHeapEx(MEMHeapHandle heap, diff --git a/include/coreinit/memdefaultheap.h b/include/coreinit/memdefaultheap.h index cbb087877..ec3747b5c 100644 --- a/include/coreinit/memdefaultheap.h +++ b/include/coreinit/memdefaultheap.h @@ -1,6 +1,6 @@ #pragma once -#include #include "memheap.h" +#include /** * \defgroup coreinit_memdefaultheap Default Heap @@ -23,10 +23,9 @@ extern MEMFreeToDefaultHeapFn MEMFreeToDefaultHeap; /** * Default implementation of __preinit_user. */ -void -CoreInitDefaultHeap(MEMHeapHandle *outMem1, - MEMHeapHandle *outFG, - MEMHeapHandle *outMem2); +void CoreInitDefaultHeap(MEMHeapHandle *outMem1, + MEMHeapHandle *outFG, + MEMHeapHandle *outMem2); /** * Allows the user to completely customise the default heaps, this runs after @@ -36,10 +35,9 @@ CoreInitDefaultHeap(MEMHeapHandle *outMem1, * This is for a user to export from their .rpx file, it is not exported from * coreinit.rpl */ -void -__preinit_user(MEMHeapHandle *outMem1, - MEMHeapHandle *outFG, - MEMHeapHandle *outMem2); +void __preinit_user(MEMHeapHandle *outMem1, + MEMHeapHandle *outFG, + MEMHeapHandle *outMem2); #ifdef __cplusplus } diff --git a/include/coreinit/memexpheap.h b/include/coreinit/memexpheap.h index 11da2d2a8..4f33e0bdf 100644 --- a/include/coreinit/memexpheap.h +++ b/include/coreinit/memexpheap.h @@ -1,6 +1,6 @@ #pragma once -#include #include "memheap.h" +#include /** * \defgroup coreinit_memexpheap Expanded Heap @@ -21,14 +21,14 @@ typedef void (*MEMExpHeapBlockVisitor)(void *block, MEMHeapHandle heap, typedef enum MEMExpHeapMode { - MEM_EXP_HEAP_MODE_FIRST_FREE = 0, - MEM_EXP_HEAP_MODE_NEAREST_SIZE = 1, + MEM_EXP_HEAP_MODE_FIRST_FREE = 0, + MEM_EXP_HEAP_MODE_NEAREST_SIZE = 1, } MEMExpHeapMode; typedef enum MEMExpHeapDirection { - MEM_EXP_HEAP_DIR_FROM_TOP = 0, - MEM_EXP_HEAP_DIR_FROM_BOTTOM = 1, + MEM_EXP_HEAP_DIR_FROM_TOP = 0, + MEM_EXP_HEAP_DIR_FROM_BOTTOM = 1, } MEMExpHeapDirection; struct MEMExpHeapBlock @@ -84,9 +84,8 @@ MEMAllocFromExpHeapEx(MEMHeapHandle heap, uint32_t size, int alignment); -void -MEMFreeToExpHeap(MEMHeapHandle heap, - void *block); +void MEMFreeToExpHeap(MEMHeapHandle heap, + void *block); MEMExpHeapMode MEMSetAllocModeForExpHeap(MEMHeapHandle heap, @@ -126,10 +125,9 @@ MEMGetGroupIDForMBlockExpHeap(void *block); MEMExpHeapDirection MEMGetAllocDirForMBlockExpHeap(void *block); -void -MEMVisitAllocatedForExpHeap(MEMHeapHandle heap, - MEMExpHeapBlockVisitor callback, - void *context); +void MEMVisitAllocatedForExpHeap(MEMHeapHandle heap, + MEMExpHeapBlockVisitor callback, + void *context); #ifdef __cplusplus } diff --git a/include/coreinit/memfrmheap.h b/include/coreinit/memfrmheap.h index 731286095..851b18c0a 100644 --- a/include/coreinit/memfrmheap.h +++ b/include/coreinit/memfrmheap.h @@ -1,6 +1,6 @@ #pragma once -#include #include "memheap.h" +#include /** * \defgroup coreinit_memfrmheap Frame Heap @@ -14,9 +14,9 @@ extern "C" { typedef enum MEMFrmHeapFreeMode { - MEM_FRM_HEAP_FREE_HEAD = 1 << 0, - MEM_FRM_HEAP_FREE_TAIL = 1 << 1, - MEM_FRM_HEAP_FREE_ALL = MEM_FRM_HEAP_FREE_HEAD | MEM_FRM_HEAP_FREE_TAIL, + MEM_FRM_HEAP_FREE_HEAD = 1 << 0, + MEM_FRM_HEAP_FREE_TAIL = 1 << 1, + MEM_FRM_HEAP_FREE_ALL = MEM_FRM_HEAP_FREE_HEAD | MEM_FRM_HEAP_FREE_TAIL, } MEMFrmHeapFreeMode; typedef struct MEMFrmHeap MEMFrmHeap; @@ -61,17 +61,14 @@ MEMAllocFromFrmHeapEx(MEMHeapHandle heap, uint32_t size, int alignment); -void -MEMFreeToFrmHeap(MEMHeapHandle heap, - MEMFrmHeapFreeMode mode); +void MEMFreeToFrmHeap(MEMHeapHandle heap, + MEMFrmHeapFreeMode mode); -BOOL -MEMRecordStateForFrmHeap(MEMHeapHandle heap, - uint32_t tag); +BOOL MEMRecordStateForFrmHeap(MEMHeapHandle heap, + uint32_t tag); -BOOL -MEMFreeByStateToFrmHeap(MEMHeapHandle heap, - uint32_t tag); +BOOL MEMFreeByStateToFrmHeap(MEMHeapHandle heap, + uint32_t tag); uint32_t MEMAdjustFrmHeap(MEMHeapHandle heap); diff --git a/include/coreinit/memheap.h b/include/coreinit/memheap.h index 914d3206e..c5f191689 100644 --- a/include/coreinit/memheap.h +++ b/include/coreinit/memheap.h @@ -1,7 +1,7 @@ #pragma once -#include -#include "spinlock.h" #include "memlist.h" +#include "spinlock.h" +#include /** * \defgroup coreinit_memheap Common Memory Heap @@ -20,9 +20,9 @@ typedef MEMHeapHeader *MEMHeapHandle; typedef enum MEMBaseHeapType { - MEM_BASE_HEAP_MEM1 = 0, - MEM_BASE_HEAP_MEM2 = 1, - MEM_BASE_HEAP_FG = 8, + MEM_BASE_HEAP_MEM1 = 0, + MEM_BASE_HEAP_MEM2 = 1, + MEM_BASE_HEAP_FG = 8, } MEMBaseHeapType; typedef enum MEMHeapFillType @@ -34,18 +34,18 @@ typedef enum MEMHeapFillType typedef enum MEMHeapTag { - MEM_BLOCK_HEAP_TAG = 0x424C4B48u, - MEM_EXPANDED_HEAP_TAG = 0x45585048u, - MEM_FRAME_HEAP_TAG = 0x46524D48u, - MEM_UNIT_HEAP_TAG = 0x554E5448u, - MEM_USER_HEAP_TAG = 0x55535248u, + MEM_BLOCK_HEAP_TAG = 0x424C4B48u, + MEM_EXPANDED_HEAP_TAG = 0x45585048u, + MEM_FRAME_HEAP_TAG = 0x46524D48u, + MEM_UNIT_HEAP_TAG = 0x554E5448u, + MEM_USER_HEAP_TAG = 0x55535248u, } MEMHeapTag; typedef enum MEMHeapFlags { - MEM_HEAP_FLAG_ZERO_ALLOCATED = 1 << 0, - MEM_HEAP_FLAG_DEBUG_MODE = 1 << 1, - MEM_HEAP_FLAG_USE_LOCK = 1 << 2, + MEM_HEAP_FLAG_ZERO_ALLOCATED = 1 << 0, + MEM_HEAP_FLAG_DEBUG_MODE = 1 << 1, + MEM_HEAP_FLAG_USE_LOCK = 1 << 2, } MEMHeapFlags; struct MEMHeapHeader @@ -114,8 +114,7 @@ MEMCreateUserHeapHandle(void *heap, /** * Print details about heap to COSWarn */ -void -MEMDumpHeap(MEMHeapHandle heap); +void MEMDumpHeap(MEMHeapHandle heap); /** @@ -140,9 +139,8 @@ MEMGetFillValForHeap(MEMHeapFillType type); /** * Set the data fill value used when MEM_HEAP_FLAG_DEBUG_MODE is set. */ -void -MEMSetFillValForHeap(MEMHeapFillType type, - uint32_t value); +void MEMSetFillValForHeap(MEMHeapFillType type, + uint32_t value); #ifdef __cplusplus } diff --git a/include/coreinit/memlist.h b/include/coreinit/memlist.h index b98d024d2..aac8f328d 100644 --- a/include/coreinit/memlist.h +++ b/include/coreinit/memlist.h @@ -36,26 +36,21 @@ WUT_CHECK_OFFSET(MEMMemoryList, 0x8, count); WUT_CHECK_OFFSET(MEMMemoryList, 0xa, offsetToMemoryLink); WUT_CHECK_SIZE(MEMMemoryList, 0xc); -void -MEMInitList(MEMMemoryList *list, - uint16_t offsetToMemoryLink); +void MEMInitList(MEMMemoryList *list, + uint16_t offsetToMemoryLink); -void -MEMAppendListObject(MEMMemoryList *list, - void *object); +void MEMAppendListObject(MEMMemoryList *list, + void *object); -void -MEMPrependListObject(MEMMemoryList *list, - void *object); +void MEMPrependListObject(MEMMemoryList *list, + void *object); -void -MEMInsertListObject(MEMMemoryList *list, - void *before, - void *object); +void MEMInsertListObject(MEMMemoryList *list, + void *before, + void *object); -void -MEMRemoveListObject(MEMMemoryList *list, - void *object); +void MEMRemoveListObject(MEMMemoryList *list, + void *object); void * MEMGetNextListObject(MEMMemoryList *list, diff --git a/include/coreinit/memory.h b/include/coreinit/memory.h index cbe0c10dd..cec917fc0 100644 --- a/include/coreinit/memory.h +++ b/include/coreinit/memory.h @@ -20,18 +20,17 @@ typedef enum OSMemoryType typedef enum OSSharedDataType { - OS_SHAREDDATATYPE_FONT_CHINESE = 0, - OS_SHAREDDATATYPE_FONT_KOREAN = 1, - OS_SHAREDDATATYPE_FONT_STANDARD = 2, - OS_SHAREDDATATYPE_FONT_TAIWANESE = 3, - OS_SHAREDDATATYPE_FONT_MAX = 4, + OS_SHAREDDATATYPE_FONT_CHINESE = 0, + OS_SHAREDDATATYPE_FONT_KOREAN = 1, + OS_SHAREDDATATYPE_FONT_STANDARD = 2, + OS_SHAREDDATATYPE_FONT_TAIWANESE = 3, + OS_SHAREDDATATYPE_FONT_MAX = 4, } OSSharedDataType; -BOOL -OSGetSharedData(OSSharedDataType type, - uint32_t unk_r4, - void **outPtr, - uint32_t *outSize); +BOOL OSGetSharedData(OSSharedDataType type, + uint32_t unk_r4, + void **outPtr, + uint32_t *outSize); /** * Moves chunks of memory around, similarly to memmove. Overlapping source and @@ -86,8 +85,7 @@ void * OSAllocFromSystem(uint32_t size, int align); -void -OSFreeToSystem(void *ptr); +void OSFreeToSystem(void *ptr); /** * Gets the location and size of the foreground bucket memory area. @@ -105,9 +103,8 @@ OSFreeToSystem(void *ptr); * \return * \c true on success. */ -BOOL -OSGetForegroundBucket(uint32_t *outAddr, - uint32_t *outSize); +BOOL OSGetForegroundBucket(uint32_t *outAddr, + uint32_t *outSize); /** * Gets the location and size of the application-usable portion of the @@ -122,9 +119,8 @@ OSGetForegroundBucket(uint32_t *outAddr, * \return * \c true on success. */ -BOOL -OSGetForegroundBucketFreeArea(uint32_t *outAddr, - uint32_t *outSize); +BOOL OSGetForegroundBucketFreeArea(uint32_t *outAddr, + uint32_t *outSize); /** * Gets the location and size of available memory areas. @@ -141,17 +137,15 @@ OSGetForegroundBucketFreeArea(uint32_t *outAddr, * \return * 0 on success, -1 otherwise. */ -int -OSGetMemBound(OSMemoryType type, - uint32_t *outAddr, - uint32_t *outSize); +int OSGetMemBound(OSMemoryType type, + uint32_t *outAddr, + uint32_t *outSize); /** * Zeros the memory for a given proccessID. * Works only inside the ROOT process. **/ -void -__OSZeroProcessMemory(uint32_t proccesID); +void __OSZeroProcessMemory(uint32_t proccesID); #ifdef __cplusplus } diff --git a/include/coreinit/memorymap.h b/include/coreinit/memorymap.h index 85eea1886..1515cb673 100644 --- a/include/coreinit/memorymap.h +++ b/include/coreinit/memorymap.h @@ -14,11 +14,11 @@ extern "C" { typedef enum OSMemoryMapMode { - OS_MAP_MEMORY_INVALID = 0, - OS_MAP_MEMORY_READ_ONLY = 1, - OS_MAP_MEMORY_READ_WRITE = 2, - OS_MAP_MEMORY_FREE = 3, - OS_MAP_MEMORY_ALLOCATED = 4, + OS_MAP_MEMORY_INVALID = 0, + OS_MAP_MEMORY_READ_ONLY = 1, + OS_MAP_MEMORY_READ_WRITE = 2, + OS_MAP_MEMORY_FREE = 3, + OS_MAP_MEMORY_ALLOCATED = 4, } OSMemoryMapMode; #define OS_PAGE_SIZE (128 * 1024) @@ -26,13 +26,11 @@ typedef enum OSMemoryMapMode uint32_t OSEffectiveToPhysical(uint32_t virtualAddress); -BOOL -OSIsAddressValid(uint32_t virtualAddress); +BOOL OSIsAddressValid(uint32_t virtualAddress); -BOOL -__OSValidateAddressSpaceRange(int /* unused */, - uint32_t virtualAddress, - uint32_t size); +BOOL __OSValidateAddressSpaceRange(int /* unused */, + uint32_t virtualAddress, + uint32_t size); /** * Allocates virtual address range for later mapping. @@ -71,9 +69,8 @@ OSAllocVirtAddr(uint32_t virtualAddress, * \return * \c true on success. */ -BOOL -OSFreeVirtAddr(uint32_t virtualAddress, - uint32_t size); +BOOL OSFreeVirtAddr(uint32_t virtualAddress, + uint32_t size); /** * Determines the status of the given virtual memory address - mapped read-write @@ -111,11 +108,10 @@ OSQueryVirtAddr(uint32_t virtualAddress); * - OSAllocVirtAddr() * - OSUnmapMemory() */ -BOOL -OSMapMemory(uint32_t virtualAddress, - uint32_t physicalAddress, - uint32_t size, - OSMemoryMapMode mode); +BOOL OSMapMemory(uint32_t virtualAddress, + uint32_t physicalAddress, + uint32_t size, + OSMemoryMapMode mode); /** * Unmaps previously mapped memory. @@ -129,9 +125,8 @@ OSMapMemory(uint32_t virtualAddress, * \return * \c true on success. */ -BOOL -OSUnmapMemory(uint32_t virtualAddress, - uint32_t size); +BOOL OSUnmapMemory(uint32_t virtualAddress, + uint32_t size); /** * Gets the range of virtual addresses available for mapping. @@ -145,9 +140,8 @@ OSUnmapMemory(uint32_t virtualAddress, * \sa * - OSMapMemory() */ -void -OSGetMapVirtAddrRange(uint32_t *outVirtualAddress, - uint32_t *outSize); +void OSGetMapVirtAddrRange(uint32_t *outVirtualAddress, + uint32_t *outSize); /** * Gets the range of available physical memory (not reserved for app code or @@ -164,9 +158,8 @@ OSGetMapVirtAddrRange(uint32_t *outVirtualAddress, * get a straight answer from decaf-emu's kernel_memory.cpp... * \endif */ -void -OSGetAvailPhysAddrRange(uint32_t *outPhysicalAddress, - uint32_t *outSize); +void OSGetAvailPhysAddrRange(uint32_t *outPhysicalAddress, + uint32_t *outSize); /** * Gets the range of physical memory used for the application's data. @@ -181,9 +174,8 @@ OSGetAvailPhysAddrRange(uint32_t *outPhysicalAddress, * does this include the main heap? * \endif */ -void -OSGetDataPhysAddrRange(uint32_t *outPhysicalAddress, - uint32_t *outSize); +void OSGetDataPhysAddrRange(uint32_t *outPhysicalAddress, + uint32_t *outSize); #ifdef __cplusplus } diff --git a/include/coreinit/memunitheap.h b/include/coreinit/memunitheap.h index c1df857bb..1db8c31b4 100644 --- a/include/coreinit/memunitheap.h +++ b/include/coreinit/memunitheap.h @@ -1,6 +1,6 @@ #pragma once -#include #include "memheap.h" +#include /** * \defgroup coreinit_unitheap Unit Heap @@ -46,12 +46,10 @@ MEMDestroyUnitHeap(MEMHeapHandle heap); void * MEMAllocFromUnitHeap(MEMHeapHandle heap); -void -MEMFreeToUnitHeap(MEMHeapHandle heap, - void *block); +void MEMFreeToUnitHeap(MEMHeapHandle heap, + void *block); -void -MEMiDumpUnitHeap(MEMHeapHandle heap); +void MEMiDumpUnitHeap(MEMHeapHandle heap); uint32_t MEMCountFreeBlockForUnitHeap(MEMHeapHandle heap); diff --git a/include/coreinit/messagequeue.h b/include/coreinit/messagequeue.h index 0b0c29200..eb5417ff4 100644 --- a/include/coreinit/messagequeue.h +++ b/include/coreinit/messagequeue.h @@ -1,6 +1,6 @@ #pragma once -#include #include "threadqueue.h" +#include /** * \defgroup coreinit_msgq Message Queue @@ -17,24 +17,24 @@ typedef struct OSMessageQueue OSMessageQueue; typedef enum OSMessageFlags { - OS_MESSAGE_FLAGS_NONE = 0, - OS_MESSAGE_FLAGS_BLOCKING = 1 << 0, - OS_MESSAGE_FLAGS_HIGH_PRIORITY = 1 << 1, + OS_MESSAGE_FLAGS_NONE = 0, + OS_MESSAGE_FLAGS_BLOCKING = 1 << 0, + OS_MESSAGE_FLAGS_HIGH_PRIORITY = 1 << 1, } OSMessageFlags; typedef enum OSFunctionType { - OS_FUNCTION_TYPE_HIO_OPEN = 1, - OS_FUNCTION_TYPE_HIO_READ_ASYNC = 2, - OS_FUNCTION_TYPE_HIO_WRITE_ASYNC = 3, - OS_FUNCTION_TYPE_FSA_CMD_ASYNC = 4, - OS_FUNCTION_TYPE_FSA_PR_CMD_ASYNC = 5, - OS_FUNCTION_TYPE_FSA_PR_CMD_ASYNC_NO_ALLOC = 6, - OS_FUNCTION_TYPE_FSA_ATTACH_EVENT = 7, - OS_FUNCTION_TYPE_FS_CMD_ASYNC = 8, - OS_FUNCTION_TYPE_FS_CMD_HANDLER = 9, - OS_FUNCTION_TYPE_FS_ATTACH_EVENT = 10, - OS_FUNCTION_TYPE_FS_STATE_CHANGE_EVENT = 11, + OS_FUNCTION_TYPE_HIO_OPEN = 1, + OS_FUNCTION_TYPE_HIO_READ_ASYNC = 2, + OS_FUNCTION_TYPE_HIO_WRITE_ASYNC = 3, + OS_FUNCTION_TYPE_FSA_CMD_ASYNC = 4, + OS_FUNCTION_TYPE_FSA_PR_CMD_ASYNC = 5, + OS_FUNCTION_TYPE_FSA_PR_CMD_ASYNC_NO_ALLOC = 6, + OS_FUNCTION_TYPE_FSA_ATTACH_EVENT = 7, + OS_FUNCTION_TYPE_FS_CMD_ASYNC = 8, + OS_FUNCTION_TYPE_FS_CMD_HANDLER = 9, + OS_FUNCTION_TYPE_FS_ATTACH_EVENT = 10, + OS_FUNCTION_TYPE_FS_STATE_CHANGE_EVENT = 11, } OSFunctionType; struct OSMessage @@ -70,30 +70,25 @@ WUT_CHECK_OFFSET(OSMessageQueue, 0x34, first); WUT_CHECK_OFFSET(OSMessageQueue, 0x38, used); WUT_CHECK_SIZE(OSMessageQueue, 0x3c); -void -OSInitMessageQueue(OSMessageQueue *queue, - OSMessage *messages, - int32_t size); - -void -OSInitMessageQueueEx(OSMessageQueue *queue, - OSMessage *messages, - int32_t size, - const char *name); - -BOOL -OSSendMessage(OSMessageQueue *queue, - OSMessage *message, - OSMessageFlags flags); - -BOOL -OSReceiveMessage(OSMessageQueue *queue, - OSMessage *message, - OSMessageFlags flags); - -BOOL -OSPeekMessage(OSMessageQueue *queue, - OSMessage *message); +void OSInitMessageQueue(OSMessageQueue *queue, + OSMessage *messages, + int32_t size); + +void OSInitMessageQueueEx(OSMessageQueue *queue, + OSMessage *messages, + int32_t size, + const char *name); + +BOOL OSSendMessage(OSMessageQueue *queue, + OSMessage *message, + OSMessageFlags flags); + +BOOL OSReceiveMessage(OSMessageQueue *queue, + OSMessage *message, + OSMessageFlags flags); + +BOOL OSPeekMessage(OSMessageQueue *queue, + OSMessage *message); OSMessageQueue * OSGetSystemMessageQueue(); diff --git a/include/coreinit/mutex.h b/include/coreinit/mutex.h index 043b0a42f..4617e4eed 100644 --- a/include/coreinit/mutex.h +++ b/include/coreinit/mutex.h @@ -1,6 +1,6 @@ #pragma once -#include #include "threadqueue.h" +#include /** * \defgroup coreinit_mutex Mutex @@ -66,16 +66,14 @@ WUT_CHECK_SIZE(OSMutex, 0x2c); /** * Initialise a mutex structure. */ -void -OSInitMutex(OSMutex *mutex); +void OSInitMutex(OSMutex *mutex); /** * Initialise a mutex structure with a name. */ -void -OSInitMutexEx(OSMutex *mutex, - const char *name); +void OSInitMutexEx(OSMutex *mutex, + const char *name); /** @@ -90,8 +88,7 @@ OSInitMutexEx(OSMutex *mutex, * * Similar to std::recursive_mutex::lock. */ -void -OSLockMutex(OSMutex *mutex); +void OSLockMutex(OSMutex *mutex); /** @@ -107,8 +104,7 @@ OSLockMutex(OSMutex *mutex); * * Similar to std::recursive_mutex::try_lock. */ -BOOL -OSTryLockMutex(OSMutex *mutex); +BOOL OSTryLockMutex(OSMutex *mutex); /** @@ -121,8 +117,7 @@ OSTryLockMutex(OSMutex *mutex); * * Similar to std::recursive_mutex::unlock. */ -void -OSUnlockMutex(OSMutex *mutex); +void OSUnlockMutex(OSMutex *mutex); #ifdef __cplusplus diff --git a/include/coreinit/rendezvous.h b/include/coreinit/rendezvous.h index 87e1a7f2c..a6187e9fb 100644 --- a/include/coreinit/rendezvous.h +++ b/include/coreinit/rendezvous.h @@ -21,17 +21,14 @@ struct OSRendezvous WUT_CHECK_OFFSET(OSRendezvous, 0x00, core); WUT_CHECK_SIZE(OSRendezvous, 0x10); -void -OSInitRendezvous(OSRendezvous *rendezvous); +void OSInitRendezvous(OSRendezvous *rendezvous); -BOOL -OSWaitRendezvous(OSRendezvous *rendezvous, - uint32_t coreMask); +BOOL OSWaitRendezvous(OSRendezvous *rendezvous, + uint32_t coreMask); -BOOL -OSWaitRendezvousWithTimeout(OSRendezvous *rendezvous, - uint32_t coreMask, - OSTime timeout); +BOOL OSWaitRendezvousWithTimeout(OSRendezvous *rendezvous, + uint32_t coreMask, + OSTime timeout); #ifdef __cplusplus } diff --git a/include/coreinit/scheduler.h b/include/coreinit/scheduler.h index 488fc4725..6d2b3d39f 100644 --- a/include/coreinit/scheduler.h +++ b/include/coreinit/scheduler.h @@ -11,28 +11,21 @@ extern "C" { #endif -extern void* __OSSchedulerLock; +extern void *__OSSchedulerLock; -void -__OSEnableScheduler(); +void __OSEnableScheduler(); -void -__OSDisableScheduler(); +void __OSDisableScheduler(); -void -__OSLockScheduler(void* lockId); +void __OSLockScheduler(void *lockId); -void -__OSUnlockScheduler(void* lockId); +void __OSUnlockScheduler(void *lockId); -BOOL -OSIsSchedulerLocked(void* lockId); +BOOL OSIsSchedulerLocked(void *lockId); -void -__OSTryLockScheduler(void* lockId); - -void -__OSTouchSchedulerLock(); +void __OSTryLockScheduler(void *lockId); + +void __OSTouchSchedulerLock(); #ifdef __cplusplus } diff --git a/include/coreinit/screen.h b/include/coreinit/screen.h index 421f3c117..f1e6e661c 100644 --- a/include/coreinit/screen.h +++ b/include/coreinit/screen.h @@ -44,9 +44,9 @@ extern "C" { typedef enum OSScreenID { //! Represents the TV connected to the system. - SCREEN_TV = 0, + SCREEN_TV = 0, //! Represents the screen in the DRC (gamepad). - SCREEN_DRC = 1, + SCREEN_DRC = 1, } OSScreenID; /** @@ -59,8 +59,7 @@ typedef enum OSScreenID *
  • \link OSScreenShutdown \endlink
    • * */ -void -OSScreenInit(); +void OSScreenInit(); /** * Cleans up and shuts down the OSScreen library. @@ -69,8 +68,7 @@ OSScreenInit(); *
  • \link OSScreenEnableEx \endlink
    • * */ -void -OSScreenShutdown(); +void OSScreenShutdown(); /** * Gets the amount of memory required to fit both buffers of a given screen. @@ -101,9 +99,8 @@ OSScreenGetBufferSizeEx(OSScreenID screen); *
  • \link OSScreenGetBufferSizeEx \endlink
    • * */ -void -OSScreenSetBufferEx(OSScreenID screen, - void *addr); +void OSScreenSetBufferEx(OSScreenID screen, + void *addr); /** * Clear the work buffer of the given screen by setting all of its pixels to @@ -128,9 +125,8 @@ OSScreenSetBufferEx(OSScreenID screen, * */ -void -OSScreenClearBufferEx(OSScreenID screen, - uint32_t colour); +void OSScreenClearBufferEx(OSScreenID screen, + uint32_t colour); /** * Swap the buffers of the given screen. The work buffer will become the visible @@ -143,8 +139,7 @@ OSScreenClearBufferEx(OSScreenID screen, * \param screen * The ID of the screen to flip. */ -void -OSScreenFlipBuffersEx(OSScreenID screen); +void OSScreenFlipBuffersEx(OSScreenID screen); /** * Draws text at the given position. The text will be drawn to the work @@ -174,11 +169,10 @@ OSScreenFlipBuffersEx(OSScreenID screen); *
  • \link OSScreenClearBufferEx \endlink
    • * */ -void -OSScreenPutFontEx(OSScreenID screen, - uint32_t row, - uint32_t column, - const char *buffer); +void OSScreenPutFontEx(OSScreenID screen, + uint32_t row, + uint32_t column, + const char *buffer); /** * Draws a single pixel at the given position. The pixel, a 32-bit RGBX @@ -206,11 +200,10 @@ OSScreenPutFontEx(OSScreenID screen, *
  • \link OSScreenClearBufferEx \endlink
    • * */ -void -OSScreenPutPixelEx(OSScreenID screen, - uint32_t x, - uint32_t y, - uint32_t colour); +void OSScreenPutPixelEx(OSScreenID screen, + uint32_t x, + uint32_t y, + uint32_t colour); /** * Enables or disables a given screen. If a screen is disabled, it shows black. @@ -221,9 +214,8 @@ OSScreenPutPixelEx(OSScreenID screen, * \param enable * \c true if the screen should be enabled, otherwise false. */ -void -OSScreenEnableEx(OSScreenID screen, - BOOL enable); +void OSScreenEnableEx(OSScreenID screen, + BOOL enable); #ifdef __cplusplus } diff --git a/include/coreinit/semaphore.h b/include/coreinit/semaphore.h index 29d7bfb97..6d33d3d90 100644 --- a/include/coreinit/semaphore.h +++ b/include/coreinit/semaphore.h @@ -1,6 +1,6 @@ #pragma once -#include #include "threadqueue.h" +#include /** * \defgroup coreinit_semaphore Semaphore @@ -44,18 +44,16 @@ WUT_CHECK_SIZE(OSSemaphore, 0x20); /** * Initialise semaphore object with count. */ -void -OSInitSemaphore(OSSemaphore *semaphore, - int32_t count); +void OSInitSemaphore(OSSemaphore *semaphore, + int32_t count); /** * Initialise semaphore object with count and name. */ -void -OSInitSemaphoreEx(OSSemaphore *semaphore, - int32_t count, - const char *name); +void OSInitSemaphoreEx(OSSemaphore *semaphore, + int32_t count, + const char *name); /** diff --git a/include/coreinit/spinlock.h b/include/coreinit/spinlock.h index b24fa5249..72ba5e83f 100644 --- a/include/coreinit/spinlock.h +++ b/include/coreinit/spinlock.h @@ -1,6 +1,6 @@ #pragma once -#include #include "time.h" +#include /** * \defgroup coreinit_spinlock Spinlock @@ -25,34 +25,25 @@ WUT_CHECK_OFFSET(OSSpinLock, 0x0, owner); WUT_CHECK_OFFSET(OSSpinLock, 0x8, recursion); WUT_CHECK_SIZE(OSSpinLock, 0x10); -void -OSInitSpinLock(OSSpinLock *spinlock); +void OSInitSpinLock(OSSpinLock *spinlock); -BOOL -OSAcquireSpinLock(OSSpinLock *spinlock); +BOOL OSAcquireSpinLock(OSSpinLock *spinlock); -BOOL -OSTryAcquireSpinLock(OSSpinLock *spinlock); +BOOL OSTryAcquireSpinLock(OSSpinLock *spinlock); -BOOL -OSTryAcquireSpinLockWithTimeout(OSSpinLock *spinlock, - OSTime timeout); +BOOL OSTryAcquireSpinLockWithTimeout(OSSpinLock *spinlock, + OSTime timeout); -BOOL -OSReleaseSpinLock(OSSpinLock *spinlock); +BOOL OSReleaseSpinLock(OSSpinLock *spinlock); -BOOL -OSUninterruptibleSpinLock_Acquire(OSSpinLock *spinlock); +BOOL OSUninterruptibleSpinLock_Acquire(OSSpinLock *spinlock); -BOOL -OSUninterruptibleSpinLock_TryAcquire(OSSpinLock *spinlock); +BOOL OSUninterruptibleSpinLock_TryAcquire(OSSpinLock *spinlock); -BOOL -OSUninterruptibleSpinLock_TryAcquireWithTimeout(OSSpinLock *spinlock, - OSTime timeout); +BOOL OSUninterruptibleSpinLock_TryAcquireWithTimeout(OSSpinLock *spinlock, + OSTime timeout); -BOOL -OSUninterruptibleSpinLock_Release(OSSpinLock *spinlock); +BOOL OSUninterruptibleSpinLock_Release(OSSpinLock *spinlock); #ifdef __cplusplus } diff --git a/include/coreinit/systeminfo.h b/include/coreinit/systeminfo.h index 7c4dc37a2..ac6021ac8 100644 --- a/include/coreinit/systeminfo.h +++ b/include/coreinit/systeminfo.h @@ -28,11 +28,9 @@ WUT_CHECK_SIZE(OSSystemInfo, 0x20); OSSystemInfo * OSGetSystemInfo(); -BOOL -OSEnableHomeButtonMenu(BOOL enable); +BOOL OSEnableHomeButtonMenu(BOOL enable); -BOOL -OSIsHomeButtonMenuEnabled(); +BOOL OSIsHomeButtonMenuEnabled(); uint64_t OSGetOSID(); diff --git a/include/coreinit/taskqueue.h b/include/coreinit/taskqueue.h index 374cfdd3b..db51f9656 100644 --- a/include/coreinit/taskqueue.h +++ b/include/coreinit/taskqueue.h @@ -1,6 +1,6 @@ #pragma once -#include #include "time.h" +#include /** * \defgroup coreinit_taskq Task Queue @@ -21,19 +21,19 @@ typedef uint32_t (*MPTaskFunc)(uint32_t, uint32_t); typedef enum MPTaskState { - MP_TASK_STATE_INITIALISED = 1 << 0, - MP_TASK_STATE_READY = 1 << 1, - MP_TASK_STATE_RUNNING = 1 << 2, - MP_TASK_STATE_FINISHED = 1 << 3, + MP_TASK_STATE_INITIALISED = 1 << 0, + MP_TASK_STATE_READY = 1 << 1, + MP_TASK_STATE_RUNNING = 1 << 2, + MP_TASK_STATE_FINISHED = 1 << 3, } MPTaskState; typedef enum MPTaskQueueState { - MP_TASK_QUEUE_STATE_INITIALISED = 1 << 0, - MP_TASK_QUEUE_STATE_READY = 1 << 1, - MP_TASK_QUEUE_STATE_STOPPING = 1 << 2, - MP_TASK_QUEUE_STATE_STOPPED = 1 << 3, - MP_TASK_QUEUE_STATE_FINISHED = 1 << 4, + MP_TASK_QUEUE_STATE_INITIALISED = 1 << 0, + MP_TASK_QUEUE_STATE_READY = 1 << 1, + MP_TASK_QUEUE_STATE_STOPPING = 1 << 2, + MP_TASK_QUEUE_STATE_STOPPED = 1 << 3, + MP_TASK_QUEUE_STATE_FINISHED = 1 << 4, } MPTaskQueueState; #pragma pack(push, 1) @@ -124,30 +124,23 @@ WUT_CHECK_OFFSET(MPTaskQueue, 0x3C, queueMaxSize); WUT_CHECK_OFFSET(MPTaskQueue, 0x40, lock); WUT_CHECK_SIZE(MPTaskQueue, 0x50); -void -MPInitTaskQ(MPTaskQueue *queue, - MPTask **queueBuffer, - uint32_t queueBufferLen); +void MPInitTaskQ(MPTaskQueue *queue, + MPTask **queueBuffer, + uint32_t queueBufferLen); -BOOL -MPTermTaskQ(MPTaskQueue *queue); +BOOL MPTermTaskQ(MPTaskQueue *queue); -BOOL -MPGetTaskQInfo(MPTaskQueue *queue, - MPTaskQueueInfo *info); +BOOL MPGetTaskQInfo(MPTaskQueue *queue, + MPTaskQueueInfo *info); -BOOL -MPStartTaskQ(MPTaskQueue *queue); +BOOL MPStartTaskQ(MPTaskQueue *queue); -BOOL -MPStopTaskQ(MPTaskQueue *queue); +BOOL MPStopTaskQ(MPTaskQueue *queue); -BOOL -MPResetTaskQ(MPTaskQueue *queue); +BOOL MPResetTaskQ(MPTaskQueue *queue); -BOOL -MPEnqueTask(MPTaskQueue *queue, - MPTask *task); +BOOL MPEnqueTask(MPTaskQueue *queue, + MPTask *task); MPTask * MPDequeTask(MPTaskQueue *queue); @@ -157,45 +150,36 @@ MPDequeTasks(MPTaskQueue *queue, MPTask **queueBuffer, uint32_t queueBufferLen); -BOOL -MPWaitTaskQ(MPTaskQueue *queue, - MPTaskQueueState mask); +BOOL MPWaitTaskQ(MPTaskQueue *queue, + MPTaskQueueState mask); -BOOL -MPWaitTaskQWithTimeout(MPTaskQueue *queue, - MPTaskQueueState wmask, - OSTime timeout); +BOOL MPWaitTaskQWithTimeout(MPTaskQueue *queue, + MPTaskQueueState wmask, + OSTime timeout); -BOOL -MPPrintTaskQStats(MPTaskQueue *queue, - uint32_t unk); +BOOL MPPrintTaskQStats(MPTaskQueue *queue, + uint32_t unk); -void -MPInitTask(MPTask *task, - MPTaskFunc func, - uint32_t userArg1, - uint32_t userArg2); +void MPInitTask(MPTask *task, + MPTaskFunc func, + uint32_t userArg1, + uint32_t userArg2); -BOOL -MPTermTask(MPTask* task); +BOOL MPTermTask(MPTask *task); -BOOL -MPGetTaskInfo(MPTask *task, - MPTaskInfo *info); +BOOL MPGetTaskInfo(MPTask *task, + MPTaskInfo *info); void * MPGetTaskUserData(MPTask *task); -void -MPSetTaskUserData(MPTask *task, - void *userData); +void MPSetTaskUserData(MPTask *task, + void *userData); -BOOL -MPRunTasksFromTaskQ(MPTaskQueue *queue, - uint32_t count); +BOOL MPRunTasksFromTaskQ(MPTaskQueue *queue, + uint32_t count); -BOOL -MPRunTask(MPTask *task); +BOOL MPRunTask(MPTask *task); #ifdef __cplusplus } diff --git a/include/coreinit/thread.h b/include/coreinit/thread.h index e83e86cdf..d8a83a2b9 100644 --- a/include/coreinit/thread.h +++ b/include/coreinit/thread.h @@ -1,8 +1,8 @@ #pragma once -#include #include "context.h" -#include "time.h" #include "threadqueue.h" +#include "time.h" +#include /** * \defgroup coreinit_thread Thread @@ -51,47 +51,47 @@ typedef void (*OSThreadDeallocatorFn)(OSThread *thread, void *stack); enum OS_THREAD_STATE { - OS_THREAD_STATE_NONE = 0, + OS_THREAD_STATE_NONE = 0, //! Thread is ready to run - OS_THREAD_STATE_READY = 1 << 0, + OS_THREAD_STATE_READY = 1 << 0, //! Thread is running - OS_THREAD_STATE_RUNNING = 1 << 1, + OS_THREAD_STATE_RUNNING = 1 << 1, //! Thread is waiting, i.e. on a mutex - OS_THREAD_STATE_WAITING = 1 << 2, + OS_THREAD_STATE_WAITING = 1 << 2, //! Thread is about to terminate - OS_THREAD_STATE_MORIBUND = 1 << 3, + OS_THREAD_STATE_MORIBUND = 1 << 3, }; enum OS_THREAD_REQUEST { - OS_THREAD_REQUEST_NONE = 0, - OS_THREAD_REQUEST_SUSPEND = 1, - OS_THREAD_REQUEST_CANCEL = 2, + OS_THREAD_REQUEST_NONE = 0, + OS_THREAD_REQUEST_SUSPEND = 1, + OS_THREAD_REQUEST_CANCEL = 2, }; enum OS_THREAD_ATTRIB { //! Allow the thread to run on CPU0. - OS_THREAD_ATTRIB_AFFINITY_CPU0 = 1 << 0, + OS_THREAD_ATTRIB_AFFINITY_CPU0 = 1 << 0, //! Allow the thread to run on CPU1. - OS_THREAD_ATTRIB_AFFINITY_CPU1 = 1 << 1, + OS_THREAD_ATTRIB_AFFINITY_CPU1 = 1 << 1, //! Allow the thread to run on CPU2. - OS_THREAD_ATTRIB_AFFINITY_CPU2 = 1 << 2, + OS_THREAD_ATTRIB_AFFINITY_CPU2 = 1 << 2, //! Allow the thread to run any CPU. - OS_THREAD_ATTRIB_AFFINITY_ANY = ((1 << 0) | (1 << 1) | (1 << 2)), + OS_THREAD_ATTRIB_AFFINITY_ANY = ((1 << 0) | (1 << 1) | (1 << 2)), //! Start the thread detached. - OS_THREAD_ATTRIB_DETACHED = 1 << 3, + OS_THREAD_ATTRIB_DETACHED = 1 << 3, //! Enables tracking of stack usage. - OS_THREAD_ATTRIB_STACK_USAGE = 1 << 5 + OS_THREAD_ATTRIB_STACK_USAGE = 1 << 5 }; struct OSMutexQueue @@ -249,8 +249,7 @@ WUT_CHECK_SIZE(OSThread, 0x6a0); * This sets the threads requestFlag to OS_THREAD_REQUEST_CANCEL, the thread will * be terminated next time OSTestThreadCancel is called. */ -void -OSCancelThread(OSThread *thread); +void OSCancelThread(OSThread *thread); /** @@ -270,15 +269,13 @@ OSCheckThreadStackUsage(OSThread *thread); /** * Disable tracking of thread stack usage */ -void -OSClearThreadStackUsage(OSThread *thread); +void OSClearThreadStackUsage(OSThread *thread); /** * Clears a thread's suspend counter and resumes it. */ -void -OSContinueThread(OSThread *thread); +void OSContinueThread(OSThread *thread); /** @@ -293,22 +290,20 @@ OSContinueThread(OSThread *thread); * \param priority Thread priority, 0 is highest priorty, 31 is lowest. * \param attributes Thread attributes, see OSThreadAttributes. */ -BOOL -OSCreateThread(OSThread *thread, - OSThreadEntryPointFn entry, - int32_t argc, - char *argv, - void *stack, - uint32_t stackSize, - int32_t priority, - OSThreadAttributes attributes); +BOOL OSCreateThread(OSThread *thread, + OSThreadEntryPointFn entry, + int32_t argc, + char *argv, + void *stack, + uint32_t stackSize, + int32_t priority, + OSThreadAttributes attributes); /** * Detach thread. */ -void -OSDetachThread(OSThread *thread); +void OSDetachThread(OSThread *thread); /** @@ -316,16 +311,14 @@ OSDetachThread(OSThread *thread); * * This function is implicitly called when the thread entry point returns. */ -void -OSExitThread(int32_t result); +void OSExitThread(int32_t result); /** * Get the next and previous thread in the thread's active queue. */ -void -OSGetActiveThreadLink(OSThread *thread, - OSThreadLink *link); +void OSGetActiveThreadLink(OSThread *thread, + OSThreadLink *link); /** @@ -384,15 +377,13 @@ OSGetThreadSpecific(uint32_t id); /** * Returns TRUE if a thread is suspended. */ -BOOL -OSIsThreadSuspended(OSThread *thread); +BOOL OSIsThreadSuspended(OSThread *thread); /** * Returns TRUE if a thread is terminated. */ -BOOL -OSIsThreadTerminated(OSThread *thread); +BOOL OSIsThreadTerminated(OSThread *thread); /** @@ -404,9 +395,8 @@ OSIsThreadTerminated(OSThread *thread); * \param threadResult Pointer to store thread exit value in. * \returns Returns TRUE if thread has terminated, FALSE if thread is detached. */ -BOOL -OSJoinThread(OSThread *thread, - int *threadResult); +BOOL OSJoinThread(OSThread *thread, + int *threadResult); /** @@ -426,19 +416,17 @@ OSResumeThread(OSThread *thread); * * Can only be used on idle threads. */ -BOOL -OSRunThread(OSThread *thread, - OSThreadEntryPointFn entry, - int argc, - const char **argv); +BOOL OSRunThread(OSThread *thread, + OSThreadEntryPointFn entry, + int argc, + const char **argv); /** * Set a thread's affinity. */ -BOOL -OSSetThreadAffinity(OSThread *thread, - uint32_t affinity); +BOOL OSSetThreadAffinity(OSThread *thread, + uint32_t affinity); /** @@ -447,8 +435,7 @@ OSSetThreadAffinity(OSThread *thread, * If the state is TRUE then the thread can be suspended or cancelled when * OSTestThreadCancel is called. */ -BOOL -OSSetThreadCancelState(BOOL state); +BOOL OSSetThreadCancelState(BOOL state); /** @@ -470,17 +457,15 @@ OSSetThreadDeallocator(OSThread *thread, /** * Set a thread's name. */ -void -OSSetThreadName(OSThread *thread, - const char *name); +void OSSetThreadName(OSThread *thread, + const char *name); /** * Set a thread's priority. */ -BOOL -OSSetThreadPriority(OSThread *thread, - int32_t priority); +BOOL OSSetThreadPriority(OSThread *thread, + int32_t priority); /** @@ -489,25 +474,22 @@ OSSetThreadPriority(OSThread *thread, * This is the maximum amount of time the thread can run for before being forced * to yield. */ -BOOL -OSSetThreadRunQuantum(OSThread *thread, - uint32_t quantum); +BOOL OSSetThreadRunQuantum(OSThread *thread, + uint32_t quantum); /** * Set a thread specific value. * * Can be read with OSGetThreadSpecific. */ -void -OSSetThreadSpecific(uint32_t id, - void *value); +void OSSetThreadSpecific(uint32_t id, + void *value); /** * Set thread stack usage tracking. */ -BOOL -OSSetThreadStackUsage(OSThread *thread); +BOOL OSSetThreadStackUsage(OSThread *thread); /** @@ -515,15 +497,13 @@ OSSetThreadStackUsage(OSThread *thread); * * Will sleep until the thread queue is woken with OSWakeupThread. */ -void -OSSleepThread(OSThreadQueue *queue); +void OSSleepThread(OSThreadQueue *queue); /** * Sleep the current thread for a period of time. */ -void -OSSleepTicks(OSTime ticks); +void OSSleepTicks(OSTime ticks); /** @@ -551,8 +531,7 @@ OSSuspendThread(OSThread *thread); * - OSReleaseSpinLock * - OSCancelThread */ -void -OSTestThreadCancel(); +void OSTestThreadCancel(); /** @@ -560,8 +539,7 @@ OSTestThreadCancel(); * * Clears the thread queue. */ -void -OSWakeupThread(OSThreadQueue *queue); +void OSWakeupThread(OSThreadQueue *queue); /** @@ -570,8 +548,7 @@ OSWakeupThread(OSThreadQueue *queue); * This will never switch to a thread with a lower priority than the current * thread. */ -void -OSYieldThread(); +void OSYieldThread(); #ifdef __cplusplus diff --git a/include/coreinit/threadqueue.h b/include/coreinit/threadqueue.h index 6e4fac9df..ffd98c3f5 100644 --- a/include/coreinit/threadqueue.h +++ b/include/coreinit/threadqueue.h @@ -47,12 +47,10 @@ WUT_CHECK_OFFSET(OSThreadSimpleQueue, 0x00, head); WUT_CHECK_OFFSET(OSThreadSimpleQueue, 0x04, tail); WUT_CHECK_SIZE(OSThreadSimpleQueue, 0x08); -void -OSInitThreadQueue(OSThreadQueue *queue); +void OSInitThreadQueue(OSThreadQueue *queue); -void -OSInitThreadQueueEx(OSThreadQueue *queue, - void *parent); +void OSInitThreadQueueEx(OSThreadQueue *queue, + void *parent); #ifdef __cplusplus } diff --git a/include/coreinit/time.h b/include/coreinit/time.h index d5915974f..133745763 100644 --- a/include/coreinit/time.h +++ b/include/coreinit/time.h @@ -1,6 +1,6 @@ #pragma once -#include #include "systeminfo.h" +#include /** * \defgroup coreinit_time Time @@ -53,17 +53,17 @@ WUT_CHECK_OFFSET(OSCalendarTime, 0x20, tm_msec); WUT_CHECK_OFFSET(OSCalendarTime, 0x24, tm_usec); WUT_CHECK_SIZE(OSCalendarTime, 0x28); -#define OSTimerClockSpeed ((OSGetSystemInfo()->busClockSpeed) / 4) +#define OSTimerClockSpeed ((OSGetSystemInfo()->busClockSpeed) / 4) -#define OSSecondsToTicks(val) ((uint64_t)(val) * (uint64_t)OSTimerClockSpeed) -#define OSMillisecondsToTicks(val) (((uint64_t)(val) * (uint64_t)OSTimerClockSpeed) / 1000ull) -#define OSMicrosecondsToTicks(val) (((uint64_t)(val) * (uint64_t)OSTimerClockSpeed) / 1000000ull) -#define OSNanosecondsToTicks(val) (((uint64_t)(val) * ((uint64_t)OSTimerClockSpeed) / 31250ull) / 32000ull) +#define OSSecondsToTicks(val) ((uint64_t) (val) * (uint64_t) OSTimerClockSpeed) +#define OSMillisecondsToTicks(val) (((uint64_t) (val) * (uint64_t) OSTimerClockSpeed) / 1000ull) +#define OSMicrosecondsToTicks(val) (((uint64_t) (val) * (uint64_t) OSTimerClockSpeed) / 1000000ull) +#define OSNanosecondsToTicks(val) (((uint64_t) (val) * ((uint64_t) OSTimerClockSpeed) / 31250ull) / 32000ull) -#define OSTicksToSeconds(val) ((uint64_t)(val) / (uint64_t)OSTimerClockSpeed) -#define OSTicksToMilliseconds(val) (((uint64_t)(val) * 1000ull) / (uint64_t)OSTimerClockSpeed) -#define OSTicksToMicroseconds(val) (((uint64_t)(val) * 1000000ull) / (uint64_t)OSTimerClockSpeed) -#define OSTicksToNanoseconds(val) (((uint64_t)(val) * 32000ull) / ((uint64_t)OSTimerClockSpeed / 31250ull)) +#define OSTicksToSeconds(val) ((uint64_t) (val) / (uint64_t) OSTimerClockSpeed) +#define OSTicksToMilliseconds(val) (((uint64_t) (val) *1000ull) / (uint64_t) OSTimerClockSpeed) +#define OSTicksToMicroseconds(val) (((uint64_t) (val) *1000000ull) / (uint64_t) OSTimerClockSpeed) +#define OSTicksToNanoseconds(val) (((uint64_t) (val) *32000ull) / ((uint64_t) OSTimerClockSpeed / 31250ull)) OSTime OSGetTime(); @@ -80,9 +80,8 @@ OSGetSystemTick(); OSTime OSCalendarTimeToTicks(OSCalendarTime *calendarTime); -void -OSTicksToCalendarTime(OSTime time, - OSCalendarTime *calendarTime); +void OSTicksToCalendarTime(OSTime time, + OSCalendarTime *calendarTime); #ifdef __cplusplus } diff --git a/include/coreinit/title.h b/include/coreinit/title.h index a0787d41e..b5c9a6fa6 100644 --- a/include/coreinit/title.h +++ b/include/coreinit/title.h @@ -11,7 +11,8 @@ extern "C" { #endif -uint64_t OSGetTitleID(void); +uint64_t +OSGetTitleID(void); #ifdef __cplusplus } diff --git a/include/coreinit/userconfig.h b/include/coreinit/userconfig.h index ac73af181..c07f70ffe 100644 --- a/include/coreinit/userconfig.h +++ b/include/coreinit/userconfig.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup coreinit_userconfig User Config @@ -19,75 +19,75 @@ typedef struct UCAsyncParams UCAsyncParams; typedef enum UCCommand { - UC_CMD_READ_SYS_CONFIG = 0x30, - UC_CMD_WRITE_SYS_CONFIG = 0x31, - UC_CMD_DELETE_SYS_CONFIG = 0x32, - UC_CMD_QUERY_SYS_CONFIG = 0x33, - UC_CMD_LIST_SYS_CONFIG = 0x34, + UC_CMD_READ_SYS_CONFIG = 0x30, + UC_CMD_WRITE_SYS_CONFIG = 0x31, + UC_CMD_DELETE_SYS_CONFIG = 0x32, + UC_CMD_QUERY_SYS_CONFIG = 0x33, + UC_CMD_LIST_SYS_CONFIG = 0x34, } UCCommand; typedef enum UCDataType { - UC_DATATYPE_UNDEFINED = 0x00, - UC_DATATYPE_UNSIGNED_BYTE = 0x01, - UC_DATATYPE_UNSIGNED_SHORT = 0x02, - UC_DATATYPE_UNSIGNED_INT = 0x03, - UC_DATATYPE_SIGNED_INT = 0x04, - UC_DATATYPE_FLOAT = 0x05, - UC_DATATYPE_STRING = 0x06, - UC_DATATYPE_HEXBINARY = 0x07, - UC_DATATYPE_COMPLEX = 0x08, - UC_DATATYPE_INVALID = 0xFF, + UC_DATATYPE_UNDEFINED = 0x00, + UC_DATATYPE_UNSIGNED_BYTE = 0x01, + UC_DATATYPE_UNSIGNED_SHORT = 0x02, + UC_DATATYPE_UNSIGNED_INT = 0x03, + UC_DATATYPE_SIGNED_INT = 0x04, + UC_DATATYPE_FLOAT = 0x05, + UC_DATATYPE_STRING = 0x06, + UC_DATATYPE_HEXBINARY = 0x07, + UC_DATATYPE_COMPLEX = 0x08, + UC_DATATYPE_INVALID = 0xFF, } UCDataType; typedef enum UCErrors { - UC_ERROR_OK = 0, - UC_ERROR_ERROR = -1, - UC_ERROR_OTHER = -0x200001, - UC_ERROR_SYSTEM = -0x200002, - UC_ERROR_ALLOC = -0x200003, - UC_ERROR_OPCODE = -0x200004, - UC_ERROR_INVALID_PARAM = -0x200005, - UC_ERROR_INVALID_TYPE = -0x200006, - UC_ERROR_UNSUPPORTED = -0x200007, - UC_ERROR_NON_LEAF_NODE = -0x200008, - UC_ERROR_KEY_NOT_FOUND = -0x200009, - UC_ERROR_MODIFY = -0x20000A, - UC_ERROR_STRING_TOO_LONG = -0x20000B, - UC_ERROR_ROOT_KEYS_DIFFER = -0x20000C, - UC_ERROR_INVALID_LOCATION = -0x20000D, - UC_ERROR_BAD_COMMENT = -0x20000E, - UC_ERROR_READ_ACCESS = -0x20000F, - UC_ERROR_WRITE_ACCESS = -0x200010, - UC_ERROR_CREATE_ACCESS = -0x200011, - UC_ERROR_FILE_SYS_NAME = -0x200012, - UC_ERROR_FILE_SYS_INIT = -0x200013, - UC_ERROR_FILE_SYS_MOUNT = -0x200014, - UC_ERROR_FILE_OPEN = -0x200015, - UC_ERROR_FILE_STAT = -0x200016, - UC_ERROR_FILE_READ = -0x200017, - UC_ERROR_FILE_WRITE = -0x200018, - UC_ERROR_FILE_TOO_BIG = -0x200019, - UC_ERROR_FILE_REMOVE = -0x20001A, - UC_ERROR_FILE_RENAME = -0x20001B, - UC_ERROR_FILE_CLOSE = -0x20001C, - UC_ERROR_FILE_SEEK = -0x20001D, - UC_ERROR_FILE_CONFIRM = -0x20001E, - UC_ERROR_FILE_BACKUP = -0x20001F, - UC_ERROR_MALFORMED_XML = -0x200020, - UC_ERROR_VERSION = -0x200021, - UC_ERROR_NO_IPC_BUFFERS = -0x200022, - UC_ERROR_FILE_LOCK_NEEDED = -0x200024, - UC_ERROR_SYS_PROT = -0x200028, + UC_ERROR_OK = 0, + UC_ERROR_ERROR = -1, + UC_ERROR_OTHER = -0x200001, + UC_ERROR_SYSTEM = -0x200002, + UC_ERROR_ALLOC = -0x200003, + UC_ERROR_OPCODE = -0x200004, + UC_ERROR_INVALID_PARAM = -0x200005, + UC_ERROR_INVALID_TYPE = -0x200006, + UC_ERROR_UNSUPPORTED = -0x200007, + UC_ERROR_NON_LEAF_NODE = -0x200008, + UC_ERROR_KEY_NOT_FOUND = -0x200009, + UC_ERROR_MODIFY = -0x20000A, + UC_ERROR_STRING_TOO_LONG = -0x20000B, + UC_ERROR_ROOT_KEYS_DIFFER = -0x20000C, + UC_ERROR_INVALID_LOCATION = -0x20000D, + UC_ERROR_BAD_COMMENT = -0x20000E, + UC_ERROR_READ_ACCESS = -0x20000F, + UC_ERROR_WRITE_ACCESS = -0x200010, + UC_ERROR_CREATE_ACCESS = -0x200011, + UC_ERROR_FILE_SYS_NAME = -0x200012, + UC_ERROR_FILE_SYS_INIT = -0x200013, + UC_ERROR_FILE_SYS_MOUNT = -0x200014, + UC_ERROR_FILE_OPEN = -0x200015, + UC_ERROR_FILE_STAT = -0x200016, + UC_ERROR_FILE_READ = -0x200017, + UC_ERROR_FILE_WRITE = -0x200018, + UC_ERROR_FILE_TOO_BIG = -0x200019, + UC_ERROR_FILE_REMOVE = -0x20001A, + UC_ERROR_FILE_RENAME = -0x20001B, + UC_ERROR_FILE_CLOSE = -0x20001C, + UC_ERROR_FILE_SEEK = -0x20001D, + UC_ERROR_FILE_CONFIRM = -0x20001E, + UC_ERROR_FILE_BACKUP = -0x20001F, + UC_ERROR_MALFORMED_XML = -0x200020, + UC_ERROR_VERSION = -0x200021, + UC_ERROR_NO_IPC_BUFFERS = -0x200022, + UC_ERROR_FILE_LOCK_NEEDED = -0x200024, + UC_ERROR_SYS_PROT = -0x200028, } UCErrors; typedef enum UCFileSys { - UC_FILE_SYS_INVALID = 0x00, - UC_FILE_SYS_SYS = 0x01, - UC_FILE_SYS_SLC = 0x02, - UC_FILE_SYS_RAM = 0x03, + UC_FILE_SYS_INVALID = 0x00, + UC_FILE_SYS_SYS = 0x01, + UC_FILE_SYS_SLC = 0x02, + UC_FILE_SYS_RAM = 0x03, } UCFileSys; #pragma pack(push, 1) @@ -117,13 +117,13 @@ typedef void (*UCAsyncCallbackFn)(UCError result, #pragma pack(push, 1) struct UCAsyncParams { - UCAsyncCallbackFn callback; - void *context; - UCCommand command; - uint32_t unk0x0C; - uint32_t count; - UCSysConfig *settings; - IOSVec *vecs; + UCAsyncCallbackFn callback; + void *context; + UCCommand command; + uint32_t unk0x0C; + uint32_t count; + UCSysConfig *settings; + IOSVec *vecs; }; #pragma pack(pop) WUT_CHECK_OFFSET(UCAsyncParams, 0x00, callback); diff --git a/include/dmae/mem.h b/include/dmae/mem.h index ec8c0d96f..e92d44506 100644 --- a/include/dmae/mem.h +++ b/include/dmae/mem.h @@ -1,6 +1,6 @@ #pragma once -#include #include "sync.h" +#include /** * \defgroup dmae_mem Memory Operations diff --git a/include/dmae/sync.h b/include/dmae/sync.h index 50de52b2d..7da1e664d 100644 --- a/include/dmae/sync.h +++ b/include/dmae/sync.h @@ -23,8 +23,7 @@ typedef uint64_t DMAETimeStamp; * \return * TRUE when successful. */ -BOOL -DMAEWaitDone(DMAETimeStamp timestamp); +BOOL DMAEWaitDone(DMAETimeStamp timestamp); #ifdef __cplusplus } diff --git a/include/erreula/rpl_interface.h b/include/erreula/rpl_interface.h index 87440e96b..ace713faa 100644 --- a/include/erreula/rpl_interface.h +++ b/include/erreula/rpl_interface.h @@ -1,7 +1,7 @@ #pragma once -#include #include #include +#include /** * \defgroup erreula_rpl RPL Interface @@ -14,33 +14,55 @@ struct FSClient; -namespace Rpl -{ - -void ErrEulaSetVersion(int version); -bool ErrEulaJump(const char *buffer, uint32_t bufferSize); -void ErrEulaPlayAppearSE(bool playAppearSoundEffect); -bool ErrEulaIsSelectCursorActive(); -void ErrEulaChangeLang(nn::erreula::LangType language); -void ErrEulaDisappearHomeNixSign(); -bool ErrEulaIsAppearHomeNixSign(); -void ErrEulaAppearHomeNixSign(const nn::erreula::HomeNixSignArg &arg); -void ErrEulaSetControllerRemo(nn::erreula::ControllerType controller); -int32_t ErrEulaGetSelectButtonNumError(); -int32_t ErrEulaGetResultCode(); -nn::erreula::ResultType ErrEulaGetResultType(); -nn::erreula::State ErrEulaGetStateErrorViewer(); -bool ErrEulaIsDecideSelectRightButtonError(); -bool ErrEulaIsDecideSelectLeftButtonError(); -bool ErrEulaIsDecideSelectButtonError(); -void ErrEulaDisappearError(); -void ErrEulaAppearError(const nn::erreula::AppearArg &arg); -void ErrEulaCalc(const nn::erreula::ControllerInfo &controllerInfo); -void ErrEulaDrawDRC(); -void ErrEulaDrawTV(); -void ErrEulaDestroy(); -void ErrEulaCreate(void *workMemory, nn::erreula::RegionType region, - nn::erreula::LangType language, FSClient *fsClient); +namespace Rpl { + + void + ErrEulaSetVersion(int version); + bool + ErrEulaJump(const char *buffer, uint32_t bufferSize); + void + ErrEulaPlayAppearSE(bool playAppearSoundEffect); + bool + ErrEulaIsSelectCursorActive(); + void + ErrEulaChangeLang(nn::erreula::LangType language); + void + ErrEulaDisappearHomeNixSign(); + bool + ErrEulaIsAppearHomeNixSign(); + void + ErrEulaAppearHomeNixSign(const nn::erreula::HomeNixSignArg &arg); + void + ErrEulaSetControllerRemo(nn::erreula::ControllerType controller); + int32_t + ErrEulaGetSelectButtonNumError(); + int32_t + ErrEulaGetResultCode(); + nn::erreula::ResultType + ErrEulaGetResultType(); + nn::erreula::State + ErrEulaGetStateErrorViewer(); + bool + ErrEulaIsDecideSelectRightButtonError(); + bool + ErrEulaIsDecideSelectLeftButtonError(); + bool + ErrEulaIsDecideSelectButtonError(); + void + ErrEulaDisappearError(); + void + ErrEulaAppearError(const nn::erreula::AppearArg &arg); + void + ErrEulaCalc(const nn::erreula::ControllerInfo &controllerInfo); + void + ErrEulaDrawDRC(); + void + ErrEulaDrawTV(); + void + ErrEulaDestroy(); + void + ErrEulaCreate(void *workMemory, nn::erreula::RegionType region, + nn::erreula::LangType language, FSClient *fsClient); } // namespace Rpl diff --git a/include/gx2/clear.h b/include/gx2/clear.h index e8eea698e..710dc7edf 100644 --- a/include/gx2/clear.h +++ b/include/gx2/clear.h @@ -1,6 +1,6 @@ #pragma once -#include #include "enum.h" +#include /** * \defgroup gx2_clear Clear @@ -15,43 +15,37 @@ extern "C" { typedef struct GX2ColorBuffer GX2ColorBuffer; typedef struct GX2DepthBuffer GX2DepthBuffer; -void -GX2ClearColor(GX2ColorBuffer *colorBuffer, - float red, - float green, - float blue, - float alpha); - -void -GX2ClearDepthStencilEx(GX2DepthBuffer *depthBuffer, +void GX2ClearColor(GX2ColorBuffer *colorBuffer, + float red, + float green, + float blue, + float alpha); + +void GX2ClearDepthStencilEx(GX2DepthBuffer *depthBuffer, + float depth, + uint8_t stencil, + GX2ClearFlags clearMode); + +void GX2ClearBuffersEx(GX2ColorBuffer *colorBuffer, + GX2DepthBuffer *depthBuffer, + float red, + float green, + float blue, + float alpha, float depth, uint8_t stencil, GX2ClearFlags clearMode); -void -GX2ClearBuffersEx(GX2ColorBuffer *colorBuffer, - GX2DepthBuffer *depthBuffer, - float red, - float green, - float blue, - float alpha, - float depth, - uint8_t stencil, - GX2ClearFlags clearMode); - -void -GX2SetClearDepth(GX2DepthBuffer *depthBuffer, - float depth); - -void -GX2SetClearStencil(GX2DepthBuffer *depthBuffer, - uint8_t stencil); - -void -GX2SetClearDepthStencil(GX2DepthBuffer *depthBuffer, - float depth, +void GX2SetClearDepth(GX2DepthBuffer *depthBuffer, + float depth); + +void GX2SetClearStencil(GX2DepthBuffer *depthBuffer, uint8_t stencil); +void GX2SetClearDepthStencil(GX2DepthBuffer *depthBuffer, + float depth, + uint8_t stencil); + #ifdef __cplusplus } #endif diff --git a/include/gx2/context.h b/include/gx2/context.h index a6f2b396e..7cf29e004 100644 --- a/include/gx2/context.h +++ b/include/gx2/context.h @@ -47,20 +47,16 @@ WUT_CHECK_OFFSET(GX2ContextState, 0x9804, shadowDisplayListSize); WUT_CHECK_OFFSET(GX2ContextState, 0x9e00, shadowDisplayList); WUT_CHECK_SIZE(GX2ContextState, 0xa100); -void -GX2SetupContextStateEx(GX2ContextState *state, - BOOL unk1); +void GX2SetupContextStateEx(GX2ContextState *state, + BOOL unk1); -void -GX2GetContextStateDisplayList(const GX2ContextState *state, - void *outDisplayList, - uint32_t *outSize); +void GX2GetContextStateDisplayList(const GX2ContextState *state, + void *outDisplayList, + uint32_t *outSize); -void -GX2SetContextState(GX2ContextState *state); +void GX2SetContextState(GX2ContextState *state); -void -GX2SetDefaultState(); +void GX2SetDefaultState(); #ifdef __cplusplus } diff --git a/include/gx2/debug.h b/include/gx2/debug.h index 91d1c6de6..5431eb2d2 100644 --- a/include/gx2/debug.h +++ b/include/gx2/debug.h @@ -1,6 +1,6 @@ #pragma once -#include #include "surface.h" +#include /** * \defgroup gx2_debug Debug @@ -16,27 +16,27 @@ typedef struct GX2DebugCaptureInterface GX2DebugCaptureInterface; typedef enum GX2DebugCaptureInterfaceVersion { - GX2_DEBUG_CAPTURE_INTERFACE_VERSION = 1, + GX2_DEBUG_CAPTURE_INTERFACE_VERSION = 1, } GX2DebugCaptureInterfaceVersion; //! Options for \link GX2DebugCaptureStart \endlink. typedef enum GX2DebugCaptureStartFlags { //! When set \link GX2DebugCaptureStart \endlink will call \link GX2DrawDone \endlink before the capture is started. - GX2_DEBUG_CAPTURE_START_FLAGS_NONE = 0, + GX2_DEBUG_CAPTURE_START_FLAGS_NONE = 0, //! When set \link GX2DebugCaptureStart \endlink will NOT call \link GX2DrawDone \endlink. - GX2_DEBUG_CAPTURE_START_FLAGS_DISABLE_GX2DRAWDONE = 1, + GX2_DEBUG_CAPTURE_START_FLAGS_DISABLE_GX2DRAWDONE = 1, } GX2DebugCaptureStartFlags; //! Options for \link GX2DebugCaptureEnd \endlink. typedef enum GX2DebugCaptureEndFlags { //! When set \link GX2DebugCaptureEnd \endlink will call \link GX2Flush \endlink before the capture is completed. - GX2_DEBUG_CAPTURE_END_FLAGS_NONE = 0, + GX2_DEBUG_CAPTURE_END_FLAGS_NONE = 0, //! When set \link GX2DebugCaptureEnd \endlink will NOT call \link GX2Flush \endlink. - GX2_DEBUG_CAPTURE_END_FLAGS_DISABLE_GX2FLUSH = 1, + GX2_DEBUG_CAPTURE_END_FLAGS_DISABLE_GX2FLUSH = 1, } GX2DebugCaptureEndFlags; struct GX2DebugCaptureInterface @@ -58,7 +58,8 @@ struct GX2DebugCaptureInterface void (*onCaptureEnd)(); //! Check if capture is enabled. - BOOL (*isCaptureEnabled)(); + BOOL(*isCaptureEnabled) + (); //! Called when GX2 memory is allocated. void (*onAlloc)(void *ptr, uint32_t size, uint32_t align); @@ -97,8 +98,7 @@ WUT_CHECK_OFFSET(GX2DebugCaptureInterface, 0x28, onSwapScanBuffers); WUT_CHECK_OFFSET(GX2DebugCaptureInterface, 0x2C, submitToRing); WUT_CHECK_SIZE(GX2DebugCaptureInterface, 0x30); -BOOL -_GX2DebugSetCaptureInterface(GX2DebugCaptureInterface *interface); +BOOL _GX2DebugSetCaptureInterface(GX2DebugCaptureInterface *interface); /** @@ -116,9 +116,8 @@ _GX2DebugSetCaptureInterface(GX2DebugCaptureInterface *interface); * \param flags * A \link GX2DebugCaptureStartFlags \endlink option. */ -void -GX2DebugCaptureStart(const char *filename, - GX2DebugCaptureStartFlags flags); +void GX2DebugCaptureStart(const char *filename, + GX2DebugCaptureStartFlags flags); /** @@ -127,8 +126,7 @@ GX2DebugCaptureStart(const char *filename, * \param flags * A \link GX2DebugCaptureEndFlags \endlink option. */ -void -GX2DebugCaptureEnd(GX2DebugCaptureEndFlags flags); +void GX2DebugCaptureEnd(GX2DebugCaptureEndFlags flags); /** @@ -139,8 +137,7 @@ GX2DebugCaptureEnd(GX2DebugCaptureEndFlags flags); * * Equivalent to calling GX2DebugCaptureFrames(filename, 1) */ -void -GX2DebugCaptureFrame(const char* filename); +void GX2DebugCaptureFrame(const char *filename); /** @@ -151,9 +148,8 @@ GX2DebugCaptureFrame(const char* filename); * * Capture begins and ends during GX2SwapScanBuffers. */ -void -GX2DebugCaptureFrames(const char* filename, - uint32_t count); +void GX2DebugCaptureFrames(const char *filename, + uint32_t count); #ifdef __cplusplus } diff --git a/include/gx2/display.h b/include/gx2/display.h index 5faec448b..769f238c3 100644 --- a/include/gx2/display.h +++ b/include/gx2/display.h @@ -1,7 +1,7 @@ #pragma once -#include #include "enum.h" #include "surface.h" +#include /** * \defgroup gx2_display Display @@ -13,47 +13,39 @@ extern "C" { #endif -void -GX2SetTVEnable(BOOL enable); +void GX2SetTVEnable(BOOL enable); -void -GX2SetDRCEnable(BOOL enable); +void GX2SetDRCEnable(BOOL enable); -void -GX2CalcTVSize(GX2TVRenderMode tvRenderMode, - GX2SurfaceFormat surfaceFormat, - GX2BufferingMode bufferingMode, - uint32_t *size, - uint32_t *unkOut); +void GX2CalcTVSize(GX2TVRenderMode tvRenderMode, + GX2SurfaceFormat surfaceFormat, + GX2BufferingMode bufferingMode, + uint32_t *size, + uint32_t *unkOut); -void -GX2CalcDRCSize(GX2DrcRenderMode drcRenderMode, - GX2SurfaceFormat surfaceFormat, - GX2BufferingMode bufferingMode, - uint32_t *size, - uint32_t *unkOut); +void GX2CalcDRCSize(GX2DrcRenderMode drcRenderMode, + GX2SurfaceFormat surfaceFormat, + GX2BufferingMode bufferingMode, + uint32_t *size, + uint32_t *unkOut); -void -GX2SetTVBuffer(void *buffer, - uint32_t size, - GX2TVRenderMode tvRenderMode, - GX2SurfaceFormat surfaceFormat, - GX2BufferingMode bufferingMode); +void GX2SetTVBuffer(void *buffer, + uint32_t size, + GX2TVRenderMode tvRenderMode, + GX2SurfaceFormat surfaceFormat, + GX2BufferingMode bufferingMode); -void -GX2SetDRCBuffer(void *buffer, - uint32_t size, - GX2DrcRenderMode drcRenderMode, - GX2SurfaceFormat surfaceFormat, - GX2BufferingMode bufferingMode); +void GX2SetDRCBuffer(void *buffer, + uint32_t size, + GX2DrcRenderMode drcRenderMode, + GX2SurfaceFormat surfaceFormat, + GX2BufferingMode bufferingMode); -void -GX2SetTVScale(uint32_t x, - uint32_t y); +void GX2SetTVScale(uint32_t x, + uint32_t y); -void -GX2SetDRCScale(uint32_t x, - uint32_t y); +void GX2SetDRCScale(uint32_t x, + uint32_t y); GX2TVScanMode GX2GetSystemTVScanMode(); diff --git a/include/gx2/displaylist.h b/include/gx2/displaylist.h index e849e8b4f..3c69ec616 100644 --- a/include/gx2/displaylist.h +++ b/include/gx2/displaylist.h @@ -11,32 +11,26 @@ extern "C" { #endif -void -GX2BeginDisplayListEx(void *displayList, - uint32_t bytes, - BOOL unk1); +void GX2BeginDisplayListEx(void *displayList, + uint32_t bytes, + BOOL unk1); uint32_t GX2EndDisplayList(void *displayList); -void -GX2DirectCallDisplayList(const void *displayList, - uint32_t bytes); +void GX2DirectCallDisplayList(const void *displayList, + uint32_t bytes); -void -GX2CallDisplayList(const void *displayList, - uint32_t bytes); +void GX2CallDisplayList(const void *displayList, + uint32_t bytes); -BOOL -GX2GetDisplayListWriteStatus(); +BOOL GX2GetDisplayListWriteStatus(); -BOOL -GX2GetCurrentDisplayList(void **outDisplayList, - uint32_t *outSize); +BOOL GX2GetCurrentDisplayList(void **outDisplayList, + uint32_t *outSize); -void -GX2CopyDisplayList(const void *displayList, - uint32_t bytes); +void GX2CopyDisplayList(const void *displayList, + uint32_t bytes); #ifdef __cplusplus } diff --git a/include/gx2/draw.h b/include/gx2/draw.h index a1c96da67..f8b4c2ca3 100644 --- a/include/gx2/draw.h +++ b/include/gx2/draw.h @@ -1,6 +1,6 @@ #pragma once -#include #include "enum.h" +#include /** * \defgroup gx2_draw Draw @@ -12,52 +12,45 @@ extern "C" { #endif -void -GX2SetAttribBuffer(uint32_t index, - uint32_t size, - uint32_t stride, - const void *buffer); - -void -GX2DrawEx(GX2PrimitiveMode mode, - uint32_t count, - uint32_t offset, - uint32_t numInstances); - -void -GX2DrawEx2(GX2PrimitiveMode mode, - uint32_t count, - uint32_t offset, - uint32_t numInstances, - uint32_t baseInstance); - -void -GX2DrawIndexedEx(GX2PrimitiveMode mode, - uint32_t count, - GX2IndexType indexType, - const void *indices, - uint32_t offset, - uint32_t numInstances); - -void -GX2DrawIndexedEx2(GX2PrimitiveMode mode, - uint32_t count, - GX2IndexType indexType, - const void *indices, - uint32_t offset, - uint32_t numInstances, - uint32_t baseInstance); - -void -GX2DrawIndexedImmediateEx(GX2PrimitiveMode mode, - uint32_t count, - GX2IndexType indexType, - const void *indices, - uint32_t offset, - uint32_t numInstances); - -void -GX2SetPrimitiveRestartIndex(uint32_t index); +void GX2SetAttribBuffer(uint32_t index, + uint32_t size, + uint32_t stride, + const void *buffer); + +void GX2DrawEx(GX2PrimitiveMode mode, + uint32_t count, + uint32_t offset, + uint32_t numInstances); + +void GX2DrawEx2(GX2PrimitiveMode mode, + uint32_t count, + uint32_t offset, + uint32_t numInstances, + uint32_t baseInstance); + +void GX2DrawIndexedEx(GX2PrimitiveMode mode, + uint32_t count, + GX2IndexType indexType, + const void *indices, + uint32_t offset, + uint32_t numInstances); + +void GX2DrawIndexedEx2(GX2PrimitiveMode mode, + uint32_t count, + GX2IndexType indexType, + const void *indices, + uint32_t offset, + uint32_t numInstances, + uint32_t baseInstance); + +void GX2DrawIndexedImmediateEx(GX2PrimitiveMode mode, + uint32_t count, + GX2IndexType indexType, + const void *indices, + uint32_t offset, + uint32_t numInstances); + +void GX2SetPrimitiveRestartIndex(uint32_t index); #ifdef __cplusplus } diff --git a/include/gx2/enum.h b/include/gx2/enum.h index 5104dd6aa..d22ef2b38 100644 --- a/include/gx2/enum.h +++ b/include/gx2/enum.h @@ -11,175 +11,175 @@ extern "C" { #endif -#define GX2_FALSE (0) -#define GX2_TRUE (1) -#define GX2_DISABLE (0) -#define GX2_ENABLE (1) +#define GX2_FALSE (0) +#define GX2_TRUE (1) +#define GX2_DISABLE (0) +#define GX2_ENABLE (1) -#define GX2_COMMAND_BUFFER_ALIGNMENT (0x40) -#define GX2_CONTEXT_STATE_ALIGNMENT (0x100) -#define GX2_SCAN_BUFFER_ALIGNMENT (0x1000) -#define GX2_SHADER_PROGRAM_ALIGNMENT (0x100) -#define GX2_VERTEX_BUFFER_ALIGNMENT (0x40) -#define GX2_INDEX_BUFFER_ALIGNMENT (0x20) +#define GX2_COMMAND_BUFFER_ALIGNMENT (0x40) +#define GX2_CONTEXT_STATE_ALIGNMENT (0x100) +#define GX2_SCAN_BUFFER_ALIGNMENT (0x1000) +#define GX2_SHADER_PROGRAM_ALIGNMENT (0x100) +#define GX2_VERTEX_BUFFER_ALIGNMENT (0x40) +#define GX2_INDEX_BUFFER_ALIGNMENT (0x20) -#define GX2_COMMAND_BUFFER_SIZE (0x400000) +#define GX2_COMMAND_BUFFER_SIZE (0x400000) typedef enum GX2AAMode { - GX2_AA_MODE1X = 0, - GX2_AA_MODE2X = 1, - GX2_AA_MODE4X = 2 + GX2_AA_MODE1X = 0, + GX2_AA_MODE2X = 1, + GX2_AA_MODE4X = 2 } GX2AAMode; typedef enum GX2AlphaToMaskMode { - GX2_ALPHA_TO_MASK_MODE_NON_DITHERED = 0, - GX2_ALPHA_TO_MASK_MODE_DITHER_0 = 1, - GX2_ALPHA_TO_MASK_MODE_DITHER_90 = 2, - GX2_ALPHA_TO_MASK_MODE_DITHER_180 = 3, - GX2_ALPHA_TO_MASK_MODE_DITHER_270 = 4, + GX2_ALPHA_TO_MASK_MODE_NON_DITHERED = 0, + GX2_ALPHA_TO_MASK_MODE_DITHER_0 = 1, + GX2_ALPHA_TO_MASK_MODE_DITHER_90 = 2, + GX2_ALPHA_TO_MASK_MODE_DITHER_180 = 3, + GX2_ALPHA_TO_MASK_MODE_DITHER_270 = 4, } GX2AlphaToMaskMode; typedef enum GX2AttribFormat { - GX2_ATTRIB_TYPE_8 = 0x00, - GX2_ATTRIB_TYPE_4_4 = 0x01, - GX2_ATTRIB_TYPE_16 = 0x02, - GX2_ATTRIB_TYPE_16_FLOAT = 0x03, - GX2_ATTRIB_TYPE_8_8 = 0x04, - GX2_ATTRIB_TYPE_32 = 0x05, - GX2_ATTRIB_TYPE_32_FLOAT = 0x06, - GX2_ATTRIB_TYPE_16_16 = 0x07, - GX2_ATTRIB_TYPE_16_16_FLOAT = 0x08, - GX2_ATTRIB_TYPE_10_11_11_FLOAT = 0x09, - GX2_ATTRIB_TYPE_8_8_8_8 = 0x0A, - GX2_ATTRIB_TYPE_10_10_10_2 = 0x0B, - GX2_ATTRIB_TYPE_32_32 = 0x0C, - GX2_ATTRIB_TYPE_32_32_FLOAT = 0x0D, - GX2_ATTRIB_TYPE_16_16_16_16 = 0x0E, - GX2_ATTRIB_TYPE_16_16_16_16_FLOAT = 0x0F, - GX2_ATTRIB_TYPE_32_32_32 = 0x10, - GX2_ATTRIB_TYPE_32_32_32_FLOAT = 0x11, - GX2_ATTRIB_TYPE_32_32_32_32 = 0x12, - GX2_ATTRIB_TYPE_32_32_32_32_FLOAT = 0x13, - - GX2_ATTRIB_FLAG_INTEGER = 0x100, - GX2_ATTRIB_FLAG_SIGNED = 0x200, - GX2_ATTRIB_FLAG_DEGAMMA = 0x400, - GX2_ATTRIB_FLAG_SCALED = 0x800, - - GX2_ATTRIB_FORMAT_UNORM_8 = GX2_ATTRIB_TYPE_8, - GX2_ATTRIB_FORMAT_UNORM_8_8 = GX2_ATTRIB_TYPE_8_8, - GX2_ATTRIB_FORMAT_UNORM_8_8_8_8 = GX2_ATTRIB_TYPE_8_8_8_8, - - GX2_ATTRIB_FORMAT_UINT_8 = GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8, - GX2_ATTRIB_FORMAT_UINT_8_8 = GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8, - GX2_ATTRIB_FORMAT_UINT_8_8_8_8 = GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8_8_8, - - GX2_ATTRIB_FORMAT_SNORM_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_TYPE_8, - GX2_ATTRIB_FORMAT_SNORM_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_TYPE_8_8, - GX2_ATTRIB_FORMAT_SNORM_8_8_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_TYPE_8_8_8_8, - - GX2_ATTRIB_FORMAT_SINT_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8, - GX2_ATTRIB_FORMAT_SINT_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8, - GX2_ATTRIB_FORMAT_SINT_8_8_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8_8_8, - - GX2_ATTRIB_FORMAT_FLOAT_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_FLOAT, - GX2_ATTRIB_FORMAT_FLOAT_32_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_32_FLOAT, - GX2_ATTRIB_FORMAT_FLOAT_32_32_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_32_32_FLOAT, - GX2_ATTRIB_FORMAT_FLOAT_32_32_32_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_32_32_32_FLOAT, + GX2_ATTRIB_TYPE_8 = 0x00, + GX2_ATTRIB_TYPE_4_4 = 0x01, + GX2_ATTRIB_TYPE_16 = 0x02, + GX2_ATTRIB_TYPE_16_FLOAT = 0x03, + GX2_ATTRIB_TYPE_8_8 = 0x04, + GX2_ATTRIB_TYPE_32 = 0x05, + GX2_ATTRIB_TYPE_32_FLOAT = 0x06, + GX2_ATTRIB_TYPE_16_16 = 0x07, + GX2_ATTRIB_TYPE_16_16_FLOAT = 0x08, + GX2_ATTRIB_TYPE_10_11_11_FLOAT = 0x09, + GX2_ATTRIB_TYPE_8_8_8_8 = 0x0A, + GX2_ATTRIB_TYPE_10_10_10_2 = 0x0B, + GX2_ATTRIB_TYPE_32_32 = 0x0C, + GX2_ATTRIB_TYPE_32_32_FLOAT = 0x0D, + GX2_ATTRIB_TYPE_16_16_16_16 = 0x0E, + GX2_ATTRIB_TYPE_16_16_16_16_FLOAT = 0x0F, + GX2_ATTRIB_TYPE_32_32_32 = 0x10, + GX2_ATTRIB_TYPE_32_32_32_FLOAT = 0x11, + GX2_ATTRIB_TYPE_32_32_32_32 = 0x12, + GX2_ATTRIB_TYPE_32_32_32_32_FLOAT = 0x13, + + GX2_ATTRIB_FLAG_INTEGER = 0x100, + GX2_ATTRIB_FLAG_SIGNED = 0x200, + GX2_ATTRIB_FLAG_DEGAMMA = 0x400, + GX2_ATTRIB_FLAG_SCALED = 0x800, + + GX2_ATTRIB_FORMAT_UNORM_8 = GX2_ATTRIB_TYPE_8, + GX2_ATTRIB_FORMAT_UNORM_8_8 = GX2_ATTRIB_TYPE_8_8, + GX2_ATTRIB_FORMAT_UNORM_8_8_8_8 = GX2_ATTRIB_TYPE_8_8_8_8, + + GX2_ATTRIB_FORMAT_UINT_8 = GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8, + GX2_ATTRIB_FORMAT_UINT_8_8 = GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8, + GX2_ATTRIB_FORMAT_UINT_8_8_8_8 = GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8_8_8, + + GX2_ATTRIB_FORMAT_SNORM_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_TYPE_8, + GX2_ATTRIB_FORMAT_SNORM_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_TYPE_8_8, + GX2_ATTRIB_FORMAT_SNORM_8_8_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_TYPE_8_8_8_8, + + GX2_ATTRIB_FORMAT_SINT_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8, + GX2_ATTRIB_FORMAT_SINT_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8, + GX2_ATTRIB_FORMAT_SINT_8_8_8_8 = GX2_ATTRIB_FLAG_SIGNED | GX2_ATTRIB_FLAG_INTEGER | GX2_ATTRIB_TYPE_8_8_8_8, + + GX2_ATTRIB_FORMAT_FLOAT_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_FLOAT, + GX2_ATTRIB_FORMAT_FLOAT_32_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_32_FLOAT, + GX2_ATTRIB_FORMAT_FLOAT_32_32_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_32_32_FLOAT, + GX2_ATTRIB_FORMAT_FLOAT_32_32_32_32 = GX2_ATTRIB_FLAG_SCALED | GX2_ATTRIB_TYPE_32_32_32_32_FLOAT, } GX2AttribFormat; WUT_ENUM_BITMASK_TYPE(GX2AttribFormat) typedef enum GX2AttribIndexType { - GX2_ATTRIB_INDEX_PER_VERTEX = 0, - GX2_ATTRIB_INDEX_PER_INSTANCE = 1, + GX2_ATTRIB_INDEX_PER_VERTEX = 0, + GX2_ATTRIB_INDEX_PER_INSTANCE = 1, } GX2AttribIndexType; typedef enum GX2BlendMode { - GX2_BLEND_MODE_ZERO = 0, - GX2_BLEND_MODE_ONE = 1, - GX2_BLEND_MODE_SRC_COLOR = 2, - GX2_BLEND_MODE_INV_SRC_COLOR = 3, - GX2_BLEND_MODE_SRC_ALPHA = 4, - GX2_BLEND_MODE_INV_SRC_ALPHA = 5, - GX2_BLEND_MODE_DST_ALPHA = 6, - GX2_BLEND_MODE_INV_DST_ALPHA = 7, - GX2_BLEND_MODE_DST_COLOR = 8, - GX2_BLEND_MODE_INV_DST_COLOR = 9, - GX2_BLEND_MODE_SRC_ALPHA_SAT = 10, - GX2_BLEND_MODE_BOTH_SRC_ALPHA = 11, - GX2_BLEND_MODE_BOTH_INV_SRC_ALPHA = 12, - GX2_BLEND_MODE_BLEND_FACTOR = 13, - GX2_BLEND_MODE_INV_BLEND_FACTOR = 14, - GX2_BLEND_MODE_SRC1_COLOR = 15, - GX2_BLEND_MODE_INV_SRC1_COLOR = 16, - GX2_BLEND_MODE_SRC1_ALPHA = 17, - GX2_BLEND_MODE_INV_SRC1_ALPHA = 18, + GX2_BLEND_MODE_ZERO = 0, + GX2_BLEND_MODE_ONE = 1, + GX2_BLEND_MODE_SRC_COLOR = 2, + GX2_BLEND_MODE_INV_SRC_COLOR = 3, + GX2_BLEND_MODE_SRC_ALPHA = 4, + GX2_BLEND_MODE_INV_SRC_ALPHA = 5, + GX2_BLEND_MODE_DST_ALPHA = 6, + GX2_BLEND_MODE_INV_DST_ALPHA = 7, + GX2_BLEND_MODE_DST_COLOR = 8, + GX2_BLEND_MODE_INV_DST_COLOR = 9, + GX2_BLEND_MODE_SRC_ALPHA_SAT = 10, + GX2_BLEND_MODE_BOTH_SRC_ALPHA = 11, + GX2_BLEND_MODE_BOTH_INV_SRC_ALPHA = 12, + GX2_BLEND_MODE_BLEND_FACTOR = 13, + GX2_BLEND_MODE_INV_BLEND_FACTOR = 14, + GX2_BLEND_MODE_SRC1_COLOR = 15, + GX2_BLEND_MODE_INV_SRC1_COLOR = 16, + GX2_BLEND_MODE_SRC1_ALPHA = 17, + GX2_BLEND_MODE_INV_SRC1_ALPHA = 18, } GX2BlendMode; typedef enum GX2BlendCombineMode { - GX2_BLEND_COMBINE_MODE_ADD = 0, - GX2_BLEND_COMBINE_MODE_SUB = 1, - GX2_BLEND_COMBINE_MODE_MIN = 2, - GX2_BLEND_COMBINE_MODE_MAX = 3, - GX2_BLEND_COMBINE_MODE_REV_SUB = 4, + GX2_BLEND_COMBINE_MODE_ADD = 0, + GX2_BLEND_COMBINE_MODE_SUB = 1, + GX2_BLEND_COMBINE_MODE_MIN = 2, + GX2_BLEND_COMBINE_MODE_MAX = 3, + GX2_BLEND_COMBINE_MODE_REV_SUB = 4, } GX2BlendCombineMode; typedef enum GX2BufferingMode { - GX2_BUFFERING_MODE_SINGLE = 1, - GX2_BUFFERING_MODE_DOUBLE = 2, - GX2_BUFFERING_MODE_TRIPLE = 3, + GX2_BUFFERING_MODE_SINGLE = 1, + GX2_BUFFERING_MODE_DOUBLE = 2, + GX2_BUFFERING_MODE_TRIPLE = 3, } GX2BufferingMode; typedef enum GX2ChannelMask { - GX2_CHANNEL_MASK_R = 1, - GX2_CHANNEL_MASK_G = 2, - GX2_CHANNEL_MASK_RG = 3, - GX2_CHANNEL_MASK_B = 4, - GX2_CHANNEL_MASK_RB = 5, - GX2_CHANNEL_MASK_GB = 6, - GX2_CHANNEL_MASK_RGB = 7, - GX2_CHANNEL_MASK_A = 8, - GX2_CHANNEL_MASK_RA = 9, - GX2_CHANNEL_MASK_GA = 10, - GX2_CHANNEL_MASK_RGA = 11, - GX2_CHANNEL_MASK_BA = 12, - GX2_CHANNEL_MASK_RBA = 13, - GX2_CHANNEL_MASK_GBA = 14, - GX2_CHANNEL_MASK_RGBA = 15, + GX2_CHANNEL_MASK_R = 1, + GX2_CHANNEL_MASK_G = 2, + GX2_CHANNEL_MASK_RG = 3, + GX2_CHANNEL_MASK_B = 4, + GX2_CHANNEL_MASK_RB = 5, + GX2_CHANNEL_MASK_GB = 6, + GX2_CHANNEL_MASK_RGB = 7, + GX2_CHANNEL_MASK_A = 8, + GX2_CHANNEL_MASK_RA = 9, + GX2_CHANNEL_MASK_GA = 10, + GX2_CHANNEL_MASK_RGA = 11, + GX2_CHANNEL_MASK_BA = 12, + GX2_CHANNEL_MASK_RBA = 13, + GX2_CHANNEL_MASK_GBA = 14, + GX2_CHANNEL_MASK_RGBA = 15, } GX2ChannelMask; typedef enum GX2ClearFlags { - GX2_CLEAR_FLAGS_DEPTH = 1, - GX2_CLEAR_FLAGS_STENCIL = 2, - GX2_CLEAR_FLAGS_BOTH = (GX2_CLEAR_FLAGS_DEPTH | GX2_CLEAR_FLAGS_STENCIL), + GX2_CLEAR_FLAGS_DEPTH = 1, + GX2_CLEAR_FLAGS_STENCIL = 2, + GX2_CLEAR_FLAGS_BOTH = (GX2_CLEAR_FLAGS_DEPTH | GX2_CLEAR_FLAGS_STENCIL), } GX2ClearFlags; typedef enum GX2CompareFunction { - GX2_COMPARE_FUNC_NEVER = 0, - GX2_COMPARE_FUNC_LESS = 1, - GX2_COMPARE_FUNC_EQUAL = 2, - GX2_COMPARE_FUNC_LEQUAL = 3, - GX2_COMPARE_FUNC_GREATER = 4, - GX2_COMPARE_FUNC_NOT_EQUAL = 5, - GX2_COMPARE_FUNC_GEQUAL = 6, - GX2_COMPARE_FUNC_ALWAYS = 7, + GX2_COMPARE_FUNC_NEVER = 0, + GX2_COMPARE_FUNC_LESS = 1, + GX2_COMPARE_FUNC_EQUAL = 2, + GX2_COMPARE_FUNC_LEQUAL = 3, + GX2_COMPARE_FUNC_GREATER = 4, + GX2_COMPARE_FUNC_NOT_EQUAL = 5, + GX2_COMPARE_FUNC_GEQUAL = 6, + GX2_COMPARE_FUNC_ALWAYS = 7, } GX2CompareFunction; typedef enum GX2DrcRenderMode { - GX2_DRC_RENDER_MODE_DISABLED = 0, - GX2_DRC_RENDER_MODE_SINGLE = 1, + GX2_DRC_RENDER_MODE_DISABLED = 0, + GX2_DRC_RENDER_MODE_SINGLE = 1, } GX2DrcRenderMode; typedef enum GX2EventType @@ -193,10 +193,10 @@ typedef enum GX2EventType typedef enum GX2EndianSwapMode { - GX2_ENDIAN_SWAP_NONE = 0, - GX2_ENDIAN_SWAP_8_IN_16 = 1, - GX2_ENDIAN_SWAP_8_IN_32 = 2, - GX2_ENDIAN_SWAP_DEFAULT = 3, + GX2_ENDIAN_SWAP_NONE = 0, + GX2_ENDIAN_SWAP_8_IN_16 = 1, + GX2_ENDIAN_SWAP_8_IN_32 = 2, + GX2_ENDIAN_SWAP_DEFAULT = 3, } GX2EndianSwapMode; typedef enum GX2FetchShaderType @@ -209,387 +209,387 @@ typedef enum GX2FetchShaderType typedef enum GX2FrontFace { - GX2_FRONT_FACE_CCW = 0, - GX2_FRONT_FACE_CW = 1, + GX2_FRONT_FACE_CCW = 0, + GX2_FRONT_FACE_CW = 1, } GX2FrontFace; typedef enum GX2IndexType { - GX2_INDEX_TYPE_U16_LE = 0, - GX2_INDEX_TYPE_U32_LE = 1, - GX2_INDEX_TYPE_U16 = 4, - GX2_INDEX_TYPE_U32 = 9, + GX2_INDEX_TYPE_U16_LE = 0, + GX2_INDEX_TYPE_U32_LE = 1, + GX2_INDEX_TYPE_U16 = 4, + GX2_INDEX_TYPE_U32 = 9, } GX2IndexType; typedef enum GX2InvalidateMode { - GX2_INVALIDATE_MODE_NONE = 0, - GX2_INVALIDATE_MODE_ATTRIBUTE_BUFFER = 1 << 0, - GX2_INVALIDATE_MODE_TEXTURE = 1 << 1, - GX2_INVALIDATE_MODE_UNIFORM_BLOCK = 1 << 2, - GX2_INVALIDATE_MODE_SHADER = 1 << 3, - GX2_INVALIDATE_MODE_COLOR_BUFFER = 1 << 4, - GX2_INVALIDATE_MODE_DEPTH_BUFFER = 1 << 5, - GX2_INVALIDATE_MODE_CPU = 1 << 6, - GX2_INVALIDATE_MODE_STREAM_OUT_BUFFER = 1 << 7, - GX2_INVALIDATE_MODE_EXPORT_BUFFER = 1 << 8, - GX2_INVALIDATE_MODE_CPU_ATTRIBUTE_BUFFER= GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_ATTRIBUTE_BUFFER, - GX2_INVALIDATE_MODE_CPU_TEXTURE = GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_TEXTURE, - GX2_INVALIDATE_MODE_CPU_SHADER = GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_SHADER, + GX2_INVALIDATE_MODE_NONE = 0, + GX2_INVALIDATE_MODE_ATTRIBUTE_BUFFER = 1 << 0, + GX2_INVALIDATE_MODE_TEXTURE = 1 << 1, + GX2_INVALIDATE_MODE_UNIFORM_BLOCK = 1 << 2, + GX2_INVALIDATE_MODE_SHADER = 1 << 3, + GX2_INVALIDATE_MODE_COLOR_BUFFER = 1 << 4, + GX2_INVALIDATE_MODE_DEPTH_BUFFER = 1 << 5, + GX2_INVALIDATE_MODE_CPU = 1 << 6, + GX2_INVALIDATE_MODE_STREAM_OUT_BUFFER = 1 << 7, + GX2_INVALIDATE_MODE_EXPORT_BUFFER = 1 << 8, + GX2_INVALIDATE_MODE_CPU_ATTRIBUTE_BUFFER = GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_ATTRIBUTE_BUFFER, + GX2_INVALIDATE_MODE_CPU_TEXTURE = GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_TEXTURE, + GX2_INVALIDATE_MODE_CPU_SHADER = GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_SHADER, } GX2InvalidateMode; WUT_ENUM_BITMASK_TYPE(GX2InvalidateMode) typedef enum GX2InitAttributes { - GX2_INIT_END = 0, - GX2_INIT_CMD_BUF_BASE = 1, - GX2_INIT_CMD_BUF_POOL_SIZE = 2, - GX2_INIT_ARGC = 7, - GX2_INIT_ARGV = 8, - GX2_INIT_PROFILE_MODE = 9, - GX2_INIT_TOSS_STAGE = 10, - GX2_INIT_APP_IO_THREAD_STACK_SIZE = 11, + GX2_INIT_END = 0, + GX2_INIT_CMD_BUF_BASE = 1, + GX2_INIT_CMD_BUF_POOL_SIZE = 2, + GX2_INIT_ARGC = 7, + GX2_INIT_ARGV = 8, + GX2_INIT_PROFILE_MODE = 9, + GX2_INIT_TOSS_STAGE = 10, + GX2_INIT_APP_IO_THREAD_STACK_SIZE = 11, } GX2InitAttributes; typedef enum GX2LogicOp { - GX2_LOGIC_OP_CLEAR = 0x00, - GX2_LOGIC_OP_NOR = 0x11, - GX2_LOGIC_OP_INV_AND = 0x22, - GX2_LOGIC_OP_INV_COPY = 0x33, - GX2_LOGIC_OP_REV_AND = 0x44, - GX2_LOGIC_OP_INV = 0x55, - GX2_LOGIC_OP_XOR = 0x66, - GX2_LOGIC_OP_NOT_AND = 0x77, - GX2_LOGIC_OP_AND = 0x88, - GX2_LOGIC_OP_EQUIV = 0x99, - GX2_LOGIC_OP_NOP = 0xAA, - GX2_LOGIC_OP_INV_OR = 0xBB, - GX2_LOGIC_OP_COPY = 0xCC, - GX2_LOGIC_OP_REV_OR = 0xDD, - GX2_LOGIC_OP_OR = 0xEE, - GX2_LOGIC_OP_SET = 0xFF, + GX2_LOGIC_OP_CLEAR = 0x00, + GX2_LOGIC_OP_NOR = 0x11, + GX2_LOGIC_OP_INV_AND = 0x22, + GX2_LOGIC_OP_INV_COPY = 0x33, + GX2_LOGIC_OP_REV_AND = 0x44, + GX2_LOGIC_OP_INV = 0x55, + GX2_LOGIC_OP_XOR = 0x66, + GX2_LOGIC_OP_NOT_AND = 0x77, + GX2_LOGIC_OP_AND = 0x88, + GX2_LOGIC_OP_EQUIV = 0x99, + GX2_LOGIC_OP_NOP = 0xAA, + GX2_LOGIC_OP_INV_OR = 0xBB, + GX2_LOGIC_OP_COPY = 0xCC, + GX2_LOGIC_OP_REV_OR = 0xDD, + GX2_LOGIC_OP_OR = 0xEE, + GX2_LOGIC_OP_SET = 0xFF, } GX2LogicOp; typedef enum GX2PrimitiveMode { - GX2_PRIMITIVE_MODE_POINTS = 1, - GX2_PRIMITIVE_MODE_LINES = 2, - GX2_PRIMITIVE_MODE_LINE_STRIP = 3, - GX2_PRIMITIVE_MODE_TRIANGLES = 4, - GX2_PRIMITIVE_MODE_TRIANGLE_FAN = 5, - GX2_PRIMITIVE_MODE_TRIANGLE_STRIP = 6, - GX2_PRIMITIVE_MODE_LINES_ADJACENCY = 10, - GX2_PRIMITIVE_MODE_LINE_STRIP_ADJACENCY = 11, - GX2_PRIMITIVE_MODE_TRIANGLES_ADJACENCY = 12, - GX2_PRIMITIVE_MODE_TRIANGLE_STRIP_ADJACENCY = 13, - GX2_PRIMITIVE_MODE_RECTS = 17, - GX2_PRIMITIVE_MODE_LINE_LOOP = 18, - GX2_PRIMITIVE_MODE_QUADS = 19, - GX2_PRIMITIVE_MODE_QUAD_STRIP = 20, + GX2_PRIMITIVE_MODE_POINTS = 1, + GX2_PRIMITIVE_MODE_LINES = 2, + GX2_PRIMITIVE_MODE_LINE_STRIP = 3, + GX2_PRIMITIVE_MODE_TRIANGLES = 4, + GX2_PRIMITIVE_MODE_TRIANGLE_FAN = 5, + GX2_PRIMITIVE_MODE_TRIANGLE_STRIP = 6, + GX2_PRIMITIVE_MODE_LINES_ADJACENCY = 10, + GX2_PRIMITIVE_MODE_LINE_STRIP_ADJACENCY = 11, + GX2_PRIMITIVE_MODE_TRIANGLES_ADJACENCY = 12, + GX2_PRIMITIVE_MODE_TRIANGLE_STRIP_ADJACENCY = 13, + GX2_PRIMITIVE_MODE_RECTS = 17, + GX2_PRIMITIVE_MODE_LINE_LOOP = 18, + GX2_PRIMITIVE_MODE_QUADS = 19, + GX2_PRIMITIVE_MODE_QUAD_STRIP = 20, } GX2PrimitiveMode; typedef enum GX2PolygonMode { - GX2_POLYGON_MODE_POINT = 0, - GX2_POLYGON_MODE_LINE = 1, - GX2_POLYGON_MODE_TRIANGLE = 2, + GX2_POLYGON_MODE_POINT = 0, + GX2_POLYGON_MODE_LINE = 1, + GX2_POLYGON_MODE_TRIANGLE = 2, } GX2PolygonMode; typedef enum GX2RenderTarget { - GX2_RENDER_TARGET_0 = 0, - GX2_RENDER_TARGET_1 = 1, - GX2_RENDER_TARGET_2 = 2, - GX2_RENDER_TARGET_3 = 3, - GX2_RENDER_TARGET_4 = 4, - GX2_RENDER_TARGET_5 = 5, - GX2_RENDER_TARGET_6 = 6, - GX2_RENDER_TARGET_7 = 7, + GX2_RENDER_TARGET_0 = 0, + GX2_RENDER_TARGET_1 = 1, + GX2_RENDER_TARGET_2 = 2, + GX2_RENDER_TARGET_3 = 3, + GX2_RENDER_TARGET_4 = 4, + GX2_RENDER_TARGET_5 = 5, + GX2_RENDER_TARGET_6 = 6, + GX2_RENDER_TARGET_7 = 7, } GX2RenderTarget; typedef enum GX2RoundingMode { - GX2_ROUNDING_MODE_ROUND_TO_EVEN = 0, - GX2_ROUNDING_MODE_TRUNCATE = 1, + GX2_ROUNDING_MODE_ROUND_TO_EVEN = 0, + GX2_ROUNDING_MODE_TRUNCATE = 1, } GX2RoundingMode; typedef enum GX2SamplerVarType { - GX2_SAMPLER_VAR_TYPE_SAMPLER_1D = 0, - GX2_SAMPLER_VAR_TYPE_SAMPLER_2D = 1, - GX2_SAMPLER_VAR_TYPE_SAMPLER_3D = 3, - GX2_SAMPLER_VAR_TYPE_SAMPLER_CUBE = 4, + GX2_SAMPLER_VAR_TYPE_SAMPLER_1D = 0, + GX2_SAMPLER_VAR_TYPE_SAMPLER_2D = 1, + GX2_SAMPLER_VAR_TYPE_SAMPLER_3D = 3, + GX2_SAMPLER_VAR_TYPE_SAMPLER_CUBE = 4, } GX2SamplerVarType; typedef enum GX2ScanTarget { - GX2_SCAN_TARGET_TV = 1, - GX2_SCAN_TARGET_DRC = 4, + GX2_SCAN_TARGET_TV = 1, + GX2_SCAN_TARGET_DRC = 4, } GX2ScanTarget; typedef enum GX2ShaderMode { - GX2_SHADER_MODE_UNIFORM_REGISTER = 0, - GX2_SHADER_MODE_UNIFORM_BLOCK = 1, - GX2_SHADER_MODE_GEOMETRY_SHADER = 2, - GX2_SHADER_MODE_COMPUTE_SHADER = 3, + GX2_SHADER_MODE_UNIFORM_REGISTER = 0, + GX2_SHADER_MODE_UNIFORM_BLOCK = 1, + GX2_SHADER_MODE_GEOMETRY_SHADER = 2, + GX2_SHADER_MODE_COMPUTE_SHADER = 3, } GX2ShaderMode; typedef enum GX2ShaderVarType { - GX2_SHADER_VAR_TYPE_VOID = 0, - GX2_SHADER_VAR_TYPE_BOOL = 1, - GX2_SHADER_VAR_TYPE_INT = 2, - GX2_SHADER_VAR_TYPE_UINT = 3, - GX2_SHADER_VAR_TYPE_FLOAT = 4, - GX2_SHADER_VAR_TYPE_DOUBLE = 5, - GX2_SHADER_VAR_TYPE_DOUBLE2 = 6, - GX2_SHADER_VAR_TYPE_DOUBLE3 = 7, - GX2_SHADER_VAR_TYPE_DOUBLE4 = 8, - GX2_SHADER_VAR_TYPE_FLOAT2 = 9, - GX2_SHADER_VAR_TYPE_FLOAT3 = 10, - GX2_SHADER_VAR_TYPE_FLOAT4 = 11, - GX2_SHADER_VAR_TYPE_BOOL2 = 12, - GX2_SHADER_VAR_TYPE_BOOL3 = 13, - GX2_SHADER_VAR_TYPE_BOOL4 = 14, - GX2_SHADER_VAR_TYPE_INT2 = 15, - GX2_SHADER_VAR_TYPE_INT3 = 16, - GX2_SHADER_VAR_TYPE_INT4 = 17, - GX2_SHADER_VAR_TYPE_UINT2 = 18, - GX2_SHADER_VAR_TYPE_UINT3 = 19, - GX2_SHADER_VAR_TYPE_UINT4 = 20, - GX2_SHADER_VAR_TYPE_FLOAT2X2 = 21, - GX2_SHADER_VAR_TYPE_FLOAT2X3 = 22, - GX2_SHADER_VAR_TYPE_FLOAT2X4 = 23, - GX2_SHADER_VAR_TYPE_FLOAT3X2 = 24, - GX2_SHADER_VAR_TYPE_FLOAT3X3 = 25, - GX2_SHADER_VAR_TYPE_FLOAT3X4 = 26, - GX2_SHADER_VAR_TYPE_FLOAT4X2 = 27, - GX2_SHADER_VAR_TYPE_FLOAT4X3 = 28, - GX2_SHADER_VAR_TYPE_FLOAT4X4 = 29, - GX2_SHADER_VAR_TYPE_DOUBLE2X2 = 30, - GX2_SHADER_VAR_TYPE_DOUBLE2X3 = 31, - GX2_SHADER_VAR_TYPE_DOUBLE2X4 = 32, - GX2_SHADER_VAR_TYPE_DOUBLE3X2 = 33, - GX2_SHADER_VAR_TYPE_DOUBLE3X3 = 34, - GX2_SHADER_VAR_TYPE_DOUBLE3X4 = 35, - GX2_SHADER_VAR_TYPE_DOUBLE4X2 = 36, - GX2_SHADER_VAR_TYPE_DOUBLE4X3 = 37, - GX2_SHADER_VAR_TYPE_DOUBLE4X4 = 38, + GX2_SHADER_VAR_TYPE_VOID = 0, + GX2_SHADER_VAR_TYPE_BOOL = 1, + GX2_SHADER_VAR_TYPE_INT = 2, + GX2_SHADER_VAR_TYPE_UINT = 3, + GX2_SHADER_VAR_TYPE_FLOAT = 4, + GX2_SHADER_VAR_TYPE_DOUBLE = 5, + GX2_SHADER_VAR_TYPE_DOUBLE2 = 6, + GX2_SHADER_VAR_TYPE_DOUBLE3 = 7, + GX2_SHADER_VAR_TYPE_DOUBLE4 = 8, + GX2_SHADER_VAR_TYPE_FLOAT2 = 9, + GX2_SHADER_VAR_TYPE_FLOAT3 = 10, + GX2_SHADER_VAR_TYPE_FLOAT4 = 11, + GX2_SHADER_VAR_TYPE_BOOL2 = 12, + GX2_SHADER_VAR_TYPE_BOOL3 = 13, + GX2_SHADER_VAR_TYPE_BOOL4 = 14, + GX2_SHADER_VAR_TYPE_INT2 = 15, + GX2_SHADER_VAR_TYPE_INT3 = 16, + GX2_SHADER_VAR_TYPE_INT4 = 17, + GX2_SHADER_VAR_TYPE_UINT2 = 18, + GX2_SHADER_VAR_TYPE_UINT3 = 19, + GX2_SHADER_VAR_TYPE_UINT4 = 20, + GX2_SHADER_VAR_TYPE_FLOAT2X2 = 21, + GX2_SHADER_VAR_TYPE_FLOAT2X3 = 22, + GX2_SHADER_VAR_TYPE_FLOAT2X4 = 23, + GX2_SHADER_VAR_TYPE_FLOAT3X2 = 24, + GX2_SHADER_VAR_TYPE_FLOAT3X3 = 25, + GX2_SHADER_VAR_TYPE_FLOAT3X4 = 26, + GX2_SHADER_VAR_TYPE_FLOAT4X2 = 27, + GX2_SHADER_VAR_TYPE_FLOAT4X3 = 28, + GX2_SHADER_VAR_TYPE_FLOAT4X4 = 29, + GX2_SHADER_VAR_TYPE_DOUBLE2X2 = 30, + GX2_SHADER_VAR_TYPE_DOUBLE2X3 = 31, + GX2_SHADER_VAR_TYPE_DOUBLE2X4 = 32, + GX2_SHADER_VAR_TYPE_DOUBLE3X2 = 33, + GX2_SHADER_VAR_TYPE_DOUBLE3X3 = 34, + GX2_SHADER_VAR_TYPE_DOUBLE3X4 = 35, + GX2_SHADER_VAR_TYPE_DOUBLE4X2 = 36, + GX2_SHADER_VAR_TYPE_DOUBLE4X3 = 37, + GX2_SHADER_VAR_TYPE_DOUBLE4X4 = 38, } GX2ShaderVarType; typedef enum GX2StencilFunction { - GX2_STENCIL_FUNCTION_KEEP = 0, - GX2_STENCIL_FUNCTION_ZERO = 1, - GX2_STENCIL_FUNCTION_REPLACE = 2, - GX2_STENCIL_FUNCTION_INCR_CLAMP = 3, - GX2_STENCIL_FUNCTION_DECR_CLAMP = 4, - GX2_STENCIL_FUNCTION_INV = 5, - GX2_STENCIL_FUNCTION_INCR_WRAP = 6, - GX2_STENCIL_FUNCTION_DECR_WRAP = 7, + GX2_STENCIL_FUNCTION_KEEP = 0, + GX2_STENCIL_FUNCTION_ZERO = 1, + GX2_STENCIL_FUNCTION_REPLACE = 2, + GX2_STENCIL_FUNCTION_INCR_CLAMP = 3, + GX2_STENCIL_FUNCTION_DECR_CLAMP = 4, + GX2_STENCIL_FUNCTION_INV = 5, + GX2_STENCIL_FUNCTION_INCR_WRAP = 6, + GX2_STENCIL_FUNCTION_DECR_WRAP = 7, } GX2StencilFunction; typedef enum GX2SurfaceDim { - GX2_SURFACE_DIM_TEXTURE_1D = 0, - GX2_SURFACE_DIM_TEXTURE_2D = 1, - GX2_SURFACE_DIM_TEXTURE_3D = 2, - GX2_SURFACE_DIM_TEXTURE_CUBE = 3, - GX2_SURFACE_DIM_TEXTURE_1D_ARRAY = 4, - GX2_SURFACE_DIM_TEXTURE_2D_ARRAY = 5, - GX2_SURFACE_DIM_TEXTURE_2D_MSAA = 6, - GX2_SURFACE_DIM_TEXTURE_2D_MSAA_ARRAY = 7, + GX2_SURFACE_DIM_TEXTURE_1D = 0, + GX2_SURFACE_DIM_TEXTURE_2D = 1, + GX2_SURFACE_DIM_TEXTURE_3D = 2, + GX2_SURFACE_DIM_TEXTURE_CUBE = 3, + GX2_SURFACE_DIM_TEXTURE_1D_ARRAY = 4, + GX2_SURFACE_DIM_TEXTURE_2D_ARRAY = 5, + GX2_SURFACE_DIM_TEXTURE_2D_MSAA = 6, + GX2_SURFACE_DIM_TEXTURE_2D_MSAA_ARRAY = 7, } GX2SurfaceDim; typedef enum GX2SurfaceFormat { - GX2_SURFACE_FORMAT_INVALID = 0x00, - GX2_SURFACE_FORMAT_UNORM_R4_G4 = 0x02, - GX2_SURFACE_FORMAT_UNORM_R4_G4_B4_A4 = 0x0b, - GX2_SURFACE_FORMAT_UNORM_R8 = 0x01, - GX2_SURFACE_FORMAT_UNORM_R8_G8 = 0x07, - GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8 = 0x01a, - GX2_SURFACE_FORMAT_UNORM_R16 = 0x05, - GX2_SURFACE_FORMAT_UNORM_R16_G16 = 0x0f, - GX2_SURFACE_FORMAT_UNORM_R16_G16_B16_A16 = 0x01f, - GX2_SURFACE_FORMAT_UNORM_R5_G6_B5 = 0x08, - GX2_SURFACE_FORMAT_UNORM_R5_G5_B5_A1 = 0x0a, - GX2_SURFACE_FORMAT_UNORM_A1_B5_G5_R5 = 0x0c, - GX2_SURFACE_FORMAT_UNORM_R24_X8 = 0x011, - GX2_SURFACE_FORMAT_UNORM_A2_B10_G10_R10 = 0x01b, - GX2_SURFACE_FORMAT_UNORM_R10_G10_B10_A2 = 0x019, - GX2_SURFACE_FORMAT_UNORM_BC1 = 0x031, - GX2_SURFACE_FORMAT_UNORM_BC2 = 0x032, - GX2_SURFACE_FORMAT_UNORM_BC3 = 0x033, - GX2_SURFACE_FORMAT_UNORM_BC4 = 0x034, - GX2_SURFACE_FORMAT_UNORM_BC5 = 0x035, - GX2_SURFACE_FORMAT_UNORM_NV12 = 0x081, - - GX2_SURFACE_FORMAT_UINT_R8 = 0x101, - GX2_SURFACE_FORMAT_UINT_R8_G8 = 0x107, - GX2_SURFACE_FORMAT_UINT_R8_G8_B8_A8 = 0x11a, - GX2_SURFACE_FORMAT_UINT_R16 = 0x105, - GX2_SURFACE_FORMAT_UINT_R16_G16 = 0x10f, - GX2_SURFACE_FORMAT_UINT_R16_G16_B16_A16 = 0x11f, - GX2_SURFACE_FORMAT_UINT_R32 = 0x10d, - GX2_SURFACE_FORMAT_UINT_R32_G32 = 0x11d, - GX2_SURFACE_FORMAT_UINT_R32_G32_B32_A32 = 0x122, - GX2_SURFACE_FORMAT_UINT_A2_B10_G10_R10 = 0x11b, - GX2_SURFACE_FORMAT_UINT_R10_G10_B10_A2 = 0x119, - GX2_SURFACE_FORMAT_UINT_X24_G8 = 0x111, - GX2_SURFACE_FORMAT_UINT_G8_X24 = 0x11c, - - GX2_SURFACE_FORMAT_SNORM_R8 = 0x201, - GX2_SURFACE_FORMAT_SNORM_R8_G8 = 0x207, - GX2_SURFACE_FORMAT_SNORM_R8_G8_B8_A8 = 0x21a, - GX2_SURFACE_FORMAT_SNORM_R16 = 0x205, - GX2_SURFACE_FORMAT_SNORM_R16_G16 = 0x20f, - GX2_SURFACE_FORMAT_SNORM_R16_G16_B16_A16 = 0x21f, - GX2_SURFACE_FORMAT_SNORM_R10_G10_B10_A2 = 0x219, - GX2_SURFACE_FORMAT_SNORM_BC4 = 0x234, - GX2_SURFACE_FORMAT_SNORM_BC5 = 0x235, - - GX2_SURFACE_FORMAT_SINT_R8 = 0x301, - GX2_SURFACE_FORMAT_SINT_R8_G8 = 0x307, - GX2_SURFACE_FORMAT_SINT_R8_G8_B8_A8 = 0x31a, - GX2_SURFACE_FORMAT_SINT_R16 = 0x305, - GX2_SURFACE_FORMAT_SINT_R16_G16 = 0x30f, - GX2_SURFACE_FORMAT_SINT_R16_G16_B16_A16 = 0x31f, - GX2_SURFACE_FORMAT_SINT_R32 = 0x30d, - GX2_SURFACE_FORMAT_SINT_R32_G32 = 0x31d, - GX2_SURFACE_FORMAT_SINT_R32_G32_B32_A32 = 0x322, - GX2_SURFACE_FORMAT_SINT_R10_G10_B10_A2 = 0x319, - - GX2_SURFACE_FORMAT_SRGB_R8_G8_B8_A8 = 0x41a, - GX2_SURFACE_FORMAT_SRGB_BC1 = 0x431, - GX2_SURFACE_FORMAT_SRGB_BC2 = 0x432, - GX2_SURFACE_FORMAT_SRGB_BC3 = 0x433, - - GX2_SURFACE_FORMAT_FLOAT_R32 = 0x80e, - GX2_SURFACE_FORMAT_FLOAT_R32_G32 = 0x81e, - GX2_SURFACE_FORMAT_FLOAT_R32_G32_B32_A32 = 0x823, - GX2_SURFACE_FORMAT_FLOAT_R16 = 0x806, - GX2_SURFACE_FORMAT_FLOAT_R16_G16 = 0x810, - GX2_SURFACE_FORMAT_FLOAT_R16_G16_B16_A16 = 0x820, - GX2_SURFACE_FORMAT_FLOAT_R11_G11_B10 = 0x816, - GX2_SURFACE_FORMAT_FLOAT_D24_S8 = 0x811, - GX2_SURFACE_FORMAT_FLOAT_X8_X24 = 0x81c, + GX2_SURFACE_FORMAT_INVALID = 0x00, + GX2_SURFACE_FORMAT_UNORM_R4_G4 = 0x02, + GX2_SURFACE_FORMAT_UNORM_R4_G4_B4_A4 = 0x0b, + GX2_SURFACE_FORMAT_UNORM_R8 = 0x01, + GX2_SURFACE_FORMAT_UNORM_R8_G8 = 0x07, + GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8 = 0x01a, + GX2_SURFACE_FORMAT_UNORM_R16 = 0x05, + GX2_SURFACE_FORMAT_UNORM_R16_G16 = 0x0f, + GX2_SURFACE_FORMAT_UNORM_R16_G16_B16_A16 = 0x01f, + GX2_SURFACE_FORMAT_UNORM_R5_G6_B5 = 0x08, + GX2_SURFACE_FORMAT_UNORM_R5_G5_B5_A1 = 0x0a, + GX2_SURFACE_FORMAT_UNORM_A1_B5_G5_R5 = 0x0c, + GX2_SURFACE_FORMAT_UNORM_R24_X8 = 0x011, + GX2_SURFACE_FORMAT_UNORM_A2_B10_G10_R10 = 0x01b, + GX2_SURFACE_FORMAT_UNORM_R10_G10_B10_A2 = 0x019, + GX2_SURFACE_FORMAT_UNORM_BC1 = 0x031, + GX2_SURFACE_FORMAT_UNORM_BC2 = 0x032, + GX2_SURFACE_FORMAT_UNORM_BC3 = 0x033, + GX2_SURFACE_FORMAT_UNORM_BC4 = 0x034, + GX2_SURFACE_FORMAT_UNORM_BC5 = 0x035, + GX2_SURFACE_FORMAT_UNORM_NV12 = 0x081, + + GX2_SURFACE_FORMAT_UINT_R8 = 0x101, + GX2_SURFACE_FORMAT_UINT_R8_G8 = 0x107, + GX2_SURFACE_FORMAT_UINT_R8_G8_B8_A8 = 0x11a, + GX2_SURFACE_FORMAT_UINT_R16 = 0x105, + GX2_SURFACE_FORMAT_UINT_R16_G16 = 0x10f, + GX2_SURFACE_FORMAT_UINT_R16_G16_B16_A16 = 0x11f, + GX2_SURFACE_FORMAT_UINT_R32 = 0x10d, + GX2_SURFACE_FORMAT_UINT_R32_G32 = 0x11d, + GX2_SURFACE_FORMAT_UINT_R32_G32_B32_A32 = 0x122, + GX2_SURFACE_FORMAT_UINT_A2_B10_G10_R10 = 0x11b, + GX2_SURFACE_FORMAT_UINT_R10_G10_B10_A2 = 0x119, + GX2_SURFACE_FORMAT_UINT_X24_G8 = 0x111, + GX2_SURFACE_FORMAT_UINT_G8_X24 = 0x11c, + + GX2_SURFACE_FORMAT_SNORM_R8 = 0x201, + GX2_SURFACE_FORMAT_SNORM_R8_G8 = 0x207, + GX2_SURFACE_FORMAT_SNORM_R8_G8_B8_A8 = 0x21a, + GX2_SURFACE_FORMAT_SNORM_R16 = 0x205, + GX2_SURFACE_FORMAT_SNORM_R16_G16 = 0x20f, + GX2_SURFACE_FORMAT_SNORM_R16_G16_B16_A16 = 0x21f, + GX2_SURFACE_FORMAT_SNORM_R10_G10_B10_A2 = 0x219, + GX2_SURFACE_FORMAT_SNORM_BC4 = 0x234, + GX2_SURFACE_FORMAT_SNORM_BC5 = 0x235, + + GX2_SURFACE_FORMAT_SINT_R8 = 0x301, + GX2_SURFACE_FORMAT_SINT_R8_G8 = 0x307, + GX2_SURFACE_FORMAT_SINT_R8_G8_B8_A8 = 0x31a, + GX2_SURFACE_FORMAT_SINT_R16 = 0x305, + GX2_SURFACE_FORMAT_SINT_R16_G16 = 0x30f, + GX2_SURFACE_FORMAT_SINT_R16_G16_B16_A16 = 0x31f, + GX2_SURFACE_FORMAT_SINT_R32 = 0x30d, + GX2_SURFACE_FORMAT_SINT_R32_G32 = 0x31d, + GX2_SURFACE_FORMAT_SINT_R32_G32_B32_A32 = 0x322, + GX2_SURFACE_FORMAT_SINT_R10_G10_B10_A2 = 0x319, + + GX2_SURFACE_FORMAT_SRGB_R8_G8_B8_A8 = 0x41a, + GX2_SURFACE_FORMAT_SRGB_BC1 = 0x431, + GX2_SURFACE_FORMAT_SRGB_BC2 = 0x432, + GX2_SURFACE_FORMAT_SRGB_BC3 = 0x433, + + GX2_SURFACE_FORMAT_FLOAT_R32 = 0x80e, + GX2_SURFACE_FORMAT_FLOAT_R32_G32 = 0x81e, + GX2_SURFACE_FORMAT_FLOAT_R32_G32_B32_A32 = 0x823, + GX2_SURFACE_FORMAT_FLOAT_R16 = 0x806, + GX2_SURFACE_FORMAT_FLOAT_R16_G16 = 0x810, + GX2_SURFACE_FORMAT_FLOAT_R16_G16_B16_A16 = 0x820, + GX2_SURFACE_FORMAT_FLOAT_R11_G11_B10 = 0x816, + GX2_SURFACE_FORMAT_FLOAT_D24_S8 = 0x811, + GX2_SURFACE_FORMAT_FLOAT_X8_X24 = 0x81c, } GX2SurfaceFormat; typedef enum GX2SurfaceUse { - GX2_SURFACE_USE_NONE = 0, - GX2_SURFACE_USE_TEXTURE = 1 << 0, - GX2_SURFACE_USE_COLOR_BUFFER = 1 << 1, - GX2_SURFACE_USE_DEPTH_BUFFER = 1 << 2, - GX2_SURFACE_USE_SCAN_BUFFER = 1 << 3, - GX2_SURFACE_USE_TV = 1 << 31, - GX2_SURFACE_USE_TEXTURE_COLOR_BUFFER_TV = (GX2_SURFACE_USE_TEXTURE | GX2_SURFACE_USE_COLOR_BUFFER | GX2_SURFACE_USE_TV) + GX2_SURFACE_USE_NONE = 0, + GX2_SURFACE_USE_TEXTURE = 1 << 0, + GX2_SURFACE_USE_COLOR_BUFFER = 1 << 1, + GX2_SURFACE_USE_DEPTH_BUFFER = 1 << 2, + GX2_SURFACE_USE_SCAN_BUFFER = 1 << 3, + GX2_SURFACE_USE_TV = 1 << 31, + GX2_SURFACE_USE_TEXTURE_COLOR_BUFFER_TV = (GX2_SURFACE_USE_TEXTURE | GX2_SURFACE_USE_COLOR_BUFFER | GX2_SURFACE_USE_TV) } GX2SurfaceUse; WUT_ENUM_BITMASK_TYPE(GX2SurfaceUse) typedef enum GX2TessellationMode { - GX2_TESSELLATION_MODE_DISCRETE = 0, - GX2_TESSELLATION_MODE_CONTINUOUS = 1, - GX2_TESSELLATION_MODE_ADAPTIVE = 2, + GX2_TESSELLATION_MODE_DISCRETE = 0, + GX2_TESSELLATION_MODE_CONTINUOUS = 1, + GX2_TESSELLATION_MODE_ADAPTIVE = 2, } GX2TessellationMode; typedef enum GX2TexBorderType { - GX2_TEX_BORDER_TYPE_TRANSPARENT_BLACK = 0, - GX2_TEX_BORDER_TYPE_BLACK = 1, - GX2_TEX_BORDER_TYPE_WHITE = 2, - GX2_TEX_BORDER_TYPE_VARIABLE = 3, + GX2_TEX_BORDER_TYPE_TRANSPARENT_BLACK = 0, + GX2_TEX_BORDER_TYPE_BLACK = 1, + GX2_TEX_BORDER_TYPE_WHITE = 2, + GX2_TEX_BORDER_TYPE_VARIABLE = 3, } GX2TexBorderType; typedef enum GX2TexClampMode { - GX2_TEX_CLAMP_MODE_WRAP = 0, - GX2_TEX_CLAMP_MODE_MIRROR = 1, - GX2_TEX_CLAMP_MODE_CLAMP = 2, - GX2_TEX_CLAMP_MODE_MIRROR_ONCE = 3, - GX2_TEX_CLAMP_MODE_CLAMP_BORDER = 6, + GX2_TEX_CLAMP_MODE_WRAP = 0, + GX2_TEX_CLAMP_MODE_MIRROR = 1, + GX2_TEX_CLAMP_MODE_CLAMP = 2, + GX2_TEX_CLAMP_MODE_MIRROR_ONCE = 3, + GX2_TEX_CLAMP_MODE_CLAMP_BORDER = 6, } GX2TexClampMode; typedef enum GX2TexMipFilterMode { - GX2_TEX_MIP_FILTER_MODE_NONE = 0, - GX2_TEX_MIP_FILTER_MODE_POINT = 1, - GX2_TEX_MIP_FILTER_MODE_LINEAR = 2, + GX2_TEX_MIP_FILTER_MODE_NONE = 0, + GX2_TEX_MIP_FILTER_MODE_POINT = 1, + GX2_TEX_MIP_FILTER_MODE_LINEAR = 2, } GX2TexMipFilterMode; typedef enum GX2TexMipPerfMode { - GX2_TEX_MIP_PERF_MODE_DISABLE = 0, + GX2_TEX_MIP_PERF_MODE_DISABLE = 0, } GX2TexMipPerfMode; typedef enum GX2TexXYFilterMode { - GX2_TEX_XY_FILTER_MODE_POINT = 0, - GX2_TEX_XY_FILTER_MODE_LINEAR = 1, + GX2_TEX_XY_FILTER_MODE_POINT = 0, + GX2_TEX_XY_FILTER_MODE_LINEAR = 1, } GX2TexXYFilterMode; typedef enum GX2TexAnisoRatio { - GX2_TEX_ANISO_RATIO_NONE = 0, + GX2_TEX_ANISO_RATIO_NONE = 0, } GX2TexAnisoRatio; typedef enum GX2TexZFilterMode { - GX2_TEX_Z_FILTER_MODE_NONE = 0, - GX2_TEX_Z_FILTER_MODE_POINT = 1, - GX2_TEX_Z_FILTER_MODE_LINEAR = 2, + GX2_TEX_Z_FILTER_MODE_NONE = 0, + GX2_TEX_Z_FILTER_MODE_POINT = 1, + GX2_TEX_Z_FILTER_MODE_LINEAR = 2, } GX2TexZFilterMode; typedef enum GX2TexZPerfMode { - GX2_TEX_Z_PERF_MODE_DISABLED = 0, + GX2_TEX_Z_PERF_MODE_DISABLED = 0, } GX2TexZPerfMode; typedef enum GX2TileMode { - GX2_TILE_MODE_DEFAULT = 0, - GX2_TILE_MODE_LINEAR_ALIGNED = 1, - GX2_TILE_MODE_TILED_1D_THIN1 = 2, - GX2_TILE_MODE_TILED_1D_THICK = 3, - GX2_TILE_MODE_TILED_2D_THIN1 = 4, - GX2_TILE_MODE_TILED_2D_THIN2 = 5, - GX2_TILE_MODE_TILED_2D_THIN4 = 6, - GX2_TILE_MODE_TILED_2D_THICK = 7, - GX2_TILE_MODE_TILED_2B_THIN1 = 8, - GX2_TILE_MODE_TILED_2B_THIN2 = 9, - GX2_TILE_MODE_TILED_2B_THIN4 = 10, - GX2_TILE_MODE_TILED_2B_THICK = 11, - GX2_TILE_MODE_TILED_3D_THIN1 = 12, - GX2_TILE_MODE_TILED_3D_THICK = 13, - GX2_TILE_MODE_TILED_3B_THIN1 = 14, - GX2_TILE_MODE_TILED_3B_THICK = 15, - GX2_TILE_MODE_LINEAR_SPECIAL = 16, + GX2_TILE_MODE_DEFAULT = 0, + GX2_TILE_MODE_LINEAR_ALIGNED = 1, + GX2_TILE_MODE_TILED_1D_THIN1 = 2, + GX2_TILE_MODE_TILED_1D_THICK = 3, + GX2_TILE_MODE_TILED_2D_THIN1 = 4, + GX2_TILE_MODE_TILED_2D_THIN2 = 5, + GX2_TILE_MODE_TILED_2D_THIN4 = 6, + GX2_TILE_MODE_TILED_2D_THICK = 7, + GX2_TILE_MODE_TILED_2B_THIN1 = 8, + GX2_TILE_MODE_TILED_2B_THIN2 = 9, + GX2_TILE_MODE_TILED_2B_THIN4 = 10, + GX2_TILE_MODE_TILED_2B_THICK = 11, + GX2_TILE_MODE_TILED_3D_THIN1 = 12, + GX2_TILE_MODE_TILED_3D_THICK = 13, + GX2_TILE_MODE_TILED_3B_THIN1 = 14, + GX2_TILE_MODE_TILED_3B_THICK = 15, + GX2_TILE_MODE_LINEAR_SPECIAL = 16, } GX2TileMode; typedef enum GX2TVRenderMode { - GX2_TV_RENDER_MODE_DISABLED = 0, - GX2_TV_RENDER_MODE_STANDARD_480P = 1, - GX2_TV_RENDER_MODE_WIDE_480P = 2, - GX2_TV_RENDER_MODE_WIDE_720P = 3, - GX2_TV_RENDER_MODE_WIDE_1080P = 5, + GX2_TV_RENDER_MODE_DISABLED = 0, + GX2_TV_RENDER_MODE_STANDARD_480P = 1, + GX2_TV_RENDER_MODE_WIDE_480P = 2, + GX2_TV_RENDER_MODE_WIDE_720P = 3, + GX2_TV_RENDER_MODE_WIDE_1080P = 5, } GX2TVRenderMode; typedef enum GX2TVScanMode { - GX2_TV_SCAN_MODE_NONE = 0, - GX2_TV_SCAN_MODE_576I = 1, - GX2_TV_SCAN_MODE_480I = 2, - GX2_TV_SCAN_MODE_480P = 3, - GX2_TV_SCAN_MODE_720P = 4, - GX2_TV_SCAN_MODE_1080I = 6, - GX2_TV_SCAN_MODE_1080P = 7, + GX2_TV_SCAN_MODE_NONE = 0, + GX2_TV_SCAN_MODE_576I = 1, + GX2_TV_SCAN_MODE_480I = 2, + GX2_TV_SCAN_MODE_480P = 3, + GX2_TV_SCAN_MODE_720P = 4, + GX2_TV_SCAN_MODE_1080I = 6, + GX2_TV_SCAN_MODE_1080P = 7, } GX2TVScanMode; #ifdef __cplusplus diff --git a/include/gx2/event.h b/include/gx2/event.h index 59f978c69..6d2fa5fb5 100644 --- a/include/gx2/event.h +++ b/include/gx2/event.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include "enum.h" +#include +#include /** * \defgroup gx2_event Event @@ -38,24 +38,19 @@ WUT_CHECK_OFFSET(GX2DisplayListOverrunData, 0x08, newList); WUT_CHECK_OFFSET(GX2DisplayListOverrunData, 0x0C, newSize); WUT_CHECK_SIZE(GX2DisplayListOverrunData, 0x18); -BOOL -GX2DrawDone(); +BOOL GX2DrawDone(); -void -GX2WaitForVsync(); +void GX2WaitForVsync(); -void -GX2WaitForFlip(); +void GX2WaitForFlip(); -void -GX2SetEventCallback(GX2EventType type, - GX2EventCallbackFunction func, - void *userData); +void GX2SetEventCallback(GX2EventType type, + GX2EventCallbackFunction func, + void *userData); -void -GX2GetEventCallback(GX2EventType type, - GX2EventCallbackFunction *funcOut, - void **userDataOut); +void GX2GetEventCallback(GX2EventType type, + GX2EventCallbackFunction *funcOut, + void **userDataOut); OSTime GX2GetRetiredTimeStamp(); @@ -63,14 +58,12 @@ GX2GetRetiredTimeStamp(); OSTime GX2GetLastSubmittedTimeStamp(); -void -GX2GetSwapStatus(uint32_t *swapCount, - uint32_t *flipCount, - OSTime *lastFlip, - OSTime *lastVsync); +void GX2GetSwapStatus(uint32_t *swapCount, + uint32_t *flipCount, + OSTime *lastFlip, + OSTime *lastVsync); -BOOL -GX2WaitTimeStamp(OSTime time); +BOOL GX2WaitTimeStamp(OSTime time); #ifdef __cplusplus } diff --git a/include/gx2/mem.h b/include/gx2/mem.h index a37b0d74f..e7a1aa5f3 100644 --- a/include/gx2/mem.h +++ b/include/gx2/mem.h @@ -1,6 +1,6 @@ #pragma once -#include #include "enum.h" +#include /** * \defgroup gx2_mem Memory @@ -12,10 +12,9 @@ extern "C" { #endif -void -GX2Invalidate(GX2InvalidateMode mode, - void *buffer, - uint32_t size); +void GX2Invalidate(GX2InvalidateMode mode, + void *buffer, + uint32_t size); #ifdef __cplusplus } diff --git a/include/gx2/registers.h b/include/gx2/registers.h index 3fc9f0164..0eb8666b6 100644 --- a/include/gx2/registers.h +++ b/include/gx2/registers.h @@ -1,7 +1,7 @@ #pragma once -#include #include "enum.h" #include "surface.h" +#include /** * \defgroup gx2_registers Registers @@ -186,434 +186,368 @@ WUT_CHECK_OFFSET(GX2ViewportReg, 0x28, pa_sc_vport_zmin); WUT_CHECK_OFFSET(GX2ViewportReg, 0x2C, pa_sc_vport_zmax); WUT_CHECK_SIZE(GX2ViewportReg, 48); -void -GX2SetAAMask(uint8_t upperLeft, - uint8_t upperRight, - uint8_t lowerLeft, - uint8_t lowerRight); - -void -GX2InitAAMaskReg(GX2AAMaskReg *reg, - uint8_t upperLeft, - uint8_t upperRight, - uint8_t lowerLeft, - uint8_t lowerRight); - -void -GX2GetAAMaskReg(GX2AAMaskReg *reg, - uint8_t *upperLeft, - uint8_t *upperRight, - uint8_t *lowerLeft, - uint8_t *lowerRight); - -void -GX2SetAAMaskReg(const GX2AAMaskReg *reg); - -void -GX2SetAlphaTest(BOOL alphaTest, - GX2CompareFunction func, - float ref); - -void -GX2InitAlphaTestReg(GX2AlphaTestReg *reg, - BOOL alphaTest, - GX2CompareFunction func, - float ref); - -void -GX2GetAlphaTestReg(const GX2AlphaTestReg *reg, - BOOL *alphaTest, - GX2CompareFunction *func, - float *ref); - -void -GX2SetAlphaTestReg(const GX2AlphaTestReg *reg); - -void -GX2SetAlphaToMask(BOOL alphaToMask, - GX2AlphaToMaskMode mode); - -void -GX2InitAlphaToMaskReg(GX2AlphaToMaskReg *reg, - BOOL alphaToMask, - GX2AlphaToMaskMode mode); - -void -GX2GetAlphaToMaskReg(const GX2AlphaToMaskReg *reg, - BOOL *alphaToMask, - GX2AlphaToMaskMode *mode); - -void -GX2SetAlphaToMaskReg(const GX2AlphaToMaskReg *reg); - -void -GX2SetBlendConstantColor(float red, - float green, - float blue, - float alpha); - -void -GX2InitBlendConstantColorReg(GX2BlendConstantColorReg *reg, - float red, - float green, - float blue, - float alpha); - -void -GX2GetBlendConstantColorReg(GX2BlendConstantColorReg *reg, - float *red, - float *green, - float *blue, - float *alpha); - -void -GX2SetBlendConstantColorReg(const GX2BlendConstantColorReg *reg); - -void -GX2SetBlendControl(GX2RenderTarget target, - GX2BlendMode colorSrcBlend, - GX2BlendMode colorDstBlend, - GX2BlendCombineMode colorCombine, - BOOL useAlphaBlend, - GX2BlendMode alphaSrcBlend, - GX2BlendMode alphaDstBlend, - GX2BlendCombineMode alphaCombine); - -void -GX2InitBlendControlReg(GX2BlendControlReg *reg, - GX2RenderTarget target, - GX2BlendMode colorSrcBlend, - GX2BlendMode colorDstBlend, - GX2BlendCombineMode colorCombine, - BOOL useAlphaBlend, - GX2BlendMode alphaSrcBlend, - GX2BlendMode alphaDstBlend, - GX2BlendCombineMode alphaCombine); - -void -GX2GetBlendControlReg(GX2BlendControlReg *reg, - GX2RenderTarget *target, - GX2BlendMode *colorSrcBlend, - GX2BlendMode *colorDstBlend, - GX2BlendCombineMode *colorCombine, - BOOL *useAlphaBlend, - GX2BlendMode *alphaSrcBlend, - GX2BlendMode *alphaDstBlend, - GX2BlendCombineMode *alphaCombine); - -void -GX2SetBlendControlReg(const GX2BlendControlReg *reg); - -void -GX2SetColorControl(GX2LogicOp rop3, - uint8_t targetBlendEnable, - BOOL multiWriteEnable, - BOOL colorWriteEnable); - -void -GX2InitColorControlReg(GX2ColorControlReg *reg, - GX2LogicOp rop3, - uint8_t targetBlendEnable, - BOOL multiWriteEnable, - BOOL colorWriteEnable); - -void -GX2GetColorControlReg(GX2ColorControlReg *reg, - GX2LogicOp *rop3, - uint8_t *targetBlendEnable, - BOOL *multiWriteEnable, - BOOL *colorWriteEnable); - -void -GX2SetColorControlReg(const GX2ColorControlReg *reg); - -void -GX2SetDepthOnlyControl(BOOL depthTest, - BOOL depthWrite, - GX2CompareFunction depthCompare); - -void -GX2SetDepthStencilControl(BOOL depthTest, - BOOL depthWrite, - GX2CompareFunction depthCompare, - BOOL stencilTest, - BOOL backfaceStencil, - GX2CompareFunction frontStencilFunc, - GX2StencilFunction frontStencilZPass, - GX2StencilFunction frontStencilZFail, - GX2StencilFunction frontStencilFail, - GX2CompareFunction backStencilFunc, - GX2StencilFunction backStencilZPass, - GX2StencilFunction backStencilZFail, - GX2StencilFunction backStencilFail); - -void -GX2InitDepthStencilControlReg(GX2DepthStencilControlReg *reg, - BOOL depthTest, - BOOL depthWrite, - GX2CompareFunction depthCompare, - BOOL stencilTest, - BOOL backfaceStencil, - GX2CompareFunction frontStencilFunc, - GX2StencilFunction frontStencilZPass, - GX2StencilFunction frontStencilZFail, - GX2StencilFunction frontStencilFail, - GX2CompareFunction backStencilFunc, - GX2StencilFunction backStencilZPass, - GX2StencilFunction backStencilZFail, - GX2StencilFunction backStencilFail); - -void -GX2GetDepthStencilControlReg(GX2DepthStencilControlReg *reg, - BOOL *depthTest, - BOOL *depthWrite, - GX2CompareFunction *depthCompare, - BOOL *stencilTest, - BOOL *backfaceStencil, - GX2CompareFunction *frontStencilFunc, - GX2StencilFunction *frontStencilZPass, - GX2StencilFunction *frontStencilZFail, - GX2StencilFunction *frontStencilFail, - GX2CompareFunction *backStencilFunc, - GX2StencilFunction *backStencilZPass, - GX2StencilFunction *backStencilZFail, - GX2StencilFunction *backStencilFail); - -void -GX2SetDepthStencilControlReg(const GX2DepthStencilControlReg *reg); - -void -GX2SetStencilMask(uint8_t frontMask, - uint8_t frontWriteMask, - uint8_t frontRef, - uint8_t backMask, - uint8_t backWriteMask, - uint8_t backRef); - -void -GX2InitStencilMaskReg(GX2StencilMaskReg *reg, - uint8_t frontMask, - uint8_t frontWriteMask, - uint8_t frontRef, - uint8_t backMask, - uint8_t backWriteMask, - uint8_t backRef); - -void -GX2GetStencilMaskReg(GX2StencilMaskReg *reg, - uint8_t *frontMask, - uint8_t *frontWriteMask, - uint8_t *frontRef, - uint8_t *backMask, - uint8_t *backWriteMask, - uint8_t *backRef); - -void -GX2SetStencilMaskReg(const GX2StencilMaskReg *reg); - -void -GX2SetLineWidth(float width); - -void -GX2InitLineWidthReg(GX2LineWidthReg *reg, - float width); - -void -GX2GetLineWidthReg(GX2LineWidthReg *reg, - float *width); - -void -GX2SetLineWidthReg(const GX2LineWidthReg *reg); - -void -GX2SetPointSize(float width, - float height); - -void -GX2InitPointSizeReg(GX2PointSizeReg *reg, +void GX2SetAAMask(uint8_t upperLeft, + uint8_t upperRight, + uint8_t lowerLeft, + uint8_t lowerRight); + +void GX2InitAAMaskReg(GX2AAMaskReg *reg, + uint8_t upperLeft, + uint8_t upperRight, + uint8_t lowerLeft, + uint8_t lowerRight); + +void GX2GetAAMaskReg(GX2AAMaskReg *reg, + uint8_t *upperLeft, + uint8_t *upperRight, + uint8_t *lowerLeft, + uint8_t *lowerRight); + +void GX2SetAAMaskReg(const GX2AAMaskReg *reg); + +void GX2SetAlphaTest(BOOL alphaTest, + GX2CompareFunction func, + float ref); + +void GX2InitAlphaTestReg(GX2AlphaTestReg *reg, + BOOL alphaTest, + GX2CompareFunction func, + float ref); + +void GX2GetAlphaTestReg(const GX2AlphaTestReg *reg, + BOOL *alphaTest, + GX2CompareFunction *func, + float *ref); + +void GX2SetAlphaTestReg(const GX2AlphaTestReg *reg); + +void GX2SetAlphaToMask(BOOL alphaToMask, + GX2AlphaToMaskMode mode); + +void GX2InitAlphaToMaskReg(GX2AlphaToMaskReg *reg, + BOOL alphaToMask, + GX2AlphaToMaskMode mode); + +void GX2GetAlphaToMaskReg(const GX2AlphaToMaskReg *reg, + BOOL *alphaToMask, + GX2AlphaToMaskMode *mode); + +void GX2SetAlphaToMaskReg(const GX2AlphaToMaskReg *reg); + +void GX2SetBlendConstantColor(float red, + float green, + float blue, + float alpha); + +void GX2InitBlendConstantColorReg(GX2BlendConstantColorReg *reg, + float red, + float green, + float blue, + float alpha); + +void GX2GetBlendConstantColorReg(GX2BlendConstantColorReg *reg, + float *red, + float *green, + float *blue, + float *alpha); + +void GX2SetBlendConstantColorReg(const GX2BlendConstantColorReg *reg); + +void GX2SetBlendControl(GX2RenderTarget target, + GX2BlendMode colorSrcBlend, + GX2BlendMode colorDstBlend, + GX2BlendCombineMode colorCombine, + BOOL useAlphaBlend, + GX2BlendMode alphaSrcBlend, + GX2BlendMode alphaDstBlend, + GX2BlendCombineMode alphaCombine); + +void GX2InitBlendControlReg(GX2BlendControlReg *reg, + GX2RenderTarget target, + GX2BlendMode colorSrcBlend, + GX2BlendMode colorDstBlend, + GX2BlendCombineMode colorCombine, + BOOL useAlphaBlend, + GX2BlendMode alphaSrcBlend, + GX2BlendMode alphaDstBlend, + GX2BlendCombineMode alphaCombine); + +void GX2GetBlendControlReg(GX2BlendControlReg *reg, + GX2RenderTarget *target, + GX2BlendMode *colorSrcBlend, + GX2BlendMode *colorDstBlend, + GX2BlendCombineMode *colorCombine, + BOOL *useAlphaBlend, + GX2BlendMode *alphaSrcBlend, + GX2BlendMode *alphaDstBlend, + GX2BlendCombineMode *alphaCombine); + +void GX2SetBlendControlReg(const GX2BlendControlReg *reg); + +void GX2SetColorControl(GX2LogicOp rop3, + uint8_t targetBlendEnable, + BOOL multiWriteEnable, + BOOL colorWriteEnable); + +void GX2InitColorControlReg(GX2ColorControlReg *reg, + GX2LogicOp rop3, + uint8_t targetBlendEnable, + BOOL multiWriteEnable, + BOOL colorWriteEnable); + +void GX2GetColorControlReg(GX2ColorControlReg *reg, + GX2LogicOp *rop3, + uint8_t *targetBlendEnable, + BOOL *multiWriteEnable, + BOOL *colorWriteEnable); + +void GX2SetColorControlReg(const GX2ColorControlReg *reg); + +void GX2SetDepthOnlyControl(BOOL depthTest, + BOOL depthWrite, + GX2CompareFunction depthCompare); + +void GX2SetDepthStencilControl(BOOL depthTest, + BOOL depthWrite, + GX2CompareFunction depthCompare, + BOOL stencilTest, + BOOL backfaceStencil, + GX2CompareFunction frontStencilFunc, + GX2StencilFunction frontStencilZPass, + GX2StencilFunction frontStencilZFail, + GX2StencilFunction frontStencilFail, + GX2CompareFunction backStencilFunc, + GX2StencilFunction backStencilZPass, + GX2StencilFunction backStencilZFail, + GX2StencilFunction backStencilFail); + +void GX2InitDepthStencilControlReg(GX2DepthStencilControlReg *reg, + BOOL depthTest, + BOOL depthWrite, + GX2CompareFunction depthCompare, + BOOL stencilTest, + BOOL backfaceStencil, + GX2CompareFunction frontStencilFunc, + GX2StencilFunction frontStencilZPass, + GX2StencilFunction frontStencilZFail, + GX2StencilFunction frontStencilFail, + GX2CompareFunction backStencilFunc, + GX2StencilFunction backStencilZPass, + GX2StencilFunction backStencilZFail, + GX2StencilFunction backStencilFail); + +void GX2GetDepthStencilControlReg(GX2DepthStencilControlReg *reg, + BOOL *depthTest, + BOOL *depthWrite, + GX2CompareFunction *depthCompare, + BOOL *stencilTest, + BOOL *backfaceStencil, + GX2CompareFunction *frontStencilFunc, + GX2StencilFunction *frontStencilZPass, + GX2StencilFunction *frontStencilZFail, + GX2StencilFunction *frontStencilFail, + GX2CompareFunction *backStencilFunc, + GX2StencilFunction *backStencilZPass, + GX2StencilFunction *backStencilZFail, + GX2StencilFunction *backStencilFail); + +void GX2SetDepthStencilControlReg(const GX2DepthStencilControlReg *reg); + +void GX2SetStencilMask(uint8_t frontMask, + uint8_t frontWriteMask, + uint8_t frontRef, + uint8_t backMask, + uint8_t backWriteMask, + uint8_t backRef); + +void GX2InitStencilMaskReg(GX2StencilMaskReg *reg, + uint8_t frontMask, + uint8_t frontWriteMask, + uint8_t frontRef, + uint8_t backMask, + uint8_t backWriteMask, + uint8_t backRef); + +void GX2GetStencilMaskReg(GX2StencilMaskReg *reg, + uint8_t *frontMask, + uint8_t *frontWriteMask, + uint8_t *frontRef, + uint8_t *backMask, + uint8_t *backWriteMask, + uint8_t *backRef); + +void GX2SetStencilMaskReg(const GX2StencilMaskReg *reg); + +void GX2SetLineWidth(float width); + +void GX2InitLineWidthReg(GX2LineWidthReg *reg, + float width); + +void GX2GetLineWidthReg(GX2LineWidthReg *reg, + float *width); + +void GX2SetLineWidthReg(const GX2LineWidthReg *reg); + +void GX2SetPointSize(float width, + float height); + +void GX2InitPointSizeReg(GX2PointSizeReg *reg, + float width, + float height); + +void GX2GetPointSizeReg(GX2PointSizeReg *reg, + float *width, + float *height); + +void GX2SetPointSizeReg(const GX2PointSizeReg *reg); + +void GX2SetPointLimits(float min, + float max); + +void GX2InitPointLimitsReg(GX2PointLimitsReg *reg, + float min, + float max); + +void GX2GetPointLimitsReg(GX2PointLimitsReg *reg, + float *min, + float *max); + +void GX2SetPointLimitsReg(const GX2PointLimitsReg *reg); + +void GX2SetCullOnlyControl(GX2FrontFace frontFace, + BOOL cullFront, + BOOL cullBack); + +void GX2SetPolygonControl(GX2FrontFace frontFace, + BOOL cullFront, + BOOL cullBack, + BOOL polyMode, + GX2PolygonMode polyModeFront, + GX2PolygonMode polyModeBack, + BOOL polyOffsetFrontEnable, + BOOL polyOffsetBackEnable, + BOOL polyOffsetParaEnable); + +void GX2InitPolygonControlReg(GX2PolygonControlReg *reg, + GX2FrontFace frontFace, + BOOL cullFront, + BOOL cullBack, + BOOL polyMode, + GX2PolygonMode polyModeFront, + GX2PolygonMode polyModeBack, + BOOL polyOffsetFrontEnable, + BOOL polyOffsetBackEnable, + BOOL polyOffsetParaEnable); + +void GX2GetPolygonControlReg(GX2PolygonControlReg *reg, + GX2FrontFace *frontFace, + BOOL *cullFront, + BOOL *cullBack, + BOOL *polyMode, + GX2PolygonMode *polyModeFront, + GX2PolygonMode *polyModeBack, + BOOL *polyOffsetFrontEnable, + BOOL *polyOffsetBackEnable, + BOOL *polyOffsetParaEnable); + +void GX2SetPolygonControlReg(const GX2PolygonControlReg *reg); + +void GX2SetPolygonOffset(float frontOffset, + float frontScale, + float backOffset, + float backScale, + float clamp); + +void GX2InitPolygonOffsetReg(GX2PolygonOffsetReg *reg, + float frontOffset, + float frontScale, + float backOffset, + float backScale, + float clamp); + +void GX2GetPolygonOffsetReg(GX2PolygonOffsetReg *reg, + float *frontOffset, + float *frontScale, + float *backOffset, + float *backScale, + float *clamp); + +void GX2SetPolygonOffsetReg(const GX2PolygonOffsetReg *reg); + +void GX2SetScissor(uint32_t x, + uint32_t y, + uint32_t width, + uint32_t height); + +void GX2InitScissorReg(GX2ScissorReg *reg, + uint32_t x, + uint32_t y, + uint32_t width, + uint32_t height); + +void GX2GetScissorReg(GX2ScissorReg *reg, + uint32_t *x, + uint32_t *y, + uint32_t *width, + uint32_t *height); + +void GX2SetScissorReg(const GX2ScissorReg *reg); + +void GX2SetTargetChannelMasks(GX2ChannelMask mask0, + GX2ChannelMask mask1, + GX2ChannelMask mask2, + GX2ChannelMask mask3, + GX2ChannelMask mask4, + GX2ChannelMask mask5, + GX2ChannelMask mask6, + GX2ChannelMask mask7); + +void GX2InitTargetChannelMasksReg(GX2TargetChannelMaskReg *reg, + GX2ChannelMask mask0, + GX2ChannelMask mask1, + GX2ChannelMask mask2, + GX2ChannelMask mask3, + GX2ChannelMask mask4, + GX2ChannelMask mask5, + GX2ChannelMask mask6, + GX2ChannelMask mask7); + +void GX2GetTargetChannelMasksReg(GX2TargetChannelMaskReg *reg, + GX2ChannelMask *mask0, + GX2ChannelMask *mask1, + GX2ChannelMask *mask2, + GX2ChannelMask *mask3, + GX2ChannelMask *mask4, + GX2ChannelMask *mask5, + GX2ChannelMask *mask6, + GX2ChannelMask *mask7); + +void GX2SetTargetChannelMasksReg(const GX2TargetChannelMaskReg *reg); + +void GX2SetViewport(float x, + float y, float width, - float height); - -void -GX2GetPointSizeReg(GX2PointSizeReg *reg, - float *width, - float *height); - -void -GX2SetPointSizeReg(const GX2PointSizeReg *reg); - -void -GX2SetPointLimits(float min, - float max); - -void -GX2InitPointLimitsReg(GX2PointLimitsReg *reg, - float min, - float max); - -void -GX2GetPointLimitsReg(GX2PointLimitsReg *reg, - float *min, - float *max); - -void -GX2SetPointLimitsReg(const GX2PointLimitsReg *reg); - -void -GX2SetCullOnlyControl(GX2FrontFace frontFace, - BOOL cullFront, - BOOL cullBack); - -void -GX2SetPolygonControl(GX2FrontFace frontFace, - BOOL cullFront, - BOOL cullBack, - BOOL polyMode, - GX2PolygonMode polyModeFront, - GX2PolygonMode polyModeBack, - BOOL polyOffsetFrontEnable, - BOOL polyOffsetBackEnable, - BOOL polyOffsetParaEnable); - -void -GX2InitPolygonControlReg(GX2PolygonControlReg *reg, - GX2FrontFace frontFace, - BOOL cullFront, - BOOL cullBack, - BOOL polyMode, - GX2PolygonMode polyModeFront, - GX2PolygonMode polyModeBack, - BOOL polyOffsetFrontEnable, - BOOL polyOffsetBackEnable, - BOOL polyOffsetParaEnable); - -void -GX2GetPolygonControlReg(GX2PolygonControlReg *reg, - GX2FrontFace *frontFace, - BOOL *cullFront, - BOOL *cullBack, - BOOL *polyMode, - GX2PolygonMode *polyModeFront, - GX2PolygonMode *polyModeBack, - BOOL *polyOffsetFrontEnable, - BOOL *polyOffsetBackEnable, - BOOL *polyOffsetParaEnable); - -void -GX2SetPolygonControlReg(const GX2PolygonControlReg *reg); - -void -GX2SetPolygonOffset(float frontOffset, - float frontScale, - float backOffset, - float backScale, - float clamp); - -void -GX2InitPolygonOffsetReg(GX2PolygonOffsetReg *reg, - float frontOffset, - float frontScale, - float backOffset, - float backScale, - float clamp); - -void -GX2GetPolygonOffsetReg(GX2PolygonOffsetReg *reg, - float *frontOffset, - float *frontScale, - float *backOffset, - float *backScale, - float *clamp); - -void -GX2SetPolygonOffsetReg(const GX2PolygonOffsetReg *reg); - -void -GX2SetScissor(uint32_t x, - uint32_t y, - uint32_t width, - uint32_t height); - -void -GX2InitScissorReg(GX2ScissorReg *reg, - uint32_t x, - uint32_t y, - uint32_t width, - uint32_t height); - -void -GX2GetScissorReg(GX2ScissorReg *reg, - uint32_t *x, - uint32_t *y, - uint32_t *width, - uint32_t *height); - -void -GX2SetScissorReg(const GX2ScissorReg *reg); - -void -GX2SetTargetChannelMasks(GX2ChannelMask mask0, - GX2ChannelMask mask1, - GX2ChannelMask mask2, - GX2ChannelMask mask3, - GX2ChannelMask mask4, - GX2ChannelMask mask5, - GX2ChannelMask mask6, - GX2ChannelMask mask7); - -void -GX2InitTargetChannelMasksReg(GX2TargetChannelMaskReg *reg, - GX2ChannelMask mask0, - GX2ChannelMask mask1, - GX2ChannelMask mask2, - GX2ChannelMask mask3, - GX2ChannelMask mask4, - GX2ChannelMask mask5, - GX2ChannelMask mask6, - GX2ChannelMask mask7); - -void -GX2GetTargetChannelMasksReg(GX2TargetChannelMaskReg *reg, - GX2ChannelMask *mask0, - GX2ChannelMask *mask1, - GX2ChannelMask *mask2, - GX2ChannelMask *mask3, - GX2ChannelMask *mask4, - GX2ChannelMask *mask5, - GX2ChannelMask *mask6, - GX2ChannelMask *mask7); - -void -GX2SetTargetChannelMasksReg(const GX2TargetChannelMaskReg *reg); - -void -GX2SetViewport(float x, - float y, - float width, - float height, - float nearZ, - float farZ); - -void -GX2InitViewportReg(GX2ViewportReg *reg, - float x, - float y, - float width, - float height, - float nearZ, - float farZ); - -void -GX2GetViewportReg(GX2ViewportReg *reg, - float *x, - float *y, - float *width, - float *height, - float *nearZ, - float *farZ); - -void -GX2SetViewportReg(const GX2ViewportReg *reg); + float height, + float nearZ, + float farZ); + +void GX2InitViewportReg(GX2ViewportReg *reg, + float x, + float y, + float width, + float height, + float nearZ, + float farZ); + +void GX2GetViewportReg(GX2ViewportReg *reg, + float *x, + float *y, + float *width, + float *height, + float *nearZ, + float *farZ); + +void GX2SetViewportReg(const GX2ViewportReg *reg); #ifdef __cplusplus } diff --git a/include/gx2/sampler.h b/include/gx2/sampler.h index 1b805fe39..7b3e2f2c1 100644 --- a/include/gx2/sampler.h +++ b/include/gx2/sampler.h @@ -1,6 +1,6 @@ #pragma once -#include #include "enum.h" +#include /** * \defgroup gx2_sampler Sampler @@ -20,56 +20,46 @@ struct GX2Sampler }; WUT_CHECK_SIZE(GX2Sampler, 12); -void -GX2InitSampler(GX2Sampler *sampler, - GX2TexClampMode clampMode, - GX2TexXYFilterMode minMagFilterMode); - -void -GX2InitSamplerBorderType(GX2Sampler *sampler, - GX2TexBorderType borderType); - -void -GX2InitSamplerClamping(GX2Sampler *sampler, - GX2TexClampMode clampX, - GX2TexClampMode clampY, - GX2TexClampMode clampZ); - -void -GX2InitSamplerDepthCompare(GX2Sampler *sampler, - GX2CompareFunction depthCompare); - -void -GX2InitSamplerFilterAdjust(GX2Sampler *sampler, - BOOL highPrecision, - GX2TexMipPerfMode perfMip, - GX2TexZPerfMode perfZ); - -void -GX2InitSamplerLOD(GX2Sampler *sampler, - float lodMin, - float lodMax, - float lodBias); - -void -GX2InitSamplerLODAdjust(GX2Sampler *sampler, - float unk1, - BOOL unk2); - -void -GX2InitSamplerRoundingMode(GX2Sampler *sampler, - GX2RoundingMode roundingMode); - -void -GX2InitSamplerXYFilter(GX2Sampler *sampler, - GX2TexXYFilterMode filterMag, - GX2TexXYFilterMode filterMin, - GX2TexAnisoRatio maxAniso); - -void -GX2InitSamplerZMFilter(GX2Sampler *sampler, - GX2TexZFilterMode filterZ, - GX2TexMipFilterMode filterMip); +void GX2InitSampler(GX2Sampler *sampler, + GX2TexClampMode clampMode, + GX2TexXYFilterMode minMagFilterMode); + +void GX2InitSamplerBorderType(GX2Sampler *sampler, + GX2TexBorderType borderType); + +void GX2InitSamplerClamping(GX2Sampler *sampler, + GX2TexClampMode clampX, + GX2TexClampMode clampY, + GX2TexClampMode clampZ); + +void GX2InitSamplerDepthCompare(GX2Sampler *sampler, + GX2CompareFunction depthCompare); + +void GX2InitSamplerFilterAdjust(GX2Sampler *sampler, + BOOL highPrecision, + GX2TexMipPerfMode perfMip, + GX2TexZPerfMode perfZ); + +void GX2InitSamplerLOD(GX2Sampler *sampler, + float lodMin, + float lodMax, + float lodBias); + +void GX2InitSamplerLODAdjust(GX2Sampler *sampler, + float unk1, + BOOL unk2); + +void GX2InitSamplerRoundingMode(GX2Sampler *sampler, + GX2RoundingMode roundingMode); + +void GX2InitSamplerXYFilter(GX2Sampler *sampler, + GX2TexXYFilterMode filterMag, + GX2TexXYFilterMode filterMin, + GX2TexAnisoRatio maxAniso); + +void GX2InitSamplerZMFilter(GX2Sampler *sampler, + GX2TexZFilterMode filterZ, + GX2TexMipFilterMode filterMip); #ifdef __cplusplus } diff --git a/include/gx2/shaders.h b/include/gx2/shaders.h index 5db7ef200..dda6c439c 100644 --- a/include/gx2/shaders.h +++ b/include/gx2/shaders.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include "enum.h" -#include "sampler.h" #include "gx2r/buffer.h" +#include "sampler.h" +#include +#include /** * \defgroup gx2_shader Shaders @@ -368,79 +368,62 @@ GX2CalcFetchShaderSizeEx(uint32_t attribs, GX2FetchShaderType fetchShaderType, GX2TessellationMode tesellationMode); -void -GX2InitFetchShaderEx(GX2FetchShader *fetchShader, - uint8_t *buffer, - uint32_t attribCount, - const GX2AttribStream *attribs, - GX2FetchShaderType type, - GX2TessellationMode tessMode); - -void -GX2SetFetchShader(const GX2FetchShader *shader); - -void -GX2SetVertexShader(const GX2VertexShader *shader); - -void -GX2SetPixelShader(const GX2PixelShader *shader); - -void -GX2SetGeometryShader(const GX2GeometryShader *shader); - -void -GX2SetVertexSampler(const GX2Sampler *sampler, - uint32_t id); - -void -GX2SetPixelSampler(const GX2Sampler *sampler, - uint32_t id); - -void -GX2SetGeometrySampler(const GX2Sampler *sampler, - uint32_t id); - -void -GX2SetVertexUniformReg(uint32_t offset, - uint32_t count, - const void *data); - -void -GX2SetPixelUniformReg(uint32_t offset, - uint32_t count, - const void *data); - -void -GX2SetVertexUniformBlock(uint32_t location, - uint32_t size, - const void *data); - -void -GX2SetPixelUniformBlock(uint32_t location, - uint32_t size, - const void *data); - -void -GX2SetGeometryUniformBlock(uint32_t location, - uint32_t size, +void GX2InitFetchShaderEx(GX2FetchShader *fetchShader, + uint8_t *buffer, + uint32_t attribCount, + const GX2AttribStream *attribs, + GX2FetchShaderType type, + GX2TessellationMode tessMode); + +void GX2SetFetchShader(const GX2FetchShader *shader); + +void GX2SetVertexShader(const GX2VertexShader *shader); + +void GX2SetPixelShader(const GX2PixelShader *shader); + +void GX2SetGeometryShader(const GX2GeometryShader *shader); + +void GX2SetVertexSampler(const GX2Sampler *sampler, + uint32_t id); + +void GX2SetPixelSampler(const GX2Sampler *sampler, + uint32_t id); + +void GX2SetGeometrySampler(const GX2Sampler *sampler, + uint32_t id); + +void GX2SetVertexUniformReg(uint32_t offset, + uint32_t count, + const void *data); + +void GX2SetPixelUniformReg(uint32_t offset, + uint32_t count, const void *data); -void -GX2SetShaderModeEx(GX2ShaderMode mode, - uint32_t numVsGpr, uint32_t numVsStackEntries, - uint32_t numGsGpr, uint32_t numGsStackEntries, - uint32_t numPsGpr, uint32_t numPsStackEntries); +void GX2SetVertexUniformBlock(uint32_t location, + uint32_t size, + const void *data); + +void GX2SetPixelUniformBlock(uint32_t location, + uint32_t size, + const void *data); + +void GX2SetGeometryUniformBlock(uint32_t location, + uint32_t size, + const void *data); + +void GX2SetShaderModeEx(GX2ShaderMode mode, + uint32_t numVsGpr, uint32_t numVsStackEntries, + uint32_t numGsGpr, uint32_t numGsStackEntries, + uint32_t numPsGpr, uint32_t numPsStackEntries); -void -GX2SetStreamOutEnable(BOOL enable); +void GX2SetStreamOutEnable(BOOL enable); -void -GX2SetGeometryShaderInputRingBuffer(const void *buffer, - uint32_t size); +void GX2SetGeometryShaderInputRingBuffer(const void *buffer, + uint32_t size); -void -GX2SetGeometryShaderOutputRingBuffer(void *buffer, - uint32_t size); +void GX2SetGeometryShaderOutputRingBuffer(void *buffer, + uint32_t size); uint32_t GX2GetPixelShaderGPRs(const GX2PixelShader *shader); diff --git a/include/gx2/state.h b/include/gx2/state.h index 4ea35e2bd..01a854a85 100644 --- a/include/gx2/state.h +++ b/include/gx2/state.h @@ -1,6 +1,6 @@ #pragma once -#include #include "enum.h" +#include /** * \defgroup gx2_state State @@ -12,17 +12,13 @@ extern "C" { #endif -void -GX2Init(uint32_t *attributes); +void GX2Init(uint32_t *attributes); -void -GX2Shutdown(); +void GX2Shutdown(); -void -GX2Flush(); +void GX2Flush(); -void -GX2ResetGPU(uint32_t unknown); +void GX2ResetGPU(uint32_t unknown); #ifdef __cplusplus } diff --git a/include/gx2/surface.h b/include/gx2/surface.h index 1ac2aa89f..55064e3a9 100644 --- a/include/gx2/surface.h +++ b/include/gx2/surface.h @@ -1,7 +1,7 @@ #pragma once +#include "enum.h" #include #include -#include "enum.h" /** * \defgroup gx2_surface Surface @@ -26,7 +26,8 @@ struct GX2Surface uint32_t mipLevels; GX2SurfaceFormat format; GX2AAMode aa; - union { + union + { GX2SurfaceUse use; GX2RResourceFlags resourceFlags; }; @@ -104,56 +105,45 @@ WUT_CHECK_OFFSET(GX2ColorBuffer, 0x84, aaSize); WUT_CHECK_OFFSET(GX2ColorBuffer, 0x88, regs); WUT_CHECK_SIZE(GX2ColorBuffer, 0x9C); -void -GX2CalcSurfaceSizeAndAlignment(GX2Surface *surface); +void GX2CalcSurfaceSizeAndAlignment(GX2Surface *surface); -void -GX2CalcDepthBufferHiZInfo(GX2DepthBuffer *depthBuffer, - uint32_t *outSize, - uint32_t *outAlignment); +void GX2CalcDepthBufferHiZInfo(GX2DepthBuffer *depthBuffer, + uint32_t *outSize, + uint32_t *outAlignment); -void -GX2CalcColorBufferAuxInfo(GX2ColorBuffer *surface, - uint32_t *outSize, - uint32_t *outAlignment); +void GX2CalcColorBufferAuxInfo(GX2ColorBuffer *surface, + uint32_t *outSize, + uint32_t *outAlignment); -void -GX2SetColorBuffer(const GX2ColorBuffer *colorBuffer, - GX2RenderTarget target); +void GX2SetColorBuffer(const GX2ColorBuffer *colorBuffer, + GX2RenderTarget target); -void -GX2SetDepthBuffer(const GX2DepthBuffer *depthBuffer); +void GX2SetDepthBuffer(const GX2DepthBuffer *depthBuffer); -void -GX2InitColorBufferRegs(GX2ColorBuffer *colorBuffer); +void GX2InitColorBufferRegs(GX2ColorBuffer *colorBuffer); -void -GX2InitDepthBufferRegs(GX2DepthBuffer *depthBuffer); +void GX2InitDepthBufferRegs(GX2DepthBuffer *depthBuffer); -void -GX2InitDepthBufferHiZEnable(GX2DepthBuffer *depthBuffer, - BOOL enable); +void GX2InitDepthBufferHiZEnable(GX2DepthBuffer *depthBuffer, + BOOL enable); uint32_t GX2GetSurfaceSwizzle(const GX2Surface *surface); -void -GX2SetSurfaceSwizzle(GX2Surface *surface, - uint32_t swizzle); - -void -GX2CopySurface(const GX2Surface *src, - uint32_t srcLevel, - uint32_t srcDepth, - GX2Surface *dst, - uint32_t dstLevel, - uint32_t dstDepth); - -void -GX2ResolveAAColorBuffer(const GX2ColorBuffer * srcColorBuffer, - GX2Surface * dstSurface, - uint32_t dstMip, - uint32_t dstSlice); +void GX2SetSurfaceSwizzle(GX2Surface *surface, + uint32_t swizzle); + +void GX2CopySurface(const GX2Surface *src, + uint32_t srcLevel, + uint32_t srcDepth, + GX2Surface *dst, + uint32_t dstLevel, + uint32_t dstDepth); + +void GX2ResolveAAColorBuffer(const GX2ColorBuffer *srcColorBuffer, + GX2Surface *dstSurface, + uint32_t dstMip, + uint32_t dstSlice); #ifdef __cplusplus } diff --git a/include/gx2/swap.h b/include/gx2/swap.h index 8e841c9cb..4733318b9 100644 --- a/include/gx2/swap.h +++ b/include/gx2/swap.h @@ -1,6 +1,6 @@ #pragma once -#include #include "enum.h" +#include /** * \defgroup gx2_swap Swap @@ -15,26 +15,21 @@ extern "C" { typedef struct GX2ColorBuffer GX2ColorBuffer; typedef struct GX2Texture GX2Texture; -void -GX2CopyColorBufferToScanBuffer(const GX2ColorBuffer *buffer, - GX2ScanTarget scanTarget); +void GX2CopyColorBufferToScanBuffer(const GX2ColorBuffer *buffer, + GX2ScanTarget scanTarget); -void -GX2SwapScanBuffers(); +void GX2SwapScanBuffers(); -BOOL -GX2GetLastFrame(GX2ScanTarget scanTarget, - GX2Texture *texture); +BOOL GX2GetLastFrame(GX2ScanTarget scanTarget, + GX2Texture *texture); -BOOL -GX2GetLastFrameGamma(GX2ScanTarget scanTarget, - float *gammaOut); +BOOL GX2GetLastFrameGamma(GX2ScanTarget scanTarget, + float *gammaOut); uint32_t GX2GetSwapInterval(); -void -GX2SetSwapInterval(uint32_t interval); +void GX2SetSwapInterval(uint32_t interval); #ifdef __cplusplus } diff --git a/include/gx2/tessellation.h b/include/gx2/tessellation.h index 458a1e6b7..bdd6361e3 100644 --- a/include/gx2/tessellation.h +++ b/include/gx2/tessellation.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include "enum.h" +#include +#include /** * \defgroup gx2_tessellation Tessellation @@ -13,16 +13,13 @@ extern "C" { #endif -void -GX2SetTessellation(GX2TessellationMode tessellationMode, - GX2PrimitiveMode primitiveMode, - GX2IndexType indexType); +void GX2SetTessellation(GX2TessellationMode tessellationMode, + GX2PrimitiveMode primitiveMode, + GX2IndexType indexType); -void -GX2SetMinTessellationLevel(float min); +void GX2SetMinTessellationLevel(float min); -void -GX2SetMaxTessellationLevel(float max); +void GX2SetMaxTessellationLevel(float max); #ifdef __cplusplus } diff --git a/include/gx2/texture.h b/include/gx2/texture.h index 978d9d16b..93793f0eb 100644 --- a/include/gx2/texture.h +++ b/include/gx2/texture.h @@ -1,6 +1,6 @@ #pragma once -#include #include "surface.h" +#include /** * \defgroup gx2_texture Texture @@ -34,20 +34,16 @@ WUT_CHECK_OFFSET(GX2Texture, 0x84, compMap); WUT_CHECK_OFFSET(GX2Texture, 0x88, regs); WUT_CHECK_SIZE(GX2Texture, 0x9c); -void -GX2InitTextureRegs(GX2Texture *texture); +void GX2InitTextureRegs(GX2Texture *texture); -void -GX2SetPixelTexture(const GX2Texture *texture, - uint32_t unit); +void GX2SetPixelTexture(const GX2Texture *texture, + uint32_t unit); -void -GX2SetVertexTexture(const GX2Texture *texture, - uint32_t unit); +void GX2SetVertexTexture(const GX2Texture *texture, + uint32_t unit); -void -GX2SetGeometryTexture(const GX2Texture *texture, - uint32_t unit); +void GX2SetGeometryTexture(const GX2Texture *texture, + uint32_t unit); #ifdef __cplusplus } diff --git a/include/gx2/utils.h b/include/gx2/utils.h index adc2f23ae..c6c5cb102 100644 --- a/include/gx2/utils.h +++ b/include/gx2/utils.h @@ -13,19 +13,19 @@ extern "C" { typedef enum GX2_SQ_SEL { - GX2_SQ_SEL_X = 0, - GX2_SQ_SEL_Y = 1, - GX2_SQ_SEL_Z = 2, - GX2_SQ_SEL_W = 3, - - GX2_SQ_SEL_R = 0, - GX2_SQ_SEL_G = 1, - GX2_SQ_SEL_B = 2, - GX2_SQ_SEL_A = 3, - - GX2_SQ_SEL_0 = 4, - GX2_SQ_SEL_1 = 5, - GX2_SQ_SEL_MASK = 7, + GX2_SQ_SEL_X = 0, + GX2_SQ_SEL_Y = 1, + GX2_SQ_SEL_Z = 2, + GX2_SQ_SEL_W = 3, + + GX2_SQ_SEL_R = 0, + GX2_SQ_SEL_G = 1, + GX2_SQ_SEL_B = 2, + GX2_SQ_SEL_A = 3, + + GX2_SQ_SEL_0 = 4, + GX2_SQ_SEL_1 = 5, + GX2_SQ_SEL_MASK = 7, } GX2_SQ_SEL; #define GX2_SEL_MASK(x, y, z, w) (((x) << 24) | ((y) << 16) | ((z) << 8) | (w)) diff --git a/include/gx2r/buffer.h b/include/gx2r/buffer.h index a34928147..5ef5c76ee 100644 --- a/include/gx2r/buffer.h +++ b/include/gx2r/buffer.h @@ -1,6 +1,6 @@ #pragma once -#include #include "resource.h" +#include /** * \defgroup gx2r_buffer Buffer @@ -27,20 +27,16 @@ WUT_CHECK_OFFSET(GX2RBuffer, 0x04, elemSize); WUT_CHECK_OFFSET(GX2RBuffer, 0x08, elemCount); WUT_CHECK_OFFSET(GX2RBuffer, 0x0C, buffer); -BOOL -GX2RBufferExists(GX2RBuffer *buffer); +BOOL GX2RBufferExists(GX2RBuffer *buffer); -BOOL -GX2RCreateBuffer(GX2RBuffer *buffer); +BOOL GX2RCreateBuffer(GX2RBuffer *buffer); -BOOL -GX2RCreateBufferUserMemory(GX2RBuffer *buffer, - void *memory, - uint32_t size); +BOOL GX2RCreateBufferUserMemory(GX2RBuffer *buffer, + void *memory, + uint32_t size); -void -GX2RDestroyBufferEx(GX2RBuffer *buffer, - GX2RResourceFlags flags); +void GX2RDestroyBufferEx(GX2RBuffer *buffer, + GX2RResourceFlags flags); uint32_t GX2RGetBufferAlignment(GX2RResourceFlags flags); @@ -48,32 +44,27 @@ GX2RGetBufferAlignment(GX2RResourceFlags flags); uint32_t GX2RGetBufferAllocationSize(GX2RBuffer *buffer); -void -GX2RInvalidateBuffer(GX2RBuffer *buffer, - GX2RResourceFlags flags); +void GX2RInvalidateBuffer(GX2RBuffer *buffer, + GX2RResourceFlags flags); void * GX2RLockBufferEx(GX2RBuffer *buffer, GX2RResourceFlags flags); -void -GX2RUnlockBufferEx(GX2RBuffer *buffer, - GX2RResourceFlags flags); +void GX2RUnlockBufferEx(GX2RBuffer *buffer, + GX2RResourceFlags flags); -void -GX2RSetVertexUniformBlock(GX2RBuffer *buffer, - uint32_t location, - uint32_t offset); +void GX2RSetVertexUniformBlock(GX2RBuffer *buffer, + uint32_t location, + uint32_t offset); -void -GX2RSetPixelUniformBlock(GX2RBuffer *buffer, - uint32_t location, - uint32_t offset); +void GX2RSetPixelUniformBlock(GX2RBuffer *buffer, + uint32_t location, + uint32_t offset); -void -GX2RSetGeometryUniformBlock(GX2RBuffer *buffer, - uint32_t location, - uint32_t offset); +void GX2RSetGeometryUniformBlock(GX2RBuffer *buffer, + uint32_t location, + uint32_t offset); #ifdef __cplusplus } diff --git a/include/gx2r/displaylist.h b/include/gx2r/displaylist.h index 6dde781b6..da850b81a 100644 --- a/include/gx2r/displaylist.h +++ b/include/gx2r/displaylist.h @@ -1,6 +1,6 @@ #pragma once -#include #include "resource.h" +#include /** * \defgroup gx2r_displaylist Display List @@ -14,21 +14,18 @@ extern "C" { typedef struct GX2RBuffer GX2RBuffer; -void -GX2RBeginDisplayListEx(GX2RBuffer *displayList, - uint32_t unknown, - GX2RResourceFlags flags); +void GX2RBeginDisplayListEx(GX2RBuffer *displayList, + uint32_t unknown, + GX2RResourceFlags flags); uint32_t GX2REndDisplayList(GX2RBuffer *displayList); -void -GX2RCallDisplayList(GX2RBuffer *displayList, - uint32_t size); +void GX2RCallDisplayList(GX2RBuffer *displayList, + uint32_t size); -void -GX2RDirectCallDisplayList(GX2RBuffer *displayList, - uint32_t size); +void GX2RDirectCallDisplayList(GX2RBuffer *displayList, + uint32_t size); #ifdef __cplusplus } diff --git a/include/gx2r/draw.h b/include/gx2r/draw.h index 60441a255..a0d4369f2 100644 --- a/include/gx2r/draw.h +++ b/include/gx2r/draw.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include "resource.h" +#include +#include /** * \defgroup gx2r_draw Draw @@ -15,20 +15,18 @@ extern "C" { typedef struct GX2RBuffer GX2RBuffer; -void -GX2RSetAttributeBuffer(GX2RBuffer *buffer, - uint32_t index, - uint32_t stride, - uint32_t offset); +void GX2RSetAttributeBuffer(GX2RBuffer *buffer, + uint32_t index, + uint32_t stride, + uint32_t offset); -void -GX2RDrawIndexed(GX2PrimitiveMode mode, - GX2RBuffer *buffer, - GX2IndexType indexType, - uint32_t count, - uint32_t indexOffset, - uint32_t vertexOffset, - uint32_t numInstances); +void GX2RDrawIndexed(GX2PrimitiveMode mode, + GX2RBuffer *buffer, + GX2IndexType indexType, + uint32_t count, + uint32_t indexOffset, + uint32_t vertexOffset, + uint32_t numInstances); #ifdef __cplusplus } diff --git a/include/gx2r/mem.h b/include/gx2r/mem.h index 4afc4ef75..27b297e7c 100644 --- a/include/gx2r/mem.h +++ b/include/gx2r/mem.h @@ -1,6 +1,6 @@ #pragma once -#include #include "resource.h" +#include /** * \defgroup gx2r_mem Memory @@ -12,20 +12,17 @@ extern "C" { #endif -typedef void * (*GX2RAllocFunction)(GX2RResourceFlags, uint32_t, uint32_t); +typedef void *(*GX2RAllocFunction)(GX2RResourceFlags, uint32_t, uint32_t); typedef void (*GX2RFreeFunction)(GX2RResourceFlags, void *); -void -GX2RInvalidateMemory(GX2RResourceFlags flags, - void *buffer, - uint32_t size); +void GX2RInvalidateMemory(GX2RResourceFlags flags, + void *buffer, + uint32_t size); -BOOL -GX2RIsUserMemory(GX2RResourceFlags flags); +BOOL GX2RIsUserMemory(GX2RResourceFlags flags); -void -GX2RSetAllocator(GX2RAllocFunction allocFn, - GX2RFreeFunction freeFn); +void GX2RSetAllocator(GX2RAllocFunction allocFn, + GX2RFreeFunction freeFn); #ifdef __cplusplus } diff --git a/include/gx2r/resource.h b/include/gx2r/resource.h index 83855a9ca..55e3616f9 100644 --- a/include/gx2r/resource.h +++ b/include/gx2r/resource.h @@ -14,79 +14,79 @@ extern "C" { typedef enum GX2RResourceFlags { //! No resource flags specified - GX2R_RESOURCE_BIND_NONE = 0, + GX2R_RESOURCE_BIND_NONE = 0, //! This resource is to be used as a texture - GX2R_RESOURCE_BIND_TEXTURE = 1 << 0, + GX2R_RESOURCE_BIND_TEXTURE = 1 << 0, //! This resource is to be used as a colour buffer - GX2R_RESOURCE_BIND_COLOR_BUFFER = 1 << 1, + GX2R_RESOURCE_BIND_COLOR_BUFFER = 1 << 1, //! This resource is to be used as a depth buffer - GX2R_RESOURCE_BIND_DEPTH_BUFFER = 1 << 2, + GX2R_RESOURCE_BIND_DEPTH_BUFFER = 1 << 2, //! This resource is to be used as a scan buffer - GX2R_RESOURCE_BIND_SCAN_BUFFER = 1 << 3, + GX2R_RESOURCE_BIND_SCAN_BUFFER = 1 << 3, //! This resource is to be used as a vertex buffer - GX2R_RESOURCE_BIND_VERTEX_BUFFER = 1 << 4, + GX2R_RESOURCE_BIND_VERTEX_BUFFER = 1 << 4, //! This resource is to be used as a index buffer - GX2R_RESOURCE_BIND_INDEX_BUFFER = 1 << 5, + GX2R_RESOURCE_BIND_INDEX_BUFFER = 1 << 5, //! This resource is to be used as a uniform block - GX2R_RESOURCE_BIND_UNIFORM_BLOCK = 1 << 6, + GX2R_RESOURCE_BIND_UNIFORM_BLOCK = 1 << 6, //! This resource is to be used as a shader program - GX2R_RESOURCE_BIND_SHADER_PROGRAM = 1 << 7, + GX2R_RESOURCE_BIND_SHADER_PROGRAM = 1 << 7, //! This resource is to be used as a stream output - GX2R_RESOURCE_BIND_STREAM_OUTPUT = 1 << 8, + GX2R_RESOURCE_BIND_STREAM_OUTPUT = 1 << 8, //! This resource is to be used as a display list - GX2R_RESOURCE_BIND_DISPLAY_LIST = 1 << 9, + GX2R_RESOURCE_BIND_DISPLAY_LIST = 1 << 9, //! This resource is to be used as a geometry shader ring buffer - GX2R_RESOURCE_BIND_GS_RING_BUFFER = 1 << 10, + GX2R_RESOURCE_BIND_GS_RING_BUFFER = 1 << 10, //! Invalidate resource for a CPU read - GX2R_RESOURCE_USAGE_CPU_READ = 1 << 11, + GX2R_RESOURCE_USAGE_CPU_READ = 1 << 11, //! Invalidate resource for a CPU write - GX2R_RESOURCE_USAGE_CPU_WRITE = 1 << 12, + GX2R_RESOURCE_USAGE_CPU_WRITE = 1 << 12, //! Invalidate resource for a GPU read - GX2R_RESOURCE_USAGE_GPU_READ = 1 << 13, + GX2R_RESOURCE_USAGE_GPU_READ = 1 << 13, //! Invalidate resource for a GPU write - GX2R_RESOURCE_USAGE_GPU_WRITE = 1 << 14, + GX2R_RESOURCE_USAGE_GPU_WRITE = 1 << 14, //! Invalidate resource for a DMA read - GX2R_RESOURCE_USAGE_DMA_READ = 1 << 15, + GX2R_RESOURCE_USAGE_DMA_READ = 1 << 15, //! Invalidate resource for a DMA write - GX2R_RESOURCE_USAGE_DMA_WRITE = 1 << 16, + GX2R_RESOURCE_USAGE_DMA_WRITE = 1 << 16, //! Force resource allocation to be in MEM1 - GX2R_RESOURCE_USAGE_FORCE_MEM1 = 1 << 17, + GX2R_RESOURCE_USAGE_FORCE_MEM1 = 1 << 17, //! Force resource allocation to be in MEM2 - GX2R_RESOURCE_USAGE_FORCE_MEM2 = 1 << 18, + GX2R_RESOURCE_USAGE_FORCE_MEM2 = 1 << 18, //! Disable CPU invalidation - GX2R_RESOURCE_DISABLE_CPU_INVALIDATE = 1 << 20, + GX2R_RESOURCE_DISABLE_CPU_INVALIDATE = 1 << 20, //! Disable GPU invalidation - GX2R_RESOURCE_DISABLE_GPU_INVALIDATE = 1 << 21, + GX2R_RESOURCE_DISABLE_GPU_INVALIDATE = 1 << 21, //! Resource is locked for read-only access - GX2R_RESOURCE_LOCKED_READ_ONLY = 1 << 22, + GX2R_RESOURCE_LOCKED_READ_ONLY = 1 << 22, //! Resource was allocated by GX2R. - GX2R_RESOURCE_GX2R_ALLOCATED = 1 << 29, + GX2R_RESOURCE_GX2R_ALLOCATED = 1 << 29, //! Resource is locked for all access - GX2R_RESOURCE_LOCKED = 1 << 30, + GX2R_RESOURCE_LOCKED = 1 << 30, } GX2RResourceFlags; WUT_ENUM_BITMASK_TYPE(GX2RResourceFlags) diff --git a/include/gx2r/surface.h b/include/gx2r/surface.h index 6e71a89c3..798ca8aee 100644 --- a/include/gx2r/surface.h +++ b/include/gx2r/surface.h @@ -1,6 +1,6 @@ #pragma once -#include #include "resource.h" +#include /** * \defgroup gx2r_surface Surface @@ -14,34 +14,29 @@ extern "C" { typedef struct GX2Surface GX2Surface; -BOOL -GX2RCreateSurface(GX2Surface *surface, - GX2RResourceFlags flags); +BOOL GX2RCreateSurface(GX2Surface *surface, + GX2RResourceFlags flags); -BOOL -GX2RCreateSurfaceUserMemory(GX2Surface *surface, - uint8_t *image, - uint8_t *mipmap, - GX2RResourceFlags flags); +BOOL GX2RCreateSurfaceUserMemory(GX2Surface *surface, + uint8_t *image, + uint8_t *mipmap, + GX2RResourceFlags flags); -BOOL -GX2RDestroySurfaceEx(GX2Surface *surface, - GX2RResourceFlags flags); +BOOL GX2RDestroySurfaceEx(GX2Surface *surface, + GX2RResourceFlags flags); -BOOL -GX2RInvalidateSurface(GX2Surface *surface, - int32_t level, - GX2RResourceFlags flags); +BOOL GX2RInvalidateSurface(GX2Surface *surface, + int32_t level, + GX2RResourceFlags flags); void * GX2RLockSurfaceEx(GX2Surface *surface, int32_t level, GX2RResourceFlags flags); -void -GX2RUnlockSurfaceEx(GX2Surface *surface, - int32_t level, - GX2RResourceFlags flags); +void GX2RUnlockSurfaceEx(GX2Surface *surface, + int32_t level, + GX2RResourceFlags flags); #ifdef __cplusplus } diff --git a/include/h264/stream.h b/include/h264/stream.h index 2bee3be94..fdeb544a4 100644 --- a/include/h264/stream.h +++ b/include/h264/stream.h @@ -20,30 +20,30 @@ typedef void (*H264DECFptrOutputFn)(H264DecodeOutput *output); typedef enum H264Error { //! No errors. - H264_ERROR_OK = 0, + H264_ERROR_OK = 0, //! Invalid picture parameter set. - H264_ERROR_INVALID_PPS = 24, + H264_ERROR_INVALID_PPS = 24, //! Invalid sequence parameter set. - H264_ERROR_INVALID_SPS = 26, + H264_ERROR_INVALID_SPS = 26, //! Invalid slice header. - H264_ERROR_INVALID_SLICEHEADER = 61, + H264_ERROR_INVALID_SLICEHEADER = 61, //! Generic h264 error. - H264_ERROR_GENERIC = 0x1000000, + H264_ERROR_GENERIC = 0x1000000, //! Invalid parameters passed. - H264_ERROR_INVALID_PARAMETER = 0x1010000, + H264_ERROR_INVALID_PARAMETER = 0x1010000, //! The amount of memory provided to the h264 library //! is insufficient. - H264_ERROR_OUT_OF_MEMORY = 0x1020000, + H264_ERROR_OUT_OF_MEMORY = 0x1020000, //! Invalid h264 stream profile. Only the baseline (66), //! main (77) and high (100) profiles are allowed. - H264_ERROR_INVALID_PROFILE = 0x1080000, + H264_ERROR_INVALID_PROFILE = 0x1080000, } H264Error; struct WUT_PACKED H264DecodedVuiParameters @@ -167,10 +167,10 @@ struct WUT_PACKED H264DecodeOutput { //! Number of frames output int32_t frameCount; - + //! Frames H264DecodeResult **decodeResults; - + //! User memory pointer passed into SetParam void *userMemory; }; diff --git a/include/netdb.h b/include/netdb.h index 1165dab38..94848846c 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -6,30 +6,30 @@ extern int h_errno; struct hostent { - char *h_name; + char *h_name; char **h_aliases; - int h_addrtype; - int h_length; + int h_addrtype; + int h_length; char **h_addr_list; -#define h_addr h_addr_list[0] +#define h_addr h_addr_list[0] }; struct servent { - char *s_name; + char *s_name; char **s_aliases; - int s_port; - char *s_proto; + int s_port; + char *s_proto; }; struct addrinfo { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - socklen_t ai_addrlen; - char *ai_canonname; + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + socklen_t ai_addrlen; + char *ai_canonname; struct sockaddr *ai_addr; struct addrinfo *ai_next; }; @@ -86,7 +86,7 @@ gethostbyname(const char *name); struct hostent * gethostbyaddr(const void *addr, - socklen_t len, + socklen_t len, int type); struct hostent * @@ -103,23 +103,20 @@ getservbyport(int port, struct servent * getservent(void); -int -getaddrinfo(const char *node, - const char *service, - const struct addrinfo *hints, - struct addrinfo **res); - -void -freeaddrinfo(struct addrinfo *res); - -int -getnameinfo(const struct sockaddr *addr, - socklen_t addrlen, - char *host, - socklen_t hostlen, - char *serv, - socklen_t servlen, - int flags); +int getaddrinfo(const char *node, + const char *service, + const struct addrinfo *hints, + struct addrinfo **res); + +void freeaddrinfo(struct addrinfo *res); + +int getnameinfo(const struct sockaddr *addr, + socklen_t addrlen, + char *host, + socklen_t hostlen, + char *serv, + socklen_t servlen, + int flags); const char * gai_strerror(int ecode); diff --git a/include/netinet/in.h b/include/netinet/in.h index 3d13392a8..618e1d5c6 100644 --- a/include/netinet/in.h +++ b/include/netinet/in.h @@ -2,30 +2,32 @@ #include #include -#define INADDR_ANY 0x00000000 -#define INADDR_LOOPBACK 0x7F000001 -#define INADDR_BROADCAST 0xFFFFFFFF -#define INADDR_NONE 0xFFFFFFFF +#define INADDR_ANY 0x00000000 +#define INADDR_LOOPBACK 0x7F000001 +#define INADDR_BROADCAST 0xFFFFFFFF +#define INADDR_NONE 0xFFFFFFFF -#define INET_ADDRSTRLEN 16 +#define INET_ADDRSTRLEN 16 -#define IPPROTO_IP 0 -#define IPPROTO_TCP 6 -#define IPPROTO_UDP 17 +#define IPPROTO_IP 0 +#define IPPROTO_TCP 6 +#define IPPROTO_UDP 17 -#define IP_TOS 3 -#define IP_TTL 4 +#define IP_TOS 3 +#define IP_TTL 4 typedef uint16_t in_port_t; typedef uint32_t in_addr_t; -struct in_addr { - in_addr_t s_addr; +struct in_addr +{ + in_addr_t s_addr; }; -struct sockaddr_in { - sa_family_t sin_family; - in_port_t sin_port; - struct in_addr sin_addr; - unsigned char sin_zero[8]; +struct sockaddr_in +{ + sa_family_t sin_family; + in_port_t sin_port; + struct in_addr sin_addr; + unsigned char sin_zero[8]; }; diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h index 05b446a10..4401a5ad5 100644 --- a/include/netinet/tcp.h +++ b/include/netinet/tcp.h @@ -1,8 +1,8 @@ #pragma once -#define SOL_TCP 6 +#define SOL_TCP 6 -#define TCP_ACKDELAYTIME 0x2001 -#define TCP_NOACKDELAY 0x2002 -#define TCP_MAXSEG 0x2003 -#define TCP_NODELAY 0x2004 +#define TCP_ACKDELAYTIME 0x2001 +#define TCP_NOACKDELAY 0x2002 +#define TCP_MAXSEG 0x2003 +#define TCP_NODELAY 0x2004 diff --git a/include/nn/ac/ac_c.h b/include/nn/ac/ac_c.h index 4f8a808e5..84074a038 100644 --- a/include/nn/ac/ac_c.h +++ b/include/nn/ac/ac_c.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup nn_ac_c Auto Connect C API @@ -40,8 +40,7 @@ ACInitialize(); * \sa * - \link ACInitialize \endlink */ -void -ACFinalize(); +void ACFinalize(); /** * Connects synchronically to a network, using the default configuration diff --git a/include/nn/ac/ac_cpp.h b/include/nn/ac/ac_cpp.h index adbcb2a56..f92c94456 100644 --- a/include/nn/ac/ac_cpp.h +++ b/include/nn/ac/ac_cpp.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup nn_ac_cpp Auto Connect C++ API @@ -11,45 +11,50 @@ #ifdef __cplusplus -namespace nn -{ -/** +namespace nn { + /** * Auto Connect API, used for managing and connecting to internet connection * profiles. */ -namespace ac -{ + namespace ac { -/** + /** * An ID number representing a network configuration. These are the same IDs as * shown in System Settings' Connection List. */ -typedef uint32_t ConfigIdNum; + typedef uint32_t ConfigIdNum; -/** + /** * C++ linkage for the autoconnect API, see \link nn::ac \endlink for use. * Cafe provides mangled symbols for C++ APIs, so nn::ac is actually static * inline calls to the mangled symbols under nn::ac::detail. */ -namespace detail -{ -extern "C" -{ - -nn::Result Initialize__Q2_2nn2acFv(); -void Finalize__Q2_2nn2acFv(); -nn::Result Connect__Q2_2nn2acFv(); -nn::Result ConnectAsync__Q2_2nn2acFv(); -nn::Result Close__Q2_2nn2acFv(); -nn::Result GetCloseStatus__Q2_2nn2acFPQ3_2nn2ac6Status(); -nn::Result GetStartupId__Q2_2nn2acFPQ3_2nn2ac11ConfigIdNum(ConfigIdNum *id); -nn::Result Connect__Q2_2nn2acFQ3_2nn2ac11ConfigIdNum(ConfigIdNum id); -nn::Result GetAssignedAddress__Q2_2nn2acFPUl(uint32_t *ip); - -} // extern "C" -} // namespace detail - -/** + namespace detail { + extern "C" { + + nn::Result + Initialize__Q2_2nn2acFv(); + void + Finalize__Q2_2nn2acFv(); + nn::Result + Connect__Q2_2nn2acFv(); + nn::Result + ConnectAsync__Q2_2nn2acFv(); + nn::Result + Close__Q2_2nn2acFv(); + nn::Result + GetCloseStatus__Q2_2nn2acFPQ3_2nn2ac6Status(); + nn::Result + GetStartupId__Q2_2nn2acFPQ3_2nn2ac11ConfigIdNum(ConfigIdNum *id); + nn::Result + Connect__Q2_2nn2acFQ3_2nn2ac11ConfigIdNum(ConfigIdNum id); + nn::Result + GetAssignedAddress__Q2_2nn2acFPUl(uint32_t *ip); + + } // extern "C" + } // namespace detail + + /** * Initialise the Auto Connect library. Call this function before any other nn::ac * functions. * @@ -60,27 +65,27 @@ nn::Result GetAssignedAddress__Q2_2nn2acFPUl(uint32_t *ip); * \sa * - \link Finalize \endlink */ -static inline nn::Result -Initialize() -{ - return detail::Initialize__Q2_2nn2acFv(); -} + static inline nn::Result + Initialize() + { + return detail::Initialize__Q2_2nn2acFv(); + } -/** + /** * Cleanup the Auto Connect library. Do not call any nn::ac functions (other * than \link Initialize \endlink) after calling this function. * * \sa * - \link Initialize \endlink */ -static inline void -Finalize() -{ - return detail::Finalize__Q2_2nn2acFv(); -} + static inline void + Finalize() + { + return detail::Finalize__Q2_2nn2acFv(); + } -/** + /** * Gets the default connection configuration id. This is the default as marked * in System Settings. * @@ -92,37 +97,37 @@ Finalize() * A \link nn::Result Result\endlink - see \link nn::Result::IsSuccess \endlink * and \link nn::Result::IsFailure \endlink. */ -static inline nn::Result -GetStartupId(ConfigIdNum *id) -{ - return detail::GetStartupId__Q2_2nn2acFPQ3_2nn2ac11ConfigIdNum(id); -} - -static inline nn::Result -Connect() -{ - return detail::Connect__Q2_2nn2acFv(); -} - -static inline nn::Result -ConnectAsync() -{ - return detail::ConnectAsync__Q2_2nn2acFv(); -} - -static inline nn::Result -Close() -{ - return detail::Close__Q2_2nn2acFv(); -} - -static inline nn::Result -GetCloseStatus() -{ - return detail::GetCloseStatus__Q2_2nn2acFPQ3_2nn2ac6Status(); -} - -/** + static inline nn::Result + GetStartupId(ConfigIdNum *id) + { + return detail::GetStartupId__Q2_2nn2acFPQ3_2nn2ac11ConfigIdNum(id); + } + + static inline nn::Result + Connect() + { + return detail::Connect__Q2_2nn2acFv(); + } + + static inline nn::Result + ConnectAsync() + { + return detail::ConnectAsync__Q2_2nn2acFv(); + } + + static inline nn::Result + Close() + { + return detail::Close__Q2_2nn2acFv(); + } + + static inline nn::Result + GetCloseStatus() + { + return detail::GetCloseStatus__Q2_2nn2acFPQ3_2nn2ac6Status(); + } + + /** * Connects to a network, using the configuration represented by the given * \link ConfigIdNum \endlink. * @@ -133,13 +138,13 @@ GetCloseStatus() * A \link nn::Result Result\endlink - see \link nn::Result::IsSuccess \endlink * and \link nn::Result::IsFailure \endlink. */ -static inline nn::Result -Connect(ConfigIdNum id) -{ - return detail::Connect__Q2_2nn2acFQ3_2nn2ac11ConfigIdNum(id); -} + static inline nn::Result + Connect(ConfigIdNum id) + { + return detail::Connect__Q2_2nn2acFQ3_2nn2ac11ConfigIdNum(id); + } -/** + /** * Gets the IP address assosciated with the currently active connection. * * \param ip @@ -151,13 +156,13 @@ Connect(ConfigIdNum id) * A \link nn::Result Result\endlink - see \link nn::Result::IsSuccess \endlink * and \link nn::Result::IsFailure \endlink. */ -static inline nn::Result -GetAssignedAddress(uint32_t *ip) -{ - return detail::GetAssignedAddress__Q2_2nn2acFPUl(ip); -} + static inline nn::Result + GetAssignedAddress(uint32_t *ip) + { + return detail::GetAssignedAddress__Q2_2nn2acFPUl(ip); + } -} // namespace ac + } // namespace ac } // namespace nn #endif // ifdef __cplusplus diff --git a/include/nn/acp/device.h b/include/nn/acp/device.h index 893823560..8e6d7c34c 100644 --- a/include/nn/acp/device.h +++ b/include/nn/acp/device.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup nn_acp_device @@ -15,7 +15,7 @@ extern "C" { typedef int32_t ACPDeviceType; ACPResult -ACPCheckApplicationDeviceEmulation(BOOL* emulation); +ACPCheckApplicationDeviceEmulation(BOOL *emulation); #ifdef __cplusplus } diff --git a/include/nn/acp/result.h b/include/nn/acp/result.h index eaff90e62..fd5c2429e 100644 --- a/include/nn/acp/result.h +++ b/include/nn/acp/result.h @@ -8,89 +8,90 @@ * @{ */ -typedef enum ACPResult { - ACP_RESULT_SUCCESS = 0, - - ACP_RESULT_INVALID = -200, - ACP_RESULT_INVALID_PARAMETER = -201, - ACP_RESULT_INVALID_FILE = -202, - ACP_RESULT_INVALID_XML_FILE = -203, - ACP_RESULT_FILE_ACCESS_MODE = -204, - ACP_RESULT_INVALID_NETWORK_TIME = -205, - - ACP_RESULT_NOT_FOUND = -500, - ACP_RESULT_FILE_NOT_FOUND = -501, - ACP_RESULT_DIR_NOT_FOUND = -502, - ACP_RESULT_DEVICE_NOT_FOUND = -503, - ACP_RESULT_TITLE_NOT_FOUND = -504, - ACP_RESULT_APPLICATION_NOT_FOUND = -505, - ACP_RESULT_SYSTEM_CONFIG_NOT_FOUND = -506, - ACP_RESULT_XML_ITEM_NOT_FOUND = -507, - - ACP_RESULT_ALREADY_EXISTS = -600, - ACP_RESULT_FILE_ALREADY_EXISTS = -601, - ACP_RESULT_DIR_ALREADY_EXISTS = -602, - - ACP_RESULT_ALREADY_DONE = -700, - - ACP_RESULT_AUTHENTICATION = -1000, - ACP_RESULT_INVALID_REGION = -1001, - ACP_RESULT_RESTRICTED_RATING = -1002, - ACP_RESULT_NOT_PRESENT_RATING = -1003, - ACP_RESULT_PENDING_RATING = -1004, - ACP_RESULT_NET_SETTING_REQUIRED = -1005, - ACP_RESULT_NET_ACCOUNT_REQUIRED = -1006, - ACP_RESULT_NET_ACCOUNT_ERROR = -1007, - ACP_RESULT_BROWSER_REQUIRED = -1008, - ACP_RESULT_OLV_REQUIRED = -1009, - ACP_RESULT_PINCODE_REQUIRED = -1010, - ACP_RESULT_INCORRECT_PINCODE = -1011, - ACP_RESULT_INVALID_LOGO = -1012, - ACP_RESULT_DEMO_EXPIRED_NUMBER = -1013, - ACP_RESULT_DRC_REQUIRED = -1014, - - ACP_RESULT_NO_PERMISSION = -1100, - ACP_RESULT_NO_FILE_PERMISSION = -1101, - ACP_RESULT_NO_DIR_PERMISSION = -1102, - - ACP_RESULT_BUSY = -1300, - ACP_RESULT_USB_STORAGE_NOT_READY = -1301, - - ACP_RESULT_CANCELLED = -1400, - - ACP_RESULT_RESOURCE = -1500, - ACP_RESULT_DEVICE_FULL = -1501, - ACP_RESULT_JOURNAL_FULL = -1502, - ACP_RESULT_SYSTEM_MEMORY = -1503, - ACP_RESULT_FS_RESOURCE = -1504, - ACP_RESULT_IPC_RESOURCE = -1505, - - ACP_RESULT_NOT_INITIALISED = -1600, - - ACP_RESULT_ACCOUNT_ERROR = -1700, - - ACP_RESULT_UNSUPPORTED = -1800, - - ACP_RESULT_DATA_CORRUPTED = -2000, - ACP_RESULT_DEVICE = -2001, - ACP_RESULT_SLC_DATA_CORRUPTED = -2002, - ACP_RESULT_MLC_DATA_CORRUPTED = -2003, - ACP_RESULT_USB_DATA_CORRUPTED = -2004, - - ACP_RESULT_MEDIA = -2100, - ACP_RESULT_MEDIA_NOT_READY = -2101, - ACP_RESULT_MEDIA_BROKEN = -2102, - ACP_RESULT_ODD_MEDIA_NOT_READY = -2103, - ACP_RESULT_ODD_MEDIA_BROKEN = -2104, - ACP_RESULT_USB_MEDIA_NOT_READY = -2105, - ACP_RESULT_USB_MEDIA_BROKEN = -2106, - ACP_RESULT_MEDIA_WRITE_PROTECTED = -2107, - ACP_RESULT_USB_WRITE_PROTECTED = -2108, - - ACP_RESULT_MII = -2200, - ACP_RESULT_ENCRYPTION_ERROR = -2201, - - ACP_RESULT_GENERIC_ERROR = -4096, +typedef enum ACPResult +{ + ACP_RESULT_SUCCESS = 0, + + ACP_RESULT_INVALID = -200, + ACP_RESULT_INVALID_PARAMETER = -201, + ACP_RESULT_INVALID_FILE = -202, + ACP_RESULT_INVALID_XML_FILE = -203, + ACP_RESULT_FILE_ACCESS_MODE = -204, + ACP_RESULT_INVALID_NETWORK_TIME = -205, + + ACP_RESULT_NOT_FOUND = -500, + ACP_RESULT_FILE_NOT_FOUND = -501, + ACP_RESULT_DIR_NOT_FOUND = -502, + ACP_RESULT_DEVICE_NOT_FOUND = -503, + ACP_RESULT_TITLE_NOT_FOUND = -504, + ACP_RESULT_APPLICATION_NOT_FOUND = -505, + ACP_RESULT_SYSTEM_CONFIG_NOT_FOUND = -506, + ACP_RESULT_XML_ITEM_NOT_FOUND = -507, + + ACP_RESULT_ALREADY_EXISTS = -600, + ACP_RESULT_FILE_ALREADY_EXISTS = -601, + ACP_RESULT_DIR_ALREADY_EXISTS = -602, + + ACP_RESULT_ALREADY_DONE = -700, + + ACP_RESULT_AUTHENTICATION = -1000, + ACP_RESULT_INVALID_REGION = -1001, + ACP_RESULT_RESTRICTED_RATING = -1002, + ACP_RESULT_NOT_PRESENT_RATING = -1003, + ACP_RESULT_PENDING_RATING = -1004, + ACP_RESULT_NET_SETTING_REQUIRED = -1005, + ACP_RESULT_NET_ACCOUNT_REQUIRED = -1006, + ACP_RESULT_NET_ACCOUNT_ERROR = -1007, + ACP_RESULT_BROWSER_REQUIRED = -1008, + ACP_RESULT_OLV_REQUIRED = -1009, + ACP_RESULT_PINCODE_REQUIRED = -1010, + ACP_RESULT_INCORRECT_PINCODE = -1011, + ACP_RESULT_INVALID_LOGO = -1012, + ACP_RESULT_DEMO_EXPIRED_NUMBER = -1013, + ACP_RESULT_DRC_REQUIRED = -1014, + + ACP_RESULT_NO_PERMISSION = -1100, + ACP_RESULT_NO_FILE_PERMISSION = -1101, + ACP_RESULT_NO_DIR_PERMISSION = -1102, + + ACP_RESULT_BUSY = -1300, + ACP_RESULT_USB_STORAGE_NOT_READY = -1301, + + ACP_RESULT_CANCELLED = -1400, + + ACP_RESULT_RESOURCE = -1500, + ACP_RESULT_DEVICE_FULL = -1501, + ACP_RESULT_JOURNAL_FULL = -1502, + ACP_RESULT_SYSTEM_MEMORY = -1503, + ACP_RESULT_FS_RESOURCE = -1504, + ACP_RESULT_IPC_RESOURCE = -1505, + + ACP_RESULT_NOT_INITIALISED = -1600, + + ACP_RESULT_ACCOUNT_ERROR = -1700, + + ACP_RESULT_UNSUPPORTED = -1800, + + ACP_RESULT_DATA_CORRUPTED = -2000, + ACP_RESULT_DEVICE = -2001, + ACP_RESULT_SLC_DATA_CORRUPTED = -2002, + ACP_RESULT_MLC_DATA_CORRUPTED = -2003, + ACP_RESULT_USB_DATA_CORRUPTED = -2004, + + ACP_RESULT_MEDIA = -2100, + ACP_RESULT_MEDIA_NOT_READY = -2101, + ACP_RESULT_MEDIA_BROKEN = -2102, + ACP_RESULT_ODD_MEDIA_NOT_READY = -2103, + ACP_RESULT_ODD_MEDIA_BROKEN = -2104, + ACP_RESULT_USB_MEDIA_NOT_READY = -2105, + ACP_RESULT_USB_MEDIA_BROKEN = -2106, + ACP_RESULT_MEDIA_WRITE_PROTECTED = -2107, + ACP_RESULT_USB_WRITE_PROTECTED = -2108, + + ACP_RESULT_MII = -2200, + ACP_RESULT_ENCRYPTION_ERROR = -2201, + + ACP_RESULT_GENERIC_ERROR = -4096, } ACPResult; WUT_CHECK_SIZE(ACPResult, 0x4); diff --git a/include/nn/acp/save.h b/include/nn/acp/save.h index 591661cbe..2d0f9cbea 100644 --- a/include/nn/acp/save.h +++ b/include/nn/acp/save.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include +#include +#include /** * \defgroup nn_acp_save Save @@ -20,7 +20,7 @@ ACPCreateSaveDir(uint32_t persistentId, ACPDeviceType deviceType); ACPResult -ACPIsExternalStorageRequired(BOOL* required); +ACPIsExternalStorageRequired(BOOL *required); ACPResult ACPMountExternalStorage(); diff --git a/include/nn/acp/title.h b/include/nn/acp/title.h index 5c4aedce6..2f390137d 100644 --- a/include/nn/acp/title.h +++ b/include/nn/acp/title.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include #include +#include +#include +#include /** * \defgroup nn_acp_title Title @@ -19,114 +19,115 @@ extern "C" { typedef uint64_t ACPTitleId; typedef struct ACPMetaXml ACPMetaXml; -struct WUT_PACKED ACPMetaXml { - uint64_t title_id; - uint64_t boss_id; - uint64_t os_version; - uint64_t app_size; - uint64_t common_save_size; - uint64_t account_save_size; - uint64_t common_boss_size; - uint64_t account_boss_size; - uint64_t join_game_mode_mask; - uint32_t version; - char product_code[32]; - char content_platform[32]; - char company_code[8]; - char mastering_date[32]; - uint32_t logo_type; - uint32_t app_launch_type; - uint32_t invisible_flag; - uint32_t no_managed_flag; - uint32_t no_event_log; - uint32_t no_icon_database; - uint32_t launching_flag; - uint32_t install_flag; - uint32_t closing_msg; - uint32_t title_version; - uint32_t group_id; - uint32_t save_no_rollback; - uint32_t bg_daemon_enable; - uint32_t join_game_id; - uint32_t olv_accesskey; - uint32_t wood_tin; - uint32_t e_manual; - uint32_t e_manual_version; - uint32_t region; - uint32_t pc_cero; - uint32_t pc_esrb; - uint32_t pc_bbfc; - uint32_t pc_usk; - uint32_t pc_pegi_gen; - uint32_t pc_pegi_fin; - uint32_t pc_pegi_prt; - uint32_t pc_pegi_bbfc; - uint32_t pc_cob; - uint32_t pc_grb; - uint32_t pc_cgsrr; - uint32_t pc_oflc; - uint32_t pc_reserved0; - uint32_t pc_reserved1; - uint32_t pc_reserved2; - uint32_t pc_reserved3; - uint32_t ext_dev_nunchaku; - uint32_t ext_dev_classic; - uint32_t ext_dev_urcc; - uint32_t ext_dev_board; - uint32_t ext_dev_usb_keyboard; - uint32_t ext_dev_etc; - char ext_dev_etc_name[512]; - uint32_t eula_version; - uint32_t drc_use; - uint32_t network_use; - uint32_t online_account_use; - uint32_t direct_boot; - uint32_t reserved_flag0; - uint32_t reserved_flag1; - uint32_t reserved_flag2; - uint32_t reserved_flag3; - uint32_t reserved_flag4; - uint32_t reserved_flag5; - uint32_t reserved_flag6; - uint32_t reserved_flag7; - char longname_ja[512]; - char longname_en[512]; - char longname_fr[512]; - char longname_de[512]; - char longname_it[512]; - char longname_es[512]; - char longname_zhs[512]; - char longname_ko[512]; - char longname_nl[512]; - char longname_pt[512]; - char longname_ru[512]; - char longname_zht[512]; - char shortname_ja[256]; - char shortname_en[256]; - char shortname_fr[256]; - char shortname_de[256]; - char shortname_it[256]; - char shortname_es[256]; - char shortname_zhs[256]; - char shortname_ko[256]; - char shortname_nl[256]; - char shortname_pt[256]; - char shortname_ru[256]; - char shortname_zht[256]; - char publisher_ja[256]; - char publisher_en[256]; - char publisher_fr[256]; - char publisher_de[256]; - char publisher_it[256]; - char publisher_es[256]; - char publisher_zhs[256]; - char publisher_ko[256]; - char publisher_nl[256]; - char publisher_pt[256]; - char publisher_ru[256]; - char publisher_zht[256]; - uint32_t add_on_unique_id[32]; - WUT_UNKNOWN_BYTES(52); +struct WUT_PACKED ACPMetaXml +{ + uint64_t title_id; + uint64_t boss_id; + uint64_t os_version; + uint64_t app_size; + uint64_t common_save_size; + uint64_t account_save_size; + uint64_t common_boss_size; + uint64_t account_boss_size; + uint64_t join_game_mode_mask; + uint32_t version; + char product_code[32]; + char content_platform[32]; + char company_code[8]; + char mastering_date[32]; + uint32_t logo_type; + uint32_t app_launch_type; + uint32_t invisible_flag; + uint32_t no_managed_flag; + uint32_t no_event_log; + uint32_t no_icon_database; + uint32_t launching_flag; + uint32_t install_flag; + uint32_t closing_msg; + uint32_t title_version; + uint32_t group_id; + uint32_t save_no_rollback; + uint32_t bg_daemon_enable; + uint32_t join_game_id; + uint32_t olv_accesskey; + uint32_t wood_tin; + uint32_t e_manual; + uint32_t e_manual_version; + uint32_t region; + uint32_t pc_cero; + uint32_t pc_esrb; + uint32_t pc_bbfc; + uint32_t pc_usk; + uint32_t pc_pegi_gen; + uint32_t pc_pegi_fin; + uint32_t pc_pegi_prt; + uint32_t pc_pegi_bbfc; + uint32_t pc_cob; + uint32_t pc_grb; + uint32_t pc_cgsrr; + uint32_t pc_oflc; + uint32_t pc_reserved0; + uint32_t pc_reserved1; + uint32_t pc_reserved2; + uint32_t pc_reserved3; + uint32_t ext_dev_nunchaku; + uint32_t ext_dev_classic; + uint32_t ext_dev_urcc; + uint32_t ext_dev_board; + uint32_t ext_dev_usb_keyboard; + uint32_t ext_dev_etc; + char ext_dev_etc_name[512]; + uint32_t eula_version; + uint32_t drc_use; + uint32_t network_use; + uint32_t online_account_use; + uint32_t direct_boot; + uint32_t reserved_flag0; + uint32_t reserved_flag1; + uint32_t reserved_flag2; + uint32_t reserved_flag3; + uint32_t reserved_flag4; + uint32_t reserved_flag5; + uint32_t reserved_flag6; + uint32_t reserved_flag7; + char longname_ja[512]; + char longname_en[512]; + char longname_fr[512]; + char longname_de[512]; + char longname_it[512]; + char longname_es[512]; + char longname_zhs[512]; + char longname_ko[512]; + char longname_nl[512]; + char longname_pt[512]; + char longname_ru[512]; + char longname_zht[512]; + char shortname_ja[256]; + char shortname_en[256]; + char shortname_fr[256]; + char shortname_de[256]; + char shortname_it[256]; + char shortname_es[256]; + char shortname_zhs[256]; + char shortname_ko[256]; + char shortname_nl[256]; + char shortname_pt[256]; + char shortname_ru[256]; + char shortname_zht[256]; + char publisher_ja[256]; + char publisher_en[256]; + char publisher_fr[256]; + char publisher_de[256]; + char publisher_it[256]; + char publisher_es[256]; + char publisher_zhs[256]; + char publisher_ko[256]; + char publisher_nl[256]; + char publisher_pt[256]; + char publisher_ru[256]; + char publisher_zht[256]; + uint32_t add_on_unique_id[32]; + WUT_UNKNOWN_BYTES(52); }; WUT_CHECK_OFFSET(ACPMetaXml, 0x00, title_id); WUT_CHECK_OFFSET(ACPMetaXml, 0x08, boss_id); @@ -234,21 +235,21 @@ WUT_CHECK_OFFSET(ACPMetaXml, 0x308C, publisher_pt); WUT_CHECK_OFFSET(ACPMetaXml, 0x318C, publisher_ru); WUT_CHECK_OFFSET(ACPMetaXml, 0x328C, publisher_zht); WUT_CHECK_OFFSET(ACPMetaXml, 0x338C, add_on_unique_id); -WUT_CHECK_SIZE(ACPMetaXml,0x3440); +WUT_CHECK_SIZE(ACPMetaXml, 0x3440); ACPResult -ACPAssignTitlePatch(MCPTitleListType* titleInfo); +ACPAssignTitlePatch(MCPTitleListType *titleInfo); ACPResult -ACPGetTitleIdOfMainApplication(ACPTitleId* titleId); +ACPGetTitleIdOfMainApplication(ACPTitleId *titleId); ACPResult ACPGetTitleMetaXml(ACPTitleId titleId, - ACPMetaXml* metaXml); + ACPMetaXml *metaXml); ACPResult ACPGetTitleMetaDirByDevice(ACPTitleId titleId, - char* directory, + char *directory, size_t directoryLen, ACPDeviceType deviceType); diff --git a/include/nn/act/client_cpp.h b/include/nn/act/client_cpp.h index 195894c34..6422cc28c 100644 --- a/include/nn/act/client_cpp.h +++ b/include/nn/act/client_cpp.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include +#include +#include /** * \defgroup nn_act_client Accounts Client API @@ -14,205 +14,161 @@ namespace nn { -namespace act { + namespace act { -//https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/nn/act/nn_act_types.h + //https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/nn/act/nn_act_types.h -using ACTLoadOption = uint32_t; -using SlotNo = uint8_t; -using LocalFriendCode = uint64_t; -using PersistentId = uint32_t; -using PrincipalId = uint32_t; -using SimpleAddressId = uint32_t; -using TransferrableId = uint64_t; + using ACTLoadOption = uint32_t; + using SlotNo = uint8_t; + using LocalFriendCode = uint64_t; + using PersistentId = uint32_t; + using PrincipalId = uint32_t; + using SimpleAddressId = uint32_t; + using TransferrableId = uint64_t; -static constexpr size_t AccountIdSize = 17; -static constexpr size_t DeviceHashSize = 8; -static constexpr size_t NfsPasswordSize = 17; -static constexpr size_t MiiNameSize = 11; -static constexpr size_t UuidSize = 16; + static constexpr size_t AccountIdSize = 17; + static constexpr size_t DeviceHashSize = 8; + static constexpr size_t NfsPasswordSize = 17; + static constexpr size_t MiiNameSize = 11; + static constexpr size_t UuidSize = 16; -//https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/cafe/libraries/nn_act/nn_act_client.cpp + //https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/cafe/libraries/nn_act/nn_act_client.cpp -nn::Result -Initialize(void) - asm("Initialize__Q2_2nn3actFv"); + nn::Result + Initialize(void) asm("Initialize__Q2_2nn3actFv"); -nn::Result -Finalize(void) - asm("Finalize__Q2_2nn3actFv"); + nn::Result + Finalize(void) asm("Finalize__Q2_2nn3actFv"); -//https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/cafe/libraries/nn_act/nn_act_clientstandardservice.cpp + //https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/cafe/libraries/nn_act/nn_act_clientstandardservice.cpp -nn::Result -GetAccountId(char outAccountId[AccountIdSize]) - asm("GetAccountId__Q2_2nn3actFPc"); + nn::Result + GetAccountId(char outAccountId[AccountIdSize]) asm("GetAccountId__Q2_2nn3actFPc"); -nn::Result -GetAccountIdEx(char outAccountId[AccountIdSize], SlotNo slot) - asm("GetAccountIdEx__Q2_2nn3actFPcUc"); + nn::Result + GetAccountIdEx(char outAccountId[AccountIdSize], SlotNo slot) asm("GetAccountIdEx__Q2_2nn3actFPcUc"); -nn::Result -GetBirthday(uint16_t* outYear, uint8_t* outMonth, uint8_t* outDay) - asm("GetBirthday__Q2_2nn3actFPUsPUcT2"); + nn::Result + GetBirthday(uint16_t *outYear, uint8_t *outMonth, uint8_t *outDay) asm("GetBirthday__Q2_2nn3actFPUsPUcT2"); -nn::Result -GetBirthdayEx(uint16_t* outYear, uint8_t* outMonth, uint8_t* outDay, SlotNo slot) - asm("GetBirthdayEx__Q2_2nn3actFPUsPUcT2Uc"); + nn::Result + GetBirthdayEx(uint16_t *outYear, uint8_t *outMonth, uint8_t *outDay, SlotNo slot) asm("GetBirthdayEx__Q2_2nn3actFPUsPUcT2Uc"); -SlotNo -GetDefaultAccount(void) - asm("GetDefaultAccount__Q2_2nn3actFv"); + SlotNo + GetDefaultAccount(void) asm("GetDefaultAccount__Q2_2nn3actFv"); -nn::Result -GetDeviceHash(char outHash[DeviceHashSize]) - asm("GetDeviceHash__Q2_2nn3actFPUL"); + nn::Result + GetDeviceHash(char outHash[DeviceHashSize]) asm("GetDeviceHash__Q2_2nn3actFPUL"); -nn::Result -LoadConsoleAccount(SlotNo slot, ACTLoadOption unk1, char const * unk2, bool unk3) - asm("LoadConsoleAccount__Q2_2nn3actFUc13ACTLoadOptionPCcb"); + nn::Result + LoadConsoleAccount(SlotNo slot, ACTLoadOption unk1, char const *unk2, bool unk3) asm("LoadConsoleAccount__Q2_2nn3actFUc13ACTLoadOptionPCcb"); -nn::Result -GetMii(FFLStoreData* mii) - asm("GetMii__Q2_2nn3actFP12FFLStoreData"); + nn::Result + GetMii(FFLStoreData *mii) asm("GetMii__Q2_2nn3actFP12FFLStoreData"); -nn::Result -GetMiiEx(FFLStoreData* mii, SlotNo slot) - asm("GetMiiEx__Q2_2nn3actFP12FFLStoreDataUc"); + nn::Result + GetMiiEx(FFLStoreData *mii, SlotNo slot) asm("GetMiiEx__Q2_2nn3actFP12FFLStoreDataUc"); -nn::Result -GetMiiImageEx(size_t* outImageSize, void* buffer, size_t bufferSize, int unk, SlotNo slot) - asm("GetMiiImageEx__Q2_2nn3actFPUiPvUi15ACTMiiImageTypeUc"); + nn::Result + GetMiiImageEx(size_t *outImageSize, void *buffer, size_t bufferSize, int unk, SlotNo slot) asm("GetMiiImageEx__Q2_2nn3actFPUiPvUi15ACTMiiImageTypeUc"); -nn::Result -GetMiiName(int16_t outName[MiiNameSize]) - asm("GetMiiName__Q2_2nn3actFPw"); + nn::Result + GetMiiName(int16_t outName[MiiNameSize]) asm("GetMiiName__Q2_2nn3actFPw"); -nn::Result -GetMiiNameEx(int16_t outName[MiiNameSize], SlotNo slot) - asm("GetMiiNameEx__Q2_2nn3actFPwUc"); + nn::Result + GetMiiNameEx(int16_t outName[MiiNameSize], SlotNo slot) asm("GetMiiNameEx__Q2_2nn3actFPwUc"); -nn::Result -GetNfsPassword(char outPassword[NfsPasswordSize]) - asm("GetNfsPassword__Q2_2nn3actFPc"); + nn::Result + GetNfsPassword(char outPassword[NfsPasswordSize]) asm("GetNfsPassword__Q2_2nn3actFPc"); -nn::Result -GetNfsPasswordEx(char outPassword[NfsPasswordSize], SlotNo slot) - asm("GetNfsPasswordEx__Q2_2nn3actFPcUc"); + nn::Result + GetNfsPasswordEx(char outPassword[NfsPasswordSize], SlotNo slot) asm("GetNfsPasswordEx__Q2_2nn3actFPcUc"); -uint8_t -GetNumOfAccounts(void) - asm("GetNumOfAccounts__Q2_2nn3actFv"); + uint8_t + GetNumOfAccounts(void) asm("GetNumOfAccounts__Q2_2nn3actFv"); -SlotNo -GetParentalControlsSlotNo(void) - asm("GetParentalControlSlotNo__Q2_2nn3actFv"); + SlotNo + GetParentalControlsSlotNo(void) asm("GetParentalControlSlotNo__Q2_2nn3actFv"); -nn::Result -GetParentalControlsSlotNoEx(void) - asm("GetParentalControlSlotNoEx__Q2_2nn3actFPUcUc"); + nn::Result + GetParentalControlsSlotNoEx(void) asm("GetParentalControlSlotNoEx__Q2_2nn3actFPUcUc"); -PersistentId -GetPersistentId(void) - asm("GetPersistentId__Q2_2nn3actFv"); + PersistentId + GetPersistentId(void) asm("GetPersistentId__Q2_2nn3actFv"); -PersistentId -GetPersistentIdEx(SlotNo slot) - asm("GetPersistentIdEx__Q2_2nn3actFUc"); + PersistentId + GetPersistentIdEx(SlotNo slot) asm("GetPersistentIdEx__Q2_2nn3actFUc"); -PrincipalId -GetPrincipalId(void) - asm("GetPrincipalId__Q2_2nn3actFv"); + PrincipalId + GetPrincipalId(void) asm("GetPrincipalId__Q2_2nn3actFv"); -nn::Result -GetPrincipalIdEx(PrincipalId* outId, SlotNo slot) - asm("GetPrincipalIdEx__Q2_2nn3actFPUiUc"); + nn::Result + GetPrincipalIdEx(PrincipalId *outId, SlotNo slot) asm("GetPrincipalIdEx__Q2_2nn3actFPUiUc"); -SimpleAddressId -GetSimpleAddressId(void) - asm("GetSimpleAddressId__Q2_2nn3actFv"); + SimpleAddressId + GetSimpleAddressId(void) asm("GetSimpleAddressId__Q2_2nn3actFv"); -nn::Result -GetSimpleAddressId(SimpleAddressId* outId, SlotNo slot) - asm("GetSimpleAddressIdEx__Q2_2nn3actFPUiUc"); + nn::Result + GetSimpleAddressId(SimpleAddressId *outId, SlotNo slot) asm("GetSimpleAddressIdEx__Q2_2nn3actFPUiUc"); -SlotNo -GetSlotNo(void) - asm("GetSlotNo__Q2_2nn3actFv"); + SlotNo + GetSlotNo(void) asm("GetSlotNo__Q2_2nn3actFv"); -TransferrableId -GetTransferableId(uint32_t unk1) - asm("GetTransferableId__Q2_2nn3actFUi"); + TransferrableId + GetTransferableId(uint32_t unk1) asm("GetTransferableId__Q2_2nn3actFUi"); -nn::Result -GetTransferableIdEx(TransferrableId* outId, uint32_t unk1, SlotNo slot) - asm("GetTransferableIdEx__Q2_2nn3actFPULUiUc"); + nn::Result + GetTransferableIdEx(TransferrableId *outId, uint32_t unk1, SlotNo slot) asm("GetTransferableIdEx__Q2_2nn3actFPULUiUc"); -nn::Result -GetUuidEx(char outUuid[UuidSize], SlotNo slot, int32_t unk1) - asm("GetUuidEx__Q2_2nn3actFP7ACTUuidUcUi"); + nn::Result + GetUuidEx(char outUuid[UuidSize], SlotNo slot, int32_t unk1) asm("GetUuidEx__Q2_2nn3actFP7ACTUuidUcUi"); -nn::Result -GetUuidEx(char outUuid[UuidSize], SlotNo slot) - asm("GetUuidEx__Q2_2nn3actFP7ACTUuidUc"); + nn::Result + GetUuidEx(char outUuid[UuidSize], SlotNo slot) asm("GetUuidEx__Q2_2nn3actFP7ACTUuidUc"); -nn::Result -GetUuid(char outUuid[UuidSize], int32_t unk1) - asm("GetUuid__Q2_2nn3actFP7ACTUuidUi"); + nn::Result + GetUuid(char outUuid[UuidSize], int32_t unk1) asm("GetUuid__Q2_2nn3actFP7ACTUuidUi"); -nn::Result -GetUuid(char outUuid[UuidSize]) - asm("GetUuid__Q2_2nn3actFP7ACTUuid"); + nn::Result + GetUuid(char outUuid[UuidSize]) asm("GetUuid__Q2_2nn3actFP7ACTUuid"); -BOOL -HasNfsAccount(void) - asm("HasNfsAccount__Q2_2nn3actFv"); + BOOL + HasNfsAccount(void) asm("HasNfsAccount__Q2_2nn3actFv"); -BOOL -IsCommitted(void) - asm("IsCommitted__Q2_2nn3actFv"); + BOOL + IsCommitted(void) asm("IsCommitted__Q2_2nn3actFv"); -BOOL -IsCommittedEx(SlotNo slot) - asm("IsCommittedEx__Q2_2nn3actFUc"); + BOOL + IsCommittedEx(SlotNo slot) asm("IsCommittedEx__Q2_2nn3actFUc"); -BOOL -IsPasswordCacheEnabled(void) - asm("IsPasswordCacheEnabled__Q2_2nn3actFv"); + BOOL + IsPasswordCacheEnabled(void) asm("IsPasswordCacheEnabled__Q2_2nn3actFv"); -BOOL -IsPasswordCacheEnabledEx(SlotNo slot) - asm("IsPasswordCacheEnabledEx__Q2_2nn3actFUc"); + BOOL + IsPasswordCacheEnabledEx(SlotNo slot) asm("IsPasswordCacheEnabledEx__Q2_2nn3actFUc"); -BOOL -IsNetworkAccount(void) - asm("IsNetworkAccount__Q2_2nn3actFv"); + BOOL + IsNetworkAccount(void) asm("IsNetworkAccount__Q2_2nn3actFv"); -BOOL -IsNetworkAccountEx(SlotNo slot) - asm("IsNetworkAccountEx__Q2_2nn3actFUc"); + BOOL + IsNetworkAccountEx(SlotNo slot) asm("IsNetworkAccountEx__Q2_2nn3actFUc"); -BOOL -IsServerAccountActive(void) - asm("IsServerAccountActive__Q2_2nn3actFv"); + BOOL + IsServerAccountActive(void) asm("IsServerAccountActive__Q2_2nn3actFv"); -BOOL -IsServerAccountActiveEx(SlotNo slot) - asm("IsServerAccountActiveEx__Q2_2nn3actFUc"); + BOOL + IsServerAccountActiveEx(SlotNo slot) asm("IsServerAccountActiveEx__Q2_2nn3actFUc"); -BOOL -IsServerAccountDeleted(void) - asm("IsServerAccountDeleted__Q2_2nn3actFv"); + BOOL + IsServerAccountDeleted(void) asm("IsServerAccountDeleted__Q2_2nn3actFv"); -BOOL -IsServerAccountDeletedEx(SlotNo slot) - asm("IsServerAccountDeletedEx__Q2_2nn3actFUc"); + BOOL + IsServerAccountDeletedEx(SlotNo slot) asm("IsServerAccountDeletedEx__Q2_2nn3actFUc"); -BOOL -IsSlotOccupied(SlotNo slot) - asm("IsSlotOccupied__Q2_2nn3actFUc"); + BOOL + IsSlotOccupied(SlotNo slot) asm("IsSlotOccupied__Q2_2nn3actFUc"); -} //namespace act + } //namespace act } //namespace nn diff --git a/include/nn/ccr/sys_caffeine.h b/include/nn/ccr/sys_caffeine.h index 440b7fe12..1b6e8faa0 100644 --- a/include/nn/ccr/sys_caffeine.h +++ b/include/nn/ccr/sys_caffeine.h @@ -9,16 +9,15 @@ typedef struct CCRAppLaunchParam CCRAppLaunchParam; struct WUT_PACKED CCRAppLaunchParam { - uint64_t titleId; - char uuid[16]; - WUT_UNKNOWN_BYTES(0xE7); + uint64_t titleId; + char uuid[16]; + WUT_UNKNOWN_BYTES(0xE7); }; WUT_CHECK_OFFSET(CCRAppLaunchParam, 0x00, titleId); WUT_CHECK_OFFSET(CCRAppLaunchParam, 0x08, uuid); WUT_CHECK_SIZE(CCRAppLaunchParam, 0xFF); -void -CCRSysCaffeineGetAppLaunchParam(CCRAppLaunchParam * data); +void CCRSysCaffeineGetAppLaunchParam(CCRAppLaunchParam *data); uint32_t CCRSysCaffeineBootCheck(); diff --git a/include/nn/cmpt/cmpt.h b/include/nn/cmpt/cmpt.h index 48501ceba..a14651c6d 100644 --- a/include/nn/cmpt/cmpt.h +++ b/include/nn/cmpt/cmpt.h @@ -12,10 +12,11 @@ extern "C" { #endif -typedef enum CmptScreenType { - CMPT_SCREEN_TYPE_TV = 1, - CMPT_SCREEN_TYPE_DRC, - CMPT_SCREEN_TYPE_BOTH, +typedef enum CmptScreenType +{ + CMPT_SCREEN_TYPE_TV = 1, + CMPT_SCREEN_TYPE_DRC, + CMPT_SCREEN_TYPE_BOTH, } CmptScreenType; /** @@ -26,7 +27,7 @@ typedef enum CmptScreenType { * 0 on success. */ int32_t -CMPTGetDataSize(uint32_t* outSize); +CMPTGetDataSize(uint32_t *outSize); /** * Launches the specified vWii title. @@ -35,7 +36,7 @@ CMPTGetDataSize(uint32_t* outSize); * 0 on success. */ int32_t -CMPTLaunchTitle(void* dataBuffer, uint32_t bufferSize, uint32_t titleId_low, uint32_t titleId_high); +CMPTLaunchTitle(void *dataBuffer, uint32_t bufferSize, uint32_t titleId_low, uint32_t titleId_high); /** * Launches vWii System Menu. @@ -44,7 +45,7 @@ CMPTLaunchTitle(void* dataBuffer, uint32_t bufferSize, uint32_t titleId_low, uin * 0 on success. */ int32_t -CMPTLaunchMenu(void* dataBuffer, uint32_t bufferSize); +CMPTLaunchMenu(void *dataBuffer, uint32_t bufferSize); /** * Launches vWii Data Management. @@ -53,7 +54,7 @@ CMPTLaunchMenu(void* dataBuffer, uint32_t bufferSize); * 0 on success. */ int32_t -CMPTLaunchDataManager(void* dataBuffer, uint32_t bufferSize); +CMPTLaunchDataManager(void *dataBuffer, uint32_t bufferSize); /** * Sets the screen type. diff --git a/include/nn/erreula/erreula_cpp.h b/include/nn/erreula/erreula_cpp.h index 14dc09b97..c088d0516 100644 --- a/include/nn/erreula/erreula_cpp.h +++ b/include/nn/erreula/erreula_cpp.h @@ -1,10 +1,10 @@ #pragma once -#include #include #include #include -#include #include +#include +#include /** * \defgroup nn_erreula_erreula Error Viewer @@ -17,252 +17,247 @@ #ifdef __cplusplus -namespace nn -{ -namespace erreula -{ - -enum class ControllerType -{ - WiiRemote0 = 0, - WiiRemote1 = 1, - WiiRemote2 = 2, - WiiRemote3 = 3, - DrcGamepad = 4, -}; - -enum class ErrorType -{ - Code = 0, - Message = 1, - Message1Button = 2, - Message2Button = 3, -}; - -enum class LangType -{ - Japanese = 0, - English = 1, - // TODO: More languages -}; - -enum class RegionType -{ - Japan = 0, - USA = 1, - Europe = 2, - China = 3, - Korea = 4, - Taiwan = 5, -}; - -enum class ResultType -{ - None = 0, - - //! The user exited the error viewer - Exited = 1, - - // TODO: More result types -}; - -enum class RenderTarget -{ - //! Render only to TV - Tv = 0, - - //! Render only to DRC gamepad - Drc = 1, - - //! Render to both TV and Gamepad - Both = 2, -}; - -enum class State -{ - //! The error viewer is completely hidden. - Hidden = 0, - - //! The error viewer is drawing the fade-in animation. - FadeIn = 1, - - //! The error viewer is done drawing the fade in animation and completely visible. - Visible = 2, - - //! The error viewer is drawing the fade-out animation. - FadeOut = 3, -}; - -struct ErrorArg -{ - ErrorArg() : - errorType(ErrorType::Code), - renderTarget(RenderTarget::Both), - controllerType(ControllerType::DrcGamepad), - unknown0x0C(0), - errorCode(0), - unknown0x14(1), - errorMessage(nullptr), - button1Label(nullptr), - button2Label(nullptr), - errorTitle(nullptr), - unknown0x28(true) - { - } - - ErrorType errorType; - RenderTarget renderTarget; - ControllerType controllerType; - uint32_t unknown0x0C; - int32_t errorCode; - uint32_t unknown0x14; - const char16_t *errorMessage; - const char16_t *button1Label; - const char16_t *button2Label; - const char16_t *errorTitle; - bool unknown0x28; - WUT_PADDING_BYTES(3); -}; -WUT_CHECK_OFFSET(ErrorArg, 0x00, errorType); -WUT_CHECK_OFFSET(ErrorArg, 0x04, renderTarget); -WUT_CHECK_OFFSET(ErrorArg, 0x08, controllerType); -WUT_CHECK_OFFSET(ErrorArg, 0x0C, unknown0x0C); -WUT_CHECK_OFFSET(ErrorArg, 0x10, errorCode); -WUT_CHECK_OFFSET(ErrorArg, 0x14, unknown0x14); -WUT_CHECK_OFFSET(ErrorArg, 0x18, errorMessage); -WUT_CHECK_OFFSET(ErrorArg, 0x1C, button1Label); -WUT_CHECK_OFFSET(ErrorArg, 0x20, button2Label); -WUT_CHECK_OFFSET(ErrorArg, 0x24, errorTitle); -WUT_CHECK_OFFSET(ErrorArg, 0x28, unknown0x28); -WUT_CHECK_SIZE(ErrorArg, 0x2C); - - -struct AppearArg -{ - ErrorArg errorArg; -}; -WUT_CHECK_OFFSET(AppearArg, 0x00, errorArg); -WUT_CHECK_SIZE(AppearArg, 0x2C); - -//! Configuration options for the error -struct CreateArg -{ - CreateArg() : - workMemory(nullptr), - region(RegionType::Europe), - language(LangType::English), - fsClient(nullptr) - { - } - - void *workMemory; - RegionType region; - LangType language; - FSClient *fsClient; -}; -WUT_CHECK_OFFSET(CreateArg, 0x00, workMemory); -WUT_CHECK_OFFSET(CreateArg, 0x04, region); -WUT_CHECK_OFFSET(CreateArg, 0x08, language); -WUT_CHECK_OFFSET(CreateArg, 0x0C, fsClient); -WUT_CHECK_SIZE(CreateArg, 0x10); - - -struct ControllerInfo -{ - ControllerInfo() - { - memset(this, 0, sizeof(*this)); - } - - const VPADStatus *vpad; - const KPADStatus *kpad[4]; -}; -WUT_CHECK_OFFSET(ControllerInfo, 0x00, vpad); -WUT_CHECK_OFFSET(ControllerInfo, 0x04, kpad); -WUT_CHECK_SIZE(ControllerInfo, 0x14); - -struct HomeNixSignArg -{ - HomeNixSignArg() : - unknown0x00(1) - { - } - - uint32_t unknown0x00; -}; -WUT_CHECK_OFFSET(HomeNixSignArg, 0x00, unknown0x00); -WUT_CHECK_SIZE(HomeNixSignArg, 0x04); - -void -AppearErrorViewer(const AppearArg &arg); - -void -AppearHomeNixSign(const HomeNixSignArg &arg); - -void -Calc(const ControllerInfo &controllerInfo); - -void -ChangeLangError(LangType languageType); - -bool -Create(const CreateArg &args); - -void -Destroy(); - -void -DisappearErrorViewer(); - -void -DisappearHomeNixSign(); - -void -DrawDRC(); - -void -DrawTV(); - -int32_t -GetResultCode(); - -ResultType -GetResultType(); +namespace nn { + namespace erreula { + + enum class ControllerType + { + WiiRemote0 = 0, + WiiRemote1 = 1, + WiiRemote2 = 2, + WiiRemote3 = 3, + DrcGamepad = 4, + }; + + enum class ErrorType + { + Code = 0, + Message = 1, + Message1Button = 2, + Message2Button = 3, + }; + + enum class LangType + { + Japanese = 0, + English = 1, + // TODO: More languages + }; + + enum class RegionType + { + Japan = 0, + USA = 1, + Europe = 2, + China = 3, + Korea = 4, + Taiwan = 5, + }; + + enum class ResultType + { + None = 0, + + //! The user exited the error viewer + Exited = 1, + + // TODO: More result types + }; + + enum class RenderTarget + { + //! Render only to TV + Tv = 0, + + //! Render only to DRC gamepad + Drc = 1, + + //! Render to both TV and Gamepad + Both = 2, + }; + + enum class State + { + //! The error viewer is completely hidden. + Hidden = 0, + + //! The error viewer is drawing the fade-in animation. + FadeIn = 1, + + //! The error viewer is done drawing the fade in animation and completely visible. + Visible = 2, + + //! The error viewer is drawing the fade-out animation. + FadeOut = 3, + }; + + struct ErrorArg + { + ErrorArg() : errorType(ErrorType::Code), + renderTarget(RenderTarget::Both), + controllerType(ControllerType::DrcGamepad), + unknown0x0C(0), + errorCode(0), + unknown0x14(1), + errorMessage(nullptr), + button1Label(nullptr), + button2Label(nullptr), + errorTitle(nullptr), + unknown0x28(true) + { + } + + ErrorType errorType; + RenderTarget renderTarget; + ControllerType controllerType; + uint32_t unknown0x0C; + int32_t errorCode; + uint32_t unknown0x14; + const char16_t *errorMessage; + const char16_t *button1Label; + const char16_t *button2Label; + const char16_t *errorTitle; + bool unknown0x28; + WUT_PADDING_BYTES(3); + }; + WUT_CHECK_OFFSET(ErrorArg, 0x00, errorType); + WUT_CHECK_OFFSET(ErrorArg, 0x04, renderTarget); + WUT_CHECK_OFFSET(ErrorArg, 0x08, controllerType); + WUT_CHECK_OFFSET(ErrorArg, 0x0C, unknown0x0C); + WUT_CHECK_OFFSET(ErrorArg, 0x10, errorCode); + WUT_CHECK_OFFSET(ErrorArg, 0x14, unknown0x14); + WUT_CHECK_OFFSET(ErrorArg, 0x18, errorMessage); + WUT_CHECK_OFFSET(ErrorArg, 0x1C, button1Label); + WUT_CHECK_OFFSET(ErrorArg, 0x20, button2Label); + WUT_CHECK_OFFSET(ErrorArg, 0x24, errorTitle); + WUT_CHECK_OFFSET(ErrorArg, 0x28, unknown0x28); + WUT_CHECK_SIZE(ErrorArg, 0x2C); + + + struct AppearArg + { + ErrorArg errorArg; + }; + WUT_CHECK_OFFSET(AppearArg, 0x00, errorArg); + WUT_CHECK_SIZE(AppearArg, 0x2C); + + //! Configuration options for the error + struct CreateArg + { + CreateArg() : workMemory(nullptr), + region(RegionType::Europe), + language(LangType::English), + fsClient(nullptr) + { + } + + void *workMemory; + RegionType region; + LangType language; + FSClient *fsClient; + }; + WUT_CHECK_OFFSET(CreateArg, 0x00, workMemory); + WUT_CHECK_OFFSET(CreateArg, 0x04, region); + WUT_CHECK_OFFSET(CreateArg, 0x08, language); + WUT_CHECK_OFFSET(CreateArg, 0x0C, fsClient); + WUT_CHECK_SIZE(CreateArg, 0x10); + + + struct ControllerInfo + { + ControllerInfo() + { + memset(this, 0, sizeof(*this)); + } + + const VPADStatus *vpad; + const KPADStatus *kpad[4]; + }; + WUT_CHECK_OFFSET(ControllerInfo, 0x00, vpad); + WUT_CHECK_OFFSET(ControllerInfo, 0x04, kpad); + WUT_CHECK_SIZE(ControllerInfo, 0x14); + + struct HomeNixSignArg + { + HomeNixSignArg() : unknown0x00(1) + { + } + + uint32_t unknown0x00; + }; + WUT_CHECK_OFFSET(HomeNixSignArg, 0x00, unknown0x00); + WUT_CHECK_SIZE(HomeNixSignArg, 0x04); + + void + AppearErrorViewer(const AppearArg &arg); + + void + AppearHomeNixSign(const HomeNixSignArg &arg); + + void + Calc(const ControllerInfo &controllerInfo); + + void + ChangeLangError(LangType languageType); + + bool + Create(const CreateArg &args); + + void + Destroy(); + + void + DisappearErrorViewer(); + + void + DisappearHomeNixSign(); + + void + DrawDRC(); + + void + DrawTV(); + + int32_t + GetResultCode(); + + ResultType + GetResultType(); -int32_t -GetSelectButtonNumError(); + int32_t + GetSelectButtonNumError(); -State -GetStateErrorViewer(); + State + GetStateErrorViewer(); -uint32_t -GetWorkMemorySize(); + uint32_t + GetWorkMemorySize(); -bool -IsAppearHomeNixSign(); + bool + IsAppearHomeNixSign(); -bool -IsDecideSelectButtonError(); + bool + IsDecideSelectButtonError(); -bool -IsDecideSelectLeftButtonError(); + bool + IsDecideSelectLeftButtonError(); -bool -IsDecideSelectRightButtonError(); + bool + IsDecideSelectRightButtonError(); -bool -IsSelectCursorActive(); + bool + IsSelectCursorActive(); -bool -Jump(const char *buffer, uint32_t bufferSize); + bool + Jump(const char *buffer, uint32_t bufferSize); -void -PlayAppearSE(bool playAppearSoundEffect); + void + PlayAppearSE(bool playAppearSoundEffect); -void -SetControllerRemo(ControllerType controller); + void + SetControllerRemo(ControllerType controller); -} // namespace erreula + } // namespace erreula } // namespace nn #endif // ifdef __cplusplus diff --git a/include/nn/ffl/miidata.h b/include/nn/ffl/miidata.h index 0632089ab..1c8ee8a14 100644 --- a/include/nn/ffl/miidata.h +++ b/include/nn/ffl/miidata.h @@ -14,13 +14,15 @@ extern "C" { // https://github.com/decaf-emu/decaf-emu/blob/master/src/libdecaf/src/nn/ffl/nn_ffl_miidata.h -typedef enum FFLCreateIDFlags { - FFL_CREATE_ID_FLAG_WII_U = 0x1 | 0x4, +typedef enum FFLCreateIDFlags +{ + FFL_CREATE_ID_FLAG_WII_U = 0x1 | 0x4, FFL_CREATE_ID_FLAG_TEMPORARY = 0x2, - FFL_CREATE_ID_FLAG_NORMAL = 0x8, + FFL_CREATE_ID_FLAG_NORMAL = 0x8, } FFLCreateIDFlags; -typedef struct WUT_PACKED FFLCreateID { +typedef struct WUT_PACKED FFLCreateID +{ FFLCreateIDFlags flags : 4; uint32_t timestamp : 28; @@ -31,7 +33,8 @@ WUT_CHECK_OFFSET(FFLCreateID, 4, deviceHash); WUT_CHECK_SIZE(FFLCreateID, 10); //Note: the endian may be wrong here -typedef struct WUT_PACKED FFLiMiiDataCore { +typedef struct WUT_PACKED FFLiMiiDataCore +{ // 0x00 uint8_t birth_platform : 4; uint8_t unk_0x00_b4 : 4; @@ -150,14 +153,16 @@ WUT_CHECK_OFFSET(FFLiMiiDataCore, 0x2F, fatness); WUT_CHECK_OFFSET(FFLiMiiDataCore, 0x33, hair_type); WUT_CHECK_SIZE(FFLiMiiDataCore, 0x48); -typedef struct WUT_PACKED FFLiMiiDataOfficial { +typedef struct WUT_PACKED FFLiMiiDataOfficial +{ FFLiMiiDataCore core; uint16_t creator_name[10]; } FFLiMiiDataOfficial; WUT_CHECK_OFFSET(FFLiMiiDataOfficial, 0x48, creator_name); WUT_CHECK_SIZE(FFLiMiiDataOfficial, 0x5C); -typedef struct WUT_PACKED FFLStoreData { +typedef struct WUT_PACKED FFLStoreData +{ FFLiMiiDataOfficial data; uint16_t unk_0x5C; uint16_t checksum; diff --git a/include/nn/pdm/pdm_c.h b/include/nn/pdm/pdm_c.h index 5c8aa6969..ba36a98f6 100644 --- a/include/nn/pdm/pdm_c.h +++ b/include/nn/pdm/pdm_c.h @@ -25,20 +25,16 @@ PDMInitialize(); /** * Finalize PDM. */ -void -PDMFinalize(); +void PDMFinalize(); /** * Close all opened PDM Files. */ -void -PDMCloseAllFiles(); +void PDMCloseAllFiles(); -void -PDMNotifySetTimeBeginEvent(); +void PDMNotifySetTimeBeginEvent(); -void -PDMNotifySetTimeEndEvent(); +void PDMNotifySetTimeEndEvent(); #ifdef __cplusplus } diff --git a/include/nn/pdm/pdm_cpp.h b/include/nn/pdm/pdm_cpp.h index 5df326257..7615eb54b 100644 --- a/include/nn/pdm/pdm_cpp.h +++ b/include/nn/pdm/pdm_cpp.h @@ -12,122 +12,117 @@ namespace nn { -namespace pdm { - -//! Flags for PlayDiary -typedef enum PlayDiaryFlags : uint16_t -{ - PLAYDIARY_FLAG_DEFAULT = 0x0000, - - //! Set when the user played in Wii Mode - //! Note: Title Id should be ffff ffff ffff ffff when set - PLAYDIARY_FLAG_PLAYED_IN_WII_MODE = 0x0100, - PLAYDIARY_FLAG_UNKNOWN_0A00 = 0x0a00 -} PlayDiaryFlags; -WUT_CHECK_SIZE(PlayDiaryFlags, 0x02); - -//! Stores PlayData for each Day -struct WUT_PACKED PlayDiary -{ - //! Title ID of the title - uint64_t title_id; - //! Playtime in Minutes - uint32_t playtime; - //! Date in days since 01/01/2000 - uint16_t date; - //! flags \link PlayDiaryFlags \endlink - PlayDiaryFlags flags; -}; -WUT_CHECK_OFFSET(PlayDiary, 0x00, title_id); -WUT_CHECK_OFFSET(PlayDiary, 0x08, playtime); -WUT_CHECK_OFFSET(PlayDiary, 0x0c, date); -WUT_CHECK_OFFSET(PlayDiary, 0x0e, flags); - -//! Stores total stats -struct WUT_PACKED PlayStats -{ - //! Title ID of the title - uint64_t title_id; - //! Total Playtime in minutes - uint32_t playtime; - //! Total amount of times played - uint16_t times_played; - //! Date when the title was first played in days since 01/01/2000 - uint16_t first_time_played; - //! Date when the title was last played in days since 01/01/2000 - uint16_t last_time_played; - - //! Unknown seems to be always 0x0000 - WUT_UNKNOWN_BYTES(2); -}; -WUT_CHECK_OFFSET(PlayStats, 0x00, title_id); -WUT_CHECK_OFFSET(PlayStats, 0x08, playtime); -WUT_CHECK_OFFSET(PlayStats, 0x0c, times_played); -WUT_CHECK_OFFSET(PlayStats, 0x0e, first_time_played); -WUT_CHECK_OFFSET(PlayStats, 0x10, last_time_played); - -//! Unknown -struct WUT_PACKED PlayEvent -{ - uint64_t title_id; - WUT_UNKNOWN_BYTES(12); -}; -WUT_CHECK_OFFSET(PlayEvent, 0x00, title_id); - -//! Unknown -struct WUT_PACKED PlayLog -{ - uint64_t title_id; - WUT_UNKNOWN_BYTES(16); -}; -WUT_CHECK_OFFSET(PlayLog, 0x00, title_id); - -/** + namespace pdm { + + //! Flags for PlayDiary + typedef enum PlayDiaryFlags : uint16_t + { + PLAYDIARY_FLAG_DEFAULT = 0x0000, + + //! Set when the user played in Wii Mode + //! Note: Title Id should be ffff ffff ffff ffff when set + PLAYDIARY_FLAG_PLAYED_IN_WII_MODE = 0x0100, + PLAYDIARY_FLAG_UNKNOWN_0A00 = 0x0a00 + } PlayDiaryFlags; + WUT_CHECK_SIZE(PlayDiaryFlags, 0x02); + + //! Stores PlayData for each Day + struct WUT_PACKED PlayDiary + { + //! Title ID of the title + uint64_t title_id; + //! Playtime in Minutes + uint32_t playtime; + //! Date in days since 01/01/2000 + uint16_t date; + //! flags \link PlayDiaryFlags \endlink + PlayDiaryFlags flags; + }; + WUT_CHECK_OFFSET(PlayDiary, 0x00, title_id); + WUT_CHECK_OFFSET(PlayDiary, 0x08, playtime); + WUT_CHECK_OFFSET(PlayDiary, 0x0c, date); + WUT_CHECK_OFFSET(PlayDiary, 0x0e, flags); + + //! Stores total stats + struct WUT_PACKED PlayStats + { + //! Title ID of the title + uint64_t title_id; + //! Total Playtime in minutes + uint32_t playtime; + //! Total amount of times played + uint16_t times_played; + //! Date when the title was first played in days since 01/01/2000 + uint16_t first_time_played; + //! Date when the title was last played in days since 01/01/2000 + uint16_t last_time_played; + + //! Unknown seems to be always 0x0000 + WUT_UNKNOWN_BYTES(2); + }; + WUT_CHECK_OFFSET(PlayStats, 0x00, title_id); + WUT_CHECK_OFFSET(PlayStats, 0x08, playtime); + WUT_CHECK_OFFSET(PlayStats, 0x0c, times_played); + WUT_CHECK_OFFSET(PlayStats, 0x0e, first_time_played); + WUT_CHECK_OFFSET(PlayStats, 0x10, last_time_played); + + //! Unknown + struct WUT_PACKED PlayEvent + { + uint64_t title_id; + WUT_UNKNOWN_BYTES(12); + }; + WUT_CHECK_OFFSET(PlayEvent, 0x00, title_id); + + //! Unknown + struct WUT_PACKED PlayLog + { + uint64_t title_id; + WUT_UNKNOWN_BYTES(16); + }; + WUT_CHECK_OFFSET(PlayLog, 0x00, title_id); + + /** * Initializes PDM. * Needs to be called before using other functions- * * \return * 0 on success. */ -uint32_t -Initialize() - asm("Initialize__Q2_2nn3pdmFv"); + uint32_t + Initialize() asm("Initialize__Q2_2nn3pdmFv"); -/** + /** * Finalize PDM. */ -void -Finalize() - asm("Finalize__Q2_2nn3pdmFv"); + void + Finalize() asm("Finalize__Q2_2nn3pdmFv"); -/** + /** * Close all opened PDM Files. */ -void -CloseAllFiles() - asm("CloseAllFiles__Q2_2nn3pdmFv"); + void + CloseAllFiles() asm("CloseAllFiles__Q2_2nn3pdmFv"); -/** + /** * Convert an users PDM Save to a newer save version. * * \return * 0 on success. */ -uint32_t -Convert(uint32_t userId) - asm("Convert__Q2_2nn3pdmFi"); + uint32_t + Convert(uint32_t userId) asm("Convert__Q2_2nn3pdmFi"); -/** + /** * Wait until convert is done. * * \return * 0 on success. */ -uint32_t -WaitForConvertDone() - asm("WaitForConvertDone__Q2_2nn3pdmFv"); + uint32_t + WaitForConvertDone() asm("WaitForConvertDone__Q2_2nn3pdmFv"); -/** + /** * The max amount of \link PlayDiary \endlink that can * be written into the save. * @@ -137,11 +132,10 @@ WaitForConvertDone() * \return * 0 on success. */ -uint32_t -GetPlayDiaryMaxLength(uint32_t* outMaxLength) - asm("GetPlayDiaryMaxLength__Q2_2nn3pdmFPi"); + uint32_t + GetPlayDiaryMaxLength(uint32_t *outMaxLength) asm("GetPlayDiaryMaxLength__Q2_2nn3pdmFPi"); -/** + /** * Gets the amount of an users \link PlayDiary \endlink entries. * * \param outLength @@ -153,11 +147,10 @@ GetPlayDiaryMaxLength(uint32_t* outMaxLength) * \return * 0 on success. */ -uint32_t -GetPlayDiaryLength(uint32_t* outLength, uint32_t userId) - asm("GetPlayDiaryLength__Q2_2nn3pdmFPii"); + uint32_t + GetPlayDiaryLength(uint32_t *outLength, uint32_t userId) asm("GetPlayDiaryLength__Q2_2nn3pdmFPii"); -/** + /** * * * \param outStart @@ -169,11 +162,10 @@ GetPlayDiaryLength(uint32_t* outLength, uint32_t userId) * \return * 0 on success. */ -uint32_t -GetPlayDiaryStart(uint32_t* outStart, uint32_t userId) - asm("GetPlayDiaryStart__Q2_2nn3pdmFPii"); + uint32_t + GetPlayDiaryStart(uint32_t *outStart, uint32_t userId) asm("GetPlayDiaryStart__Q2_2nn3pdmFPii"); -/** + /** * Gets an array of \link PlayDiary \endlink entries. * * \param outAmount @@ -194,11 +186,10 @@ GetPlayDiaryStart(uint32_t* outStart, uint32_t userId) * \return * 0 on success. */ -uint32_t -GetPlayDiary(uint32_t* outAmount, PlayDiary* outPlayDiaries, uint32_t userId, uint32_t amount) - asm("GetPlayDiary__Q2_2nn3pdmFPiPQ3_2nn3pdm9PlayDiaryiT3"); + uint32_t + GetPlayDiary(uint32_t *outAmount, PlayDiary *outPlayDiaries, uint32_t userId, uint32_t amount) asm("GetPlayDiary__Q2_2nn3pdmFPiPQ3_2nn3pdm9PlayDiaryiT3"); -/** + /** * Gets an array of \link PlayDiary \endlink entries. * * \param outPlayDiaries @@ -216,11 +207,10 @@ GetPlayDiary(uint32_t* outAmount, PlayDiary* outPlayDiaries, uint32_t userId, ui * written to the array or 0xFFFFFF on error. * May be smaller than the amount passed to the function. */ -uint32_t -GetPlayDiary(PlayDiary* outPlayDiaries, uint32_t userId, uint32_t amount) - asm("GetPlayDiary__Q2_2nn3pdmFPQ3_2nn3pdm9PlayDiaryiT2"); + uint32_t + GetPlayDiary(PlayDiary *outPlayDiaries, uint32_t userId, uint32_t amount) asm("GetPlayDiary__Q2_2nn3pdmFPQ3_2nn3pdm9PlayDiaryiT2"); -/** + /** * The max amount of \link PlayEvent \endlink that can * be written into the save. * @@ -230,11 +220,10 @@ GetPlayDiary(PlayDiary* outPlayDiaries, uint32_t userId, uint32_t amount) * \return * 0 on success. */ -uint32_t -GetPlayEventMaxLength(uint32_t* outMaxLength) - asm("GetPlayEventMaxLength__Q2_2nn3pdmFPi"); + uint32_t + GetPlayEventMaxLength(uint32_t *outMaxLength) asm("GetPlayEventMaxLength__Q2_2nn3pdmFPi"); -/** + /** * Gets an array of \link PlayEvent \endlink entries. * * \param outAmount @@ -255,11 +244,10 @@ GetPlayEventMaxLength(uint32_t* outMaxLength) * \return * 0 on success. */ -uint32_t -GetPlayEvent(uint32_t* outAmount, PlayEvent* outPlayEvents, uint32_t userId, uint32_t amount) - asm("GetPlayEvent__Q2_2nn3pdmFPiPQ3_2nn3pdm9PlayEventiT3"); + uint32_t + GetPlayEvent(uint32_t *outAmount, PlayEvent *outPlayEvents, uint32_t userId, uint32_t amount) asm("GetPlayEvent__Q2_2nn3pdmFPiPQ3_2nn3pdm9PlayEventiT3"); -/** + /** * The max amount of \link PlayLog \endlink that can * be written into the save. * @@ -269,11 +257,10 @@ GetPlayEvent(uint32_t* outAmount, PlayEvent* outPlayEvents, uint32_t userId, uin * \return * 0 on success. */ -uint32_t -GetPlayLogMaxLength(uint32_t* outMaxLength) - asm("GetPlayLogMaxLength__Q2_2nn3pdmFPi"); + uint32_t + GetPlayLogMaxLength(uint32_t *outMaxLength) asm("GetPlayLogMaxLength__Q2_2nn3pdmFPi"); -/** + /** * Gets the amount of an users \link PlayLog \endlink entries. * * \param outLength @@ -285,11 +272,10 @@ GetPlayLogMaxLength(uint32_t* outMaxLength) * \return * 0 on success. */ -uint32_t -GetPlayLogLength(uint32_t* outLength, uint32_t userId) - asm("GetPlayLogLength__Q2_2nn3pdmFPii"); + uint32_t + GetPlayLogLength(uint32_t *outLength, uint32_t userId) asm("GetPlayLogLength__Q2_2nn3pdmFPii"); -/** + /** * * * \param outStart @@ -301,11 +287,10 @@ GetPlayLogLength(uint32_t* outLength, uint32_t userId) * \return * 0 on success. */ -uint32_t -GetPlayLogStart(uint32_t* outStart, uint32_t userId) - asm("GetPlayLogStart__Q2_2nn3pdmFPii"); + uint32_t + GetPlayLogStart(uint32_t *outStart, uint32_t userId) asm("GetPlayLogStart__Q2_2nn3pdmFPii"); -/** + /** * Gets an array of \link PlayLog \endlink entries. * * \param outAmount @@ -326,11 +311,10 @@ GetPlayLogStart(uint32_t* outStart, uint32_t userId) * \return * 0 on success. */ -uint32_t -GetPlayLog(uint32_t* outAmount, PlayLog* outPlayLogs, uint32_t userId, uint32_t amount) - asm("GetPlayLog__Q2_2nn3pdmFPiPQ3_2nn3pdm7PlayLogiT3"); + uint32_t + GetPlayLog(uint32_t *outAmount, PlayLog *outPlayLogs, uint32_t userId, uint32_t amount) asm("GetPlayLog__Q2_2nn3pdmFPiPQ3_2nn3pdm7PlayLogiT3"); -/** + /** * Gets an array of \link PlayLog \endlink entries. * * \param outPlayLogs @@ -348,11 +332,10 @@ GetPlayLog(uint32_t* outAmount, PlayLog* outPlayLogs, uint32_t userId, uint32_t * written to the array or 0xFFFFFF on error. * May be smaller than the amount passed to the function. */ -uint32_t -GetPlayLog(PlayLog* outPlayLogs, uint32_t userId, uint32_t amount) - asm("GetPlayLog__Q2_2nn3pdmFPQ3_2nn3pdm7PlayLogiT2"); + uint32_t + GetPlayLog(PlayLog *outPlayLogs, uint32_t userId, uint32_t amount) asm("GetPlayLog__Q2_2nn3pdmFPQ3_2nn3pdm7PlayLogiT2"); -/** + /** * The max amount of \link PlayStats \endlink that can * be written into the save. * @@ -362,11 +345,10 @@ GetPlayLog(PlayLog* outPlayLogs, uint32_t userId, uint32_t amount) * \return * 0 on success. */ -uint32_t -GetPlayStatsMaxLength(uint32_t* outMaxLength) - asm("GetPlayStatsMaxLength__Q2_2nn3pdmFPi"); + uint32_t + GetPlayStatsMaxLength(uint32_t *outMaxLength) asm("GetPlayStatsMaxLength__Q2_2nn3pdmFPi"); -/** + /** * Gets the amount of an users \link PlayStats \endlink entries. * * \param outLength @@ -378,11 +360,10 @@ GetPlayStatsMaxLength(uint32_t* outMaxLength) * \return * 0 on success. */ -uint32_t -GetPlayStatsLength(uint32_t* outLength, uint32_t userId) - asm("GetPlayStatsLength__Q2_2nn3pdmFPii"); + uint32_t + GetPlayStatsLength(uint32_t *outLength, uint32_t userId) asm("GetPlayStatsLength__Q2_2nn3pdmFPii"); -/** + /** * Gets \link PlayLog \endlink entry of a Title ID. * * \param outPlayStats @@ -398,11 +379,10 @@ GetPlayStatsLength(uint32_t* outLength, uint32_t userId) * \return * 0 on success */ -uint32_t -GetPlayStatsOfTitleId(PlayStats* outPlayStats, uint32_t userId, uint64_t titleId) - asm("GetPlayStatsOfTitleId__Q2_2nn3pdmFPQ3_2nn3pdm9PlayStatsiUL"); + uint32_t + GetPlayStatsOfTitleId(PlayStats *outPlayStats, uint32_t userId, uint64_t titleId) asm("GetPlayStatsOfTitleId__Q2_2nn3pdmFPQ3_2nn3pdm9PlayStatsiUL"); -/** + /** * Gets an array of \link PlayStats \endlink entries. * * \param outAmount @@ -423,11 +403,10 @@ GetPlayStatsOfTitleId(PlayStats* outPlayStats, uint32_t userId, uint64_t titleId * \return * 0 on success. */ -uint32_t -GetPlayStats(uint32_t* outAmount, PlayStats* outPlayStats, uint32_t userId, uint32_t amount) - asm("GetPlayStats__Q2_2nn3pdmFPiPQ3_2nn3pdm9PlayStatsiT3"); + uint32_t + GetPlayStats(uint32_t *outAmount, PlayStats *outPlayStats, uint32_t userId, uint32_t amount) asm("GetPlayStats__Q2_2nn3pdmFPiPQ3_2nn3pdm9PlayStatsiT3"); -/** + /** * Gets an array of \link PlayStats \endlink entries. * * \param outPlayStats @@ -445,19 +424,16 @@ GetPlayStats(uint32_t* outAmount, PlayStats* outPlayStats, uint32_t userId, uint * written to the array or 0xFFFFFF on error. * May be smaller than the amount passed to the function. */ -uint32_t -GetPlayStats(PlayStats* outPlayStats, uint32_t userId, uint32_t amount) - asm("GetPlayStats__Q2_2nn3pdmFPQ3_2nn3pdm9PlayStatsiT2"); + uint32_t + GetPlayStats(PlayStats *outPlayStats, uint32_t userId, uint32_t amount) asm("GetPlayStats__Q2_2nn3pdmFPQ3_2nn3pdm9PlayStatsiT2"); -void -NotifySetTimeBeginEvent() - asm("NotifySetTimeBeginEvent__Q2_2nn3pdmFv"); + void + NotifySetTimeBeginEvent() asm("NotifySetTimeBeginEvent__Q2_2nn3pdmFv"); -void -NotifySetTimeEndEvent() - asm("NotifySetTimeEndEvent__Q2_2nn3pdmFv"); + void + NotifySetTimeEndEvent() asm("NotifySetTimeEndEvent__Q2_2nn3pdmFv"); -} //namespace pdm + } //namespace pdm } //namespace nn diff --git a/include/nn/result.h b/include/nn/result.h index 28dc35cca..b6502ba48 100644 --- a/include/nn/result.h +++ b/include/nn/result.h @@ -34,7 +34,8 @@ struct NNResult * \sa * - \link NNResult_IsFailure \endlink */ -static inline int NNResult_IsSuccess(NNResult result) +static inline int +NNResult_IsSuccess(NNResult result) { return result.value >= 0; } @@ -51,187 +52,184 @@ static inline int NNResult_IsSuccess(NNResult result) * \sa * - \link NNResult_IsSuccess \endlink */ -static inline int NNResult_IsFailure(NNResult result) +static inline int +NNResult_IsFailure(NNResult result) { return result.value < 0; } #ifdef __cplusplus -namespace nn -{ +namespace nn { -/** + /** * Result value type used by nn libraries. */ -class Result -{ -public: - enum Level - { - LEVEL_SUCCESS = 0, - LEVEL_FATAL = -1, - LEVEL_USAGE = -2, - LEVEL_STATUS = -3, - LEVEL_END = -7, - }; - - enum LegacyLevel - { - LEVEL_INFO = 1, - LEVEL_RESET = -4, - LEVEL_REINIT = -5, - LEVEL_PERMANENT = -6, - LEVEL_TEMPORARY = -7, - }; - - enum Module - { - RESULT_MODULE_COMMON = 0, - RESULT_MODULE_NN_IPC = 1, - RESULT_MODULE_NN_BOSS = 2, - RESULT_MODULE_NN_ACP = 3, - RESULT_MODULE_NN_IOS = 4, - RESULT_MODULE_NN_NIM = 5, - RESULT_MODULE_NN_PDM = 6, - RESULT_MODULE_NN_ACT = 7, - RESULT_MODULE_NN_NGC = 8, - RESULT_MODULE_NN_ECA = 9, - RESULT_MODULE_NN_NUP = 10, - RESULT_MODULE_NN_NDM = 11, - RESULT_MODULE_NN_FP = 12, - RESULT_MODULE_NN_AC = 13, - RESULT_MODULE_NN_CONNTEST = 14, - RESULT_MODULE_NN_DRMAPP = 15, - RESULT_MODULE_NN_TELNET = 16, - RESULT_MODULE_NN_OLV = 17, - RESULT_MODULE_NN_VCTL = 18, - RESULT_MODULE_NN_NEIA = 19, - RESULT_MODULE_NN_SPM = 20, - RESULT_MODULE_NN_TEST = 125, - }; - - enum LegacyModule - { - MODULE_COMMON = 0, - MODULE_NN_KERNEL = 1, - MODULE_NN_UTIL = 2, - MODULE_NN_FILE_SERVER = 3, - MODULE_NN_LOADER_SERVER = 4, - MODULE_NN_TCB = 5, - MODULE_NN_OS = 6, - MODULE_NN_DBG = 7, - MODULE_NN_DMNT = 8, - MODULE_NN_PDN = 9, - MODULE_NN_GX = 0xA, - MODULE_NN_I2C = 0xB, - MODULE_NN_GPIO = 0xC, - MODULE_NN_DD = 0xD, - MODULE_NN_CODEC = 0xE, - MODULE_NN_SPI = 0xF, - MODULE_NN_PXI = 0x10, - MODULE_NN_FS = 0x11, - MODULE_NN_DI = 0x12, - MODULE_NN_HID = 0x13, - MODULE_NN_CAMERA = 0x14, - MODULE_NN_PI = 0x15, - MODULE_NN_PM = 0x16, - MODULE_NN_PMLOW = 0x17, - MODULE_NN_FSI = 0x18, - MODULE_NN_SRV = 0x19, - MODULE_NN_NDM = 0x1A, - MODULE_NN_NWM = 0x1B, - MODULE_NN_SOCKET = 0x1C, - MODULE_NN_LDR = 0x1D, - MODULE_NN_ACC = 0x1E, - MODULE_NN_ROMFS = 0x1F, - MODULE_NN_AM = 0x20, - MODULE_NN_HIO = 0x21, - MODULE_NN_UPDATER = 0x22, - MODULE_NN_MIC = 0x23, - MODULE_NN_FND = 0x24, - MODULE_NN_MP = 0x25, - MODULE_NN_MPWL = 0x26, - MODULE_NN_AC = 0x27, - MODULE_NN_HTTP = 0x28, - MODULE_NN_DSP = 0x29, - MODULE_NN_SND = 0x2A, - MODULE_NN_DLP = 0x2B, - MODULE_NN_HIOLOW = 0x2C, - MODULE_NN_CSND = 0x2D, - MODULE_NN_SSL = 0x2E, - MODULE_NN_AMLOW = 0x2F, - MODULE_NN_NEX = 0x30, - MODULE_NN_FRIENDS = 0x31, - MODULE_NN_RDT = 0x32, - MODULE_NN_APPLET = 0x33, - MODULE_NN_NIM = 0x34, - MODULE_NN_PTM = 0x35, - MODULE_NN_MIDI = 0x36, - MODULE_NN_MC = 0x37, - MODULE_NN_SWC = 0x38, - MODULE_NN_FATFS = 0x39, - MODULE_NN_NGC = 0x3A, - MODULE_NN_CARD = 0x3B, - MODULE_NN_CARDNOR = 0x3C, - MODULE_NN_SDMC = 0x3D, - MODULE_NN_BOSS = 0x3E, - MODULE_NN_DBM = 0x3F, - MODULE_NN_CFG = 0x40, - MODULE_NN_PS = 0x41, - MODULE_NN_CEC = 0x42, - MODULE_NN_IR = 0x43, - MODULE_NN_UDS = 0x44, - MODULE_NN_PL = 0x45, - MODULE_NN_CUP = 0x46, - MODULE_NN_GYROSCOPE = 0x47, - MODULE_NN_MCU = 0x48, - MODULE_NN_NS = 0x49, - MODULE_NN_NEWS = 0x4A, - MODULE_NN_RO = 0x4B, - MODULE_NN_GD = 0x4C, - MODULE_NN_CARDSPI = 0x4D, - MODULE_NN_EC = 0x4E, - MODULE_NN_WEBBRS = 0x4F, - MODULE_NN_TEST = 0x50, - MODULE_NN_ENC = 0x51, - MODULE_NN_PIA = 0x52, - MODULE_APPLICATION = 0x1FE, - }; - - enum LegacySummary - { - SUMMARY_SUCCESS = 0, - SUMMARY_NOTHING_HAPPENED = 1, - SUMMARY_WOULD_BLOCK = 2, - SUMMARY_OUT_OF_RESOURCE = 3, - SUMMARY_NOT_FOUND = 4, - SUMMARY_INVALID_STATE = 5, - SUMMARY_NOT_SUPPORTED = 6, - SUMMARY_INVALID_ARGUMENT = 7, - SUMMARY_WRONG_ARGUMENT = 8, - SUMMARY_CANCELLED = 9, - SUMMARY_STATUS_CHANGED = 10, - SUMMARY_INTERNAL = 11, - }; - - enum LegacySignature - { - SIGNATURE_IS_LEGACY = 3, - }; - -public: - Result(Level level, Module module, unsigned description) : - mValue(((level & 0x7) << 29) | ((module & 0x1FF) << 20) | (description & 0xFFFFF)) - { - } + class Result { + public: + enum Level + { + LEVEL_SUCCESS = 0, + LEVEL_FATAL = -1, + LEVEL_USAGE = -2, + LEVEL_STATUS = -3, + LEVEL_END = -7, + }; + + enum LegacyLevel + { + LEVEL_INFO = 1, + LEVEL_RESET = -4, + LEVEL_REINIT = -5, + LEVEL_PERMANENT = -6, + LEVEL_TEMPORARY = -7, + }; + + enum Module + { + RESULT_MODULE_COMMON = 0, + RESULT_MODULE_NN_IPC = 1, + RESULT_MODULE_NN_BOSS = 2, + RESULT_MODULE_NN_ACP = 3, + RESULT_MODULE_NN_IOS = 4, + RESULT_MODULE_NN_NIM = 5, + RESULT_MODULE_NN_PDM = 6, + RESULT_MODULE_NN_ACT = 7, + RESULT_MODULE_NN_NGC = 8, + RESULT_MODULE_NN_ECA = 9, + RESULT_MODULE_NN_NUP = 10, + RESULT_MODULE_NN_NDM = 11, + RESULT_MODULE_NN_FP = 12, + RESULT_MODULE_NN_AC = 13, + RESULT_MODULE_NN_CONNTEST = 14, + RESULT_MODULE_NN_DRMAPP = 15, + RESULT_MODULE_NN_TELNET = 16, + RESULT_MODULE_NN_OLV = 17, + RESULT_MODULE_NN_VCTL = 18, + RESULT_MODULE_NN_NEIA = 19, + RESULT_MODULE_NN_SPM = 20, + RESULT_MODULE_NN_TEST = 125, + }; + + enum LegacyModule + { + MODULE_COMMON = 0, + MODULE_NN_KERNEL = 1, + MODULE_NN_UTIL = 2, + MODULE_NN_FILE_SERVER = 3, + MODULE_NN_LOADER_SERVER = 4, + MODULE_NN_TCB = 5, + MODULE_NN_OS = 6, + MODULE_NN_DBG = 7, + MODULE_NN_DMNT = 8, + MODULE_NN_PDN = 9, + MODULE_NN_GX = 0xA, + MODULE_NN_I2C = 0xB, + MODULE_NN_GPIO = 0xC, + MODULE_NN_DD = 0xD, + MODULE_NN_CODEC = 0xE, + MODULE_NN_SPI = 0xF, + MODULE_NN_PXI = 0x10, + MODULE_NN_FS = 0x11, + MODULE_NN_DI = 0x12, + MODULE_NN_HID = 0x13, + MODULE_NN_CAMERA = 0x14, + MODULE_NN_PI = 0x15, + MODULE_NN_PM = 0x16, + MODULE_NN_PMLOW = 0x17, + MODULE_NN_FSI = 0x18, + MODULE_NN_SRV = 0x19, + MODULE_NN_NDM = 0x1A, + MODULE_NN_NWM = 0x1B, + MODULE_NN_SOCKET = 0x1C, + MODULE_NN_LDR = 0x1D, + MODULE_NN_ACC = 0x1E, + MODULE_NN_ROMFS = 0x1F, + MODULE_NN_AM = 0x20, + MODULE_NN_HIO = 0x21, + MODULE_NN_UPDATER = 0x22, + MODULE_NN_MIC = 0x23, + MODULE_NN_FND = 0x24, + MODULE_NN_MP = 0x25, + MODULE_NN_MPWL = 0x26, + MODULE_NN_AC = 0x27, + MODULE_NN_HTTP = 0x28, + MODULE_NN_DSP = 0x29, + MODULE_NN_SND = 0x2A, + MODULE_NN_DLP = 0x2B, + MODULE_NN_HIOLOW = 0x2C, + MODULE_NN_CSND = 0x2D, + MODULE_NN_SSL = 0x2E, + MODULE_NN_AMLOW = 0x2F, + MODULE_NN_NEX = 0x30, + MODULE_NN_FRIENDS = 0x31, + MODULE_NN_RDT = 0x32, + MODULE_NN_APPLET = 0x33, + MODULE_NN_NIM = 0x34, + MODULE_NN_PTM = 0x35, + MODULE_NN_MIDI = 0x36, + MODULE_NN_MC = 0x37, + MODULE_NN_SWC = 0x38, + MODULE_NN_FATFS = 0x39, + MODULE_NN_NGC = 0x3A, + MODULE_NN_CARD = 0x3B, + MODULE_NN_CARDNOR = 0x3C, + MODULE_NN_SDMC = 0x3D, + MODULE_NN_BOSS = 0x3E, + MODULE_NN_DBM = 0x3F, + MODULE_NN_CFG = 0x40, + MODULE_NN_PS = 0x41, + MODULE_NN_CEC = 0x42, + MODULE_NN_IR = 0x43, + MODULE_NN_UDS = 0x44, + MODULE_NN_PL = 0x45, + MODULE_NN_CUP = 0x46, + MODULE_NN_GYROSCOPE = 0x47, + MODULE_NN_MCU = 0x48, + MODULE_NN_NS = 0x49, + MODULE_NN_NEWS = 0x4A, + MODULE_NN_RO = 0x4B, + MODULE_NN_GD = 0x4C, + MODULE_NN_CARDSPI = 0x4D, + MODULE_NN_EC = 0x4E, + MODULE_NN_WEBBRS = 0x4F, + MODULE_NN_TEST = 0x50, + MODULE_NN_ENC = 0x51, + MODULE_NN_PIA = 0x52, + MODULE_APPLICATION = 0x1FE, + }; + + enum LegacySummary + { + SUMMARY_SUCCESS = 0, + SUMMARY_NOTHING_HAPPENED = 1, + SUMMARY_WOULD_BLOCK = 2, + SUMMARY_OUT_OF_RESOURCE = 3, + SUMMARY_NOT_FOUND = 4, + SUMMARY_INVALID_STATE = 5, + SUMMARY_NOT_SUPPORTED = 6, + SUMMARY_INVALID_ARGUMENT = 7, + SUMMARY_WRONG_ARGUMENT = 8, + SUMMARY_CANCELLED = 9, + SUMMARY_STATUS_CHANGED = 10, + SUMMARY_INTERNAL = 11, + }; + + enum LegacySignature + { + SIGNATURE_IS_LEGACY = 3, + }; + + public: + Result(Level level, Module module, unsigned description) : mValue(((level & 0x7) << 29) | ((module & 0x1FF) << 20) | (description & 0xFFFFF)) + { + } - Result(const NNResult &result) : - mValue(result.value) - { - } + Result(const NNResult &result) : mValue(result.value) + { + } - /** + /** * Determine if the Result instance represents a failure. * * \return @@ -240,12 +238,13 @@ class Result * \sa * - \link IsSuccess \endlink */ - bool IsFailure() const - { - return !IsSuccess(); - } + bool + IsFailure() const + { + return !IsSuccess(); + } - /** + /** * Determine if the Result instance represents a successful state. * * \return @@ -254,69 +253,77 @@ class Result * \sa * - \link IsFailure \endlink */ - bool IsSuccess() const - { - return mValue >= 0; // level >= 0 - } - - bool IsLegacy() const - { - return ((mValue >> 27) & 0x3) == SIGNATURE_IS_LEGACY; - } - - unsigned GetDescription() const - { - return mValue & (IsLegacy() ? 0x3FF : 0xFFFFF); - } - - int GetLevel() const - { - if (IsLegacy()) { - return (mValue << 14) >> 28; // cause arithmetic shift + bool + IsSuccess() const + { + return mValue >= 0; // level >= 0 } - return mValue >> 29; - } + bool + IsLegacy() const + { + return ((mValue >> 27) & 0x3) == SIGNATURE_IS_LEGACY; + } - unsigned GetModule() const - { - return (mValue >> 20) & (IsLegacy() ? 0x7F : 0x1FF); - } + unsigned + GetDescription() const + { + return mValue & (IsLegacy() ? 0x3FF : 0xFFFFF); + } - unsigned GetSummary() const - { - if (IsLegacy()) { - return (mValue >> 10) & 0xF; + int + GetLevel() const + { + if (IsLegacy()) { + return (mValue << 14) >> 28; // cause arithmetic shift + } + + return mValue >> 29; } - return 0; - } - - operator bool() const - { - return IsSuccess(); - } - - operator NNResult() const - { - NNResult result; - result.value = mValue; - return result; - } - - bool operator==(const Result &other) const - { - return mValue == other.mValue; - } - - bool operator!=(const Result &other) const - { - return mValue != other.mValue; - } - -private: - int32_t mValue; -}; + unsigned + GetModule() const + { + return (mValue >> 20) & (IsLegacy() ? 0x7F : 0x1FF); + } + + unsigned + GetSummary() const + { + if (IsLegacy()) { + return (mValue >> 10) & 0xF; + } + + return 0; + } + + operator bool() const + { + return IsSuccess(); + } + + operator NNResult() const + { + NNResult result; + result.value = mValue; + return result; + } + + bool + operator==(const Result &other) const + { + return mValue == other.mValue; + } + + bool + operator!=(const Result &other) const + { + return mValue != other.mValue; + } + + private: + int32_t mValue; + }; } // namespace nn diff --git a/include/nn/sl.h b/include/nn/sl.h index 5d2be8472..b957ef111 100644 --- a/include/nn/sl.h +++ b/include/nn/sl.h @@ -4,6 +4,6 @@ * \defgroup nn_sl nn_sl */ -#include -#include #include +#include +#include diff --git a/include/nn/sl/FileStream.h b/include/nn/sl/FileStream.h index 2d659cb6d..7c3469898 100644 --- a/include/nn/sl/FileStream.h +++ b/include/nn/sl/FileStream.h @@ -1,46 +1,55 @@ #pragma once -#include -#include #include +#include +#include #ifdef __cplusplus namespace nn { -namespace sl { - -typedef struct WUT_PACKED FileStreamInternal { - WUT_UNKNOWN_BYTES(0x10); -} FileStreamInternal; -WUT_CHECK_SIZE(FileStreamInternal, 0x10); - -extern "C" nn::Result Initialize__Q3_2nn2sl10FileStreamFP8FSClientP10FSCmdBlockPCcT3(FileStreamInternal *, FSClient *, FSCmdBlock *, char const *, char const *); -extern "C" FileStreamInternal *__ct__Q3_2nn2sl10FileStreamFv(FileStreamInternal *); -extern "C" void __dt__Q3_2nn2sl10FileStreamFv(FileStreamInternal *); - -class FileStream { - friend class LaunchInfoDatabase; -public: - FileStream() { - instance = __ct__Q3_2nn2sl10FileStreamFv(nullptr); - } - - ~FileStream() { - if (instance != nullptr) { - __dt__Q3_2nn2sl10FileStreamFv(instance); - } - } - - nn::Result Initialize(FSClient *client, FSCmdBlock *cmdBlock, char const *path, char const *mode) { - return Initialize__Q3_2nn2sl10FileStreamFP8FSClientP10FSCmdBlockPCcT3(this->instance, client, cmdBlock, path, mode); - } - -private: - FileStreamInternal *instance = nullptr; -}; - -}; //namespace sl + namespace sl { + + typedef struct WUT_PACKED FileStreamInternal + { + WUT_UNKNOWN_BYTES(0x10); + } FileStreamInternal; + WUT_CHECK_SIZE(FileStreamInternal, 0x10); + + extern "C" nn::Result + Initialize__Q3_2nn2sl10FileStreamFP8FSClientP10FSCmdBlockPCcT3(FileStreamInternal *, FSClient *, FSCmdBlock *, char const *, char const *); + extern "C" FileStreamInternal * + __ct__Q3_2nn2sl10FileStreamFv(FileStreamInternal *); + extern "C" void + __dt__Q3_2nn2sl10FileStreamFv(FileStreamInternal *); + + class FileStream { + friend class LaunchInfoDatabase; + + public: + FileStream() + { + instance = __ct__Q3_2nn2sl10FileStreamFv(nullptr); + } + + ~FileStream() + { + if (instance != nullptr) { + __dt__Q3_2nn2sl10FileStreamFv(instance); + } + } + + nn::Result + Initialize(FSClient *client, FSCmdBlock *cmdBlock, char const *path, char const *mode) + { + return Initialize__Q3_2nn2sl10FileStreamFP8FSClientP10FSCmdBlockPCcT3(this->instance, client, cmdBlock, path, mode); + } + + private: + FileStreamInternal *instance = nullptr; + }; + + }; //namespace sl }; //namespace nn diff --git a/include/nn/sl/LaunchInfoDatabase.h b/include/nn/sl/LaunchInfoDatabase.h index e49adb1b4..e0607508c 100644 --- a/include/nn/sl/LaunchInfoDatabase.h +++ b/include/nn/sl/LaunchInfoDatabase.h @@ -1,48 +1,59 @@ #pragma once -#include -#include #include "FileStream.h" +#include +#include #ifdef __cplusplus namespace nn { -namespace sl { - -typedef struct WUT_PACKED LaunchInfoDatabaseInternal { - WUT_UNKNOWN_BYTES(0x1C); -} LaunchInfoDatabaseInternal; -WUT_CHECK_SIZE(LaunchInfoDatabaseInternal, 0x1C); - -extern "C" LaunchInfoDatabaseInternal *__ct__Q3_2nn2sl18LaunchInfoDatabaseFv(LaunchInfoDatabaseInternal *); -extern "C" nn::Result Load__Q3_2nn2sl18LaunchInfoDatabaseFRQ3_2nn2sl7IStreamQ3_2nn2sl6Region(LaunchInfoDatabaseInternal *, nn::sl::FileStreamInternal *, nn::sl::Region); -extern "C" void Finalize__Q3_2nn2sl18LaunchInfoDatabaseFv(LaunchInfoDatabaseInternal *); -extern "C" nn::Result GetLaunchInfoById__Q3_2nn2sl18LaunchInfoDatabaseCFPQ3_2nn2sl10LaunchInfoUL(LaunchInfoDatabaseInternal *, nn::sl::LaunchInfo *, uint64_t titleId); - -class LaunchInfoDatabase { -public: - LaunchInfoDatabase() { - instance = __ct__Q3_2nn2sl18LaunchInfoDatabaseFv(nullptr); - } - - ~LaunchInfoDatabase() { - Finalize__Q3_2nn2sl18LaunchInfoDatabaseFv(instance); - } - - nn::Result Load(nn::sl::FileStream *fileStream, nn::sl::Region region) { - return Load__Q3_2nn2sl18LaunchInfoDatabaseFRQ3_2nn2sl7IStreamQ3_2nn2sl6Region(instance, fileStream->instance, region); - } - - nn::Result GetLaunchInfoById(nn::sl::LaunchInfo *launchInfo, uint64_t titleId) { - return GetLaunchInfoById__Q3_2nn2sl18LaunchInfoDatabaseCFPQ3_2nn2sl10LaunchInfoUL(instance, launchInfo, titleId); - } - -private: - LaunchInfoDatabaseInternal *instance; -}; - -} //namespace sl + namespace sl { + + typedef struct WUT_PACKED LaunchInfoDatabaseInternal + { + WUT_UNKNOWN_BYTES(0x1C); + } LaunchInfoDatabaseInternal; + WUT_CHECK_SIZE(LaunchInfoDatabaseInternal, 0x1C); + + extern "C" LaunchInfoDatabaseInternal * + __ct__Q3_2nn2sl18LaunchInfoDatabaseFv(LaunchInfoDatabaseInternal *); + extern "C" nn::Result + Load__Q3_2nn2sl18LaunchInfoDatabaseFRQ3_2nn2sl7IStreamQ3_2nn2sl6Region(LaunchInfoDatabaseInternal *, nn::sl::FileStreamInternal *, nn::sl::Region); + extern "C" void + Finalize__Q3_2nn2sl18LaunchInfoDatabaseFv(LaunchInfoDatabaseInternal *); + extern "C" nn::Result + GetLaunchInfoById__Q3_2nn2sl18LaunchInfoDatabaseCFPQ3_2nn2sl10LaunchInfoUL(LaunchInfoDatabaseInternal *, nn::sl::LaunchInfo *, uint64_t titleId); + + class LaunchInfoDatabase { + public: + LaunchInfoDatabase() + { + instance = __ct__Q3_2nn2sl18LaunchInfoDatabaseFv(nullptr); + } + + ~LaunchInfoDatabase() + { + Finalize__Q3_2nn2sl18LaunchInfoDatabaseFv(instance); + } + + nn::Result + Load(nn::sl::FileStream *fileStream, nn::sl::Region region) + { + return Load__Q3_2nn2sl18LaunchInfoDatabaseFRQ3_2nn2sl7IStreamQ3_2nn2sl6Region(instance, fileStream->instance, region); + } + + nn::Result + GetLaunchInfoById(nn::sl::LaunchInfo *launchInfo, uint64_t titleId) + { + return GetLaunchInfoById__Q3_2nn2sl18LaunchInfoDatabaseCFPQ3_2nn2sl10LaunchInfoUL(instance, launchInfo, titleId); + } + + private: + LaunchInfoDatabaseInternal *instance; + }; + + } //namespace sl } //namespace nn diff --git a/include/nn/sl/sl_cpp.h b/include/nn/sl/sl_cpp.h index 1cd9bb34c..8cc963597 100644 --- a/include/nn/sl/sl_cpp.h +++ b/include/nn/sl/sl_cpp.h @@ -1,42 +1,41 @@ #pragma once -#include -#include #include +#include +#include #ifdef __cplusplus namespace nn { -namespace sl { + namespace sl { -typedef struct WUT_PACKED LaunchInfo { - uint64_t titleId; - WUT_UNKNOWN_BYTES(0x810 - 0x08); -} LaunchInfo; + typedef struct WUT_PACKED LaunchInfo + { + uint64_t titleId; + WUT_UNKNOWN_BYTES(0x810 - 0x08); + } LaunchInfo; -WUT_CHECK_OFFSET(LaunchInfo, 0x00, titleId); -WUT_CHECK_SIZE(LaunchInfo, 0x810); + WUT_CHECK_OFFSET(LaunchInfo, 0x00, titleId); + WUT_CHECK_SIZE(LaunchInfo, 0x810); -typedef enum Region { - REGION_JPN = 0, - REGION_USA = 1, - REGION_EUR = 2 -} Region; + typedef enum Region + { + REGION_JPN = 0, + REGION_USA = 1, + REGION_EUR = 2 + } Region; -void -GetDefaultDatabasePath(char *, int size, uint64_t titleId) - asm("GetDefaultDatabasePath__Q2_2nn2slFPcUiUL"); + void + GetDefaultDatabasePath(char *, int size, uint64_t titleId) asm("GetDefaultDatabasePath__Q2_2nn2slFPcUiUL"); -nn::Result -Initialize(MEMAllocFromDefaultHeapExFn, MEMFreeToDefaultHeapFn) - asm("Initialize__Q2_2nn2slFPFUiT1_PvPFPv_v"); + nn::Result + Initialize(MEMAllocFromDefaultHeapExFn, MEMFreeToDefaultHeapFn) asm("Initialize__Q2_2nn2slFPFUiT1_PvPFPv_v"); -nn::Result -Finalize() - asm("Finalize__Q2_2nn2slFv"); + nn::Result + Finalize() asm("Finalize__Q2_2nn2slFv"); -}; //namespace sl + }; //namespace sl }; //namespace nn diff --git a/include/nn/spm/storage.h b/include/nn/spm/storage.h index 62ee48fe2..8a856f570 100644 --- a/include/nn/spm/storage.h +++ b/include/nn/spm/storage.h @@ -13,134 +13,123 @@ #include namespace nn { -namespace spm { + namespace spm { -enum StorageType : uint32_t -{ - STORAGE_TYPE_RAW, - STORAGE_TYPE_WFS, -}; + enum StorageType : uint32_t + { + STORAGE_TYPE_RAW, + STORAGE_TYPE_WFS, + }; -using StorageIndex = uint64_t; + using StorageIndex = uint64_t; -struct VolumeId -{ - VolumeId() = default; + struct VolumeId + { + VolumeId() = default; - VolumeId(char const* id){ - strncpy(this->id, id, sizeof(this->id)); - } + VolumeId(char const *id) + { + strncpy(this->id, id, sizeof(this->id)); + } - /** + /** * Compares this VolumeId with another one * * \return * 0 if equal */ - int32_t - Compare(VolumeId const& other) const - asm("Compare__Q3_2nn3spm8VolumeIdCFRCQ3_2nn3spm8VolumeId"); - - char id[16]; -}; -WUT_CHECK_SIZE(VolumeId, 0x10); - -struct StorageListItem -{ - StorageIndex index; - WUT_UNKNOWN_BYTES(0x04); - StorageType type; -}; -WUT_CHECK_OFFSET(StorageListItem, 0x00, index); -WUT_CHECK_OFFSET(StorageListItem, 0x0c, type); -WUT_CHECK_SIZE(StorageListItem, 0x10); - -struct StorageInfo -{ - //! The mount path (e.g. "/vol/storage_usb01") - char path[0x280]; - //! The connection type (e.g. "usb") - char connection_type_string[8]; - //! The drive format (e.g. "raw" / "wfs") - char format_string[8]; - WUT_UNKNOWN_BYTES(4); - StorageType type; - VolumeId volumeId; -}; -WUT_CHECK_OFFSET(StorageInfo, 0x000, path); -WUT_CHECK_OFFSET(StorageInfo, 0x280, connection_type_string); -WUT_CHECK_OFFSET(StorageInfo, 0x288, format_string); -WUT_CHECK_OFFSET(StorageInfo, 0x294, type); -WUT_CHECK_OFFSET(StorageInfo, 0x298, volumeId); -WUT_CHECK_SIZE(StorageInfo, 0x2a8); - -void -Initialize() - asm("Initialize__Q2_2nn3spmFv"); - -void -Finalize() - asm("Finalize__Q2_2nn3spmFv"); - -void -SetAutoFatal(bool enabled) - asm("SetAutoFatal__Q2_2nn3spmFb"); - -/** + int32_t + Compare(VolumeId const &other) const + asm("Compare__Q3_2nn3spm8VolumeIdCFRCQ3_2nn3spm8VolumeId"); + + char id[16]; + }; + WUT_CHECK_SIZE(VolumeId, 0x10); + + struct StorageListItem + { + StorageIndex index; + WUT_UNKNOWN_BYTES(0x04); + StorageType type; + }; + WUT_CHECK_OFFSET(StorageListItem, 0x00, index); + WUT_CHECK_OFFSET(StorageListItem, 0x0c, type); + WUT_CHECK_SIZE(StorageListItem, 0x10); + + struct StorageInfo + { + //! The mount path (e.g. "/vol/storage_usb01") + char path[0x280]; + //! The connection type (e.g. "usb") + char connection_type_string[8]; + //! The drive format (e.g. "raw" / "wfs") + char format_string[8]; + WUT_UNKNOWN_BYTES(4); + StorageType type; + VolumeId volumeId; + }; + WUT_CHECK_OFFSET(StorageInfo, 0x000, path); + WUT_CHECK_OFFSET(StorageInfo, 0x280, connection_type_string); + WUT_CHECK_OFFSET(StorageInfo, 0x288, format_string); + WUT_CHECK_OFFSET(StorageInfo, 0x294, type); + WUT_CHECK_OFFSET(StorageInfo, 0x298, volumeId); + WUT_CHECK_SIZE(StorageInfo, 0x2a8); + + void + Initialize() asm("Initialize__Q2_2nn3spmFv"); + + void + Finalize() asm("Finalize__Q2_2nn3spmFv"); + + void + SetAutoFatal(bool enabled) asm("SetAutoFatal__Q2_2nn3spmFb"); + + /** * Sets the storage drive which should be used for extended storage * * \return * 0 on success. */ -int32_t -SetExtendedStorage(StorageIndex* index) - asm("SetExtendedStorage__Q2_2nn3spmFQ3_2nn3spm12StorageIndex"); + int32_t + SetExtendedStorage(StorageIndex *index) asm("SetExtendedStorage__Q2_2nn3spmFQ3_2nn3spm12StorageIndex"); -/** + /** * Sets the id of the default extended storage drive */ -void -SetDefaultExtendedStorageVolumeId(VolumeId const& id) - asm("SetDefaultExtendedStorageVolumeId__Q2_2nn3spmFRCQ3_2nn3spm8VolumeId"); + void + SetDefaultExtendedStorageVolumeId(VolumeId const &id) asm("SetDefaultExtendedStorageVolumeId__Q2_2nn3spmFRCQ3_2nn3spm8VolumeId"); -/** + /** * Gets the id of the default extended storage drive */ -void -GetDefaultExtendedStorageVolumeId(VolumeId* id) - asm("GetDefaultExtendedStorageVolumeId__Q2_2nn3spmFv"); + void + GetDefaultExtendedStorageVolumeId(VolumeId *id) asm("GetDefaultExtendedStorageVolumeId__Q2_2nn3spmFv"); -bool -GetPreviousExtendedStorageVolumeId(bool*, VolumeId* outVolumeId) - asm("GetPreviousExtendedStorageVolumeId__Q2_2nn3spmFPbPQ3_2nn3spm8VolumeId"); + bool + GetPreviousExtendedStorageVolumeId(bool *, VolumeId *outVolumeId) asm("GetPreviousExtendedStorageVolumeId__Q2_2nn3spmFPbPQ3_2nn3spm8VolumeId"); -bool -FindStorageByVolumeId(StorageIndex* outIndex, VolumeId const& volumeId) - asm("FindStorageByVolumeId__Q2_2nn3spmFPQ3_2nn3spm12StorageIndexRCQ3_2nn3spm8VolumeId"); + bool + FindStorageByVolumeId(StorageIndex *outIndex, VolumeId const &volumeId) asm("FindStorageByVolumeId__Q2_2nn3spmFPQ3_2nn3spm12StorageIndexRCQ3_2nn3spm8VolumeId"); -int32_t -GetExtendedStorageIndex(StorageIndex* outIndex) - asm("GetExtendedStorageIndex__Q2_2nn3spmFPQ3_2nn3spm12StorageIndex"); + int32_t + GetExtendedStorageIndex(StorageIndex *outIndex) asm("GetExtendedStorageIndex__Q2_2nn3spmFPQ3_2nn3spm12StorageIndex"); -int32_t -GetStorageList(StorageListItem* items, uint32_t maxNumItems) - asm("GetStorageList__Q2_2nn3spmFPQ3_2nn3spm15StorageListItemUi"); + int32_t + GetStorageList(StorageListItem *items, uint32_t maxNumItems) asm("GetStorageList__Q2_2nn3spmFPQ3_2nn3spm15StorageListItemUi"); -int32_t -GetStorageInfo(StorageInfo* outInfo, StorageIndex* index) - asm("GetStorageInfo__Q2_2nn3spmFPQ3_2nn3spm11StorageInfoQ3_2nn3spm12StorageIndex"); + int32_t + GetStorageInfo(StorageInfo *outInfo, StorageIndex *index) asm("GetStorageInfo__Q2_2nn3spmFPQ3_2nn3spm11StorageInfoQ3_2nn3spm12StorageIndex"); -/** + /** * Reads the first 512 bytes of the storage head into the buffer * * \return * 0 on success. */ -int32_t -ReadRawStorageHead512(StorageIndex* index, char* outBuffer) - asm("ReadRawStorageHead512__Q2_2nn3spmFQ3_2nn3spm12StorageIndexPc"); + int32_t + ReadRawStorageHead512(StorageIndex *index, char *outBuffer) asm("ReadRawStorageHead512__Q2_2nn3spmFQ3_2nn3spm12StorageIndexPc"); -/** + /** * * \param isPcFormatted * True if the drive contains a valid MBR with at least one active partition @@ -148,11 +137,10 @@ ReadRawStorageHead512(StorageIndex* index, char* outBuffer) * \return * 0 on success. */ -int32_t -IsStorageMaybePcFormatted(bool* isPcFormatted, StorageIndex* index) - asm("IsStorageMaybePcFormatted__Q2_2nn3spmFPbQ3_2nn3spm12StorageIndex"); + int32_t + IsStorageMaybePcFormatted(bool *isPcFormatted, StorageIndex *index) asm("IsStorageMaybePcFormatted__Q2_2nn3spmFPbQ3_2nn3spm12StorageIndex"); -/** + /** * * \param isWfsFormatted * True if the drive does not contain a valid MBR @@ -160,12 +148,11 @@ IsStorageMaybePcFormatted(bool* isPcFormatted, StorageIndex* index) * \return * 0 on success. */ -int32_t -IsStorageMaybeWfsFormatted(bool* isWfsFormatted, StorageIndex* index) - asm("IsStorageMaybeWfsFormatted__Q2_2nn3spmFPbQ3_2nn3spm12StorageIndex"); + int32_t + IsStorageMaybeWfsFormatted(bool *isWfsFormatted, StorageIndex *index) asm("IsStorageMaybeWfsFormatted__Q2_2nn3spmFPbQ3_2nn3spm12StorageIndex"); -}; -}; + }; // namespace spm +}; // namespace nn #endif diff --git a/include/nn/swkbd/swkbd_cpp.h b/include/nn/swkbd/swkbd_cpp.h index 12f3c9cde..4095b08ae 100644 --- a/include/nn/swkbd/swkbd_cpp.h +++ b/include/nn/swkbd/swkbd_cpp.h @@ -1,10 +1,10 @@ #pragma once -#include #include #include #include -#include #include +#include +#include /** * \defgroup nn_swkbd_swkbd Software Keyboard @@ -16,10 +16,9 @@ #ifdef __cplusplus -namespace nn -{ +namespace nn { -/** + /** * Graphical software keyboard, supporting several languages and configurations. * Applications should first call \link Create \endlink to initialise the * library, followed by \link AppearInputForm \endlink to show a text area and @@ -32,267 +31,266 @@ namespace nn * once satisfied the application can dismiss the keyboard with * \link DisappearInputForm \endlink. Don't forget \link Destroy \endlink! */ -namespace swkbd -{ - -enum class ControllerType -{ - WiiRemote0 = 0, - WiiRemote1 = 1, - WiiRemote2 = 2, - WiiRemote3 = 3, - DrcGamepad = 4, -}; - -enum class LanguageType -{ - Japanese = 0, - English = 1, - //! TODO: find more language types -}; - -enum class RegionType -{ - Japan = 0, - USA = 1, - Europe = 2, - //! TODO: find more region types -}; - -enum class State -{ - //! The input form / keyboard is completely hidden. - Hidden = 0, - //! The input form / keyboard is drawing the fade in animation. - FadeIn = 1, - //! The input form / keyboard is done drawing the fade in animation and completely visible. - Visible = 2, - //! The input form / keyboard is drawing the fade out animation. - FadeOut = 3, -}; - -enum class InputFormType -{ - //! Input form seen when adding an NNID on Friends List or creating a folder on the System Menu. (Individual square design with up to 40 characters) - InputForm0 = 0, - //! The default input layout that is usually used (Page design) - Default = 1, -}; - -enum class KeyboardMode -{ - //! The one that fully allows utf-16LE(char16_t) charaters - Full = 0, - //! Numpad used for entering for example a DNS address - Numpad = 1, - //! ascii, possibly used for passwords ? - Utf8 = 2, - //! the one thats used for registering an nnid full alphabet, numbers, '_' and '-' - NNID = 3, -}; - -enum class PasswordMode -{ - //! Show clear text - Clear = 0, - //! Hides the text - Hide = 1, - //! Hides the charater after a few seconds - Fade = 2, -}; - -//! Configuration options for the virtual keyboard. -struct ConfigArg -{ - ConfigArg() - { - memset(this, 0, sizeof(*this)); - languageType = LanguageType::English; - controllerType = ControllerType::DrcGamepad; - keyboardMode = KeyboardMode::Full; - accessFlags = 0x7FFFF; - unk_0x10 = 19; - unk_0x14 = -1; - unk_0x9C = 1; - unk_0xA4 = -1; - } - - //! The language to use for input - LanguageType languageType; - ControllerType controllerType; - KeyboardMode keyboardMode; - //! TODO: find all bit flags - uint32_t accessFlags; // Bitmasked! - uint32_t unk_0x10; - int32_t unk_0x14; - bool unk_0x18; - //! Text that's displayed on the "OK" button - const char16_t *okString; - //! The left side button exclusive to the numpad keyboard mode - char16_t numpadCharLeft; - //! The right side button exclusive to the numpad keyboard mode - char16_t numpadCharRight; - //! Bool to either enable or disable word suggestions - bool showWordSuggestions; - WUT_PADDING_BYTES(3); - uint8_t unk_0x28; - uint8_t unk_0x29; - uint8_t unk_0x2A; - //! If true it'll disable the new Line character on the keyboard - bool disableNewLine; - WUT_UNKNOWN_BYTES(0x9C - 0x2C); - uint32_t unk_0x9C; - //! Draws the system Wii remote pointer. - bool drawSysWiiPointer; - int32_t unk_0xA4; -}; -WUT_CHECK_OFFSET(ConfigArg, 0x00, languageType); -WUT_CHECK_OFFSET(ConfigArg, 0x04, controllerType); -WUT_CHECK_OFFSET(ConfigArg, 0x08, keyboardMode); -WUT_CHECK_OFFSET(ConfigArg, 0x0C, accessFlags); -WUT_CHECK_OFFSET(ConfigArg, 0x10, unk_0x10); -WUT_CHECK_OFFSET(ConfigArg, 0x14, unk_0x14); -WUT_CHECK_OFFSET(ConfigArg, 0x18, unk_0x18); -WUT_CHECK_OFFSET(ConfigArg, 0x1C, okString); -WUT_CHECK_OFFSET(ConfigArg, 0x20, numpadCharLeft); -WUT_CHECK_OFFSET(ConfigArg, 0x22, numpadCharRight); -WUT_CHECK_OFFSET(ConfigArg, 0x24, showWordSuggestions); -WUT_CHECK_OFFSET(ConfigArg, 0x28, unk_0x28); -WUT_CHECK_OFFSET(ConfigArg, 0x29, unk_0x29); -WUT_CHECK_OFFSET(ConfigArg, 0x2A, unk_0x2A); -WUT_CHECK_OFFSET(ConfigArg, 0x2B, disableNewLine); -WUT_CHECK_OFFSET(ConfigArg, 0x9C, unk_0x9C); -WUT_CHECK_OFFSET(ConfigArg, 0xA0, drawSysWiiPointer); -WUT_CHECK_OFFSET(ConfigArg, 0xA4, unk_0xA4); -WUT_CHECK_SIZE(ConfigArg, 0xA8); - -struct ReceiverArg -{ - uint32_t unk_0x00 = 0; - uint32_t unk_0x04 = 0; - uint32_t unk_0x08 = 0; - int32_t unk_0x0C = -1; - uint32_t unk_0x10 = 0; - int32_t unk_0x14 = -1; -}; -WUT_CHECK_OFFSET(ReceiverArg, 0x00, unk_0x00); -WUT_CHECK_OFFSET(ReceiverArg, 0x04, unk_0x04); -WUT_CHECK_OFFSET(ReceiverArg, 0x08, unk_0x08); -WUT_CHECK_OFFSET(ReceiverArg, 0x0C, unk_0x0C); -WUT_CHECK_OFFSET(ReceiverArg, 0x10, unk_0x10); -WUT_CHECK_OFFSET(ReceiverArg, 0x14, unk_0x14); -WUT_CHECK_SIZE(ReceiverArg, 0x18); - -//! Arguments for the swkbd keyboard -struct KeyboardArg -{ - //! Configuration for the keyboard itself - ConfigArg configArg; - ReceiverArg receiverArg; -}; -WUT_CHECK_SIZE(KeyboardArg, 0xC0); - -//! Arguments for swkbd the input form (text area). -struct InputFormArg -{ - //! The type of input form - InputFormType type = InputFormType::Default; - int32_t unk_0x04 = -1; - //! Initial string to open the keyboard with - const char16_t *initialText = nullptr; - //! Hint string - const char16_t *hintText = nullptr; - //! The maximum number of characters that can be entered, -1 for unlimited. - int32_t maxTextLength = -1; - //! Which password inputting preset to use - nn::swkbd::PasswordMode passwordMode = nn::swkbd::PasswordMode::Clear; - uint32_t unk_0x18 = 0; - //! Whether or not to draw a cursor. Exclusive to the inputform0 input form type. - bool drawInput0Cursor = false; - //! Whether or not to highlight the initial string. Exclusive to the Default input form type. - bool higlightInitialText = false; - //! Whether or not to show a copy and a paste button. - bool showCopyPasteButtons = false; - WUT_PADDING_BYTES(1); -}; -WUT_CHECK_OFFSET(InputFormArg, 0x00, type); -WUT_CHECK_OFFSET(InputFormArg, 0x04, unk_0x04); -WUT_CHECK_OFFSET(InputFormArg, 0x08, initialText); -WUT_CHECK_OFFSET(InputFormArg, 0x0C, hintText); -WUT_CHECK_OFFSET(InputFormArg, 0x10, maxTextLength); -WUT_CHECK_OFFSET(InputFormArg, 0x14, passwordMode); -WUT_CHECK_OFFSET(InputFormArg, 0x18, unk_0x18); -WUT_CHECK_OFFSET(InputFormArg, 0x1C, drawInput0Cursor); -WUT_CHECK_OFFSET(InputFormArg, 0x1D, higlightInitialText); -WUT_CHECK_OFFSET(InputFormArg, 0x1E, showCopyPasteButtons); -WUT_CHECK_SIZE(InputFormArg, 0x20); - -//! Arguments for the swkbd input form and keyboard. -struct AppearArg -{ - //! Arguments for the virtual keyboard - KeyboardArg keyboardArg; - //! Arguments for the input form (text area) - InputFormArg inputFormArg; -}; -WUT_CHECK_SIZE(AppearArg, 0xE0); - -//!The arguments used to initialise swkbd and pass in its required resources. -struct CreateArg -{ - //! A pointer to a work memory buffer; see \link GetWorkMemorySize \endlink. - void *workMemory = nullptr; - //! The swkbd region to use. - RegionType regionType = RegionType::Europe; - uint32_t unk_0x08 = 0; - //! An FSClient for swkbd to use while loading resources. - FSClient *fsClient = nullptr; -}; -WUT_CHECK_OFFSET(CreateArg, 0x00, workMemory); -WUT_CHECK_OFFSET(CreateArg, 0x04, regionType); -WUT_CHECK_OFFSET(CreateArg, 0x08, unk_0x08); -WUT_CHECK_OFFSET(CreateArg, 0x0C, fsClient); -WUT_CHECK_SIZE(CreateArg, 0x10); - -//! Input and controller information for swkbd. -struct ControllerInfo -{ - //! DRC input information, see \link VPADRead \endlink. - VPADStatus *vpad = nullptr; - //! Wiimote and extension controller inputs, see \link KPADRead \endlink. - KPADStatus *kpad[4] = { nullptr, nullptr, nullptr, nullptr }; -}; -WUT_CHECK_OFFSET(ControllerInfo, 0x00, vpad); -WUT_CHECK_OFFSET(ControllerInfo, 0x04, kpad); -WUT_CHECK_SIZE(ControllerInfo, 0x14); - -struct DrawStringInfo -{ - DrawStringInfo() - { - memset(this, 0, sizeof(*this)); - } - - WUT_UNKNOWN_BYTES(0x1C); -}; -WUT_CHECK_SIZE(DrawStringInfo, 0x1C); - -struct KeyboardCondition -{ - //! Selected Language - uint32_t unk_0x00 = 0; - //! Selected Character menu - uint32_t unk_0x04 = 0; -}; -WUT_CHECK_OFFSET(KeyboardCondition, 0x00, unk_0x00); -WUT_CHECK_OFFSET(KeyboardCondition, 0x04, unk_0x04); -WUT_CHECK_SIZE(KeyboardCondition, 0x8); - -struct IEventReceiver; -struct IControllerEventObj; -struct ISoundObj; - -/** + namespace swkbd { + + enum class ControllerType + { + WiiRemote0 = 0, + WiiRemote1 = 1, + WiiRemote2 = 2, + WiiRemote3 = 3, + DrcGamepad = 4, + }; + + enum class LanguageType + { + Japanese = 0, + English = 1, + //! TODO: find more language types + }; + + enum class RegionType + { + Japan = 0, + USA = 1, + Europe = 2, + //! TODO: find more region types + }; + + enum class State + { + //! The input form / keyboard is completely hidden. + Hidden = 0, + //! The input form / keyboard is drawing the fade in animation. + FadeIn = 1, + //! The input form / keyboard is done drawing the fade in animation and completely visible. + Visible = 2, + //! The input form / keyboard is drawing the fade out animation. + FadeOut = 3, + }; + + enum class InputFormType + { + //! Input form seen when adding an NNID on Friends List or creating a folder on the System Menu. (Individual square design with up to 40 characters) + InputForm0 = 0, + //! The default input layout that is usually used (Page design) + Default = 1, + }; + + enum class KeyboardMode + { + //! The one that fully allows utf-16LE(char16_t) charaters + Full = 0, + //! Numpad used for entering for example a DNS address + Numpad = 1, + //! ascii, possibly used for passwords ? + Utf8 = 2, + //! the one thats used for registering an nnid full alphabet, numbers, '_' and '-' + NNID = 3, + }; + + enum class PasswordMode + { + //! Show clear text + Clear = 0, + //! Hides the text + Hide = 1, + //! Hides the charater after a few seconds + Fade = 2, + }; + + //! Configuration options for the virtual keyboard. + struct ConfigArg + { + ConfigArg() + { + memset(this, 0, sizeof(*this)); + languageType = LanguageType::English; + controllerType = ControllerType::DrcGamepad; + keyboardMode = KeyboardMode::Full; + accessFlags = 0x7FFFF; + unk_0x10 = 19; + unk_0x14 = -1; + unk_0x9C = 1; + unk_0xA4 = -1; + } + + //! The language to use for input + LanguageType languageType; + ControllerType controllerType; + KeyboardMode keyboardMode; + //! TODO: find all bit flags + uint32_t accessFlags; // Bitmasked! + uint32_t unk_0x10; + int32_t unk_0x14; + bool unk_0x18; + //! Text that's displayed on the "OK" button + const char16_t *okString; + //! The left side button exclusive to the numpad keyboard mode + char16_t numpadCharLeft; + //! The right side button exclusive to the numpad keyboard mode + char16_t numpadCharRight; + //! Bool to either enable or disable word suggestions + bool showWordSuggestions; + WUT_PADDING_BYTES(3); + uint8_t unk_0x28; + uint8_t unk_0x29; + uint8_t unk_0x2A; + //! If true it'll disable the new Line character on the keyboard + bool disableNewLine; + WUT_UNKNOWN_BYTES(0x9C - 0x2C); + uint32_t unk_0x9C; + //! Draws the system Wii remote pointer. + bool drawSysWiiPointer; + int32_t unk_0xA4; + }; + WUT_CHECK_OFFSET(ConfigArg, 0x00, languageType); + WUT_CHECK_OFFSET(ConfigArg, 0x04, controllerType); + WUT_CHECK_OFFSET(ConfigArg, 0x08, keyboardMode); + WUT_CHECK_OFFSET(ConfigArg, 0x0C, accessFlags); + WUT_CHECK_OFFSET(ConfigArg, 0x10, unk_0x10); + WUT_CHECK_OFFSET(ConfigArg, 0x14, unk_0x14); + WUT_CHECK_OFFSET(ConfigArg, 0x18, unk_0x18); + WUT_CHECK_OFFSET(ConfigArg, 0x1C, okString); + WUT_CHECK_OFFSET(ConfigArg, 0x20, numpadCharLeft); + WUT_CHECK_OFFSET(ConfigArg, 0x22, numpadCharRight); + WUT_CHECK_OFFSET(ConfigArg, 0x24, showWordSuggestions); + WUT_CHECK_OFFSET(ConfigArg, 0x28, unk_0x28); + WUT_CHECK_OFFSET(ConfigArg, 0x29, unk_0x29); + WUT_CHECK_OFFSET(ConfigArg, 0x2A, unk_0x2A); + WUT_CHECK_OFFSET(ConfigArg, 0x2B, disableNewLine); + WUT_CHECK_OFFSET(ConfigArg, 0x9C, unk_0x9C); + WUT_CHECK_OFFSET(ConfigArg, 0xA0, drawSysWiiPointer); + WUT_CHECK_OFFSET(ConfigArg, 0xA4, unk_0xA4); + WUT_CHECK_SIZE(ConfigArg, 0xA8); + + struct ReceiverArg + { + uint32_t unk_0x00 = 0; + uint32_t unk_0x04 = 0; + uint32_t unk_0x08 = 0; + int32_t unk_0x0C = -1; + uint32_t unk_0x10 = 0; + int32_t unk_0x14 = -1; + }; + WUT_CHECK_OFFSET(ReceiverArg, 0x00, unk_0x00); + WUT_CHECK_OFFSET(ReceiverArg, 0x04, unk_0x04); + WUT_CHECK_OFFSET(ReceiverArg, 0x08, unk_0x08); + WUT_CHECK_OFFSET(ReceiverArg, 0x0C, unk_0x0C); + WUT_CHECK_OFFSET(ReceiverArg, 0x10, unk_0x10); + WUT_CHECK_OFFSET(ReceiverArg, 0x14, unk_0x14); + WUT_CHECK_SIZE(ReceiverArg, 0x18); + + //! Arguments for the swkbd keyboard + struct KeyboardArg + { + //! Configuration for the keyboard itself + ConfigArg configArg; + ReceiverArg receiverArg; + }; + WUT_CHECK_SIZE(KeyboardArg, 0xC0); + + //! Arguments for swkbd the input form (text area). + struct InputFormArg + { + //! The type of input form + InputFormType type = InputFormType::Default; + int32_t unk_0x04 = -1; + //! Initial string to open the keyboard with + const char16_t *initialText = nullptr; + //! Hint string + const char16_t *hintText = nullptr; + //! The maximum number of characters that can be entered, -1 for unlimited. + int32_t maxTextLength = -1; + //! Which password inputting preset to use + nn::swkbd::PasswordMode passwordMode = nn::swkbd::PasswordMode::Clear; + uint32_t unk_0x18 = 0; + //! Whether or not to draw a cursor. Exclusive to the inputform0 input form type. + bool drawInput0Cursor = false; + //! Whether or not to highlight the initial string. Exclusive to the Default input form type. + bool higlightInitialText = false; + //! Whether or not to show a copy and a paste button. + bool showCopyPasteButtons = false; + WUT_PADDING_BYTES(1); + }; + WUT_CHECK_OFFSET(InputFormArg, 0x00, type); + WUT_CHECK_OFFSET(InputFormArg, 0x04, unk_0x04); + WUT_CHECK_OFFSET(InputFormArg, 0x08, initialText); + WUT_CHECK_OFFSET(InputFormArg, 0x0C, hintText); + WUT_CHECK_OFFSET(InputFormArg, 0x10, maxTextLength); + WUT_CHECK_OFFSET(InputFormArg, 0x14, passwordMode); + WUT_CHECK_OFFSET(InputFormArg, 0x18, unk_0x18); + WUT_CHECK_OFFSET(InputFormArg, 0x1C, drawInput0Cursor); + WUT_CHECK_OFFSET(InputFormArg, 0x1D, higlightInitialText); + WUT_CHECK_OFFSET(InputFormArg, 0x1E, showCopyPasteButtons); + WUT_CHECK_SIZE(InputFormArg, 0x20); + + //! Arguments for the swkbd input form and keyboard. + struct AppearArg + { + //! Arguments for the virtual keyboard + KeyboardArg keyboardArg; + //! Arguments for the input form (text area) + InputFormArg inputFormArg; + }; + WUT_CHECK_SIZE(AppearArg, 0xE0); + + //!The arguments used to initialise swkbd and pass in its required resources. + struct CreateArg + { + //! A pointer to a work memory buffer; see \link GetWorkMemorySize \endlink. + void *workMemory = nullptr; + //! The swkbd region to use. + RegionType regionType = RegionType::Europe; + uint32_t unk_0x08 = 0; + //! An FSClient for swkbd to use while loading resources. + FSClient *fsClient = nullptr; + }; + WUT_CHECK_OFFSET(CreateArg, 0x00, workMemory); + WUT_CHECK_OFFSET(CreateArg, 0x04, regionType); + WUT_CHECK_OFFSET(CreateArg, 0x08, unk_0x08); + WUT_CHECK_OFFSET(CreateArg, 0x0C, fsClient); + WUT_CHECK_SIZE(CreateArg, 0x10); + + //! Input and controller information for swkbd. + struct ControllerInfo + { + //! DRC input information, see \link VPADRead \endlink. + VPADStatus *vpad = nullptr; + //! Wiimote and extension controller inputs, see \link KPADRead \endlink. + KPADStatus *kpad[4] = {nullptr, nullptr, nullptr, nullptr}; + }; + WUT_CHECK_OFFSET(ControllerInfo, 0x00, vpad); + WUT_CHECK_OFFSET(ControllerInfo, 0x04, kpad); + WUT_CHECK_SIZE(ControllerInfo, 0x14); + + struct DrawStringInfo + { + DrawStringInfo() + { + memset(this, 0, sizeof(*this)); + } + + WUT_UNKNOWN_BYTES(0x1C); + }; + WUT_CHECK_SIZE(DrawStringInfo, 0x1C); + + struct KeyboardCondition + { + //! Selected Language + uint32_t unk_0x00 = 0; + //! Selected Character menu + uint32_t unk_0x04 = 0; + }; + WUT_CHECK_OFFSET(KeyboardCondition, 0x00, unk_0x00); + WUT_CHECK_OFFSET(KeyboardCondition, 0x04, unk_0x04); + WUT_CHECK_SIZE(KeyboardCondition, 0x8); + + struct IEventReceiver; + struct IControllerEventObj; + struct ISoundObj; + + /** * Show an input form (keyboard with text area) with the given configuration. * * \param args @@ -308,10 +306,10 @@ struct ISoundObj; * - \link IsDecideOkButton \endlink * - \link IsDecideCancelButton \endlink */ -bool -AppearInputForm(const AppearArg& args); + bool + AppearInputForm(const AppearArg &args); -/** + /** * Show a keyboard with the given configuration. * * \param args @@ -326,10 +324,10 @@ AppearInputForm(const AppearArg& args); * - \link IsDecideOkButton \endlink * - \link IsDecideCancelButton \endlink */ -bool -AppearKeyboard(const KeyboardArg& args); + bool + AppearKeyboard(const KeyboardArg &args); -/** + /** * Calculate font data. Call in response to * \link IsNeedCalcSubThreadFont \endlink. * @@ -337,10 +335,10 @@ AppearKeyboard(const KeyboardArg& args); * - \link CalcSubThreadPredict \endlink * - \link Calc \endlink */ -void -CalcSubThreadFont(); + void + CalcSubThreadFont(); -/** + /** * Calculate word prediction data. Call in response to * \link IsNeedCalcSubThreadPredict \endlink. * @@ -348,10 +346,10 @@ CalcSubThreadFont(); * - \link CalcSubThreadFont \endlink * - \link Calc \endlink */ -void -CalcSubThreadPredict(); + void + CalcSubThreadPredict(); -/** + /** * Respond to user inputs and calculate the state of input buffers and graphics. * * \param controllerInfo @@ -364,13 +362,13 @@ CalcSubThreadPredict(); * - \link CalcSubThreadFont \endlink * - \link CalcSubThreadPredict \endlink */ -void -Calc(const ControllerInfo &controllerInfo); + void + Calc(const ControllerInfo &controllerInfo); -void -ConfirmUnfixAll(); + void + ConfirmUnfixAll(); -/** + /** * Initialise the swkbd library and create the keyboard and input form. * * \param args @@ -385,10 +383,10 @@ ConfirmUnfixAll(); * - \link Destroy \endlink * - \link GetWorkMemorySize \endlink */ -bool -Create(const CreateArg &args); + bool + Create(const CreateArg &args); -/** + /** * Clean up and shut down the swkbd library. * * \note @@ -399,10 +397,10 @@ Create(const CreateArg &args); * \sa * - \link Create \endlink */ -void -Destroy(); + void + Destroy(); -/** + /** * Hide a previously shown input form. * * \return @@ -412,10 +410,10 @@ Destroy(); * - \link AppearInputForm \endlink * - \link GetInputFormString \endlink */ -bool -DisappearInputForm(); + bool + DisappearInputForm(); -/** + /** * Hide a previously shown keyboard. * * \return @@ -424,29 +422,29 @@ DisappearInputForm(); * \sa * - \link AppearKeyboard \endlink */ -bool -DisappearKeyboard(); + bool + DisappearKeyboard(); -/** + /** * Draw the keyboard to the DRC. Must be called inside a valid GX2 rendering * context, after rendering all other DRC graphics (to appear under the * keyboard) */ -void -DrawDRC(); + void + DrawDRC(); -/** + /** * Draw the keyboard to the TV. Must be called inside a valid GX2 rendering * context, after rendering all other TV graphics (to appear under the * keyboard) */ -void -DrawTV(); + void + DrawTV(); -void -GetDrawStringInfo(DrawStringInfo *drawStringInfo); + void + GetDrawStringInfo(DrawStringInfo *drawStringInfo); -/** + /** * Get the string the user typed into the input form. * * \returns @@ -455,25 +453,25 @@ GetDrawStringInfo(DrawStringInfo *drawStringInfo); * \sa * - \link SetInputFormString \endlink */ -const char16_t * -GetInputFormString(); + const char16_t * + GetInputFormString(); -void -GetKeyboardCondition(KeyboardCondition *keyboardCondition); + void + GetKeyboardCondition(KeyboardCondition *keyboardCondition); -/** + /** * Get the current state of the input form. * * \returns * The current \link nn::swkbd::State State \endlink of the input form. */ -State -GetStateInputForm(); + State + GetStateInputForm(); -State -GetStateKeyboard(); + State + GetStateKeyboard(); -/** + /** * Get the required size for swkbd's work memory buffer. The application must * allocate a buffer of this size and pass it into \link Create \endlink. * @@ -486,19 +484,19 @@ GetStateKeyboard(); * \sa * - \link Create \endlink */ -uint32_t -GetWorkMemorySize(uint32_t unk); + uint32_t + GetWorkMemorySize(uint32_t unk); -void -InactivateSelectCursor(); + void + InactivateSelectCursor(); -bool -InitLearnDic(void *dictionary); + bool + InitLearnDic(void *dictionary); -bool -IsCoveredWithSubWindow(); + bool + IsCoveredWithSubWindow(); -/** + /** * Gets the current status of the Cancel button on the keyboard. * * \param outIsSelected @@ -511,10 +509,10 @@ IsCoveredWithSubWindow(); * \sa * - \link IsDecideOkButton \endlink */ -bool -IsDecideCancelButton(bool *outIsSelected); + bool + IsDecideCancelButton(bool *outIsSelected); -/** + /** * Gets the current status of the OK button on the keyboard. * * \param outIsSelected @@ -527,13 +525,13 @@ IsDecideCancelButton(bool *outIsSelected); * \sa * - \link IsDecideCancelButton \endlink */ -bool -IsDecideOkButton(bool *outIsSelected); + bool + IsDecideOkButton(bool *outIsSelected); -bool -IsKeyboardTarget(IEventReceiver *eventReceiver); + bool + IsKeyboardTarget(IEventReceiver *eventReceiver); -/** + /** * Determines whether the font data needs calculating. If it does, a call to * \link CalcSubThreadFont \endlink is required. * @@ -543,10 +541,10 @@ IsKeyboardTarget(IEventReceiver *eventReceiver); * \sa * - \link IsNeedCalcSubThreadPredict \endlink */ -bool -IsNeedCalcSubThreadFont(); + bool + IsNeedCalcSubThreadFont(); -/** + /** * Determines whether the prediction data needs calculating. If it does, a call * to \link CalcSubThreadPredict \endlink is required. * @@ -556,32 +554,32 @@ IsNeedCalcSubThreadFont(); * \sa * - \link IsNeedCalcSubThreadFont \endlink */ -bool -IsNeedCalcSubThreadPredict(); + bool + IsNeedCalcSubThreadPredict(); -/** + /** * Determines whether the selection cursor is active. * * \return * \c true if the selection cursor is active, \c false otherwise. */ -bool -IsSelectCursorActive(); + bool + IsSelectCursorActive(); -/** + /** * Mutes or unmutes the sounds generated by the keyboard. * Must be called inside a valid AX sound context, after AXInit and before AXQuit. * * \param muted * \c true to disable all sounds, or \c false to enable them. */ -void -MuteAllSound(bool muted); + void + MuteAllSound(bool muted); -void -SetControllerRemo(ControllerType type); + void + SetControllerRemo(ControllerType type); -/** + /** * Set the character at which the cursor is positioned. * * \param pos @@ -593,20 +591,20 @@ SetControllerRemo(ControllerType type); * Does one need to account for multiword UTF-16 characters? * --> */ -void -SetCursorPos(int pos); + void + SetCursorPos(int pos); -/** + /** * Enables and disables the OK button on the keyboard. When disabled, the button * cannot be pressed. * * \param enable * \c true to enable the button, or \c false to disable it. */ -void -SetEnableOkButton(bool enable); + void + SetEnableOkButton(bool enable); -/** + /** * Sets the text in the input form. * * \param str @@ -615,22 +613,22 @@ SetEnableOkButton(bool enable); * \sa * - \link GetInputFormString \endlink */ -void -SetInputFormString(const char16_t *str); + void + SetInputFormString(const char16_t *str); -void -SetReceiver(const ReceiverArg &receiver); + void + SetReceiver(const ReceiverArg &receiver); -void -SetSelectFrom(int); + void + SetSelectFrom(int); -void -SetUserControllerEventObj(IControllerEventObj *controllerEventObj); + void + SetUserControllerEventObj(IControllerEventObj *controllerEventObj); -void -SetUserSoundObj(ISoundObj *soundObj); + void + SetUserSoundObj(ISoundObj *soundObj); -} // namespace swkbd + } // namespace swkbd } // namespace nn #endif // ifdef __cplusplus diff --git a/include/nsyshid/hid.h b/include/nsyshid/hid.h index 1e2840768..d5ee55310 100644 --- a/include/nsyshid/hid.h +++ b/include/nsyshid/hid.h @@ -19,17 +19,15 @@ typedef enum HIDAttachEvent HID_DEVICE_ATTACH = 1, } HIDAttachEvent; -typedef int32_t -(*HIDAttachCallback)(HIDClient *client, - HIDDevice *device, - HIDAttachEvent attach); - -typedef void -(*HIDCallback)(uint32_t handle, - int32_t error, - uint8_t *buffer, - uint32_t bytesTransferred, - void *userContext); +typedef int32_t (*HIDAttachCallback)(HIDClient *client, + HIDDevice *device, + HIDAttachEvent attach); + +typedef void (*HIDCallback)(uint32_t handle, + int32_t error, + uint8_t *buffer, + uint32_t bytesTransferred, + void *userContext); struct HIDDevice { diff --git a/include/nsysnet/_netdb.h b/include/nsysnet/_netdb.h index d0f406f4f..04e873e70 100644 --- a/include/nsysnet/_netdb.h +++ b/include/nsysnet/_netdb.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup nsysnet_netdb Netdb @@ -12,43 +12,43 @@ extern "C" { #endif struct hostent * -RPLWRAP(gethostbyaddr)(const void *addr, - size_t len, - int type); + RPLWRAP(gethostbyaddr)(const void *addr, + size_t len, + int type); struct hostent * -RPLWRAP(gethostbyname)(const char *name); + RPLWRAP(gethostbyname)(const char *name); int -RPLWRAP(getaddrinfo)(const char *node, - const char *service, - const struct addrinfo *hints, - struct addrinfo **res); + RPLWRAP(getaddrinfo)(const char *node, + const char *service, + const struct addrinfo *hints, + struct addrinfo **res); void -RPLWRAP(freeaddrinfo)(struct addrinfo *res); + RPLWRAP(freeaddrinfo)(struct addrinfo *res); int -RPLWRAP(getnameinfo)(const struct sockaddr *addr, - socklen_t addrlen, - char *host, - socklen_t hostlen, - char *serv, - socklen_t servlen, - int flags); + RPLWRAP(getnameinfo)(const struct sockaddr *addr, + socklen_t addrlen, + char *host, + socklen_t hostlen, + char *serv, + socklen_t servlen, + int flags); -void -RPLWRAP(clear_resolver_cache)(void); +void + RPLWRAP(clear_resolver_cache)(void); int -RPLWRAP(set_resolver_allocator)(void* (*alloc)(uint32_t), - void (*free)(void*)); + RPLWRAP(set_resolver_allocator)(void *(*alloc)(uint32_t), + void (*free)(void *)); int * -RPLWRAP(get_h_errno)(void); + RPLWRAP(get_h_errno)(void); const char * -RPLWRAP(gai_strerror)(int ecode); + RPLWRAP(gai_strerror)(int ecode); #ifdef __cplusplus } diff --git a/include/nsysnet/_socket.h b/include/nsysnet/_socket.h index 03ac03832..de99046af 100644 --- a/include/nsysnet/_socket.h +++ b/include/nsysnet/_socket.h @@ -1,12 +1,12 @@ #pragma once -#include -#include +#include +#include #include +#include #include #include -#include -#include -#include +#include +#include /** * \defgroup nsysnet_socket Socket @@ -20,7 +20,7 @@ extern "C" { /* * fd_set for select() */ -#define NSYSNET_FD_SETSIZE 32 +#define NSYSNET_FD_SETSIZE 32 #define NSYSNET_FD_SET(n, p) ((p)->fds_bits |= (1L << (n))) #define NSYSNET_FD_CLR(n, p) ((p)->fds_bits &= ~(1L << (n))) @@ -32,124 +32,122 @@ typedef struct nsysnet_fd_set nsysnet_fd_set; struct nsysnet_fd_set { - nsysnet_fd_mask fds_bits; + nsysnet_fd_mask fds_bits; }; struct nsysnet_timeval { - long tv_sec; - long tv_usec; + long tv_sec; + long tv_usec; }; -void -socket_lib_init(); +void socket_lib_init(); -void -socket_lib_finish(); +void socket_lib_finish(); int -RPLWRAP(accept)(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen); + RPLWRAP(accept)(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen); int -RPLWRAP(bind)(int sockfd, - const struct sockaddr *addr, - socklen_t addrlen); + RPLWRAP(bind)(int sockfd, + const struct sockaddr *addr, + socklen_t addrlen); int -RPLWRAP(socketclose)(int sockfd); + RPLWRAP(socketclose)(int sockfd); int -RPLWRAP(connect)(int sockfd, - const struct sockaddr *addr, - socklen_t addrlen); + RPLWRAP(connect)(int sockfd, + const struct sockaddr *addr, + socklen_t addrlen); int -RPLWRAP(getpeername)(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen); + RPLWRAP(getpeername)(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen); int -RPLWRAP(getsockname)(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen); + RPLWRAP(getsockname)(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen); int -RPLWRAP(getsockopt)(int sockfd, - int level, - int optname, - void *optval, - socklen_t *optlen); + RPLWRAP(getsockopt)(int sockfd, + int level, + int optname, + void *optval, + socklen_t *optlen); int -RPLWRAP(listen)(int sockfd, - int backlog); + RPLWRAP(listen)(int sockfd, + int backlog); int -RPLWRAP(recv)(int sockfd, - void *buf, - size_t len, - int flags); + RPLWRAP(recv)(int sockfd, + void *buf, + size_t len, + int flags); int -RPLWRAP(recvfrom)(int sockfd, - void *buf, - size_t len, - int flags, - struct sockaddr *src_addr, - socklen_t *addrlen); + RPLWRAP(recvfrom)(int sockfd, + void *buf, + size_t len, + int flags, + struct sockaddr *src_addr, + socklen_t *addrlen); int -RPLWRAP(send)(int sockfd, - const void *buf, - size_t len, - int flags); + RPLWRAP(send)(int sockfd, + const void *buf, + size_t len, + int flags); int -RPLWRAP(sendto)(int sockfd, - const void *buf, - size_t len, - int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen); + RPLWRAP(sendto)(int sockfd, + const void *buf, + size_t len, + int flags, + const struct sockaddr *dest_addr, + socklen_t addrlen); int -RPLWRAP(setsockopt)(int sockfd, - int level, - int optname, - const void *optval, - socklen_t optlen); + RPLWRAP(setsockopt)(int sockfd, + int level, + int optname, + const void *optval, + socklen_t optlen); int -RPLWRAP(shutdown)(int sockfd, - int how); + RPLWRAP(shutdown)(int sockfd, + int how); int -RPLWRAP(socket)(int domain, - int type, - int protocol); + RPLWRAP(socket)(int domain, + int type, + int protocol); int -RPLWRAP(select)(int nfds, - nsysnet_fd_set *readfds, - nsysnet_fd_set *writefds, - nsysnet_fd_set *exceptfds, - struct nsysnet_timeval *timeout); + RPLWRAP(select)(int nfds, + nsysnet_fd_set *readfds, + nsysnet_fd_set *writefds, + nsysnet_fd_set *exceptfds, + struct nsysnet_timeval *timeout); const char * -RPLWRAP(inet_ntop)(int af, - const void *src, - char *dst, - socklen_t size); + RPLWRAP(inet_ntop)(int af, + const void *src, + char *dst, + socklen_t size); int -RPLWRAP(inet_pton)(int af, - const char *src, - void *dst); + RPLWRAP(inet_pton)(int af, + const char *src, + void *dst); int -RPLWRAP(socketlasterr)(); + RPLWRAP(socketlasterr)(); #ifdef __cplusplus } diff --git a/include/nsysnet/nssl.h b/include/nsysnet/nssl.h index ebc6eaacb..32479f21e 100644 --- a/include/nsysnet/nssl.h +++ b/include/nsysnet/nssl.h @@ -36,57 +36,57 @@ typedef int32_t NSSLConnectionHandle; */ typedef enum NSSLErrors { - NSSL_ERROR_OK = 0x0, - NSSL_ERROR_GENERIC = -0x1, - NSSL_ERROR_INVALID_NSSL_CONTEXT = -0x280001, - NSSL_ERROR_INVALID_CERT_ID = -0x280002, - NSSL_ERROR_CERT_LIMIT = -0x280003, - NSSL_ERROR_INVALID_NSSL_CONNECTION = -0x280004, - NSSL_ERROR_INVALID_CERT = -0x280005, - NSSL_ERROR_ZERO_RETURN = -0x280006, - NSSL_ERROR_WANT_READ = -0x280007, - NSSL_ERROR_WANT_WRITE = -0x280008, - NSSL_ERROR_IO_ERROR = -0x280009, - NSSL_ERROR_NSSL_LIB_ERROR = -0x28000a, - NSSL_ERROR_UNKNOWN = -0x28000b, - NSSL_ERROR_OUT_OF_MEMORY = -0x28000c, - NSSL_ERROR_INVALID_STATE = -0x28000d, - NSSL_ERROR_HANDSHAKE_ERROR = -0x28000e, - NSSL_ERROR_NO_CERT = -0x28000f, - NSSL_ERROR_INVALID_FD = -0x280010, - NSSL_ERROR_LIB_NOT_READY = -0x280011, - NSSL_ERROR_IPC_ERROR = -0x280012, - NSSL_ERROR_RESOURCE_LIMIT = -0x280013, - NSSL_ERROR_INVALID_HANDLE = -0x280014, - NSSL_ERROR_INVALID_CERT_TYPE = -0x280015, - NSSL_ERROR_INVALID_KEY_TYPE = -0x280016, - NSSL_ERROR_INVALID_SIZE = -0x280017, - NSSL_ERROR_NO_PEER_CERT = -0x280018, - NSSL_ERROR_INSUFFICIENT_SIZE = -0x280019, - NSSL_ERROR_NO_CIPHER = -0x28001a, - NSSL_ERROR_INVALID_ARG = -0x28001b, - NSSL_ERROR_INVALID_NSSL_SESSION = -0x28001c, - NSSL_ERROR_NO_SESSION = -0x28001d, - NSSL_ERROR_SSL_SHUTDOWN_ERROR = -0x28001e, - NSSL_ERROR_CERT_SIZE_LIMIT = -0x28001f, - NSSL_ERROR_CERT_NO_ACCESS = -0x280020, - NSSL_ERROR_INVALID_CERT_ID2 = -0x280021, - NSSL_ERROR_CERT_READ_ERROR = -0x280022, - NSSL_ERROR_CERT_STORE_INIT_FAILURE = -0x280023, - NSSL_ERROR_INVALID_CERT_ENCODING = -0x280024, - NSSL_ERROR_CERT_STORE_ERROR = -0x280025, - NSSL_ERROR_PRIVATE_KEY_READ_ERROR = -0x280026, - NSSL_ERROR_INVALID_PRIVATE_KEY = -0x280027, - NSSL_ERROR_NOT_READY = -0x280028, - NSSL_ERROR_ENCRYPTION_ERROR = -0x280029, - NSSL_ERROR_NO_CERT_STORE = -0x28002a, - NSSL_ERROR_PRIVATE_KEY_SIZE_LIMIT = -0x28002b, - NSSL_ERROR_PROCESS_MAX_EXT_CERTS = -0x28002c, - NSSL_ERROR_PROCESS_MAX_CONTEXTS = -0x28002d, - NSSL_ERROR_PROCESS_MAX_CONNECTIONS = -0x28002e, - NSSL_ERROR_CERT_NOT_EXPORTABLE = -0x28002f, - NSSL_ERROR_INVALID_CERT_SIZE = -0x280030, - NSSL_ERROR_INVALID_KEY_SIZE = -0x280031, + NSSL_ERROR_OK = 0x0, + NSSL_ERROR_GENERIC = -0x1, + NSSL_ERROR_INVALID_NSSL_CONTEXT = -0x280001, + NSSL_ERROR_INVALID_CERT_ID = -0x280002, + NSSL_ERROR_CERT_LIMIT = -0x280003, + NSSL_ERROR_INVALID_NSSL_CONNECTION = -0x280004, + NSSL_ERROR_INVALID_CERT = -0x280005, + NSSL_ERROR_ZERO_RETURN = -0x280006, + NSSL_ERROR_WANT_READ = -0x280007, + NSSL_ERROR_WANT_WRITE = -0x280008, + NSSL_ERROR_IO_ERROR = -0x280009, + NSSL_ERROR_NSSL_LIB_ERROR = -0x28000a, + NSSL_ERROR_UNKNOWN = -0x28000b, + NSSL_ERROR_OUT_OF_MEMORY = -0x28000c, + NSSL_ERROR_INVALID_STATE = -0x28000d, + NSSL_ERROR_HANDSHAKE_ERROR = -0x28000e, + NSSL_ERROR_NO_CERT = -0x28000f, + NSSL_ERROR_INVALID_FD = -0x280010, + NSSL_ERROR_LIB_NOT_READY = -0x280011, + NSSL_ERROR_IPC_ERROR = -0x280012, + NSSL_ERROR_RESOURCE_LIMIT = -0x280013, + NSSL_ERROR_INVALID_HANDLE = -0x280014, + NSSL_ERROR_INVALID_CERT_TYPE = -0x280015, + NSSL_ERROR_INVALID_KEY_TYPE = -0x280016, + NSSL_ERROR_INVALID_SIZE = -0x280017, + NSSL_ERROR_NO_PEER_CERT = -0x280018, + NSSL_ERROR_INSUFFICIENT_SIZE = -0x280019, + NSSL_ERROR_NO_CIPHER = -0x28001a, + NSSL_ERROR_INVALID_ARG = -0x28001b, + NSSL_ERROR_INVALID_NSSL_SESSION = -0x28001c, + NSSL_ERROR_NO_SESSION = -0x28001d, + NSSL_ERROR_SSL_SHUTDOWN_ERROR = -0x28001e, + NSSL_ERROR_CERT_SIZE_LIMIT = -0x28001f, + NSSL_ERROR_CERT_NO_ACCESS = -0x280020, + NSSL_ERROR_INVALID_CERT_ID2 = -0x280021, + NSSL_ERROR_CERT_READ_ERROR = -0x280022, + NSSL_ERROR_CERT_STORE_INIT_FAILURE = -0x280023, + NSSL_ERROR_INVALID_CERT_ENCODING = -0x280024, + NSSL_ERROR_CERT_STORE_ERROR = -0x280025, + NSSL_ERROR_PRIVATE_KEY_READ_ERROR = -0x280026, + NSSL_ERROR_INVALID_PRIVATE_KEY = -0x280027, + NSSL_ERROR_NOT_READY = -0x280028, + NSSL_ERROR_ENCRYPTION_ERROR = -0x280029, + NSSL_ERROR_NO_CERT_STORE = -0x28002a, + NSSL_ERROR_PRIVATE_KEY_SIZE_LIMIT = -0x28002b, + NSSL_ERROR_PROCESS_MAX_EXT_CERTS = -0x28002c, + NSSL_ERROR_PROCESS_MAX_CONTEXTS = -0x28002d, + NSSL_ERROR_PROCESS_MAX_CONNECTIONS = -0x28002e, + NSSL_ERROR_CERT_NOT_EXPORTABLE = -0x28002f, + NSSL_ERROR_INVALID_CERT_SIZE = -0x280030, + NSSL_ERROR_INVALID_KEY_SIZE = -0x280031, } NSSLErrors; /** @@ -102,143 +102,143 @@ typedef enum NSSLErrors */ typedef enum NSSLServerCertId { - //! Represents the first certificate in the Nintendo CA group. - NSSL_SERVER_CERT_GROUP_NINTENDO_FIRST = 100, - //! Nintendo CA - //! (SHA1: B5 22 94 55 DD 26 C1 F5 3C 73 06 0E 90 89 B3 91 38 9E 1F 75) - NSSL_SERVER_CERT_NINTENDO_CA = 100, - //! Nintendo CA - G2 - //! (SHA1: C6 0B 2A 5C C9 0F 06 30 CC A3 30 40 DF 6B 33 78 23 9F 3B FA) - NSSL_SERVER_CERT_NINTENDO_CA_G2 = 101, - //! Nintendo CA - G3 - //! (SHA1: 68 A0 77 05 CC C7 A4 08 41 6E 0E D7 AD 65 F2 EC 3F EA 98 62) - NSSL_SERVER_CERT_NINTENDO_CA_G3 = 102, - //! Nintendo Class 2 CA - //! (SHA1: AA 8E F6 6A E0 F8 07 ED B8 41 C8 89 EE 36 66 A2 59 A2 8C CC) - NSSL_SERVER_CERT_NINTENDO_CLASS2_CA = 103, - //! Nintendo Class 2 CA - G2 - //! (SHA1: 03 9D E5 37 3A C6 5E 1A EE 89 8D 54 E7 56 35 76 EB BE 54 9B) - NSSL_SERVER_CERT_NINTENDO_CLASS2_CA_G2 = 104, - //! Nintendo Class 2 CA - G3 - //! (SHA1: FA B5 6C 4C C7 CF F5 07 1D 40 B6 B0 07 38 61 D2 90 CA 2A 1A) - NSSL_SERVER_CERT_NINTENDO_CLASS2_CA_G3 = 105, - //! Represents the last certificate in the Nintendo CA group. - NSSL_SERVER_CERT_GROUP_NINTENDO_LAST = 105, + //! Represents the first certificate in the Nintendo CA group. + NSSL_SERVER_CERT_GROUP_NINTENDO_FIRST = 100, + //! Nintendo CA + //! (SHA1: B5 22 94 55 DD 26 C1 F5 3C 73 06 0E 90 89 B3 91 38 9E 1F 75) + NSSL_SERVER_CERT_NINTENDO_CA = 100, + //! Nintendo CA - G2 + //! (SHA1: C6 0B 2A 5C C9 0F 06 30 CC A3 30 40 DF 6B 33 78 23 9F 3B FA) + NSSL_SERVER_CERT_NINTENDO_CA_G2 = 101, + //! Nintendo CA - G3 + //! (SHA1: 68 A0 77 05 CC C7 A4 08 41 6E 0E D7 AD 65 F2 EC 3F EA 98 62) + NSSL_SERVER_CERT_NINTENDO_CA_G3 = 102, + //! Nintendo Class 2 CA + //! (SHA1: AA 8E F6 6A E0 F8 07 ED B8 41 C8 89 EE 36 66 A2 59 A2 8C CC) + NSSL_SERVER_CERT_NINTENDO_CLASS2_CA = 103, + //! Nintendo Class 2 CA - G2 + //! (SHA1: 03 9D E5 37 3A C6 5E 1A EE 89 8D 54 E7 56 35 76 EB BE 54 9B) + NSSL_SERVER_CERT_NINTENDO_CLASS2_CA_G2 = 104, + //! Nintendo Class 2 CA - G3 + //! (SHA1: FA B5 6C 4C C7 CF F5 07 1D 40 B6 B0 07 38 61 D2 90 CA 2A 1A) + NSSL_SERVER_CERT_NINTENDO_CLASS2_CA_G3 = 105, + //! Represents the last certificate in the Nintendo CA group. + NSSL_SERVER_CERT_GROUP_NINTENDO_LAST = 105, - //! Represents the first certificate in the commercial CA group. - NSSL_SERVER_CERT_GROUP_COMMERCIAL_FIRST = 1001, - //! Baltimore CyberTrust Root - //! (SHA1: D4 DE 20 D0 5E 66 FC 53 FE 1A 50 88 2C 78 DB 28 52 CA E4 74) - NSSL_SERVER_CERT_BALTIMORE_CYBERTRUST_ROOT_CA = 1001, - //! Cybertrust Global Root - //! (SHA1: 5F 43 E5 B1 BF F8 78 8C AC 1C C7 CA 4A 9A C6 22 2B CC 34 C6) - NSSL_SERVER_CERT_CYBERTRUST_GLOBAL_ROOT_CA = 1002, - //! Verizon Global Root - //! (SHA1: 91 21 98 EE F2 3D CA C4 09 39 31 2F EE 97 DD 56 0B AE 49 B1) - NSSL_SERVER_CERT_VERIZON_GLOBAL_ROOT_CA = 1003, - //! GlobalSign Root CA - //! (SHA1: B1 BC 96 8B D4 F4 9D 62 2A A8 9A 81 F2 15 01 52 A4 1D 82 9C) - NSSL_SERVER_CERT_GLOBALSIGN_ROOT_CA = 1004, - //! GlobalSign - //! (SHA1: 75 E0 AB B6 13 85 12 27 1C 04 F8 5F DD DE 38 E4 B7 24 2E FE) - NSSL_SERVER_CERT_GLOBALSIGN_ROOT_CA_R2 = 1005, - //! GlobalSign - //! (SHA1: D6 9B 56 11 48 F0 1C 77 C5 45 78 C1 09 26 DF 5B 85 69 76 AD) - NSSL_SERVER_CERT_GLOBALSIGN_ROOT_CA_R3 = 1006, - //! VeriSign Class 3 Public Primary Certification Authority - G3 - //! (SHA1: 13 2D 0D 45 53 4B 69 97 CD B2 D5 C3 39 E2 55 76 60 9B 5C C6) - NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA_G3 = 1007, - //! VeriSign Universal Root Certification Authority - //! (SHA1: 36 79 CA 35 66 87 72 30 4D 30 A5 FB 87 3B 0F A7 7B B7 0D 54) - NSSL_SERVER_CERT_VERISIGN_UNIVERSAL_ROOT_CA = 1008, - //! VeriSign Class 3 Public Primary Certification Authority - G5 - //! (SHA1: 4E B6 D5 78 49 9B 1C CF 5F 58 1E AD 56 BE 3D 9B 67 44 A5 E5) - NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA_G5 = 1009, - //! thawte Primary Root CA - G3 - //! (SHA1: F1 8B 53 8D 1B E9 03 B6 A6 F0 56 43 5B 17 15 89 CA F3 6B F2) - NSSL_SERVER_CERT_THAWTE_PRIMARY_ROOT_CA_G3 = 1010, - //! thawte Primary Root CA - //! (SHA1: 91 C6 D6 EE 3E 8A C8 63 84 E5 48 C2 99 29 5C 75 6C 81 7B 81) - NSSL_SERVER_CERT_THAWTE_PRIMARY_ROOT_CA = 1011, - //! GeoTrust Global CA - //! (SHA1: DE 28 F4 A4 FF E5 B9 2F A3 C5 03 D1 A3 49 A7 F9 96 2A 82 12) - NSSL_SERVER_CERT_GEOTRUST_GLOBAL_CA = 1012, - //! GeoTrust Global CA 2 - //! (SHA1: A9 E9 78 08 14 37 58 88 F2 05 19 B0 6D 2B 0D 2B 60 16 90 7D) - NSSL_SERVER_CERT_GEOTRUST_GLOBAL_CA2 = 1013, - //! GeoTrust Primary Certification Authority - //! (SHA1: 32 3C 11 8E 1B F7 B8 B6 52 54 E2 E2 10 0D D6 02 90 37 F0 96) - NSSL_SERVER_CERT_GEOTRUST_PRIMARY_CA = 1014, - //! GeoTrust Primary Certification Authority - G3 - //! (SHA1: 03 9E ED B8 0B E7 A0 3C 69 53 89 3B 20 D2 D9 32 3A 4C 2A FD) - NSSL_SERVER_CERT_GEOTRUST_PRIMARY_CA_G3 = 1015, - //! AddTrust External CA Root - //! (SHA1: 02 FA F3 E2 91 43 54 68 60 78 57 69 4D F5 E4 5B 68 85 18 68) - NSSL_SERVER_CERT_ADDTRUST_EXT_CA_ROOT = 1016, - //! COMODO Certification Authority - //! (SHA1: EE 86 93 87 FF FD 83 49 AB 5A D1 43 22 58 87 89 A4 57 B0 12) - NSSL_SERVER_CERT_COMODO_CA = 1017, - //! UTN - DATACorp SGC - //! (SHA1: 58 11 9F 0E 12 82 87 EA 50 FD D9 87 45 6F 4F 78 DC FA D6 D4) - NSSL_SERVER_CERT_UTN_DATACORP_SGC_CA = 1018, - //! UTN-USERFirst-Hardware - //! (SHA1: 04 83 ED 33 99 AC 36 08 05 87 22 ED BC 5E 46 00 E3 BE F9 D7) - NSSL_SERVER_CERT_UTN_USERFIRST_HARDWARE_CA = 1019, - //! DigiCert High Assurance EV Root CA - //! (SHA1: 5F B7 EE 06 33 E2 59 DB AD 0C 4C 9A E6 D3 8F 1A 61 C7 DC 25) - NSSL_SERVER_CERT_DIGICERT_HIGH_ASSURANCE_EV_ROOT_CA = 1020, - //! DigiCert Assured ID Root CA - //! (SHA1: 05 63 B8 63 0D 62 D7 5A BB C8 AB 1E 4B DF B5 A8 99 B2 4D 43) - NSSL_SERVER_CERT_DIGICERT_ASSURED_ID_ROOT_CA = 1021, - //! DigiCert Global Root CA - //! (SHA1: A8 98 5D 3A 65 E5 E5 C4 B2 D7 D6 6D 40 C6 DD 2F B1 9C 54 36) - NSSL_SERVER_CERT_DIGICERT_GLOBAL_ROOT_CA = 1022, - //! GTE CyberTrust Global Root - //! (SHA1: 97 81 79 50 D8 1C 96 70 CC 34 D8 09 CF 79 44 31 36 7E F4 74) - NSSL_SERVER_CERT_GTE_CYBERTRUST_GLOBAL_ROOT = 1023, - //! [No common name] - //! (SHA1: A1 DB 63 93 91 6F 17 E4 18 55 09 40 04 15 C7 02 40 B0 AE 6B) - NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA = 1024, - //! Thawte Premium Server CA - //! (SHA1: 62 7F 8D 78 27 65 63 99 D2 7D 7F 90 44 C9 FE B3 F3 3E FA 9A) - NSSL_SERVER_CERT_THAWTE_PREMIUM_SERVER_CA = 1025, - //! [No common name] - //! (SHA1: D2 32 09 AD 23 D3 14 23 21 74 E4 0D 7F 9D 62 13 97 86 63 3A) - NSSL_SERVER_CERT_EQUIFAX_SECURE_CA = 1026, - //! Entrust.net Secure Server Certification Authority - //! (SHA1: 99 A6 9B E6 1A FE 88 6B 4D 2B 82 00 7C B8 54 FC 31 7E 15 39) - NSSL_SERVER_CERT_ENTRUST_SECURE_SERVER_CA = 1027, - //! [No common name] - //! (SHA1: 85 37 1C A6 E5 50 14 3D CE 28 03 47 1B DE 3A 09 E8 F8 77 0F) - NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA_G2 = 1028, - //! Entrust.net Certification Authority (2048) - //! (SHA1: 50 30 06 09 1D 97 D4 F5 AE 39 F7 CB E7 92 7D 7D 65 2D 34 31) - NSSL_SERVER_CERT_ENTRUST_CA_2048 = 1029, - //! Entrust Root Certification Authority - //! (SHA1: B3 1E B1 B7 40 E3 6C 84 02 DA DC 37 D4 4D F5 D4 67 49 52 F9) - NSSL_SERVER_CERT_ENTRUST_ROOT_CA = 1030, - //! Entrust Root Certification Authority - G2 - //! (SHA1: 8C F4 27 FD 79 0C 3A D1 66 06 8D E8 1E 57 EF BB 93 22 72 D4) - NSSL_SERVER_CERT_ENTRUST_ROOT_CA_G2 = 1031, - //! DigiCert Assured ID Root G2 - //! (SHA1: A1 4B 48 D9 43 EE 0A 0E 40 90 4F 3C E0 A4 C0 91 93 51 5D 3F) - NSSL_SERVER_CERT_DIGICERT_ASSURED_ID_ROOT_CA_G2 = 1032, - //! DigiCert Global Root G2 - //! (SHA1: DF 3C 24 F9 BF D6 66 76 1B 26 80 73 FE 06 D1 CC 8D 4F 82 A4) - NSSL_SERVER_CERT_DIGICERT_GLOBAL_ROOT_CA_G2 = 1033, - //! Represents the last certificate in the commerical CA group. - NSSL_SERVER_CERT_GROUP_COMMERCIAL_LAST = 1033, + //! Represents the first certificate in the commercial CA group. + NSSL_SERVER_CERT_GROUP_COMMERCIAL_FIRST = 1001, + //! Baltimore CyberTrust Root + //! (SHA1: D4 DE 20 D0 5E 66 FC 53 FE 1A 50 88 2C 78 DB 28 52 CA E4 74) + NSSL_SERVER_CERT_BALTIMORE_CYBERTRUST_ROOT_CA = 1001, + //! Cybertrust Global Root + //! (SHA1: 5F 43 E5 B1 BF F8 78 8C AC 1C C7 CA 4A 9A C6 22 2B CC 34 C6) + NSSL_SERVER_CERT_CYBERTRUST_GLOBAL_ROOT_CA = 1002, + //! Verizon Global Root + //! (SHA1: 91 21 98 EE F2 3D CA C4 09 39 31 2F EE 97 DD 56 0B AE 49 B1) + NSSL_SERVER_CERT_VERIZON_GLOBAL_ROOT_CA = 1003, + //! GlobalSign Root CA + //! (SHA1: B1 BC 96 8B D4 F4 9D 62 2A A8 9A 81 F2 15 01 52 A4 1D 82 9C) + NSSL_SERVER_CERT_GLOBALSIGN_ROOT_CA = 1004, + //! GlobalSign + //! (SHA1: 75 E0 AB B6 13 85 12 27 1C 04 F8 5F DD DE 38 E4 B7 24 2E FE) + NSSL_SERVER_CERT_GLOBALSIGN_ROOT_CA_R2 = 1005, + //! GlobalSign + //! (SHA1: D6 9B 56 11 48 F0 1C 77 C5 45 78 C1 09 26 DF 5B 85 69 76 AD) + NSSL_SERVER_CERT_GLOBALSIGN_ROOT_CA_R3 = 1006, + //! VeriSign Class 3 Public Primary Certification Authority - G3 + //! (SHA1: 13 2D 0D 45 53 4B 69 97 CD B2 D5 C3 39 E2 55 76 60 9B 5C C6) + NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA_G3 = 1007, + //! VeriSign Universal Root Certification Authority + //! (SHA1: 36 79 CA 35 66 87 72 30 4D 30 A5 FB 87 3B 0F A7 7B B7 0D 54) + NSSL_SERVER_CERT_VERISIGN_UNIVERSAL_ROOT_CA = 1008, + //! VeriSign Class 3 Public Primary Certification Authority - G5 + //! (SHA1: 4E B6 D5 78 49 9B 1C CF 5F 58 1E AD 56 BE 3D 9B 67 44 A5 E5) + NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA_G5 = 1009, + //! thawte Primary Root CA - G3 + //! (SHA1: F1 8B 53 8D 1B E9 03 B6 A6 F0 56 43 5B 17 15 89 CA F3 6B F2) + NSSL_SERVER_CERT_THAWTE_PRIMARY_ROOT_CA_G3 = 1010, + //! thawte Primary Root CA + //! (SHA1: 91 C6 D6 EE 3E 8A C8 63 84 E5 48 C2 99 29 5C 75 6C 81 7B 81) + NSSL_SERVER_CERT_THAWTE_PRIMARY_ROOT_CA = 1011, + //! GeoTrust Global CA + //! (SHA1: DE 28 F4 A4 FF E5 B9 2F A3 C5 03 D1 A3 49 A7 F9 96 2A 82 12) + NSSL_SERVER_CERT_GEOTRUST_GLOBAL_CA = 1012, + //! GeoTrust Global CA 2 + //! (SHA1: A9 E9 78 08 14 37 58 88 F2 05 19 B0 6D 2B 0D 2B 60 16 90 7D) + NSSL_SERVER_CERT_GEOTRUST_GLOBAL_CA2 = 1013, + //! GeoTrust Primary Certification Authority + //! (SHA1: 32 3C 11 8E 1B F7 B8 B6 52 54 E2 E2 10 0D D6 02 90 37 F0 96) + NSSL_SERVER_CERT_GEOTRUST_PRIMARY_CA = 1014, + //! GeoTrust Primary Certification Authority - G3 + //! (SHA1: 03 9E ED B8 0B E7 A0 3C 69 53 89 3B 20 D2 D9 32 3A 4C 2A FD) + NSSL_SERVER_CERT_GEOTRUST_PRIMARY_CA_G3 = 1015, + //! AddTrust External CA Root + //! (SHA1: 02 FA F3 E2 91 43 54 68 60 78 57 69 4D F5 E4 5B 68 85 18 68) + NSSL_SERVER_CERT_ADDTRUST_EXT_CA_ROOT = 1016, + //! COMODO Certification Authority + //! (SHA1: EE 86 93 87 FF FD 83 49 AB 5A D1 43 22 58 87 89 A4 57 B0 12) + NSSL_SERVER_CERT_COMODO_CA = 1017, + //! UTN - DATACorp SGC + //! (SHA1: 58 11 9F 0E 12 82 87 EA 50 FD D9 87 45 6F 4F 78 DC FA D6 D4) + NSSL_SERVER_CERT_UTN_DATACORP_SGC_CA = 1018, + //! UTN-USERFirst-Hardware + //! (SHA1: 04 83 ED 33 99 AC 36 08 05 87 22 ED BC 5E 46 00 E3 BE F9 D7) + NSSL_SERVER_CERT_UTN_USERFIRST_HARDWARE_CA = 1019, + //! DigiCert High Assurance EV Root CA + //! (SHA1: 5F B7 EE 06 33 E2 59 DB AD 0C 4C 9A E6 D3 8F 1A 61 C7 DC 25) + NSSL_SERVER_CERT_DIGICERT_HIGH_ASSURANCE_EV_ROOT_CA = 1020, + //! DigiCert Assured ID Root CA + //! (SHA1: 05 63 B8 63 0D 62 D7 5A BB C8 AB 1E 4B DF B5 A8 99 B2 4D 43) + NSSL_SERVER_CERT_DIGICERT_ASSURED_ID_ROOT_CA = 1021, + //! DigiCert Global Root CA + //! (SHA1: A8 98 5D 3A 65 E5 E5 C4 B2 D7 D6 6D 40 C6 DD 2F B1 9C 54 36) + NSSL_SERVER_CERT_DIGICERT_GLOBAL_ROOT_CA = 1022, + //! GTE CyberTrust Global Root + //! (SHA1: 97 81 79 50 D8 1C 96 70 CC 34 D8 09 CF 79 44 31 36 7E F4 74) + NSSL_SERVER_CERT_GTE_CYBERTRUST_GLOBAL_ROOT = 1023, + //! [No common name] + //! (SHA1: A1 DB 63 93 91 6F 17 E4 18 55 09 40 04 15 C7 02 40 B0 AE 6B) + NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA = 1024, + //! Thawte Premium Server CA + //! (SHA1: 62 7F 8D 78 27 65 63 99 D2 7D 7F 90 44 C9 FE B3 F3 3E FA 9A) + NSSL_SERVER_CERT_THAWTE_PREMIUM_SERVER_CA = 1025, + //! [No common name] + //! (SHA1: D2 32 09 AD 23 D3 14 23 21 74 E4 0D 7F 9D 62 13 97 86 63 3A) + NSSL_SERVER_CERT_EQUIFAX_SECURE_CA = 1026, + //! Entrust.net Secure Server Certification Authority + //! (SHA1: 99 A6 9B E6 1A FE 88 6B 4D 2B 82 00 7C B8 54 FC 31 7E 15 39) + NSSL_SERVER_CERT_ENTRUST_SECURE_SERVER_CA = 1027, + //! [No common name] + //! (SHA1: 85 37 1C A6 E5 50 14 3D CE 28 03 47 1B DE 3A 09 E8 F8 77 0F) + NSSL_SERVER_CERT_VERISIGN_CLASS3_PUBLIC_PRIMARY_CA_G2 = 1028, + //! Entrust.net Certification Authority (2048) + //! (SHA1: 50 30 06 09 1D 97 D4 F5 AE 39 F7 CB E7 92 7D 7D 65 2D 34 31) + NSSL_SERVER_CERT_ENTRUST_CA_2048 = 1029, + //! Entrust Root Certification Authority + //! (SHA1: B3 1E B1 B7 40 E3 6C 84 02 DA DC 37 D4 4D F5 D4 67 49 52 F9) + NSSL_SERVER_CERT_ENTRUST_ROOT_CA = 1030, + //! Entrust Root Certification Authority - G2 + //! (SHA1: 8C F4 27 FD 79 0C 3A D1 66 06 8D E8 1E 57 EF BB 93 22 72 D4) + NSSL_SERVER_CERT_ENTRUST_ROOT_CA_G2 = 1031, + //! DigiCert Assured ID Root G2 + //! (SHA1: A1 4B 48 D9 43 EE 0A 0E 40 90 4F 3C E0 A4 C0 91 93 51 5D 3F) + NSSL_SERVER_CERT_DIGICERT_ASSURED_ID_ROOT_CA_G2 = 1032, + //! DigiCert Global Root G2 + //! (SHA1: DF 3C 24 F9 BF D6 66 76 1B 26 80 73 FE 06 D1 CC 8D 4F 82 A4) + NSSL_SERVER_CERT_DIGICERT_GLOBAL_ROOT_CA_G2 = 1033, + //! Represents the last certificate in the commerical CA group. + NSSL_SERVER_CERT_GROUP_COMMERCIAL_LAST = 1033, - //! Represents the first certificate in the 4096-bit commercial CA group. - NSSL_SERVER_CERT_GROUP_COMMERCIAL_4096_FIRST = 1900, - //! COMODO RSA Certification Authority - //! (SHA1: AF E5 D2 44 A8 D1 19 42 30 FF 47 9F E2 F8 97 BB CD 7A 8C B4) - NSSL_SERVER_CERT_COMODO_RSA_CA = 1900, - //! USERTrust RSA Certification Authority - //! (SHA1: 2B 8F 1B 57 33 0D BB A2 D0 7A 6C 51 F7 0E E9 0D DA B9 AD 8E) - NSSL_SERVER_CERT_USERTRUST_RSA_CA = 1901, - //! Represents the last certificate in the 4096-bit commercial CA group. - NSSL_SERVER_CERT_GROUP_COMMERCIAL_4096_LAST = 1901, + //! Represents the first certificate in the 4096-bit commercial CA group. + NSSL_SERVER_CERT_GROUP_COMMERCIAL_4096_FIRST = 1900, + //! COMODO RSA Certification Authority + //! (SHA1: AF E5 D2 44 A8 D1 19 42 30 FF 47 9F E2 F8 97 BB CD 7A 8C B4) + NSSL_SERVER_CERT_COMODO_RSA_CA = 1900, + //! USERTrust RSA Certification Authority + //! (SHA1: 2B 8F 1B 57 33 0D BB A2 D0 7A 6C 51 F7 0E E9 0D DA B9 AD 8E) + NSSL_SERVER_CERT_USERTRUST_RSA_CA = 1901, + //! Represents the last certificate in the 4096-bit commercial CA group. + NSSL_SERVER_CERT_GROUP_COMMERCIAL_4096_LAST = 1901, } NSSLServerCertId; /** diff --git a/include/nsysnet/socket.h b/include/nsysnet/socket.h index 0d7c04bfc..21ac8f265 100644 --- a/include/nsysnet/socket.h +++ b/include/nsysnet/socket.h @@ -1,13 +1,13 @@ #pragma once -#include +#include +#include +#include #include +#include #include #include -#include -#include -#include #include -#include +#include #warning "nsysnet/socket.h is deprecated; please use standard socket headers instead." @@ -15,18 +15,16 @@ extern "C" { #endif -#define NSN_EAGAIN EAGAIN -#define NSN_EWOULDBLOCK EWOULDBLOCK +#define NSN_EAGAIN EAGAIN +#define NSN_EWOULDBLOCK EWOULDBLOCK -__attribute__ ((deprecated)) -static inline int +__attribute__((deprecated)) static inline int socketclose(int sockfd) { return close(sockfd); } -__attribute__ ((deprecated)) -static inline int +__attribute__((deprecated)) static inline int socketlasterr() { return errno; @@ -35,4 +33,3 @@ socketlasterr() #ifdef __cplusplus } #endif - diff --git a/include/nsysuhs/uhs.h b/include/nsysuhs/uhs.h index 6530fd207..6a98990d8 100644 --- a/include/nsysuhs/uhs.h +++ b/include/nsysuhs/uhs.h @@ -1,6 +1,6 @@ #pragma once +#include #include -#include #ifdef __cplusplus extern "C" { @@ -15,38 +15,38 @@ typedef struct UhsHandle UhsHandle; typedef struct UhsConfig UhsConfig; /* Determines which interface parameters to check */ -#define MATCH_ANY 0x000 -#define MATCH_DEV_VID 0x001 -#define MATCH_DEV_PID 0x002 -#define MATCH_DEV_CLASS 0x010 -#define MATCH_DEV_SUBCLASS 0x020 -#define MATCH_DEV_PROTOCOL 0x040 -#define MATCH_IF_CLASS 0x080 -#define MATCH_IF_SUBCLASS 0x100 -#define MATCH_IF_PROTOCOL 0x200 +#define MATCH_ANY 0x000 +#define MATCH_DEV_VID 0x001 +#define MATCH_DEV_PID 0x002 +#define MATCH_DEV_CLASS 0x010 +#define MATCH_DEV_SUBCLASS 0x020 +#define MATCH_DEV_PROTOCOL 0x040 +#define MATCH_IF_CLASS 0x080 +#define MATCH_IF_SUBCLASS 0x100 +#define MATCH_IF_PROTOCOL 0x200 typedef enum UHSStatus { - UHS_STATUS_OK = 0, - UHS_STATUS_HANDLE_INVALID_ARGS = 0xffdefffd, - UHS_STATUS_HANDLE_INVALID_STATE = 0xffdefffc, + UHS_STATUS_OK = 0, + UHS_STATUS_HANDLE_INVALID_ARGS = 0xffdefffd, + UHS_STATUS_HANDLE_INVALID_STATE = 0xffdefffc, } UHSStatus; typedef enum UHSHandleState { - UHS_HANDLE_STATE_INIT = 0x00, - UHS_HANDLE_STATE_OPENING = 0x01, - UHS_HANDLE_STATE_OPENED = 0x02, - UHS_HANDLE_STATE_CLOSING = 0x03, - UHS_HANDLE_STATE_CLOSED = 0x04, - UHS_HANDLE_STATE_ERROR = 0x05, + UHS_HANDLE_STATE_INIT = 0x00, + UHS_HANDLE_STATE_OPENING = 0x01, + UHS_HANDLE_STATE_OPENED = 0x02, + UHS_HANDLE_STATE_CLOSING = 0x03, + UHS_HANDLE_STATE_CLOSED = 0x04, + UHS_HANDLE_STATE_ERROR = 0x05, } UHSHandleState; struct WUT_PACKED UhsConfig { - uint32_t controller_num; - void* buffer; - uint32_t buffer_size; + uint32_t controller_num; + void *buffer; + uint32_t buffer_size; }; WUT_CHECK_OFFSET(UhsConfig, 0x00, controller_num); WUT_CHECK_OFFSET(UhsConfig, 0x04, buffer); @@ -55,12 +55,12 @@ WUT_CHECK_SIZE(UhsConfig, 0x0C); struct WUT_PACKED UhsHandle { - UHSHandleState state; - void* ipc_buffer; - WUT_UNKNOWN_BYTES(4); /* always 0xFFFFFFFF after init */ - uint32_t handle; - UhsConfig * config; - WUT_UNKNOWN_BYTES(4); + UHSHandleState state; + void *ipc_buffer; + WUT_UNKNOWN_BYTES(4); /* always 0xFFFFFFFF after init */ + uint32_t handle; + UhsConfig *config; + WUT_UNKNOWN_BYTES(4); }; WUT_CHECK_OFFSET(UhsHandle, 0x00, state); WUT_CHECK_OFFSET(UhsHandle, 0x04, ipc_buffer); @@ -69,25 +69,25 @@ WUT_CHECK_OFFSET(UhsHandle, 0x10, config); WUT_CHECK_SIZE(UhsHandle, 0x18); /* Endpoint transfer directions */ -#define ENDPOINT_TRANSFER_OUT 1 -#define ENDPOINT_TRANSFER_IN 2 +#define ENDPOINT_TRANSFER_OUT 1 +#define ENDPOINT_TRANSFER_IN 2 /* Special timeout values */ -#define TIMEOUT_NONE -1 - +#define TIMEOUT_NONE -1 + /* Interface filter */ struct WUT_PACKED UhsInterfaceFilter { - uint16_t match_params; /* Bitmask of above flags */ - uint16_t vid; /* Vendor ID */ - uint16_t pid; /* Product ID */ - WUT_UNKNOWN_BYTES(4); - uint8_t dev_class; /* Device class */ - uint8_t dev_subclass; /* Device subclass */ - uint8_t dev_protocol; /* Device protocol */ - uint8_t if_class; /* Interface class */ - uint8_t if_subclass; /* Interface subclass */ - uint8_t if_protocol; /* Interface protocol */ + uint16_t match_params; /* Bitmask of above flags */ + uint16_t vid; /* Vendor ID */ + uint16_t pid; /* Product ID */ + WUT_UNKNOWN_BYTES(4); + uint8_t dev_class; /* Device class */ + uint8_t dev_subclass; /* Device subclass */ + uint8_t dev_protocol; /* Device protocol */ + uint8_t if_class; /* Interface class */ + uint8_t if_subclass; /* Interface subclass */ + uint8_t if_protocol; /* Interface protocol */ }; WUT_CHECK_OFFSET(UhsInterfaceFilter, 0x00, match_params); WUT_CHECK_OFFSET(UhsInterfaceFilter, 0x02, vid); @@ -104,13 +104,13 @@ WUT_CHECK_SIZE(UhsInterfaceFilter, 0x10); /* Interface profile */ struct WUT_PACKED UhsEndpointDescriptor { - uint8_t bLength; - uint8_t bDescriptorType; - uint8_t bEndpointAddress; - uint8_t bmAttributes; - uint16_t wMaxPacketSize; - uint8_t bInterval; - WUT_UNKNOWN_BYTES(0x2); + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bEndpointAddress; + uint8_t bmAttributes; + uint16_t wMaxPacketSize; + uint8_t bInterval; + WUT_UNKNOWN_BYTES(0x2); }; WUT_CHECK_OFFSET(UhsEndpointDescriptor, 0x00, bLength); WUT_CHECK_OFFSET(UhsEndpointDescriptor, 0x01, bDescriptorType); @@ -123,13 +123,13 @@ WUT_CHECK_SIZE(UhsEndpointDescriptor, 0x09); /* Interface profile */ struct WUT_PACKED UhsInterfaceProfile { - uint32_t if_handle; - WUT_UNKNOWN_BYTES(0x24); - UhsDeviceDescriptor dev_desc; - UhsConfigDescriptor cfg_desc; - UhsInterfaceDescriptor if_desc; - UhsEndpointDescriptor in_endpoints[16]; - UhsEndpointDescriptor out_endpoints[16]; + uint32_t if_handle; + WUT_UNKNOWN_BYTES(0x24); + UhsDeviceDescriptor dev_desc; + UhsConfigDescriptor cfg_desc; + UhsInterfaceDescriptor if_desc; + UhsEndpointDescriptor in_endpoints[16]; + UhsEndpointDescriptor out_endpoints[16]; }; WUT_CHECK_OFFSET(UhsInterfaceProfile, 0x00, if_handle); WUT_CHECK_OFFSET(UhsInterfaceProfile, 0x28, dev_desc); @@ -140,102 +140,111 @@ WUT_CHECK_OFFSET(UhsInterfaceProfile, 0xdc, out_endpoints); WUT_CHECK_SIZE(UhsInterfaceProfile, 0x16C); /* Open a specific controller under /dev/uhs */ -UHSStatus UhsClientOpen(UhsHandle* handle, - UhsConfig* config); +UHSStatus +UhsClientOpen(UhsHandle *handle, + UhsConfig *config); -UHSStatus UhsClientClose(UhsHandle* handle); +UHSStatus +UhsClientClose(UhsHandle *handle); -typedef void(*UHSDrvRegCallback)(void * context, UhsInterfaceProfile * profile); +typedef void (*UHSDrvRegCallback)(void *context, UhsInterfaceProfile *profile); /* Register a USB class driver */ -UHSStatus -UhsClassDrvReg(UhsHandle* handle, - UhsInterfaceFilter *filter, - void *context, +UHSStatus +UhsClassDrvReg(UhsHandle *handle, + UhsInterfaceFilter *filter, + void *context, UHSDrvRegCallback callback); -UHSStatus UhsGetFullConfigDescriptor(UhsHandle* handle, - uint32_t if_handle, - void* data, - uint32_t size); - +UHSStatus +UhsGetFullConfigDescriptor(UhsHandle *handle, + uint32_t if_handle, + void *data, + uint32_t size); + /* Determine which USB device interfaces are plugged in and available */ -UHSStatus -UhsQueryInterfaces(UhsHandle* handle, - UhsInterfaceFilter *filter, - UhsInterfaceProfile *profiles, +UHSStatus +UhsQueryInterfaces(UhsHandle *handle, + UhsInterfaceFilter *filter, + UhsInterfaceProfile *profiles, int32_t max_profiles); -typedef void(*UhsAcquireInterfaceCallback)(void * context, int32_t arg1, int32_t arg2); +typedef void (*UhsAcquireInterfaceCallback)(void *context, int32_t arg1, int32_t arg2); /* Acquire a USB device interface for use */ -UHSStatus -UhsAcquireInterface(UhsHandle* handle, - uint32_t if_handle, - void * context, +UHSStatus +UhsAcquireInterface(UhsHandle *handle, + uint32_t if_handle, + void *context, UhsAcquireInterfaceCallback callback); /* Release a currently-held USB device interface */ -UHSStatus -UhsReleaseInterface(UhsHandle* handle, - uint32_t if_handle, +UHSStatus +UhsReleaseInterface(UhsHandle *handle, + uint32_t if_handle, bool no_reacquire); /* Administer a USB device */ -UHSStatus -UhsAdministerDevice(UhsHandle* handle, - uint32_t if_handle, - int32_t arg2, - int32_t arg3); +UHSStatus +UhsAdministerDevice(UhsHandle *handle, + uint32_t if_handle, + int32_t arg2, + int32_t arg3); /* Submit a control request to endpoint 0 */ -UHSStatus -UhsSubmitControlRequest(UhsHandle* handle, - uint32_t if_handle, - void *buffer, - uint8_t bRequest, - uint8_t bmRequestType, - uint16_t wValue, - uint16_t wIndex, - uint16_t wLength, +UHSStatus +UhsSubmitControlRequest(UhsHandle *handle, + uint32_t if_handle, + void *buffer, + uint8_t bRequest, + uint8_t bmRequestType, + uint16_t wValue, + uint16_t wIndex, + uint16_t wLength, int32_t timeout); /* Submit a bulk request to an endpoint */ -UHSStatus -UhsSubmitBulkRequest(UhsHandle* handle, - uint32_t if_handle, - uint8_t endpoint, - int32_t direction, - void *buffer, - int32_t length, +UHSStatus +UhsSubmitBulkRequest(UhsHandle *handle, + uint32_t if_handle, + uint8_t endpoint, + int32_t direction, + void *buffer, + int32_t length, int32_t timeout); - + UHSStatus -UhsAdministerEndpoint(UhsHandle* handle, +UhsAdministerEndpoint(UhsHandle *handle, uint32_t if_handle, uint32_t u1, uint32_t endpointMask, int32_t u2, uint32_t u3); -static inline uint32_t UHSEndpointDirIsIn(UhsEndpointDescriptor * endpoint_descriptor){ - return ((endpoint_descriptor->bEndpointAddress & 0x80) == 0x80); +static inline uint32_t +UHSEndpointDirIsIn(UhsEndpointDescriptor *endpoint_descriptor) +{ + return ((endpoint_descriptor->bEndpointAddress & 0x80) == 0x80); } -static inline uint32_t UHSEndpointGetNum(UhsEndpointDescriptor * endpoint_descriptor){ - return (endpoint_descriptor->bEndpointAddress & 0x0F); +static inline uint32_t +UHSEndpointGetNum(UhsEndpointDescriptor *endpoint_descriptor) +{ + return (endpoint_descriptor->bEndpointAddress & 0x0F); } -static inline uint32_t UHSEndpointGetMask(UhsEndpointDescriptor * endpoint_descriptor){ - uint32_t endpoint_mask; - - if (UHSEndpointDirIsIn(endpoint_descriptor)) { - endpoint_mask = (1 << (UHSEndpointGetNum(endpoint_descriptor) + 16)); - } else { - endpoint_mask = (1 << UHSEndpointGetNum(endpoint_descriptor)); - } - return endpoint_mask; +static inline uint32_t +UHSEndpointGetMask(UhsEndpointDescriptor *endpoint_descriptor) +{ + uint32_t endpoint_mask; + + if (UHSEndpointDirIsIn(endpoint_descriptor)) { + endpoint_mask = (1 << (UHSEndpointGetNum(endpoint_descriptor) + 16)); + } else { + endpoint_mask = (1 << UHSEndpointGetNum(endpoint_descriptor)); + } + return endpoint_mask; } #ifdef __cplusplus diff --git a/include/nsysuhs/uhs_usbspec.h b/include/nsysuhs/uhs_usbspec.h index e1497754b..0810c4f28 100644 --- a/include/nsysuhs/uhs_usbspec.h +++ b/include/nsysuhs/uhs_usbspec.h @@ -6,10 +6,10 @@ extern "C" { #endif /* USB class codes */ -#define USBCLASS_DEVICE 0x00 -#define USBCLASS_AUDIO 0x01 -#define USBCLASS_HID 0x03 -#define USBCLASS_STORAGE 0x08 +#define USBCLASS_DEVICE 0x00 +#define USBCLASS_AUDIO 0x01 +#define USBCLASS_HID 0x03 +#define USBCLASS_STORAGE 0x08 typedef struct UhsDeviceDescriptor UhsDeviceDescriptor; typedef struct UhsConfigDescriptor UhsConfigDescriptor; @@ -19,20 +19,20 @@ typedef struct UhsSetupPacket UhsSetupPacket; /* USB device descriptor */ struct WUT_PACKED UhsDeviceDescriptor { - uint8_t bLength; - uint8_t bDescriptorType; - uint16_t bcdUsb; - uint8_t bDeviceClass; - uint8_t bDeviceSubclass; - uint8_t bDeviceProtocol; - uint8_t bMaxPacketSize; - uint16_t idVendor; - uint16_t idProduct; - uint16_t bcdDevice; - uint8_t iManufacturer; - uint8_t iProduct; - uint8_t iSerialNumber; - uint8_t bNumConfigurations; + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t bcdUsb; + uint8_t bDeviceClass; + uint8_t bDeviceSubclass; + uint8_t bDeviceProtocol; + uint8_t bMaxPacketSize; + uint16_t idVendor; + uint16_t idProduct; + uint16_t bcdDevice; + uint8_t iManufacturer; + uint8_t iProduct; + uint8_t iSerialNumber; + uint8_t bNumConfigurations; }; WUT_CHECK_OFFSET(UhsDeviceDescriptor, 0x00, bLength); WUT_CHECK_OFFSET(UhsDeviceDescriptor, 0x01, bDescriptorType); @@ -49,18 +49,18 @@ WUT_CHECK_OFFSET(UhsDeviceDescriptor, 0x0F, iProduct); WUT_CHECK_OFFSET(UhsDeviceDescriptor, 0x10, iSerialNumber); WUT_CHECK_OFFSET(UhsDeviceDescriptor, 0x11, bNumConfigurations); WUT_CHECK_SIZE(UhsDeviceDescriptor, 0x12); - + /* USB configuration descriptor */ struct WUT_PACKED UhsConfigDescriptor { - uint8_t bLength; - uint8_t bDescriptorType; - uint16_t wTotalLength; - uint8_t bNumInterfaces; - uint8_t bConfigurationValue; - uint8_t iConfiguration; - uint8_t bmAttributes; - uint8_t bMaxPower; + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t wTotalLength; + uint8_t bNumInterfaces; + uint8_t bConfigurationValue; + uint8_t iConfiguration; + uint8_t bmAttributes; + uint8_t bMaxPower; }; WUT_CHECK_OFFSET(UhsConfigDescriptor, 0x00, bLength); WUT_CHECK_OFFSET(UhsConfigDescriptor, 0x01, bDescriptorType); @@ -75,15 +75,15 @@ WUT_CHECK_SIZE(UhsConfigDescriptor, 0x09); /* USB interface descriptor */ struct WUT_PACKED UhsInterfaceDescriptor { - uint8_t bLength; - uint8_t bDescriptorType; - uint8_t bInterfaceNumber; - uint8_t bAlternateSetting; - uint8_t bNumEndpoints; - uint8_t bInterfaceClass; - uint8_t bInterfaceSubClass; - uint8_t bInterfaceProtocol; - uint8_t iInterface; + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bInterfaceNumber; + uint8_t bAlternateSetting; + uint8_t bNumEndpoints; + uint8_t bInterfaceClass; + uint8_t bInterfaceSubClass; + uint8_t bInterfaceProtocol; + uint8_t iInterface; }; WUT_CHECK_OFFSET(UhsInterfaceDescriptor, 0x00, bLength); WUT_CHECK_OFFSET(UhsInterfaceDescriptor, 0x01, bDescriptorType); @@ -99,11 +99,11 @@ WUT_CHECK_SIZE(UhsInterfaceDescriptor, 0x09); /* USB setup packet */ struct WUT_PACKED UhsSetupPacket { - uint8_t bmRequestType; - uint8_t bRequest; - uint16_t wValue; - uint16_t wIndex; - uint16_t wLength; + uint8_t bmRequestType; + uint8_t bRequest; + uint16_t wValue; + uint16_t wIndex; + uint16_t wLength; }; WUT_CHECK_OFFSET(UhsSetupPacket, 0x00, bmRequestType); WUT_CHECK_OFFSET(UhsSetupPacket, 0x01, bRequest); diff --git a/include/padscore/kpad.h b/include/padscore/kpad.h index 832b86fa1..384fefca2 100644 --- a/include/padscore/kpad.h +++ b/include/padscore/kpad.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup padscore_kpad KPAD @@ -218,14 +218,12 @@ WUT_CHECK_SIZE(KPADStatus, 0xF0); /** * Initialises the KPAD library for use. */ -void -KPADInit(); +void KPADInit(); /** * Cleans up and frees the KPAD library. */ -void -KPADShutdown(); +void KPADShutdown(); /** * Read data from the desired Wii Remote. diff --git a/include/padscore/wpad.h b/include/padscore/wpad.h index 68dc5a66d..d7fcb6acc 100644 --- a/include/padscore/wpad.h +++ b/include/padscore/wpad.h @@ -20,69 +20,69 @@ typedef struct WPADVec2D WPADVec2D; typedef enum WPADChan { //! Channel 0. - WPAD_CHAN_0 = 0, + WPAD_CHAN_0 = 0, //! Channel 1. - WPAD_CHAN_1 = 1, + WPAD_CHAN_1 = 1, //! Channel 2. - WPAD_CHAN_2 = 2, + WPAD_CHAN_2 = 2, //! Channel 3. - WPAD_CHAN_3 = 3, + WPAD_CHAN_3 = 3, } WPADChan; //! Data format. typedef enum WPADDataFormat { - WPAD_FMT_PRO_CONTROLLER = 22, + WPAD_FMT_PRO_CONTROLLER = 22, } WPADDataFormat; //! Extension type. typedef enum WPADExtensionType { //! Wii Remote with no extension. - WPAD_EXT_CORE = 0, + WPAD_EXT_CORE = 0, //! Nunchuk. - WPAD_EXT_NUNCHUK = 1, + WPAD_EXT_NUNCHUK = 1, //! Classic Controller. - WPAD_EXT_CLASSIC = 2, + WPAD_EXT_CLASSIC = 2, //! Motion Plus. - WPAD_EXT_MPLUS = 5, + WPAD_EXT_MPLUS = 5, //! Motion Plus with Nunchuk. - WPAD_EXT_MPLUS_NUNCHUK = 6, + WPAD_EXT_MPLUS_NUNCHUK = 6, //! Motion Plus with Classic Controller. - WPAD_EXT_MPLUS_CLASSIC = 7, + WPAD_EXT_MPLUS_CLASSIC = 7, //! Pro Controller. - WPAD_EXT_PRO_CONTROLLER = 31, + WPAD_EXT_PRO_CONTROLLER = 31, } WPADExtensionType; //! Wii Remote buttons. typedef enum WPADButton { //! The left button of the D-pad. - WPAD_BUTTON_LEFT = 0x0001, + WPAD_BUTTON_LEFT = 0x0001, //! The right button of the D-pad. - WPAD_BUTTON_RIGHT = 0x0002, + WPAD_BUTTON_RIGHT = 0x0002, //! The down button of the D-pad. - WPAD_BUTTON_DOWN = 0x0004, + WPAD_BUTTON_DOWN = 0x0004, //! The up button of the D-pad. - WPAD_BUTTON_UP = 0x0008, + WPAD_BUTTON_UP = 0x0008, //! The + button. - WPAD_BUTTON_PLUS = 0x0010, + WPAD_BUTTON_PLUS = 0x0010, //! The 2 button. - WPAD_BUTTON_2 = 0x0100, + WPAD_BUTTON_2 = 0x0100, //! The 1 button. - WPAD_BUTTON_1 = 0x0200, + WPAD_BUTTON_1 = 0x0200, //! The B button. - WPAD_BUTTON_B = 0x0400, + WPAD_BUTTON_B = 0x0400, //! The A button. - WPAD_BUTTON_A = 0x0800, + WPAD_BUTTON_A = 0x0800, //! The - button. - WPAD_BUTTON_MINUS = 0x1000, + WPAD_BUTTON_MINUS = 0x1000, //! The Z button on the Nunchuk extension. - WPAD_BUTTON_Z = 0x2000, + WPAD_BUTTON_Z = 0x2000, //! The C button on the Nunchuk extension. - WPAD_BUTTON_C = 0x4000, + WPAD_BUTTON_C = 0x4000, //! The HOME button. - WPAD_BUTTON_HOME = 0x8000, + WPAD_BUTTON_HOME = 0x8000, } WPADButton; //! Nunchuk buttons. @@ -157,57 +157,57 @@ typedef enum WPADClassicButton typedef enum WPADProButton { //! The up button of the D-pad. - WPAD_PRO_BUTTON_UP = 0x00000001, + WPAD_PRO_BUTTON_UP = 0x00000001, //! The left button of the D-pad. - WPAD_PRO_BUTTON_LEFT = 0x00000002, + WPAD_PRO_BUTTON_LEFT = 0x00000002, //! The ZR button. - WPAD_PRO_TRIGGER_ZR = 0x00000004, + WPAD_PRO_TRIGGER_ZR = 0x00000004, //! The X button. - WPAD_PRO_BUTTON_X = 0x00000008, + WPAD_PRO_BUTTON_X = 0x00000008, //! The A button. - WPAD_PRO_BUTTON_A = 0x00000010, + WPAD_PRO_BUTTON_A = 0x00000010, //! The Y button. - WPAD_PRO_BUTTON_Y = 0x00000020, + WPAD_PRO_BUTTON_Y = 0x00000020, //! The B button. - WPAD_PRO_BUTTON_B = 0x00000040, + WPAD_PRO_BUTTON_B = 0x00000040, //! The ZL button. - WPAD_PRO_TRIGGER_ZL = 0x00000080, + WPAD_PRO_TRIGGER_ZL = 0x00000080, //! Reserved. - WPAD_PRO_RESERVED = 0x00000100, + WPAD_PRO_RESERVED = 0x00000100, //! The right trigger button. - WPAD_PRO_TRIGGER_R = 0x00000200, + WPAD_PRO_TRIGGER_R = 0x00000200, //! The + button. - WPAD_PRO_BUTTON_PLUS = 0x00000400, + WPAD_PRO_BUTTON_PLUS = 0x00000400, //! The HOME button. - WPAD_PRO_BUTTON_HOME = 0x00000800, + WPAD_PRO_BUTTON_HOME = 0x00000800, //! The - button. - WPAD_PRO_BUTTON_MINUS = 0x00001000, + WPAD_PRO_BUTTON_MINUS = 0x00001000, //! The left trigger button. - WPAD_PRO_TRIGGER_L = 0x00002000, + WPAD_PRO_TRIGGER_L = 0x00002000, //! The down button of the D-pad. - WPAD_PRO_BUTTON_DOWN = 0x00004000, + WPAD_PRO_BUTTON_DOWN = 0x00004000, //! The right button of the D-pad. - WPAD_PRO_BUTTON_RIGHT = 0x00008000, + WPAD_PRO_BUTTON_RIGHT = 0x00008000, //! The right stick button. - WPAD_PRO_BUTTON_STICK_R = 0x00010000, + WPAD_PRO_BUTTON_STICK_R = 0x00010000, //! The left stick button. - WPAD_PRO_BUTTON_STICK_L = 0x00020000, + WPAD_PRO_BUTTON_STICK_L = 0x00020000, //! The emulated up button on the left stick. - WPAD_PRO_STICK_L_EMULATION_UP = 0x00200000, + WPAD_PRO_STICK_L_EMULATION_UP = 0x00200000, //! The emulated down button on the left stick. - WPAD_PRO_STICK_L_EMULATION_DOWN = 0x00100000, + WPAD_PRO_STICK_L_EMULATION_DOWN = 0x00100000, //! The emulated left button on the left stick. - WPAD_PRO_STICK_L_EMULATION_LEFT = 0x00040000, + WPAD_PRO_STICK_L_EMULATION_LEFT = 0x00040000, //! The emulated right button on the left stick. - WPAD_PRO_STICK_L_EMULATION_RIGHT = 0x00080000, + WPAD_PRO_STICK_L_EMULATION_RIGHT = 0x00080000, //! The emulated up button on the right stick. - WPAD_PRO_STICK_R_EMULATION_UP = 0x02000000, + WPAD_PRO_STICK_R_EMULATION_UP = 0x02000000, //! The emulated down button on the right stick. - WPAD_PRO_STICK_R_EMULATION_DOWN = 0x01000000, + WPAD_PRO_STICK_R_EMULATION_DOWN = 0x01000000, //! The emulated left button on the right stick. - WPAD_PRO_STICK_R_EMULATION_LEFT = 0x00400000, + WPAD_PRO_STICK_R_EMULATION_LEFT = 0x00400000, //! The emulated right button on the right stick. - WPAD_PRO_STICK_R_EMULATION_RIGHT = 0x00800000, + WPAD_PRO_STICK_R_EMULATION_RIGHT = 0x00800000, } WPADProButton; //! 2D vector. @@ -252,14 +252,12 @@ typedef void (*WPADConnectCallback)(WPADChan chan, int32_t status); /** * Initialises the WPAD library for use. */ -void -WPADInit(); +void WPADInit(); /** * Cleans up and frees the WPAD library. */ -void -WPADShutdown(); +void WPADShutdown(); int32_t WPADProbe(WPADChan chan, @@ -269,21 +267,16 @@ int32_t WPADSetDataFormat(WPADChan chan, WPADDataFormat format); -void -WPADEnableURCC(int32_t enable); +void WPADEnableURCC(int32_t enable); -void -WPADEnableWiiRemote(int32_t enable); +void WPADEnableWiiRemote(int32_t enable); -void -WPADRead(WPADChan chan, - void *data); +void WPADRead(WPADChan chan, + void *data); -void -WPADSetAutoSleepTime(uint8_t time); +void WPADSetAutoSleepTime(uint8_t time); -void -WPADDisconnect(WPADChan chan); +void WPADDisconnect(WPADChan chan); WPADConnectCallback WPADSetConnectCallback(WPADChan chan, diff --git a/include/poll.h b/include/poll.h index f601fc4b7..0a31c1870 100644 --- a/include/poll.h +++ b/include/poll.h @@ -1,11 +1,11 @@ #pragma once -#define POLLIN 0x01 -#define POLLPRI 0x02 -#define POLLOUT 0x04 -#define POLLERR 0x08 -#define POLLHUP 0x10 -#define POLLNVAL 0x20 +#define POLLIN 0x01 +#define POLLPRI 0x02 +#define POLLOUT 0x04 +#define POLLERR 0x08 +#define POLLHUP 0x10 +#define POLLNVAL 0x20 typedef unsigned long nfds_t; @@ -20,12 +20,10 @@ struct pollfd extern "C" { #endif -int -poll(struct pollfd *fds, - nfds_t nfds, - int timeout); +int poll(struct pollfd *fds, + nfds_t nfds, + int timeout); #ifdef __cplusplus } #endif - diff --git a/include/proc_ui/procui.h b/include/proc_ui/procui.h index 60fc5492c..e6f9c860d 100644 --- a/include/proc_ui/procui.h +++ b/include/proc_ui/procui.h @@ -97,8 +97,7 @@ ProcUICalcMemorySize(uint32_t unk); * does this block? * \endif */ -void -ProcUIClearCallbacks(); +void ProcUIClearCallbacks(); /** * Signifies to ProcUI that the current application has released all foreground @@ -122,8 +121,7 @@ ProcUIClearCallbacks(); * note that threads can't be suspended immediately * \endif */ -void -ProcUIDrawDoneRelease(); +void ProcUIDrawDoneRelease(); /** * Determines whether the application is in the foreground. @@ -135,8 +133,7 @@ ProcUIDrawDoneRelease(); * - #PROCUI_STATUS_IN_FOREGROUND * - ProcUIRegisterCallback() */ -BOOL -ProcUIInForeground(); +BOOL ProcUIInForeground(); /** * Determines whether the application is in shutdown and should quit. @@ -148,8 +145,7 @@ ProcUIInForeground(); * - #PROCUI_STATUS_EXITING * - ProcUIRegisterCallback() */ -BOOL -ProcUIInShutdown(); +BOOL ProcUIInShutdown(); /** * Initialises the ProcUI library for use. @@ -163,8 +159,7 @@ ProcUIInShutdown(); * - ProcUISetSaveCallback() * - ProcUIShutdown() */ -void -ProcUIInit(ProcUISaveCallback saveCallback); +void ProcUIInit(ProcUISaveCallback saveCallback); /** * Initialises the ProcUI library for use; using a save callback that takes @@ -182,9 +177,8 @@ ProcUIInit(ProcUISaveCallback saveCallback); * - ProcUISetSaveCallback() * - ProcUIShutdown() */ -void -ProcUIInitEx(ProcUISaveCallbackEx saveCallback, - void *arg); +void ProcUIInitEx(ProcUISaveCallbackEx saveCallback, + void *arg); /** * Determines whether the application is running. @@ -196,8 +190,7 @@ ProcUIInitEx(ProcUISaveCallbackEx saveCallback, * running? what does that actually mean? any state except exiting? * \endif */ -BOOL -ProcUIIsRunning(); +BOOL ProcUIIsRunning(); /** * Main runloop for ProcUI. This function processes messages from the OS and @@ -250,11 +243,10 @@ ProcUIProcessMessages(BOOL block); * higher-priority callbacks exec first? dunno * \endif */ -void -ProcUIRegisterCallback(ProcUICallbackType type, - ProcUICallback callback, - void *param, - uint32_t priority); +void ProcUIRegisterCallback(ProcUICallbackType type, + ProcUICallback callback, + void *param, + uint32_t priority); /** * Register a callback for certain ProcUI events, executed on the given core. @@ -277,12 +269,11 @@ ProcUIRegisterCallback(ProcUICallbackType type, * \sa * - ProcUIRegisterCallback() */ -void -ProcUIRegisterCallbackCore(ProcUICallbackType type, - ProcUICallback callback, - void *param, - uint32_t priority, - uint32_t core); +void ProcUIRegisterCallbackCore(ProcUICallbackType type, + ProcUICallback callback, + void *param, + uint32_t priority, + uint32_t core); /** * Sets the save callback. Unlike ProcUIInitEx(), this function can be called @@ -299,9 +290,8 @@ ProcUIRegisterCallbackCore(ProcUICallbackType type, * - OSSavesDone_ReadyToRelease() * - ProcUIInitEx() */ -void -ProcUISetSaveCallback(ProcUISaveCallbackEx saveCallback, - void *arg); +void ProcUISetSaveCallback(ProcUISaveCallbackEx saveCallback, + void *arg); /** * Shut down the ProcUI library for the current application. This should be @@ -311,8 +301,7 @@ ProcUISetSaveCallback(ProcUISaveCallbackEx saveCallback, * Do not attempt to use any ProcUI library functions after calling this * function, except for ProcUIInit() or ProcUIInitEx(). */ -void -ProcUIShutdown(); +void ProcUIShutdown(); /** * ProcUIProcessMessages(), but for secondary cores. diff --git a/include/sndcore2/core.h b/include/sndcore2/core.h index 1a4d49259..60dde803b 100644 --- a/include/sndcore2/core.h +++ b/include/sndcore2/core.h @@ -1,6 +1,6 @@ #pragma once -#include #include "result.h" +#include /** * \defgroup sndcore2_core Core @@ -16,7 +16,7 @@ extern "C" { typedef struct AXProfile AXProfile; typedef struct AXInitParams AXInitParams; -typedef void(*AXFrameCallback)(void); +typedef void (*AXFrameCallback)(void); //! A value from enum AX_INIT_RENDERER. typedef uint32_t AXInitRenderer; @@ -26,19 +26,19 @@ typedef uint32_t AXInitPipeline; enum AX_INIT_RENDERER { - AX_INIT_RENDERER_32KHZ = 0, - AX_INIT_RENDERER_48KHZ = 1, + AX_INIT_RENDERER_32KHZ = 0, + AX_INIT_RENDERER_48KHZ = 1, }; enum AX_INIT_PIPELINE { - AX_INIT_PIPELINE_SINGLE = 0, - AX_INIT_PIPELINE_FOUR_STAGE = 1, + AX_INIT_PIPELINE_SINGLE = 0, + AX_INIT_PIPELINE_FOUR_STAGE = 1, }; struct AXProfile { - // Unknown + // Unknown }; struct AXInitParams @@ -51,21 +51,16 @@ WUT_CHECK_OFFSET(AXInitParams, 0x00, renderer); WUT_CHECK_OFFSET(AXInitParams, 0x08, pipeline); WUT_CHECK_SIZE(AXInitParams, 0x0C); -void -AXInit(); +void AXInit(); -void -AXQuit(); +void AXQuit(); -void -AXInitWithParams(AXInitParams *params); +void AXInitWithParams(AXInitParams *params); -BOOL -AXIsInit(); +BOOL AXIsInit(); -void -AXInitProfile(AXProfile *profile, - uint32_t count); +void AXInitProfile(AXProfile *profile, + uint32_t count); uint32_t AXGetSwapProfile(AXProfile *profile, diff --git a/include/sndcore2/device.h b/include/sndcore2/device.h index 14817d98b..11fbe4820 100644 --- a/include/sndcore2/device.h +++ b/include/sndcore2/device.h @@ -1,6 +1,6 @@ #pragma once -#include #include "result.h" +#include /** * \defgroup sndcore2_device Device @@ -13,8 +13,8 @@ extern "C" { #endif -typedef void(*AXDeviceFinalMixCallback)(void*); -typedef void(*AXAuxCallback)(void*, void*); +typedef void (*AXDeviceFinalMixCallback)(void *); +typedef void (*AXAuxCallback)(void *, void *); //! A value from enum AX_DEVICE_MODE. typedef uint32_t AXDeviceMode; @@ -30,9 +30,9 @@ enum AX_DEVICE_MODE enum AX_DEVICE_TYPE { - AX_DEVICE_TYPE_TV = 0, - AX_DEVICE_TYPE_DRC = 1, - AX_DEVICE_TYPE_CONTROLLER = 2, + AX_DEVICE_TYPE_TV = 0, + AX_DEVICE_TYPE_DRC = 1, + AX_DEVICE_TYPE_CONTROLLER = 2, }; AXResult diff --git a/include/sndcore2/drcvs.h b/include/sndcore2/drcvs.h index 8577e542f..76fa3b048 100644 --- a/include/sndcore2/drcvs.h +++ b/include/sndcore2/drcvs.h @@ -1,6 +1,6 @@ #pragma once -#include #include "result.h" +#include /** * \defgroup sndcore2_drcvs DRC VS diff --git a/include/sndcore2/result.h b/include/sndcore2/result.h index ea9873fcc..85940ab99 100644 --- a/include/sndcore2/result.h +++ b/include/sndcore2/result.h @@ -17,11 +17,11 @@ typedef int32_t AXResult; enum AX_RESULT { - AX_RESULT_SUCCESS = 0, - AX_RESULT_INVALID_DEVICE_TYPE = -1, - AX_RESULT_INVALID_DRC_VS_MODE = -13, - AX_RESULT_VOICE_IS_RUNNING = -18, - AX_RESULT_DELAY_TOO_BIG = -19, + AX_RESULT_SUCCESS = 0, + AX_RESULT_INVALID_DEVICE_TYPE = -1, + AX_RESULT_INVALID_DRC_VS_MODE = -13, + AX_RESULT_VOICE_IS_RUNNING = -18, + AX_RESULT_DELAY_TOO_BIG = -19, }; #ifdef __cplusplus diff --git a/include/sndcore2/voice.h b/include/sndcore2/voice.h index f4fd2438a..226dd0635 100644 --- a/include/sndcore2/voice.h +++ b/include/sndcore2/voice.h @@ -1,7 +1,7 @@ #pragma once -#include #include "device.h" #include "result.h" +#include /** * \defgroup sndcore2_voice Voice @@ -45,49 +45,49 @@ typedef int32_t AXVoiceSrcRatioResult; //! A value from enum AX_VOICE_TYPE. typedef uint32_t AXVoiceType; -typedef void(*AXVoiceCallbackFn)(void *); -typedef void(*AXVoiceCallbackExFn)(void *, uint32_t, uint32_t); +typedef void (*AXVoiceCallbackFn)(void *); +typedef void (*AXVoiceCallbackExFn)(void *, uint32_t, uint32_t); enum AX_VOICE_FORMAT { - AX_VOICE_FORMAT_ADPCM = 0, - AX_VOICE_FORMAT_LPCM16 = 10, - AX_VOICE_FORMAT_LPCM8 = 25, + AX_VOICE_FORMAT_ADPCM = 0, + AX_VOICE_FORMAT_LPCM16 = 10, + AX_VOICE_FORMAT_LPCM8 = 25, }; enum AX_VOICE_LOOP { - AX_VOICE_LOOP_DISABLED = 0, - AX_VOICE_LOOP_ENABLED = 1, + AX_VOICE_LOOP_DISABLED = 0, + AX_VOICE_LOOP_ENABLED = 1, }; enum AX_VOICE_RENDERER { - AX_VOICE_RENDERER_DSP = 0, - AX_VOICE_RENDERER_CPU = 1, - AX_VOICE_RENDERER_AUTO = 2, + AX_VOICE_RENDERER_DSP = 0, + AX_VOICE_RENDERER_CPU = 1, + AX_VOICE_RENDERER_AUTO = 2, }; enum AX_VOICE_RATIO_RESULT { - AX_VOICE_RATIO_RESULT_SUCCESS = 0, - AX_VOICE_RATIO_RESULT_LESS_THAN_ZERO = -1, - AX_VOICE_RATIO_RESULT_GREATER_THAN_SOMETHING = -2, + AX_VOICE_RATIO_RESULT_SUCCESS = 0, + AX_VOICE_RATIO_RESULT_LESS_THAN_ZERO = -1, + AX_VOICE_RATIO_RESULT_GREATER_THAN_SOMETHING = -2, }; enum AX_VOICE_SRC_TYPE { - AX_VOICE_SRC_TYPE_NONE = 0, - AX_VOICE_SRC_TYPE_LINEAR = 1, - AX_VOICE_SRC_TYPE_UNK0 = 2, - AX_VOICE_SRC_TYPE_UNK1 = 3, - AX_VOICE_SRC_TYPE_UNK2 = 4, + AX_VOICE_SRC_TYPE_NONE = 0, + AX_VOICE_SRC_TYPE_LINEAR = 1, + AX_VOICE_SRC_TYPE_UNK0 = 2, + AX_VOICE_SRC_TYPE_UNK1 = 3, + AX_VOICE_SRC_TYPE_UNK2 = 4, }; enum AX_VOICE_STATE { - AX_VOICE_STATE_STOPPED = 0, - AX_VOICE_STATE_PLAYING = 1, + AX_VOICE_STATE_STOPPED = 0, + AX_VOICE_STATE_PLAYING = 1, }; enum AX_VOICE_TYPE @@ -269,11 +269,9 @@ AXAcquireVoiceEx(uint32_t priority, AXVoiceCallbackExFn callback, void *userContext); -BOOL -AXCheckVoiceOffsets(AXVoiceOffsets *offsets); +BOOL AXCheckVoiceOffsets(AXVoiceOffsets *offsets); -void -AXFreeVoice(AXVoice *voice); +void AXFreeVoice(AXVoice *voice); uint32_t AXGetMaxVoices(); @@ -285,24 +283,19 @@ AXGetVoiceCurrentOffsetEx(AXVoice *voice, uint32_t AXGetVoiceLoopCount(AXVoice *voice); -void -AXGetVoiceOffsets(AXVoice *voice, - AXVoiceOffsets *offsets); +void AXGetVoiceOffsets(AXVoice *voice, + AXVoiceOffsets *offsets); -BOOL -AXIsVoiceRunning(AXVoice *voice); +BOOL AXIsVoiceRunning(AXVoice *voice); -void -AXSetVoiceAdpcm(AXVoice *voice, - AXVoiceAdpcm *adpcm); +void AXSetVoiceAdpcm(AXVoice *voice, + AXVoiceAdpcm *adpcm); -void -AXSetVoiceAdpcmLoop(AXVoice *voice, - AXVoiceAdpcmLoopData *loopData); +void AXSetVoiceAdpcmLoop(AXVoice *voice, + AXVoiceAdpcmLoopData *loopData); -void -AXSetVoiceCurrentOffset(AXVoice *voice, - uint32_t offset); +void AXSetVoiceCurrentOffset(AXVoice *voice, + uint32_t offset); AXResult AXSetVoiceDeviceMix(AXVoice *voice, @@ -310,72 +303,58 @@ AXSetVoiceDeviceMix(AXVoice *voice, uint32_t id, AXVoiceDeviceMixData *mixData); -void -AXSetVoiceEndOffset(AXVoice *voice, - uint32_t offset); +void AXSetVoiceEndOffset(AXVoice *voice, + uint32_t offset); -void -AXSetVoiceEndOffsetEx(AXVoice *voice, - uint32_t offset, - const void *samples); +void AXSetVoiceEndOffsetEx(AXVoice *voice, + uint32_t offset, + const void *samples); AXResult AXSetVoiceInitialTimeDelay(AXVoice *voice, uint16_t delay); -void -AXSetVoiceLoopOffset(AXVoice *voice, - uint32_t offset); +void AXSetVoiceLoopOffset(AXVoice *voice, + uint32_t offset); -void -AXSetVoiceLoopOffsetEx(AXVoice *voice, - uint32_t offset, - const void *samples); +void AXSetVoiceLoopOffsetEx(AXVoice *voice, + uint32_t offset, + const void *samples); -void -AXSetVoiceLoop(AXVoice *voice, - AXVoiceLoop loop); +void AXSetVoiceLoop(AXVoice *voice, + AXVoiceLoop loop); -void -AXSetVoiceOffsets(AXVoice *voice, - AXVoiceOffsets *offsets); +void AXSetVoiceOffsets(AXVoice *voice, + AXVoiceOffsets *offsets); -void -AXSetVoicePriority(AXVoice *voice, - uint32_t priority); +void AXSetVoicePriority(AXVoice *voice, + uint32_t priority); -void -AXSetVoiceRmtIIRCoefs(AXVoice *voice, - uint16_t filter, - ...); +void AXSetVoiceRmtIIRCoefs(AXVoice *voice, + uint16_t filter, + ...); -void -AXSetVoiceSrc(AXVoice *voice, - AXVoiceSrc *src); +void AXSetVoiceSrc(AXVoice *voice, + AXVoiceSrc *src); AXVoiceSrcRatioResult AXSetVoiceSrcRatio(AXVoice *voice, float ratio); -void -AXSetVoiceSrcType(AXVoice *voice, - AXVoiceSrcType type); +void AXSetVoiceSrcType(AXVoice *voice, + AXVoiceSrcType type); -void -AXSetVoiceState(AXVoice *voice, - AXVoiceState state); +void AXSetVoiceState(AXVoice *voice, + AXVoiceState state); -void -AXSetVoiceType(AXVoice *voice, - AXVoiceType type); +void AXSetVoiceType(AXVoice *voice, + AXVoiceType type); -void -AXSetVoiceVe(AXVoice *voice, - AXVoiceVeData *veData); +void AXSetVoiceVe(AXVoice *voice, + AXVoiceVeData *veData); -void -AXSetVoiceVeDelta(AXVoice *voice, - int16_t delta); +void AXSetVoiceVeDelta(AXVoice *voice, + int16_t delta); #ifdef __cplusplus } diff --git a/include/swkbd/rpl_interface.h b/include/swkbd/rpl_interface.h index c5eef5a3e..ed015d930 100644 --- a/include/swkbd/rpl_interface.h +++ b/include/swkbd/rpl_interface.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup swkbd_rpl RPL Interface @@ -11,48 +11,83 @@ #ifdef __cplusplus -namespace Rpl -{ +namespace Rpl { -bool SwkbdAppearInputForm(const nn::swkbd::AppearArg &appearArg); -bool SwkbdAppearKeyboard(const nn::swkbd::KeyboardArg &keyboardArg); -void SwkbdCalcSubThreadFont(); -void SwkbdCalcSubThreadPredict(); -void SwkbdCalc(const nn::swkbd::ControllerInfo &controllerInfo); -void SwkbdConfirmUnfixAll(); -void SwkbdCreate(void *buffer, nn::swkbd::RegionType regionType, - uint32_t unk, FSClient *fsClient); -void SwkbdDestroy(); -bool SwkbdDisappearInputForm(); -bool SwkbdDisappearKeyboard(); -void SwkbdDrawDRC(); -void SwkbdDrawTV(); -void SwkbdGetDrawStringInfo(nn::swkbd::DrawStringInfo *drawStringInfo); -const char16_t *SwkbdGetInputFormString(); -void SwkbdGetKeyboardCondition(nn::swkbd::KeyboardCondition *keyboardCondition); -nn::swkbd::State SwkbdGetStateInputForm(); -nn::swkbd::State SwkbdGetStateKeyboard(); -void SwkbdInactivateSelectCursor(); -bool SwkbdInitLearnDic(void *buffer); -bool SwkbdIsCoveredWithSubWindow(); -bool SwkbdIsDecideCancelButton(bool *outIsSelectCursor); -bool SwkbdIsDecideOkButton(bool *outIsSelectCursor); -bool SwkbdIsKeyboardTarget(nn::swkbd::IEventReceiver *eventReceiver); -bool SwkbdIsNeedCalcSubThreadFont(); -bool SwkbdIsNeedCalcSubThreadPredict(); -bool SwkbdIsSelectCursorActive(); -void SwkbdMuteAllSound(bool muted); -void SwkbdSetControllerRemo(nn::swkbd::ControllerType type); -void SwkbdSetCursorPos(int pos); -void SwkbdSetEnableOkButton(bool enable); -void SwkbdSetInputFormString(const char16_t *str); -void SwkbdSetReceiver(const nn::swkbd::ReceiverArg &receiver); -void SwkbdSetSelectFrom(int from); -void SwkbdSetUserControllerEventObj(nn::swkbd::IControllerEventObj *userControllerEventObj); -void SwkbdSetUserSoundObj(nn::swkbd::ISoundObj *userSoundObj); -void SwkbdSetVersion(int version); + bool + SwkbdAppearInputForm(const nn::swkbd::AppearArg &appearArg); + bool + SwkbdAppearKeyboard(const nn::swkbd::KeyboardArg &keyboardArg); + void + SwkbdCalcSubThreadFont(); + void + SwkbdCalcSubThreadPredict(); + void + SwkbdCalc(const nn::swkbd::ControllerInfo &controllerInfo); + void + SwkbdConfirmUnfixAll(); + void + SwkbdCreate(void *buffer, nn::swkbd::RegionType regionType, + uint32_t unk, FSClient *fsClient); + void + SwkbdDestroy(); + bool + SwkbdDisappearInputForm(); + bool + SwkbdDisappearKeyboard(); + void + SwkbdDrawDRC(); + void + SwkbdDrawTV(); + void + SwkbdGetDrawStringInfo(nn::swkbd::DrawStringInfo *drawStringInfo); + const char16_t * + SwkbdGetInputFormString(); + void + SwkbdGetKeyboardCondition(nn::swkbd::KeyboardCondition *keyboardCondition); + nn::swkbd::State + SwkbdGetStateInputForm(); + nn::swkbd::State + SwkbdGetStateKeyboard(); + void + SwkbdInactivateSelectCursor(); + bool + SwkbdInitLearnDic(void *buffer); + bool + SwkbdIsCoveredWithSubWindow(); + bool + SwkbdIsDecideCancelButton(bool *outIsSelectCursor); + bool + SwkbdIsDecideOkButton(bool *outIsSelectCursor); + bool + SwkbdIsKeyboardTarget(nn::swkbd::IEventReceiver *eventReceiver); + bool + SwkbdIsNeedCalcSubThreadFont(); + bool + SwkbdIsNeedCalcSubThreadPredict(); + bool + SwkbdIsSelectCursorActive(); + void + SwkbdMuteAllSound(bool muted); + void + SwkbdSetControllerRemo(nn::swkbd::ControllerType type); + void + SwkbdSetCursorPos(int pos); + void + SwkbdSetEnableOkButton(bool enable); + void + SwkbdSetInputFormString(const char16_t *str); + void + SwkbdSetReceiver(const nn::swkbd::ReceiverArg &receiver); + void + SwkbdSetSelectFrom(int from); + void + SwkbdSetUserControllerEventObj(nn::swkbd::IControllerEventObj *userControllerEventObj); + void + SwkbdSetUserSoundObj(nn::swkbd::ISoundObj *userSoundObj); + void + SwkbdSetVersion(int version); -} +} // namespace Rpl #endif // ifdef __cplusplus diff --git a/include/sys/filio.h b/include/sys/filio.h index c2e486d42..b9898ed97 100644 --- a/include/sys/filio.h +++ b/include/sys/filio.h @@ -3,19 +3,20 @@ #include /* Generic file-descriptor ioctl's. */ -#define FIOCLEX _IO('f', 1) /* set close on exec on fd */ -#define FIONCLEX _IO('f', 2) /* remove close on exec */ -#define FIONREAD _IOR('f', 127, int) /* get # bytes to read */ -#define FIONWRITE _IOR('f', 119, int) /* get # bytes (yet) to write */ -#define FIONBIO _IOW('f', 126, int) /* set/clear non-blocking i/o */ -#define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */ -#define FIOSETOWN _IOW('f', 124, int) /* set owner */ -#define FIOGETOWN _IOR('f', 123, int) /* get owner */ -#define FIODTYPE _IOR('f', 122, int) /* get d_flags type part */ -#define FIOGETLBA _IOR('f', 121, int) /* get start blk # */ -struct fiodgname_arg { - int len; - void *buf; +#define FIOCLEX _IO('f', 1) /* set close on exec on fd */ +#define FIONCLEX _IO('f', 2) /* remove close on exec */ +#define FIONREAD _IOR('f', 127, int) /* get # bytes to read */ +#define FIONWRITE _IOR('f', 119, int) /* get # bytes (yet) to write */ +#define FIONBIO _IOW('f', 126, int) /* set/clear non-blocking i/o */ +#define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */ +#define FIOSETOWN _IOW('f', 124, int) /* set owner */ +#define FIOGETOWN _IOR('f', 123, int) /* get owner */ +#define FIODTYPE _IOR('f', 122, int) /* get d_flags type part */ +#define FIOGETLBA _IOR('f', 121, int) /* get start blk # */ +struct fiodgname_arg +{ + int len; + void *buf; }; -#define FIODGNAME _IOW('f', 120, struct fiodgname_arg) /* get dev. name */ -#define FIONSPACE _IOR('f', 118, int) /* get space in send queue */ +#define FIODGNAME _IOW('f', 120, struct fiodgname_arg) /* get dev. name */ +#define FIONSPACE _IOR('f', 118, int) /* get space in send queue */ diff --git a/include/sys/ioccom.h b/include/sys/ioccom.h index c47fd895a..0b4dcc036 100644 --- a/include/sys/ioccom.h +++ b/include/sys/ioccom.h @@ -5,27 +5,26 @@ * any in or out parameters in the upper word. The high 3 bits of the * upper word are used to encode the in/out status of the parameter. */ -#define IOCPARM_SHIFT 13 /* number of bits for ioctl size */ -#define IOCPARM_MASK ((1 << IOCPARM_SHIFT) - 1) /* parameter length mask */ -#define IOCPARM_LEN(x) (((x) >> 16) & IOCPARM_MASK) -#define IOCBASECMD(x) ((x) & ~(IOCPARM_MASK << 16)) -#define IOCGROUP(x) (((x) >> 8) & 0xff) +#define IOCPARM_SHIFT 13 /* number of bits for ioctl size */ +#define IOCPARM_MASK ((1 << IOCPARM_SHIFT) - 1) /* parameter length mask */ +#define IOCPARM_LEN(x) (((x) >> 16) & IOCPARM_MASK) +#define IOCBASECMD(x) ((x) & ~(IOCPARM_MASK << 16)) +#define IOCGROUP(x) (((x) >> 8) & 0xff) -#define IOCPARM_MAX (1 << IOCPARM_SHIFT) /* max size of ioctl */ -#define IOC_VOID 0x20000000 /* no parameters */ -#define IOC_OUT 0x40000000 /* copy out parameters */ -#define IOC_IN 0x80000000 /* copy in parameters */ -#define IOC_INOUT (IOC_IN|IOC_OUT) -#define IOC_DIRMASK (IOC_VOID|IOC_OUT|IOC_IN) +#define IOCPARM_MAX (1 << IOCPARM_SHIFT) /* max size of ioctl */ +#define IOC_VOID 0x20000000 /* no parameters */ +#define IOC_OUT 0x40000000 /* copy out parameters */ +#define IOC_IN 0x80000000 /* copy in parameters */ +#define IOC_INOUT (IOC_IN | IOC_OUT) +#define IOC_DIRMASK (IOC_VOID | IOC_OUT | IOC_IN) -#define _IOC(inout,group,num,len) ((int) \ - ((inout) | (((len) & IOCPARM_MASK) << 16) | ((group) << 8) | (num))) -#define _IO(g,n) _IOC(IOC_VOID, (g), (n), 0) -#define _IOWINT(g,n) _IOC(IOC_VOID, (g), (n), sizeof(int)) -#define _IOR(g,n,t) _IOC(IOC_OUT, (g), (n), sizeof(t)) -#define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t)) +#define _IOC(inout, group, num, len) ((int) ((inout) | (((len) &IOCPARM_MASK) << 16) | ((group) << 8) | (num))) +#define _IO(g, n) _IOC(IOC_VOID, (g), (n), 0) +#define _IOWINT(g, n) _IOC(IOC_VOID, (g), (n), sizeof(int)) +#define _IOR(g, n, t) _IOC(IOC_OUT, (g), (n), sizeof(t)) +#define _IOW(g, n, t) _IOC(IOC_IN, (g), (n), sizeof(t)) /* this should be _IORW, but stdio got there first */ -#define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) +#define _IOWR(g, n, t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) #ifdef __cplusplus extern "C" { diff --git a/include/sys/socket.h b/include/sys/socket.h index b5f40b696..44b2e7a95 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -2,47 +2,47 @@ #include #include -#define SOL_SOCKET -1 +#define SOL_SOCKET -1 -#define PF_UNSPEC 0 -#define PF_INET 2 +#define PF_UNSPEC 0 +#define PF_INET 2 -#define AF_UNSPEC PF_UNSPEC -#define AF_INET PF_INET +#define AF_UNSPEC PF_UNSPEC +#define AF_INET PF_INET -#define SOCK_STREAM 1 -#define SOCK_DGRAM 2 +#define SOCK_STREAM 1 +#define SOCK_DGRAM 2 -#define MSG_OOB 0x0001 -#define MSG_PEEK 0x0002 -#define MSG_DONTROUTE 0x0004 -#define MSG_DONTWAIT 0x0020 +#define MSG_OOB 0x0001 +#define MSG_PEEK 0x0002 +#define MSG_DONTROUTE 0x0004 +#define MSG_DONTWAIT 0x0020 -#define SHUT_RD 0 -#define SHUT_WR 1 -#define SHUT_RDWR 2 +#define SHUT_RD 0 +#define SHUT_WR 1 +#define SHUT_RDWR 2 /* * SOL_SOCKET options */ -#define SO_REUSEADDR 0x0004 // reuse address -#define SO_KEEPALIVE 0x0008 // keep connections alive -#define SO_BROADCAST 0x0020 // broadcast -#define SO_LINGER 0x0080 // linger (no effect?) -#define SO_OOBINLINE 0x0100 // out-of-band data inline (no effect?) -#define SO_TCPSACK 0x0200 // set tcp selective acknowledgment -#define SO_WINSCALE 0x0400 // set tcp window scaling -#define SO_SNDBUF 0x1001 // send buffer size -#define SO_RCVBUF 0x1002 // receive buffer size -#define SO_SNDLOWAT 0x1003 // send low-water mark (no effect?) -#define SO_RCVLOWAT 0x1004 // receive low-water mark -#define SO_TYPE 0x1008 // get socket type -#define SO_ERROR 0x1009 // get socket error -#define SO_RXDATA 0x1011 // get count of bytes in sb_rcv -#define SO_TXDATA 0x1012 // get count of bytes in sb_snd -#define SO_NBIO 0x1014 // set socket to NON-blocking mode -#define SO_BIO 0x1015 // set socket to blocking mode -#define SO_NONBLOCK 0x1016 // set/get blocking mode via optval param +#define SO_REUSEADDR 0x0004 // reuse address +#define SO_KEEPALIVE 0x0008 // keep connections alive +#define SO_BROADCAST 0x0020 // broadcast +#define SO_LINGER 0x0080 // linger (no effect?) +#define SO_OOBINLINE 0x0100 // out-of-band data inline (no effect?) +#define SO_TCPSACK 0x0200 // set tcp selective acknowledgment +#define SO_WINSCALE 0x0400 // set tcp window scaling +#define SO_SNDBUF 0x1001 // send buffer size +#define SO_RCVBUF 0x1002 // receive buffer size +#define SO_SNDLOWAT 0x1003 // send low-water mark (no effect?) +#define SO_RCVLOWAT 0x1004 // receive low-water mark +#define SO_TYPE 0x1008 // get socket type +#define SO_ERROR 0x1009 // get socket error +#define SO_RXDATA 0x1011 // get count of bytes in sb_rcv +#define SO_TXDATA 0x1012 // get count of bytes in sb_snd +#define SO_NBIO 0x1014 // set socket to NON-blocking mode +#define SO_BIO 0x1015 // set socket to blocking mode +#define SO_NONBLOCK 0x1016 // set/get blocking mode via optval param typedef uint32_t socklen_t; typedef uint16_t sa_family_t; @@ -50,7 +50,7 @@ typedef uint16_t sa_family_t; struct sockaddr { sa_family_t sa_family; - char sa_data[]; + char sa_data[]; }; struct sockaddr_storage @@ -69,41 +69,34 @@ struct linger extern "C" { #endif -int -accept(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen); - -int -bind(int sockfd, - const struct sockaddr *addr, - socklen_t addrlen); - -int -connect(int sockfd, - const struct sockaddr *addr, - socklen_t addrlen); - -int -getpeername(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen); - -int -getsockname(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen); - -int -getsockopt(int sockfd, - int level, - int optname, - void *optval, - socklen_t *optlen); - -int -listen(int sockfd, - int backlog); +int accept(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen); + +int bind(int sockfd, + const struct sockaddr *addr, + socklen_t addrlen); + +int connect(int sockfd, + const struct sockaddr *addr, + socklen_t addrlen); + +int getpeername(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen); + +int getsockname(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen); + +int getsockopt(int sockfd, + int level, + int optname, + void *optval, + socklen_t *optlen); + +int listen(int sockfd, + int backlog); ssize_t recv(int sockfd, @@ -133,26 +126,21 @@ sendto(int sockfd, const struct sockaddr *dest_addr, socklen_t addrlen); -int -setsockopt(int sockfd, - int level, - int optname, - const void *optval, - socklen_t optlen); +int setsockopt(int sockfd, + int level, + int optname, + const void *optval, + socklen_t optlen); -int -shutdown(int sockfd, - int how); +int shutdown(int sockfd, + int how); -int -socket(int domain, - int type, - int protocol); +int socket(int domain, + int type, + int protocol); -int -sockatmark(int sockfd); +int sockatmark(int sockfd); #ifdef __cplusplus } #endif - diff --git a/include/sysapp/launch.h b/include/sysapp/launch.h index af8a546ef..dbd44eaef 100644 --- a/include/sysapp/launch.h +++ b/include/sysapp/launch.h @@ -35,9 +35,8 @@ extern "C" { * behaviour where pa_Argv = NULL? * --> */ -void -SYSRelaunchTitle(uint32_t argc, - char *pa_Argv[]); +void SYSRelaunchTitle(uint32_t argc, + char *pa_Argv[]); /** * Launches the HOME menu when the current application exits, and requests the @@ -46,8 +45,7 @@ SYSRelaunchTitle(uint32_t argc, * \note * This is the default behaviour upon application exit. */ -void -SYSLaunchMenu(); +void SYSLaunchMenu(); /** * Launch the given title ID once the current application exits, and requests @@ -61,34 +59,28 @@ SYSLaunchMenu(); * argc/argv? * --> */ -void -SYSLaunchTitle(uint64_t TitleId); +void SYSLaunchTitle(uint64_t TitleId); -void -_SYSLaunchTitleWithStdArgsInNoSplash(uint64_t titleId, - void* unknwn); +void _SYSLaunchTitleWithStdArgsInNoSplash(uint64_t titleId, + void *unknwn); -void -_SYSLaunchMenuWithCheckingAccount(uint8_t slot); +void _SYSLaunchMenuWithCheckingAccount(uint8_t slot); /** * Launch Mii Maker once the current application exits. * */ -void -_SYSLaunchMiiStudio(); +void _SYSLaunchMiiStudio(); /** * Launch System Settings once the current application exits. */ -void -_SYSLaunchSettings(); +void _SYSLaunchSettings(); /** * Launch Parental Controls once the current application exits. */ -void -_SYSLaunchParental(); +void _SYSLaunchParental(); /** * Launch Notifications once the current application exits. @@ -97,8 +89,7 @@ _SYSLaunchParental(); * isn't this an overlay app? does this really run on exit? * --> */ -void -_SYSLaunchNotifications(); +void _SYSLaunchNotifications(); #ifdef __cplusplus } diff --git a/include/sysapp/switch.h b/include/sysapp/switch.h index 2edebfbfe..0e55db13f 100644 --- a/include/sysapp/switch.h +++ b/include/sysapp/switch.h @@ -27,8 +27,8 @@ typedef struct SysAppEManualArgs SysAppEManualArgs; struct SysAppStandardArgs { - void *anchor; - uint32_t anchorSize; + void *anchor; + uint32_t anchorSize; }; WUT_CHECK_OFFSET(SysAppStandardArgs, 0x0, anchor); WUT_CHECK_OFFSET(SysAppStandardArgs, 0x4, anchorSize); @@ -36,8 +36,8 @@ WUT_CHECK_SIZE(SysAppStandardArgs, 0x8); struct SysAppEManualArgs { - SysAppStandardArgs stdArgs; - uint64_t titleId; + SysAppStandardArgs stdArgs; + uint64_t titleId; }; WUT_CHECK_OFFSET(SysAppEManualArgs, 0x0, stdArgs); WUT_CHECK_OFFSET(SysAppEManualArgs, 0x8, titleId); @@ -45,9 +45,9 @@ WUT_CHECK_SIZE(SysAppEManualArgs, 0x10); struct SysAppEShopArgs { - SysAppStandardArgs stdArgs; - char *query; - uint32_t querySize; + SysAppStandardArgs stdArgs; + char *query; + uint32_t querySize; }; WUT_CHECK_OFFSET(SysAppEShopArgs, 0x0, stdArgs); WUT_CHECK_OFFSET(SysAppEShopArgs, 0x8, query); @@ -56,9 +56,9 @@ WUT_CHECK_SIZE(SysAppEShopArgs, 0x10); struct SysAppBrowserArgs { - SysAppStandardArgs stdArgs; - char *url; - uint32_t urlSize; + SysAppStandardArgs stdArgs; + char *url; + uint32_t urlSize; }; WUT_CHECK_OFFSET(SysAppBrowserArgs, 0x0, stdArgs); WUT_CHECK_OFFSET(SysAppBrowserArgs, 0x8, url); @@ -67,10 +67,10 @@ WUT_CHECK_SIZE(SysAppBrowserArgs, 0x10); struct SysAppBrowserArgsWithCallback { - SysAppBrowserArgs browserArgs; - char *cbUrl; - uint32_t cbUrlSize; - BOOL hbmDisable; + SysAppBrowserArgs browserArgs; + char *cbUrl; + uint32_t cbUrlSize; + BOOL hbmDisable; }; WUT_CHECK_OFFSET(SysAppBrowserArgsWithCallback, 0x0, browserArgs); WUT_CHECK_OFFSET(SysAppBrowserArgsWithCallback, 0x10, cbUrl); @@ -79,7 +79,7 @@ WUT_CHECK_OFFSET(SysAppBrowserArgsWithCallback, 0x18, hbmDisable); WUT_CHECK_SIZE(SysAppBrowserArgsWithCallback, 0x1C); typedef enum SysAppPFID -{ +{ SYSAPP_PFID_WII_U_MENU = 2, SYSAPP_PFID_TVII = 3, SYSAPP_PFID_EMANUAL = 4, @@ -170,18 +170,18 @@ int32_t _SYSSwitchToBrowserForCallbackURLFromHBM(SysAppBrowserArgsWithCallback *); int32_t -_SYSSwitchToHBMWithMode(int32_t); + _SYSSwitchToHBMWithMode(int32_t); int32_t -_SYSSwitchToOverlayFromHBM(int32_t); + _SYSSwitchToOverlayFromHBM(int32_t); /** * Calls __OSClearCopyData then _SYSSwitchTo */ -int32_t +int32_t SYSSwitchTo(SysAppPFID pfid); -int32_t +int32_t _SYSSwitchTo(SysAppPFID pfid); #ifdef __cplusplus diff --git a/include/sysapp/title.h b/include/sysapp/title.h index 9e72fb1cf..5de099db2 100644 --- a/include/sysapp/title.h +++ b/include/sysapp/title.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include /** * \defgroup sysapp_title SYSAPP Title @@ -17,18 +17,18 @@ extern "C" { typedef enum SYSTEM_APP_ID { - SYSTEM_APP_ID_HOME_MENU = 0, - SYSTEM_APP_ID_SYSTEM_SETTINGS = 1, - SYSTEM_APP_ID_PARENTAL_CONTROLS = 2, - SYSTEM_APP_ID_USER_SETTINGS = 3, - SYSTEM_APP_ID_MII_MAKER = 4, - SYSTEM_APP_ID_ACCOUNT_SETTINGS = 5, - SYSTEM_APP_ID_DAILY_LOG = 6, - SYSTEM_APP_ID_NOTIFICATIONS = 7, - SYSTEM_APP_ID_HEALTH_AND_SAFETY = 8, - SYSTEM_APP_ID_ELECTRONIC_MANUAL = 9, - SYSTEM_APP_ID_WIIU_CHAT = 10, - SYSTEM_APP_ID_SOFTWARE_DATA_TRANSFER = 11, + SYSTEM_APP_ID_HOME_MENU = 0, + SYSTEM_APP_ID_SYSTEM_SETTINGS = 1, + SYSTEM_APP_ID_PARENTAL_CONTROLS = 2, + SYSTEM_APP_ID_USER_SETTINGS = 3, + SYSTEM_APP_ID_MII_MAKER = 4, + SYSTEM_APP_ID_ACCOUNT_SETTINGS = 5, + SYSTEM_APP_ID_DAILY_LOG = 6, + SYSTEM_APP_ID_NOTIFICATIONS = 7, + SYSTEM_APP_ID_HEALTH_AND_SAFETY = 8, + SYSTEM_APP_ID_ELECTRONIC_MANUAL = 9, + SYSTEM_APP_ID_WIIU_CHAT = 10, + SYSTEM_APP_ID_SOFTWARE_DATA_TRANSFER = 11, } SYSTEM_APP_ID; // for compatibility @@ -44,8 +44,7 @@ static const SYSTEM_APP_ID SYSTEM_APP_ID_UPDATER = SYSTEM_APP_ID_HOME_MENU; * \return * \c TRUE if the title exists, or \c FALSE otherwise. */ -BOOL -SYSCheckTitleExists(uint64_t TitleId); +BOOL SYSCheckTitleExists(uint64_t TitleId); /** * Gets the PFID/UPID for a given title. diff --git a/include/vpad/input.h b/include/vpad/input.h index 41c72e899..1b54ff446 100644 --- a/include/vpad/input.h +++ b/include/vpad/input.h @@ -24,122 +24,122 @@ typedef struct VPADVec3D VPADVec3D; typedef enum VPADButtons { //! The A button. - VPAD_BUTTON_A = 0x8000, + VPAD_BUTTON_A = 0x8000, //! The B button. - VPAD_BUTTON_B = 0x4000, + VPAD_BUTTON_B = 0x4000, //! The X button. - VPAD_BUTTON_X = 0x2000, + VPAD_BUTTON_X = 0x2000, //! The Y button. - VPAD_BUTTON_Y = 0x1000, + VPAD_BUTTON_Y = 0x1000, //! The left button of the D-pad. - VPAD_BUTTON_LEFT = 0x0800, + VPAD_BUTTON_LEFT = 0x0800, //! The right button of the D-pad. - VPAD_BUTTON_RIGHT = 0x0400, + VPAD_BUTTON_RIGHT = 0x0400, //! The up button of the D-pad. - VPAD_BUTTON_UP = 0x0200, + VPAD_BUTTON_UP = 0x0200, //! The down button of the D-pad. - VPAD_BUTTON_DOWN = 0x0100, + VPAD_BUTTON_DOWN = 0x0100, //! The ZL button. - VPAD_BUTTON_ZL = 0x0080, + VPAD_BUTTON_ZL = 0x0080, //! The ZR button. - VPAD_BUTTON_ZR = 0x0040, + VPAD_BUTTON_ZR = 0x0040, //! The L button. - VPAD_BUTTON_L = 0x0020, + VPAD_BUTTON_L = 0x0020, //! The R button. - VPAD_BUTTON_R = 0x0010, + VPAD_BUTTON_R = 0x0010, //! The + button. - VPAD_BUTTON_PLUS = 0x0008, + VPAD_BUTTON_PLUS = 0x0008, //! The - button. - VPAD_BUTTON_MINUS = 0x0004, + VPAD_BUTTON_MINUS = 0x0004, //! The HOME button. - VPAD_BUTTON_HOME = 0x0002, + VPAD_BUTTON_HOME = 0x0002, //! The SYNC button. - VPAD_BUTTON_SYNC = 0x0001, + VPAD_BUTTON_SYNC = 0x0001, //! The right stick button. - VPAD_BUTTON_STICK_R = 0x00020000, + VPAD_BUTTON_STICK_R = 0x00020000, //! The left stick button. - VPAD_BUTTON_STICK_L = 0x00040000, + VPAD_BUTTON_STICK_L = 0x00040000, //! The TV button. - VPAD_BUTTON_TV = 0x00010000, + VPAD_BUTTON_TV = 0x00010000, //! The emulated left button on the right stick. - VPAD_STICK_R_EMULATION_LEFT = 0x04000000, + VPAD_STICK_R_EMULATION_LEFT = 0x04000000, //! The emulated right button on the right stick. - VPAD_STICK_R_EMULATION_RIGHT = 0x02000000, + VPAD_STICK_R_EMULATION_RIGHT = 0x02000000, //! The emulated up button on the right stick. - VPAD_STICK_R_EMULATION_UP = 0x01000000, + VPAD_STICK_R_EMULATION_UP = 0x01000000, //! The emulated down button on the right stick. - VPAD_STICK_R_EMULATION_DOWN = 0x00800000, + VPAD_STICK_R_EMULATION_DOWN = 0x00800000, //! The emulated left button on the left stick. - VPAD_STICK_L_EMULATION_LEFT = 0x40000000, + VPAD_STICK_L_EMULATION_LEFT = 0x40000000, //! The emulated right button on the left stick. - VPAD_STICK_L_EMULATION_RIGHT = 0x20000000, + VPAD_STICK_L_EMULATION_RIGHT = 0x20000000, //! The emulated up button on the left stick. - VPAD_STICK_L_EMULATION_UP = 0x10000000, + VPAD_STICK_L_EMULATION_UP = 0x10000000, //! The emulated down button on the left stick. - VPAD_STICK_L_EMULATION_DOWN = 0x08000000, + VPAD_STICK_L_EMULATION_DOWN = 0x08000000, } VPADButtons; //! Wii U GamePad channel. typedef enum VPADChan { //! Channel 0. - VPAD_CHAN_0 = 0, + VPAD_CHAN_0 = 0, } VPADChan; //! Touch pad validity. typedef enum VPADTouchPadValidity { //! Both X and Y touchpad positions are accurate. - VPAD_VALID = 0x0, + VPAD_VALID = 0x0, //! X position is inaccurate. - VPAD_INVALID_X = 0x1, + VPAD_INVALID_X = 0x1, //! Y position is inaccurate. - VPAD_INVALID_Y = 0x2, + VPAD_INVALID_Y = 0x2, } VPADTouchPadValidity; //! Touch pad resolution. typedef enum VPADTouchPadResolution { //! 1920 x 1080 resolution. - VPAD_TP_1920X1080 = 0, + VPAD_TP_1920X1080 = 0, //! 1280 x 720 resolution. - VPAD_TP_1280X720 = 1, + VPAD_TP_1280X720 = 1, //! 854 x 480 resolution. - VPAD_TP_854X480 = 2, + VPAD_TP_854X480 = 2, } VPADTouchPadResolution; //! Read error. typedef enum VPADReadError { //! No error occurred, and data was written to the buffers. - VPAD_READ_SUCCESS = 0, + VPAD_READ_SUCCESS = 0, //! There was no sample new data available to write. - VPAD_READ_NO_SAMPLES = -1, + VPAD_READ_NO_SAMPLES = -1, //! The requested controller or channel was invalid. - VPAD_READ_INVALID_CONTROLLER = -2, + VPAD_READ_INVALID_CONTROLLER = -2, //! VPAD channel is busy, perhaps being accessed by another thread - VPAD_READ_BUSY = -4, + VPAD_READ_BUSY = -4, //! VPAD is uninitialized, need to call VPADInit() - VPAD_READ_UNINITIALIZED = -5, + VPAD_READ_UNINITIALIZED = -5, } VPADReadError; //! LCD mode. typedef enum VPADLcdMode { //! Display is in standby and will turn back on if any buttons are pressed. - VPAD_LCD_STANDBY = 0, + VPAD_LCD_STANDBY = 0, //! Display is completely off and will remain so until explicitly changed. - VPAD_LCD_OFF = 1, + VPAD_LCD_OFF = 1, //! Display is on as normal. - VPAD_LCD_ON = 0xFF, + VPAD_LCD_ON = 0xFF, } VPADLcdMode; //! Gyro zero drift mode. typedef enum VPADGyroZeroDriftMode { - VPAD_GYRO_ZERODRIFT_LOOSE = 0, + VPAD_GYRO_ZERODRIFT_LOOSE = 0, VPAD_GYRO_ZERODRIFT_STANDARD, VPAD_GYRO_ZERODRIFT_TIGHT, VPAD_GYRO_ZERODRIFT_NONE @@ -332,8 +332,7 @@ WUT_CHECK_SIZE(VPADStatus, 0xAC); * \sa * - \link VPADShutdown \endlink */ -void -VPADInit(); +void VPADInit(); /** * Cleans up and frees the VPAD library. @@ -345,8 +344,7 @@ VPADInit(); * \sa * - \link VPADShutdown \endlink */ -void -VPADShutdown(); +void VPADShutdown(); /** * Read controller data from the desired Gamepad. @@ -396,9 +394,8 @@ VPADRead(VPADChan chan, * \param outParam * Pointer to the calibration to get. */ -void -VPADGetTPCalibrationParam(VPADChan chan, - VPADTouchCalibrationParam *outParam); +void VPADGetTPCalibrationParam(VPADChan chan, + VPADTouchCalibrationParam *outParam); /** * Set touch pad calibration parameters. @@ -413,9 +410,8 @@ VPADGetTPCalibrationParam(VPADChan chan, * \param param * Pointer to the calibration to set. */ -void -VPADSetTPCalibrationParam(VPADChan chan, - const VPADTouchCalibrationParam *param); +void VPADSetTPCalibrationParam(VPADChan chan, + const VPADTouchCalibrationParam *param); /** * Transform touch data according to the current calibration data. @@ -438,10 +434,9 @@ VPADSetTPCalibrationParam(VPADChan chan, * \sa * - VPADTouchData */ -void -VPADGetTPCalibratedPoint(VPADChan chan, - VPADTouchData *calibratedData, - const VPADTouchData *uncalibratedData); +void VPADGetTPCalibratedPoint(VPADChan chan, + VPADTouchData *calibratedData, + const VPADTouchData *uncalibratedData); /** * Transform touch data according to the current calibration data. @@ -465,11 +460,10 @@ VPADGetTPCalibratedPoint(VPADChan chan, * \sa * - VPADTouchData */ -void -VPADGetTPCalibratedPointEx(VPADChan chan, - VPADTouchPadResolution tpResolution, - VPADTouchData *calibratedData, - const VPADTouchData *uncalibratedData); +void VPADGetTPCalibratedPointEx(VPADChan chan, + VPADTouchPadResolution tpResolution, + VPADTouchData *calibratedData, + const VPADTouchData *uncalibratedData); /** * Return a count representing the amount of time left for the given Gamepad's @@ -505,15 +499,13 @@ int32_t VPADBASESetMotorOnRemainingCount(VPADChan chan, int32_t counter); -void -VPADSetAccParam(VPADChan chan, - float playRadius, - float sensitivity); +void VPADSetAccParam(VPADChan chan, + float playRadius, + float sensitivity); -void -VPADGetAccParam(VPADChan chan, - float *outPlayRadius, - float *outSensitivity); +void VPADGetAccParam(VPADChan chan, + float *outPlayRadius, + float *outSensitivity); /** * Set a repeat for held buttons - instead of appearing to be continually held, @@ -535,165 +527,124 @@ VPADGetAccParam(VPADChan chan, * The amount of time to wait between simulated presses - effectively setting * the period of the repetition. */ -void -VPADSetBtnRepeat(VPADChan chan, - float delaySec, - float pulseSec); - -void -VPADEnableStickCrossClamp(VPADChan chan); - -void -VPADDisableStickCrossClamp(VPADChan chan); - -void -VPADSetLStickClampThreshold(VPADChan chan, - int32_t max, - int32_t min); - -void -VPADSetRStickClampThreshold(VPADChan chan, - int32_t max, - int32_t min); - -void -VPADGetGyroDirReviseParam(VPADChan chan, - float *param); - -void -VPADGetGyroZeroDriftMode(VPADChan chan, - VPADGyroZeroDriftMode *mode); +void VPADSetBtnRepeat(VPADChan chan, + float delaySec, + float pulseSec); -void -VPADGetLStickClampThreshold(VPADChan chan, - int32_t *max, - int32_t *min); +void VPADEnableStickCrossClamp(VPADChan chan); -void -VPADGetRStickClampThreshold(VPADChan chan, - int32_t *max, - int32_t *min); +void VPADDisableStickCrossClamp(VPADChan chan); -void -VPADSetStickOrigin(VPADChan chan); +void VPADSetLStickClampThreshold(VPADChan chan, + int32_t max, + int32_t min); -void -VPADDisableLStickZeroClamp(VPADChan chan); +void VPADSetRStickClampThreshold(VPADChan chan, + int32_t max, + int32_t min); -void -VPADDisableRStickZeroClamp(VPADChan chan); +void VPADGetGyroDirReviseParam(VPADChan chan, + float *param); -void -VPADEnableLStickZeroClamp(VPADChan chan); +void VPADGetGyroZeroDriftMode(VPADChan chan, + VPADGyroZeroDriftMode *mode); -void -VPADEnableRStickZeroClamp(VPADChan chan); +void VPADGetLStickClampThreshold(VPADChan chan, + int32_t *max, + int32_t *min); -void -VPADSetCrossStickEmulationParamsL(VPADChan chan, - float rotationDegree, - float range, - float radius); +void VPADGetRStickClampThreshold(VPADChan chan, + int32_t *max, + int32_t *min); -void -VPADSetCrossStickEmulationParamsR(VPADChan chan, - float rotationDegree, - float range, - float radius); +void VPADSetStickOrigin(VPADChan chan); -void -VPADGetCrossStickEmulationParamsL(VPADChan chan, - float *outRotationDegree, - float *outRange, - float *outRadius); +void VPADDisableLStickZeroClamp(VPADChan chan); -void -VPADGetCrossStickEmulationParamsR(VPADChan chan, - float *outRotationDegree, - float *outRange, - float *outRadius); +void VPADDisableRStickZeroClamp(VPADChan chan); -void -VPADSetGyroAngle(VPADChan chan, - float ax, - float ay, - float az); +void VPADEnableLStickZeroClamp(VPADChan chan); -void -VPADSetGyroDirReviseBase(VPADChan chan, - VPADDirection *base); +void VPADEnableRStickZeroClamp(VPADChan chan); -void -VPADSetGyroDirReviseParam(VPADChan chan, - float param); +void VPADSetCrossStickEmulationParamsL(VPADChan chan, + float rotationDegree, + float range, + float radius); -void -VPADSetGyroDirection(VPADChan chan, - VPADDirection *dir); +void VPADSetCrossStickEmulationParamsR(VPADChan chan, + float rotationDegree, + float range, + float radius); -void -VPADSetGyroDirectionMag(VPADChan chan, - float mag); +void VPADGetCrossStickEmulationParamsL(VPADChan chan, + float *outRotationDegree, + float *outRange, + float *outRadius); -void -VPADSetGyroMagnification(VPADChan chan, - float pitch, - float yaw, - float roll); +void VPADGetCrossStickEmulationParamsR(VPADChan chan, + float *outRotationDegree, + float *outRange, + float *outRadius); -void -VPADSetGyroZeroDriftMode(VPADChan chan, - VPADGyroZeroDriftMode mode); +void VPADSetGyroAngle(VPADChan chan, + float ax, + float ay, + float az); -void -VPADEnableGyroZeroPlay(VPADChan chan); +void VPADSetGyroDirReviseBase(VPADChan chan, + VPADDirection *base); -void -VPADEnableGyroDirRevise(VPADChan chan); +void VPADSetGyroDirReviseParam(VPADChan chan, + float param); -void -VPADEnableGyroAccRevise(VPADChan chan); +void VPADSetGyroDirection(VPADChan chan, + VPADDirection *dir); -void -VPADDisableGyroZeroPlay(VPADChan chan); +void VPADSetGyroDirectionMag(VPADChan chan, + float mag); -void -VPADDisableGyroDirRevise(VPADChan chan); +void VPADSetGyroMagnification(VPADChan chan, + float pitch, + float yaw, + float roll); -void -VPADDisableGyroAccRevise(VPADChan chan); +void VPADSetGyroZeroDriftMode(VPADChan chan, + VPADGyroZeroDriftMode mode); +void VPADEnableGyroZeroPlay(VPADChan chan); -float -VPADIsEnableGyroZeroPlay(VPADChan chan); +void VPADEnableGyroDirRevise(VPADChan chan); -float -VPADIsEnableGyroZeroDrift(VPADChan chan); +void VPADEnableGyroAccRevise(VPADChan chan); -float -VPADIsEnableGyroDirRevise(VPADChan chan); +void VPADDisableGyroZeroPlay(VPADChan chan); -float -VPADIsEnableGyroAccRevise(VPADChan chan); +void VPADDisableGyroDirRevise(VPADChan chan); -void -VPADSetGyroZeroPlayParam(VPADChan chan, - float radius); +void VPADDisableGyroAccRevise(VPADChan chan); -void -VPADInitGyroZeroPlayParam(VPADChan chan); -void -VPADInitGyroDirReviseParam(VPADChan chan); +float VPADIsEnableGyroZeroPlay(VPADChan chan); -void -VPADInitGyroAccReviseParam(VPADChan chan); +float VPADIsEnableGyroZeroDrift(VPADChan chan); -void -VPADStartGyroMagRevise(VPADChan chan); +float VPADIsEnableGyroDirRevise(VPADChan chan); -void -VPADStopGyroMagRevise(VPADChan chan); +float VPADIsEnableGyroAccRevise(VPADChan chan); + +void VPADSetGyroZeroPlayParam(VPADChan chan, + float radius); + +void VPADInitGyroZeroPlayParam(VPADChan chan); + +void VPADInitGyroDirReviseParam(VPADChan chan); + +void VPADInitGyroAccReviseParam(VPADChan chan); + +void VPADStartGyroMagRevise(VPADChan chan); + +void VPADStopGyroMagRevise(VPADChan chan); /** * Initializes the zero drift mode on the desired Gamepad. @@ -705,8 +656,7 @@ VPADStopGyroMagRevise(VPADChan chan); * \param chan * The channel of the Gamepad to initialize. */ -void -VPADInitGyroZeroDriftMode(VPADChan chan); +void VPADInitGyroZeroDriftMode(VPADChan chan); /** * Get the TV menu status. @@ -721,8 +671,7 @@ VPADInitGyroZeroDriftMode(VPADChan chan); * \returns * TRUE if the TV menu is shown, FALSE otherwise. */ -BOOL -VPADGetTVMenuStatus(VPADChan chan); +BOOL VPADGetTVMenuStatus(VPADChan chan); /** * Enable or disable the TV menu. @@ -737,9 +686,8 @@ VPADGetTVMenuStatus(VPADChan chan); * \param invalid * Set to TRUE to disable the TV menu or FALSE to enable it. */ -void -VPADSetTVMenuInvalid(VPADChan chan, - BOOL invalid); +void VPADSetTVMenuInvalid(VPADChan chan, + BOOL invalid); /** * Disable the power button. @@ -751,8 +699,7 @@ VPADSetTVMenuInvalid(VPADChan chan, * \param chan * The channel of the Gamepad to disable the power button from. */ -void -VPADDisablePowerButton(VPADChan chan); +void VPADDisablePowerButton(VPADChan chan); /** * Enable the power button. @@ -764,8 +711,7 @@ VPADDisablePowerButton(VPADChan chan); * \param chan * The channel of the Gamepad to enable the power button from. */ -void -VPADEnablePowerButton(VPADChan chan); +void VPADEnablePowerButton(VPADChan chan); /** * Turns on the rumble motor on the desired Gamepad. @@ -806,8 +752,7 @@ VPADControlMotor(VPADChan chan, * \param chan * The channel of the Gamepad to stop rumbling. */ -void -VPADStopMotor(VPADChan chan); +void VPADStopMotor(VPADChan chan); /** * Sets the current mode of the display on the given Gamepad. This function can @@ -850,13 +795,11 @@ int32_t VPADGetLcdMode(VPADChan chan, VPADLcdMode *outLcdMode); -void -VPADBASESetSensorBarSetting(VPADChan chan, - int8_t setting); +void VPADBASESetSensorBarSetting(VPADChan chan, + int8_t setting); -void -VPADBASEGetSensorBarSetting(VPADChan chan, - int8_t *outSetting); +void VPADBASEGetSensorBarSetting(VPADChan chan, + int8_t *outSetting); /** * Get the headphone status. @@ -887,9 +830,8 @@ VPADBASEGetHeadphoneStatus(VPADChan chan); * \param mode * Pointer to write a value of the controller mode into. */ -void -VPADBASEGetGameControllerMode(VPADChan chan, - int32_t* mode); +void VPADBASEGetGameControllerMode(VPADChan chan, + int32_t *mode); /** * Set the controller mode. @@ -905,9 +847,8 @@ VPADBASEGetGameControllerMode(VPADChan chan, * Any non-zero mode will turn off the display, like the "Display Off" button under Controller Settings. * Inputs are not disabled. */ -void -VPADBASESetGameControllerMode(VPADChan chan, - int32_t mode); +void VPADBASESetGameControllerMode(VPADChan chan, + int32_t mode); /** * Get the POWER button press status. @@ -925,10 +866,9 @@ VPADBASESetGameControllerMode(VPADChan chan, * \param status * The status is set to 0 if the POWER button is not pressed. */ -void -VPADBASEGetPowerButtonPressStatus(VPADChan chan, - uint32_t* tick, - uint32_t *status); +void VPADBASEGetPowerButtonPressStatus(VPADChan chan, + uint32_t *tick, + uint32_t *status); /** * Set the POWER button press status. @@ -942,10 +882,9 @@ VPADBASEGetPowerButtonPressStatus(VPADChan chan, * \param status * The status to set. */ -void -VPADBASESetPowerButtonPressStatus(VPADChan chan, - uint32_t tick, - uint32_t status); +void VPADBASESetPowerButtonPressStatus(VPADChan chan, + uint32_t tick, + uint32_t status); /** * Set the POWER button mode. @@ -960,9 +899,8 @@ VPADBASESetPowerButtonPressStatus(VPADChan chan, * - \link VPADDisablePowerButton \endlink * - \link VPADEnablePowerButton \endlink */ -void -VPADBASESetPowerButtonDisableMode(VPADChan chan, - uint32_t mode); +void VPADBASESetPowerButtonDisableMode(VPADChan chan, + uint32_t mode); /** * Turn the given Gamepad's sensor bar on or off. Enabling the sensor bar allows diff --git a/include/wut.h b/include/wut.h index 4bce60353..86bc55154 100644 --- a/include/wut.h +++ b/include/wut.h @@ -6,9 +6,9 @@ * https://github.com/devkitPro/wut */ +#include "wut_rplwrap.h" #include "wut_structsize.h" #include "wut_types.h" -#include "wut_rplwrap.h" #ifdef __GNUC__ diff --git a/include/wut_structsize.h b/include/wut_structsize.h index d28972e89..dfa114a1b 100644 --- a/include/wut_structsize.h +++ b/include/wut_structsize.h @@ -4,33 +4,33 @@ // Ensure structs are correct size & offsets #if defined(static_assert) || defined(__cplusplus) -# define WUT_CHECK_SIZE(Type, Size) \ - static_assert(sizeof(Type) == Size, \ - #Type " must be " #Size " bytes") +#define WUT_CHECK_SIZE(Type, Size) \ + static_assert(sizeof(Type) == Size, \ + #Type " must be " #Size " bytes") -# define WUT_CHECK_OFFSET(Type, Offset, Field) \ - static_assert(offsetof(Type, Field) == Offset, \ - #Type "::" #Field " must be at offset " #Offset) +#define WUT_CHECK_OFFSET(Type, Offset, Field) \ + static_assert(offsetof(Type, Field) == Offset, \ + #Type "::" #Field " must be at offset " #Offset) #else -# define WUT_CHECK_SIZE(Type, Size) -# define WUT_CHECK_OFFSET(Type, Offset, Field) +#define WUT_CHECK_SIZE(Type, Size) +#define WUT_CHECK_OFFSET(Type, Offset, Field) #endif // Workaround weird macro concat ## behaviour -#define WUT_PP_CAT(a, b) WUT_PP_CAT_I(a, b) -#define WUT_PP_CAT_I(a, b) WUT_PP_CAT_II(~, a ## b) -#define WUT_PP_CAT_II(p, res) res +#define WUT_PP_CAT(a, b) WUT_PP_CAT_I(a, b) +#define WUT_PP_CAT_I(a, b) WUT_PP_CAT_II(~, a##b) +#define WUT_PP_CAT_II(p, res) res // Allow us to easily add UNKNOWN / PADDING bytes into our structs, // generates unique variable names using __COUNTER__ -#define WUT_UNKNOWN_BYTES(Size) char WUT_PP_CAT(__unk, __COUNTER__) [Size] +#define WUT_UNKNOWN_BYTES(Size) char WUT_PP_CAT(__unk, __COUNTER__)[Size] #define WUT_PADDING_BYTES(Size) WUT_UNKNOWN_BYTES(Size) // Unknown struct size #define WUT_UNKNOWN_SIZE(x) // Marks a struct as packed -#define WUT_PACKED __attribute__((__packed__)) +#define WUT_PACKED __attribute__((__packed__)) // Sets alignment for a struct #if defined(__alignas_is_defined) || defined(__cplusplus) diff --git a/include/wut_types.h b/include/wut_types.h index 878a2b500..bd22fd251 100644 --- a/include/wut_types.h +++ b/include/wut_types.h @@ -1,8 +1,8 @@ #pragma once -#include +#include #include #include -#include +#include typedef int32_t BOOL; @@ -15,10 +15,14 @@ typedef int32_t BOOL; #endif #if __cplusplus >= 201402L -#define WUT_ENUM_BITMASK_TYPE(_type) \ - extern "C++" { static constexpr inline _type operator|(_type lhs, _type rhs) { \ +#define WUT_ENUM_BITMASK_TYPE(_type) \ + extern "C++" { \ + static constexpr inline _type \ + operator|(_type lhs, _type rhs) \ + { \ return static_cast<_type>(static_cast(lhs) | static_cast(rhs)); \ - } } + } \ + } #else #define WUT_ENUM_BITMASK_TYPE(_type) #endif diff --git a/libraries/libgfd/include/gfd.h b/libraries/libgfd/include/gfd.h index 46106999e..d9d7be492 100644 --- a/libraries/libgfd/include/gfd.h +++ b/libraries/libgfd/include/gfd.h @@ -1,7 +1,7 @@ #pragma once -#include #include #include +#include #ifdef __cplusplus extern "C" { @@ -11,17 +11,17 @@ typedef struct GFDHeader GFDHeader; typedef struct GFDBlockHeader GFDBlockHeader; typedef struct GFDRelocationHeader GFDRelocationHeader; -#define GFD_HEADER_MAGIC (0x47667832) -#define GFD_BLOCK_HEADER_MAGIC (0x424C4B7B) +#define GFD_HEADER_MAGIC (0x47667832) +#define GFD_BLOCK_HEADER_MAGIC (0x424C4B7B) #define GFD_RELOCATION_HEADER_MAGIC (0x7D424C4B) -#define GFD_FILE_VERSION_MAJOR (7) -#define GFD_FILE_VERSION_MINOR (1) -#define GFD_BLOCK_VERSION_MAJOR (1) +#define GFD_FILE_VERSION_MAJOR (7) +#define GFD_FILE_VERSION_MINOR (1) +#define GFD_BLOCK_VERSION_MAJOR (1) -#define GFD_PATCH_MASK (0xFFF00000) -#define GFD_PATCH_DATA (0xD0600000) -#define GFD_PATCH_TEXT (0xCA700000) +#define GFD_PATCH_MASK (0xFFF00000) +#define GFD_PATCH_DATA (0xD0600000) +#define GFD_PATCH_TEXT (0xCA700000) typedef enum GFDBlockType { @@ -126,12 +126,11 @@ uint32_t GFDGetGeometryShaderCopyProgramSize(uint32_t index, const void *file); -BOOL -GFDGetGeometryShader(GX2GeometryShader *shader, - void *program, - void *copyProgram, - uint32_t index, - const void *file); +BOOL GFDGetGeometryShader(GX2GeometryShader *shader, + void *program, + void *copyProgram, + uint32_t index, + const void *file); uint32_t GFDGetPixelShaderCount(const void *file); @@ -144,11 +143,10 @@ uint32_t GFDGetPixelShaderProgramSize(uint32_t index, const void *file); -BOOL -GFDGetPixelShader(GX2PixelShader *shader, - void *program, - uint32_t index, - const void *file); +BOOL GFDGetPixelShader(GX2PixelShader *shader, + void *program, + uint32_t index, + const void *file); uint32_t GFDGetVertexShaderCount(const void *file); @@ -161,11 +159,10 @@ uint32_t GFDGetVertexShaderProgramSize(uint32_t index, const void *file); -BOOL -GFDGetVertexShader(GX2VertexShader *shader, - void *program, - uint32_t index, - const void *file); +BOOL GFDGetVertexShader(GX2VertexShader *shader, + void *program, + uint32_t index, + const void *file); uint32_t GFDGetTextureCount(const void *file); @@ -186,17 +183,15 @@ uint32_t GFDGetTextureAlignmentSize(uint32_t index, const void *file); -BOOL -GFDGetTexture(GX2Texture *texture, - void *image, - void *mipmap, - uint32_t index, - const void *file); - -BOOL -GFDGetGX2RTexture(GX2Texture *texture, - uint32_t index, - const void *file); +BOOL GFDGetTexture(GX2Texture *texture, + void *image, + void *mipmap, + uint32_t index, + const void *file); + +BOOL GFDGetGX2RTexture(GX2Texture *texture, + uint32_t index, + const void *file); const GX2Texture * GFDGetTexturePointer(uint32_t index, diff --git a/libraries/libgfd/src/gfd.c b/libraries/libgfd/src/gfd.c index ab696d681..8231b6a40 100644 --- a/libraries/libgfd/src/gfd.c +++ b/libraries/libgfd/src/gfd.c @@ -33,7 +33,7 @@ static BOOL _GFDGetBlockPointer(GFDBlockType type, uint32_t index, void *file, #endif static char -sLastError[1024] = { 0 }; + sLastError[1024] = {0}; static void setLastError(const char *fmt, ...) @@ -56,10 +56,10 @@ _GFDGetHeaderVersions(uint32_t *majorVersion, uint32_t *gpuVersion, const void *file) { - GFDHeader *header = (GFDHeader *)file; - *majorVersion = 0; - *minorVersion = 0; - *gpuVersion = 0; + GFDHeader *header = (GFDHeader *) file; + *majorVersion = 0; + *minorVersion = 0; + *gpuVersion = 0; if (header->magic != GFD_HEADER_MAGIC) { setLastError("%s: header->magic %08X != %08X GFD_HEADER_MAGIC", @@ -69,7 +69,7 @@ _GFDGetHeaderVersions(uint32_t *majorVersion, *majorVersion = header->majorVersion; *minorVersion = header->minorVersion; - *gpuVersion = header->gpuVersion; + *gpuVersion = header->gpuVersion; return TRUE; } @@ -127,8 +127,8 @@ static uint32_t _GFDGetBlockCount(GFDBlockType type, const void *file) { - const uint8_t *ptr = (const uint8_t *)file; - const GFDHeader *fileHeader = (const GFDHeader *)file; + const uint8_t *ptr = (const uint8_t *) file; + const GFDHeader *fileHeader = (const GFDHeader *) file; const GFDBlockHeader *blockHeader; uint32_t count = 0; @@ -141,7 +141,7 @@ _GFDGetBlockCount(GFDBlockType type, } ptr += fileHeader->headerSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; while (_GFDCheckBlockHeaderMagicVersions(blockHeader)) { if (blockHeader->type == type) { @@ -151,7 +151,7 @@ _GFDGetBlockCount(GFDBlockType type, } ptr += blockHeader->headerSize + blockHeader->dataSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; } return count; @@ -162,8 +162,8 @@ _GFDGetBlockDataSize(GFDBlockType type, uint32_t index, const void *file) { - const uint8_t *ptr = (const uint8_t *)file; - const GFDHeader *fileHeader = (const GFDHeader *)file; + const uint8_t *ptr = (const uint8_t *) file; + const GFDHeader *fileHeader = (const GFDHeader *) file; const GFDBlockHeader *blockHeader; uint32_t count = 0; @@ -176,7 +176,7 @@ _GFDGetBlockDataSize(GFDBlockType type, } ptr += fileHeader->headerSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; while (_GFDCheckBlockHeaderMagicVersions(blockHeader)) { if (blockHeader->type == type) { @@ -190,7 +190,7 @@ _GFDGetBlockDataSize(GFDBlockType type, } ptr += blockHeader->headerSize + blockHeader->dataSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; } return 0; @@ -203,8 +203,8 @@ _GFDGetBlockPointerConst(GFDBlockType type, const GFDBlockHeader **blockHeaderOut, const void **blockDataOut) { - const uint8_t *ptr = (const uint8_t *)file; - const GFDHeader *fileHeader = (const GFDHeader *)file; + const uint8_t *ptr = (const uint8_t *) file; + const GFDHeader *fileHeader = (const GFDHeader *) file; const GFDBlockHeader *blockHeader; uint32_t count = 0; @@ -217,13 +217,13 @@ _GFDGetBlockPointerConst(GFDBlockType type, } ptr += fileHeader->headerSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; while (_GFDCheckBlockHeaderMagicVersions(blockHeader)) { if (blockHeader->type == type) { if (count == index) { *blockHeaderOut = blockHeader; - *blockDataOut = ptr + blockHeader->headerSize; + *blockDataOut = ptr + blockHeader->headerSize; return TRUE; } @@ -233,7 +233,7 @@ _GFDGetBlockPointerConst(GFDBlockType type, } ptr += blockHeader->headerSize + blockHeader->dataSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; } return FALSE; @@ -333,7 +333,7 @@ _GFDRelocateBlockEx(const GFDRelocationHeader *relocationHeader, return FALSE; } - target = (uint32_t *)(dst + _GFDCleanTag(offset)); + target = (uint32_t *) (dst + _GFDCleanTag(offset)); if (!_GFDCheckTagDAT(*target) && !_GFDCheckTagSTR(*target)) { setLastError("%s: !_GFDCheckTagDAT(*target = %08X) && " @@ -342,7 +342,7 @@ _GFDRelocateBlockEx(const GFDRelocationHeader *relocationHeader, return FALSE; } - *target = (uintptr_t)(dst + _GFDCleanTag(*target)); + *target = (uintptr_t) (dst + _GFDCleanTag(*target)); } return TRUE; @@ -352,7 +352,7 @@ static BOOL _GFDRelocateBlock(const GFDBlockHeader *blockHeader, void *dst) { - const uint8_t *blockData = ((const uint8_t *)blockHeader) + + const uint8_t *blockData = ((const uint8_t *) blockHeader) + blockHeader->headerSize; const GFDRelocationHeader *relocationHeader; const uint32_t *patchTable; @@ -361,9 +361,7 @@ _GFDRelocateBlock(const GFDBlockHeader *blockHeader, return FALSE; } - relocationHeader = (const GFDRelocationHeader *)(blockData - + blockHeader->dataSize - - sizeof(GFDRelocationHeader)); + relocationHeader = (const GFDRelocationHeader *) (blockData + blockHeader->dataSize - sizeof(GFDRelocationHeader)); if (relocationHeader->magic != GFD_RELOCATION_HEADER_MAGIC) { setLastError("%s: relocationHeader->magic %08X != GFD_RELOCATION_HEADER_MAGIC", @@ -377,14 +375,14 @@ _GFDRelocateBlock(const GFDBlockHeader *blockHeader, return FALSE; } - patchTable = (const uint32_t *)(blockData + _GFDCleanTag(relocationHeader->patchOffset)); - return _GFDRelocateBlockEx(relocationHeader, patchTable, (uint8_t *)dst); + patchTable = (const uint32_t *) (blockData + _GFDCleanTag(relocationHeader->patchOffset)); + return _GFDRelocateBlockEx(relocationHeader, patchTable, (uint8_t *) dst); } static BOOL _GFDCheckShaderAlign(void *program) { - return (((uintptr_t)program) & (GX2_SHADER_PROGRAM_ALIGNMENT - 1)) == 0; + return (((uintptr_t) program) & (GX2_SHADER_PROGRAM_ALIGNMENT - 1)) == 0; } static BOOL @@ -399,20 +397,20 @@ _GFDGetGenericBlock(GFDBlockType blockTypeHeader, uint32_t index, const void *file) { - const uint8_t *ptr = (const uint8_t *)file; - const GFDHeader *fileHeader = (const GFDHeader *)file; + const uint8_t *ptr = (const uint8_t *) file; + const GFDHeader *fileHeader = (const GFDHeader *) file; const GFDBlockHeader *blockHeader; - uint32_t headerCount = 0; + uint32_t headerCount = 0; uint32_t program1Count = 0; uint32_t program2Count = 0; - BOOL result = FALSE; + BOOL result = FALSE; if (!header || !file) { return FALSE; } ptr += fileHeader->headerSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; while (_GFDCheckBlockHeaderMagicVersions(blockHeader)) { ptr += blockHeader->headerSize; @@ -456,7 +454,7 @@ _GFDGetGenericBlock(GFDBlockType blockTypeHeader, } ptr += blockHeader->dataSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; } return result; @@ -536,20 +534,20 @@ GFDGetComputeShaderCount(const void *file) uint32_t GFDGetComputeShaderHeaderSize(uint32_t index, - const void *file) + const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_COMPUTE_SHADER_HEADER, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_COMPUTE_SHADER_HEADER, + index, + file); } uint32_t GFDGetComputeShaderProgramSize(uint32_t index, - const void *file) + const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_COMPUTE_SHADER_PROGRAM, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_COMPUTE_SHADER_PROGRAM, + index, + file); } /* @@ -583,35 +581,34 @@ uint32_t GFDGetGeometryShaderHeaderSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_GEOMETRY_SHADER_HEADER, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_GEOMETRY_SHADER_HEADER, + index, + file); } uint32_t GFDGetGeometryShaderProgramSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_GEOMETRY_SHADER_PROGRAM, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_GEOMETRY_SHADER_PROGRAM, + index, + file); } uint32_t GFDGetGeometryShaderCopyProgramSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_GEOMETRY_SHADER_COPY_PROGRAM, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_GEOMETRY_SHADER_COPY_PROGRAM, + index, + file); } -BOOL -GFDGetGeometryShader(GX2GeometryShader *shader, - void *program, - void *copyProgram, - uint32_t index, - const void *file) +BOOL GFDGetGeometryShader(GX2GeometryShader *shader, + void *program, + void *copyProgram, + uint32_t index, + const void *file) { if (!_GFDCheckShaderAlign(program) || !_GFDCheckShaderAlign(copyProgram)) { return FALSE; @@ -640,25 +637,24 @@ uint32_t GFDGetPixelShaderHeaderSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_PIXEL_SHADER_HEADER, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_PIXEL_SHADER_HEADER, + index, + file); } uint32_t GFDGetPixelShaderProgramSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_PIXEL_SHADER_PROGRAM, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_PIXEL_SHADER_PROGRAM, + index, + file); } -BOOL -GFDGetPixelShader(GX2PixelShader *shader, - void *program, - uint32_t index, - const void *file) +BOOL GFDGetPixelShader(GX2PixelShader *shader, + void *program, + uint32_t index, + const void *file) { if (!_GFDCheckShaderAlign(program)) { return FALSE; @@ -687,25 +683,24 @@ uint32_t GFDGetVertexShaderHeaderSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_VERTEX_SHADER_HEADER, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_VERTEX_SHADER_HEADER, + index, + file); } uint32_t GFDGetVertexShaderProgramSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_VERTEX_SHADER_PROGRAM, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_VERTEX_SHADER_PROGRAM, + index, + file); } -BOOL -GFDGetVertexShader(GX2VertexShader *shader, - void *program, - uint32_t index, - const void *file) +BOOL GFDGetVertexShader(GX2VertexShader *shader, + void *program, + uint32_t index, + const void *file) { return _GFDGetGenericBlock(GFD_BLOCK_VERTEX_SHADER_HEADER, shader, @@ -730,27 +725,27 @@ uint32_t GFDGetTextureHeaderSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_TEXTURE_HEADER, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_TEXTURE_HEADER, + index, + file); } uint32_t GFDGetTextureImageSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_TEXTURE_IMAGE, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_TEXTURE_IMAGE, + index, + file); } uint32_t GFDGetTextureMipImageSize(uint32_t index, const void *file) { - return _GFDGetBlockDataSize(GFD_BLOCK_TEXTURE_MIPMAP, - index, - file); + return _GFDGetBlockDataSize(GFD_BLOCK_TEXTURE_MIPMAP, + index, + file); } uint32_t @@ -764,19 +759,18 @@ GFDGetTextureAlignmentSize(uint32_t index, index, file, &blockHeader, - (const void **)&texture)) { + (const void **) &texture)) { return 0; } return texture->surface.alignment; } -BOOL -GFDGetTexture(GX2Texture *texture, - void *image, - void *mipmap, - uint32_t index, - const void *file) +BOOL GFDGetTexture(GX2Texture *texture, + void *image, + void *mipmap, + uint32_t index, + const void *file) { return _GFDGetGenericBlock(GFD_BLOCK_TEXTURE_HEADER, texture, @@ -790,23 +784,22 @@ GFDGetTexture(GX2Texture *texture, file); } -BOOL -GFDGetGX2RTexture(GX2Texture *texture, - uint32_t index, - const void *file) +BOOL GFDGetGX2RTexture(GX2Texture *texture, + uint32_t index, + const void *file) { - const uint8_t *ptr = (const uint8_t *)file; - const GFDHeader *fileHeader = (const GFDHeader *)file; + const uint8_t *ptr = (const uint8_t *) file; + const GFDHeader *fileHeader = (const GFDHeader *) file; const GFDBlockHeader *blockHeader; uint32_t headerCount = 0; - BOOL created = FALSE; + BOOL created = FALSE; if (!texture || !file) { return FALSE; } ptr += fileHeader->headerSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; while (_GFDCheckBlockHeaderMagicVersions(blockHeader)) { ptr += blockHeader->headerSize; @@ -819,14 +812,11 @@ GFDGetGX2RTexture(GX2Texture *texture, memcpy(texture, ptr, sizeof(GX2Texture)); - texture->surface.image = NULL; + texture->surface.image = NULL; texture->surface.mipmaps = NULL; GX2RCreateSurface(&texture->surface, - GX2R_RESOURCE_BIND_TEXTURE - | GX2R_RESOURCE_USAGE_CPU_READ - | GX2R_RESOURCE_USAGE_CPU_WRITE - | GX2R_RESOURCE_USAGE_GPU_READ); + GX2R_RESOURCE_BIND_TEXTURE | GX2R_RESOURCE_USAGE_CPU_READ | GX2R_RESOURCE_USAGE_CPU_WRITE | GX2R_RESOURCE_USAGE_GPU_READ); created = TRUE; } else if (created) { @@ -843,8 +833,7 @@ GFDGetGX2RTexture(GX2Texture *texture, memcpy(image, ptr, blockHeader->dataSize); GX2RUnlockSurfaceEx(&texture->surface, 0, - GX2R_RESOURCE_DISABLE_CPU_INVALIDATE - | GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); + GX2R_RESOURCE_DISABLE_CPU_INVALIDATE | GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); } } else if (blockHeader->type == GFD_BLOCK_TEXTURE_MIPMAP) { if (created) { @@ -855,15 +844,14 @@ GFDGetGX2RTexture(GX2Texture *texture, memcpy(mipmap, ptr, blockHeader->dataSize); GX2RUnlockSurfaceEx(&texture->surface, -1, - GX2R_RESOURCE_DISABLE_CPU_INVALIDATE - | GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); + GX2R_RESOURCE_DISABLE_CPU_INVALIDATE | GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); } } else if (blockHeader->type == GFD_BLOCK_END_OF_FILE) { break; } ptr += blockHeader->dataSize; - blockHeader = (const GFDBlockHeader *)ptr; + blockHeader = (const GFDBlockHeader *) ptr; } if (created && (texture->surface.image || texture->surface.mipmaps)) { @@ -894,7 +882,7 @@ GFDGetTexturePointer(uint32_t index, index, file, &blockHeader, - (const void **)&texture)) { + (const void **) &texture)) { return NULL; } diff --git a/libraries/libwhb/include/whb/crash.h b/libraries/libwhb/include/whb/crash.h index dd255f9d6..4cf88b9d7 100644 --- a/libraries/libwhb/include/whb/crash.h +++ b/libraries/libwhb/include/whb/crash.h @@ -11,8 +11,7 @@ extern "C" { #endif -BOOL -WHBInitCrashHandler(); +BOOL WHBInitCrashHandler(); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/file.h b/libraries/libwhb/include/whb/file.h index 93cd83166..f6ccd8045 100644 --- a/libraries/libwhb/include/whb/file.h +++ b/libraries/libwhb/include/whb/file.h @@ -13,12 +13,11 @@ extern "C" { typedef enum WHBFileError { - WHB_FILE_OK = 0, + WHB_FILE_OK = 0, WHB_FILE_FATAL_ERROR = -1, } WHBFileError; -BOOL -WHBDeInitFileSystem(); +BOOL WHBDeInitFileSystem(); int32_t WHBOpenFile(const char *path, @@ -40,8 +39,7 @@ char * WHBReadWholeFile(const char *path, uint32_t *outSize); -void -WHBFreeWholeFile(char *file); +void WHBFreeWholeFile(char *file); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/gfx.h b/libraries/libwhb/include/whb/gfx.h index 7cde90e97..9d3b5c60c 100644 --- a/libraries/libwhb/include/whb/gfx.h +++ b/libraries/libwhb/include/whb/gfx.h @@ -1,8 +1,8 @@ #pragma once -#include #include #include #include +#include /** * \defgroup whb_gfx Graphics @@ -26,71 +26,55 @@ struct WHBGfxShaderGroup GX2AttribStream attributes[16]; }; -BOOL -WHBGfxInit(); +BOOL WHBGfxInit(); -void -WHBGfxShutdown(); +void WHBGfxShutdown(); -void -WHBGfxBeginRender(); +void WHBGfxBeginRender(); -void -WHBGfxFinishRender(); +void WHBGfxFinishRender(); -void -WHBGfxClearColor(float r, float g, float b, float a); +void WHBGfxClearColor(float r, float g, float b, float a); -void -WHBGfxBeginRenderDRC(); +void WHBGfxBeginRenderDRC(); -void -WHBGfxFinishRenderDRC(); +void WHBGfxFinishRenderDRC(); -void -WHBGfxBeginRenderTV(); +void WHBGfxBeginRenderTV(); -void -WHBGfxFinishRenderTV(); +void WHBGfxFinishRenderTV(); GX2PixelShader * WHBGfxLoadGFDPixelShader(uint32_t index, const void *file); -BOOL -WHBGfxFreePixelShader(GX2PixelShader *shader); +BOOL WHBGfxFreePixelShader(GX2PixelShader *shader); GX2VertexShader * WHBGfxLoadGFDVertexShader(uint32_t index, const void *file); -BOOL -WHBGfxFreeVertexShader(GX2VertexShader *shader); +BOOL WHBGfxFreeVertexShader(GX2VertexShader *shader); -BOOL -WHBGfxLoadGFDShaderGroup(WHBGfxShaderGroup *group, - uint32_t index, - const void *file); +BOOL WHBGfxLoadGFDShaderGroup(WHBGfxShaderGroup *group, + uint32_t index, + const void *file); -BOOL -WHBGfxInitShaderAttribute(WHBGfxShaderGroup *group, - const char *name, - uint32_t buffer, - uint32_t offset, - GX2AttribFormat format); +BOOL WHBGfxInitShaderAttribute(WHBGfxShaderGroup *group, + const char *name, + uint32_t buffer, + uint32_t offset, + GX2AttribFormat format); -BOOL -WHBGfxInitFetchShader(WHBGfxShaderGroup *group); +BOOL WHBGfxInitFetchShader(WHBGfxShaderGroup *group); -BOOL -WHBGfxFreeShaderGroup(WHBGfxShaderGroup *group); +BOOL WHBGfxFreeShaderGroup(WHBGfxShaderGroup *group); GX2Texture * WHBGfxLoadGFDTexture(uint32_t index, const void *file); -BOOL -WHBGfxFreeTexture(GX2Texture *texture); +BOOL WHBGfxFreeTexture(GX2Texture *texture); GX2ColorBuffer * WHBGfxGetTVColourBuffer(); diff --git a/libraries/libwhb/include/whb/libmanager.h b/libraries/libwhb/include/whb/libmanager.h index 42a179a95..7b64af577 100644 --- a/libraries/libwhb/include/whb/libmanager.h +++ b/libraries/libwhb/include/whb/libmanager.h @@ -14,10 +14,10 @@ extern "C" { * Socket Library (nsysnet.rpl) */ -__attribute__ ((deprecated)) void +__attribute__((deprecated)) void WHBInitializeSocketLibrary(); -__attribute__ ((deprecated)) void +__attribute__((deprecated)) void WHBDeinitializeSocketLibrary(); #ifdef __cplusplus diff --git a/libraries/libwhb/include/whb/log.h b/libraries/libwhb/include/whb/log.h index f2c1964dd..168092963 100644 --- a/libraries/libwhb/include/whb/log.h +++ b/libraries/libwhb/include/whb/log.h @@ -13,23 +13,17 @@ extern "C" { typedef void (*LogHandlerFn)(const char *msg); -BOOL -WHBAddLogHandler(LogHandlerFn fn); +BOOL WHBAddLogHandler(LogHandlerFn fn); -BOOL -WHBRemoveLogHandler(LogHandlerFn fn); +BOOL WHBRemoveLogHandler(LogHandlerFn fn); -BOOL -WHBLogWrite(const char *str); +BOOL WHBLogWrite(const char *str); -BOOL -WHBLogPrint(const char *str); +BOOL WHBLogPrint(const char *str); -BOOL -WHBLogWritef(const char *fmt, ...); +BOOL WHBLogWritef(const char *fmt, ...); -BOOL -WHBLogPrintf(const char *fmt, ...); +BOOL WHBLogPrintf(const char *fmt, ...); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/log_cafe.h b/libraries/libwhb/include/whb/log_cafe.h index 023b5fe8f..db4438cc9 100644 --- a/libraries/libwhb/include/whb/log_cafe.h +++ b/libraries/libwhb/include/whb/log_cafe.h @@ -11,11 +11,9 @@ extern "C" { #endif -BOOL -WHBLogCafeInit(); +BOOL WHBLogCafeInit(); -BOOL -WHBLogCafeDeinit(); +BOOL WHBLogCafeDeinit(); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/log_console.h b/libraries/libwhb/include/whb/log_console.h index f7924f4fe..5c72ea21e 100644 --- a/libraries/libwhb/include/whb/log_console.h +++ b/libraries/libwhb/include/whb/log_console.h @@ -13,17 +13,13 @@ extern "C" { #define WHB_SERVER_BUFFER_SIZE 1024 -BOOL -WHBLogConsoleInit(); +BOOL WHBLogConsoleInit(); -void -WHBLogConsoleFree(); +void WHBLogConsoleFree(); -void -WHBLogConsoleSetColor(uint32_t color); +void WHBLogConsoleSetColor(uint32_t color); -void -WHBLogConsoleDraw(); +void WHBLogConsoleDraw(); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/log_module.h b/libraries/libwhb/include/whb/log_module.h index 3dc95ae51..8c275352a 100644 --- a/libraries/libwhb/include/whb/log_module.h +++ b/libraries/libwhb/include/whb/log_module.h @@ -11,11 +11,9 @@ extern "C" { #endif -BOOL -WHBLogModuleInit(); +BOOL WHBLogModuleInit(); -BOOL -WHBLogModuleDeinit(); +BOOL WHBLogModuleDeinit(); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/log_udp.h b/libraries/libwhb/include/whb/log_udp.h index 00900c66c..08d7bf452 100644 --- a/libraries/libwhb/include/whb/log_udp.h +++ b/libraries/libwhb/include/whb/log_udp.h @@ -11,11 +11,9 @@ extern "C" { #endif -BOOL -WHBLogUdpInit(); +BOOL WHBLogUdpInit(); -BOOL -WHBLogUdpDeinit(); +BOOL WHBLogUdpDeinit(); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/proc.h b/libraries/libwhb/include/whb/proc.h index b07cd5716..1cda03064 100644 --- a/libraries/libwhb/include/whb/proc.h +++ b/libraries/libwhb/include/whb/proc.h @@ -11,17 +11,13 @@ extern "C" { #endif -void -WHBProcInit(); +void WHBProcInit(); -void -WHBProcShutdown(); +void WHBProcShutdown(); -void -WHBProcStopRunning(); +void WHBProcStopRunning(); -BOOL -WHBProcIsRunning(); +BOOL WHBProcIsRunning(); #ifdef __cplusplus } diff --git a/libraries/libwhb/include/whb/sdcard.h b/libraries/libwhb/include/whb/sdcard.h index bee1a8c48..8e683bfd5 100644 --- a/libraries/libwhb/include/whb/sdcard.h +++ b/libraries/libwhb/include/whb/sdcard.h @@ -11,14 +11,12 @@ extern "C" { #endif -BOOL -WHBMountSdCard(); +BOOL WHBMountSdCard(); char * WHBGetSdCardMountPath(); -BOOL -WHBUnmountSdCard(); +BOOL WHBUnmountSdCard(); #ifdef __cplusplus } diff --git a/libraries/libwhb/src/console.c b/libraries/libwhb/src/console.c index ec6d5e40a..c20797adc 100644 --- a/libraries/libwhb/src/console.c +++ b/libraries/libwhb/src/console.c @@ -1,25 +1,25 @@ #include #include -#include #include #include +#include #include #include #include #include -#define NUM_LINES (16) -#define LINE_LENGTH (128) +#define NUM_LINES (16) +#define LINE_LENGTH (128) #define CONSOLE_FRAME_HEAP_TAG (0x000DECAF) static char sConsoleBuffer[NUM_LINES][LINE_LENGTH]; -static int sLineNum = 0; +static int sLineNum = 0; static void *sBufferTV = NULL, *sBufferDRC = NULL; static uint32_t sBufferSizeTV = 0, sBufferSizeDRC = 0; static BOOL sConsoleHasForeground = TRUE; -static uint32_t consoleColor = 0x993333FF; +static uint32_t consoleColor = 0x993333FF; static void ConsoleAddLine(const char *line) @@ -71,11 +71,10 @@ ConsoleProcCallbackReleased(void *context) return 0; } -BOOL -WHBLogConsoleInit() +BOOL WHBLogConsoleInit() { OSScreenInit(); - sBufferSizeTV = OSScreenGetBufferSizeEx(SCREEN_TV); + sBufferSizeTV = OSScreenGetBufferSizeEx(SCREEN_TV); sBufferSizeDRC = OSScreenGetBufferSizeEx(SCREEN_DRC); ConsoleProcCallbackAcquired(NULL); @@ -88,8 +87,7 @@ WHBLogConsoleInit() return FALSE; } -void -WHBLogConsoleFree() +void WHBLogConsoleFree() { if (sConsoleHasForeground) { OSScreenShutdown(); @@ -97,14 +95,12 @@ WHBLogConsoleFree() } } -void -WHBLogConsoleSetColor(uint32_t color) +void WHBLogConsoleSetColor(uint32_t color) { consoleColor = color; } -void -WHBLogConsoleDraw() +void WHBLogConsoleDraw() { if (!sConsoleHasForeground) { return; diff --git a/libraries/libwhb/src/crash.c b/libraries/libwhb/src/crash.c index f3cad2a1d..7a99ae23b 100644 --- a/libraries/libwhb/src/crash.c +++ b/libraries/libwhb/src/crash.c @@ -1,4 +1,3 @@ -#include #include #include #include @@ -8,37 +7,38 @@ #include #include #include +#include #include #define LOG_DISASSEMBLY_SIZE (4096) #define LOG_STACK_TRACE_SIZE (4096) -#define LOG_REGISTER_SIZE (4096) +#define LOG_REGISTER_SIZE (4096) -#define THREAD_STACK_SIZE (4096) +#define THREAD_STACK_SIZE (4096) static const char * -sCrashType = NULL; + sCrashType = NULL; static char -sDisassemblyBuffer[LOG_DISASSEMBLY_SIZE]; + sDisassemblyBuffer[LOG_DISASSEMBLY_SIZE]; static uint32_t -sDisassemblyLength = 0; + sDisassemblyLength = 0; static char -sStackTraceBuffer[LOG_STACK_TRACE_SIZE]; + sStackTraceBuffer[LOG_STACK_TRACE_SIZE]; static uint32_t -sStackTraceLength = 0; + sStackTraceLength = 0; static char -sRegistersBuffer[LOG_REGISTER_SIZE]; + sRegistersBuffer[LOG_REGISTER_SIZE]; static uint32_t -sRegistersLength = 0; + sRegistersLength = 0; static uint8_t -sCrashThreadStack[THREAD_STACK_SIZE]; + sCrashThreadStack[THREAD_STACK_SIZE]; static OSThread __attribute__((aligned(8))) sCrashThread; @@ -56,7 +56,7 @@ crashReportThread(int argc, const char **argv) } static void -disassemblyPrintCallback(const char* fmt, ...) +disassemblyPrintCallback(const char *fmt, ...) { va_list args; va_start(args, fmt); @@ -69,12 +69,12 @@ disassemblyPrintCallback(const char* fmt, ...) static void getDisassembly(OSContext *context) { - sDisassemblyLength = 0; + sDisassemblyLength = 0; sDisassemblyBuffer[0] = 0; if (context->srr0 > 16) { - DisassemblePPCRange((void *)(context->srr0 - 16), - (void *)(context->srr0 + 16), + DisassemblePPCRange((void *) (context->srr0 - 16), + (void *) (context->srr0 + 16), disassemblyPrintCallback, OSGetSymbolName, DISASSEMBLE_PPC_FLAGS_NONE); @@ -88,9 +88,9 @@ getStackTrace(OSContext *context) uint32_t *stackPtr; char name[256]; - sStackTraceLength = 0; + sStackTraceLength = 0; sStackTraceBuffer[0] = 0; - stackPtr = (uint32_t *)context->gpr[1]; + stackPtr = (uint32_t *) context->gpr[1]; sStackTraceLength += sprintf(sStackTraceBuffer + sStackTraceLength, "Address: Back Chain LR Save\n"); @@ -99,33 +99,33 @@ getStackTrace(OSContext *context) uint32_t addr; if (!stackPtr || - (uintptr_t)stackPtr == 0x1 || - (uintptr_t)stackPtr == 0xFFFFFFFF) { + (uintptr_t) stackPtr == 0x1 || + (uintptr_t) stackPtr == 0xFFFFFFFF) { break; } sStackTraceLength += sprintf(sStackTraceBuffer + sStackTraceLength, "0x%08x: 0x%08x 0x%08x", - (uintptr_t)stackPtr, - (uintptr_t)stackPtr[0], - (uintptr_t)stackPtr[1]); + (uintptr_t) stackPtr, + (uintptr_t) stackPtr[0], + (uintptr_t) stackPtr[1]); addr = OSGetSymbolName(stackPtr[1], name, sizeof(name)); if (addr) { sStackTraceLength += sprintf(sStackTraceBuffer + sStackTraceLength, " %s+0x%x", name, - (uintptr_t)(stackPtr[1] - addr)); + (uintptr_t) (stackPtr[1] - addr)); } sStackTraceLength += sprintf(sStackTraceBuffer + sStackTraceLength, "\n"); - stackPtr = (uint32_t *)*stackPtr; + stackPtr = (uint32_t *) *stackPtr; } sStackTraceBuffer[sStackTraceLength] = 0; } static void -writeRegister(const char* fmt, ...) +writeRegister(const char *fmt, ...) { va_list args; va_start(args, fmt); @@ -143,19 +143,19 @@ getRegisters(OSContext *context) int i; uint64_t *fpr, *psf; - sRegistersLength = 0; + sRegistersLength = 0; sRegistersBuffer[sRegistersLength] = 0; writeRegister("--Proc%d-Core%u--------- OSContext 0x%p --------------------\n\n", OSGetUPID(), OSGetCoreId(), context); writeRegister("tag1 = 0x%08X (expecting 0x%08X)\n", - (uint32_t)(context->tag >> 32), - (uint32_t)(OS_CONTEXT_TAG >> 32)); + (uint32_t) (context->tag >> 32), + (uint32_t) (OS_CONTEXT_TAG >> 32)); writeRegister("tag2 = 0x%08X (expecting 0x%08X)\n", - (uint32_t)(context->tag & 0xFFFFFFFF), - (uint32_t)(OS_CONTEXT_TAG & 0xFFFFFFFF)); + (uint32_t) (context->tag & 0xFFFFFFFF), + (uint32_t) (OS_CONTEXT_TAG & 0xFFFFFFFF)); writeRegister("TBR = 0x%08X_%08X\n", - (uint32_t)(tbr >> 32), (uint32_t)(tbr & 0xFFFFFFFF)); + (uint32_t) (tbr >> 32), (uint32_t) (tbr & 0xFFFFFFFF)); writeRegister("CR = 0x%08X\n", context->cr); writeRegister("CTR = 0x%08X\n", context->ctr); @@ -197,19 +197,19 @@ getRegisters(OSContext *context) } writeRegister("\n--FPRs----------\n"); - fpr = (uint64_t *)context->fpr; + fpr = (uint64_t *) context->fpr; for (i = 0; i < 16; ++i) { writeRegister("fr%d \t= 0x%16.16llx \t fr%d \t= 0x%16.16llx\n", - i, fpr[i], - i + 16, fpr[i + 16]); + i, fpr[i], + i + 16, fpr[i + 16]); } writeRegister("\n\n--PSFs----------\n"); - psf = (uint64_t *)context->psf; + psf = (uint64_t *) context->psf; for (i = 0; i < 16; ++i) { writeRegister("ps%d \t= 0x%16.16llx \t ps%d \t= 0x%16.16llx\n", - i, psf[i], - i + 16, psf[i + 16]); + i, psf[i], + i + 16, psf[i + 16]); } } @@ -232,7 +232,7 @@ handleException(const char *type, 0); OSResumeThread(&sCrashThread); - OSSuspendThread((OSThread *)context); + OSSuspendThread((OSThread *) context); return TRUE; } @@ -260,8 +260,7 @@ handleProgram(OSContext *context) return handleException("PROGRAM", context); } -BOOL -WHBInitCrashHandler() +BOOL WHBInitCrashHandler() { OSSetExceptionCallbackEx(OS_EXCEPTION_MODE_GLOBAL, OS_EXCEPTION_TYPE_ALIGNMENT, handleAlignment); diff --git a/libraries/libwhb/src/file.c b/libraries/libwhb/src/file.c index cc462d824..0a45eb73f 100644 --- a/libraries/libwhb/src/file.c +++ b/libraries/libwhb/src/file.c @@ -1,14 +1,14 @@ -#include #include +#include #include #include #include static BOOL -sInitialised = FALSE; + sInitialised = FALSE; static FSClient -sClient; + sClient; static BOOL InitFileSystem() @@ -26,18 +26,17 @@ InitFileSystem() return TRUE; } -BOOL -WHBDeInitFileSystem() +BOOL WHBDeInitFileSystem() { - if (sInitialised) { + if (sInitialised) { if (FSDelClient(&sClient, FS_ERROR_FLAG_ALL) != FS_STATUS_OK) { return FALSE; } sInitialised = FALSE; - } + } - return TRUE; + return TRUE; } int32_t @@ -68,7 +67,7 @@ WHBOpenFile(const char *path, return WHB_FILE_FATAL_ERROR; } - return (int32_t)handle; + return (int32_t) handle; } uint32_t @@ -78,7 +77,7 @@ WHBGetFileSize(int32_t handle) FSStatus result; FSStat stat; FSInitCmdBlock(&cmd); - result = FSGetStatFile(&sClient, &cmd, (FSFileHandle)handle, &stat, FS_ERROR_FLAG_ALL); + result = FSGetStatFile(&sClient, &cmd, (FSFileHandle) handle, &stat, FS_ERROR_FLAG_ALL); if (result < 0) { WHBLogPrintf("%s: FSGetStatFile error %d", __FUNCTION__, result); return 0; @@ -96,13 +95,13 @@ WHBReadFile(int32_t handle, FSCmdBlock cmd; FSStatus result; FSInitCmdBlock(&cmd); - result = FSReadFile(&sClient, &cmd, buf, size, count, (FSFileHandle)handle, 0, FS_ERROR_FLAG_ALL); + result = FSReadFile(&sClient, &cmd, buf, size, count, (FSFileHandle) handle, 0, FS_ERROR_FLAG_ALL); if (result < 0) { WHBLogPrintf("%s: FSReadFile error %d", __FUNCTION__, result); return 0; } - return (uint32_t)result; + return (uint32_t) result; } int32_t @@ -111,7 +110,7 @@ WHBCloseFile(int32_t handle) FSCmdBlock cmd; FSStatus result; FSInitCmdBlock(&cmd); - result = FSCloseFile(&sClient, &cmd, (FSFileHandle)handle, FS_ERROR_FLAG_ALL); + result = FSCloseFile(&sClient, &cmd, (FSFileHandle) handle, FS_ERROR_FLAG_ALL); if (result != FS_STATUS_OK) { WHBLogPrintf("%s: FSCloseFile error %d", __FUNCTION__, result); return WHB_FILE_FATAL_ERROR; @@ -127,7 +126,7 @@ WHBReadWholeFile(const char *path, int32_t handle; uint32_t size; char *buf = NULL; - handle = WHBOpenFile(path, "r"); + handle = WHBOpenFile(path, "r"); if (handle == WHB_FILE_FATAL_ERROR) { WHBLogPrintf("%s: WHBOpenFile failed", __FUNCTION__); return NULL; @@ -164,8 +163,7 @@ WHBReadWholeFile(const char *path, return NULL; } -void -WHBFreeWholeFile(char *file) +void WHBFreeWholeFile(char *file) { MEMFreeToDefaultHeap(file); } diff --git a/libraries/libwhb/src/gfx.c b/libraries/libwhb/src/gfx.c index a88bda5b6..67e6b95e0 100644 --- a/libraries/libwhb/src/gfx.c +++ b/libraries/libwhb/src/gfx.c @@ -20,58 +20,58 @@ #define WHB_GFX_COMMAND_BUFFER_POOL_SIZE (0x400000) static void * -sCommandBufferPool = NULL; + sCommandBufferPool = NULL; static GX2DrcRenderMode -sDrcRenderMode; + sDrcRenderMode; static void * -sDrcScanBuffer = NULL; + sDrcScanBuffer = NULL; static uint32_t -sDrcScanBufferSize = 0; + sDrcScanBufferSize = 0; static GX2SurfaceFormat -sDrcSurfaceFormat; + sDrcSurfaceFormat; static GX2TVRenderMode -sTvRenderMode; + sTvRenderMode; static void * -sTvScanBuffer = NULL; + sTvScanBuffer = NULL; static uint32_t -sTvScanBufferSize = 0; + sTvScanBufferSize = 0; static GX2SurfaceFormat -sTvSurfaceFormat; + sTvSurfaceFormat; static GX2ColorBuffer -sTvColourBuffer = { 0 }; + sTvColourBuffer = {0}; static GX2DepthBuffer -sTvDepthBuffer = { 0 }; + sTvDepthBuffer = {0}; static GX2ColorBuffer -sDrcColourBuffer = { 0 }; + sDrcColourBuffer = {0}; static GX2DepthBuffer -sDrcDepthBuffer = { 0 }; + sDrcDepthBuffer = {0}; static GX2ContextState * -sTvContextState = NULL; + sTvContextState = NULL; static GX2ContextState * -sDrcContextState = NULL; + sDrcContextState = NULL; static BOOL -sDrawingTv = FALSE; + sDrawingTv = FALSE; static BOOL -sGpuTimedOut = FALSE; + sGpuTimedOut = FALSE; static BOOL -sGfxHasForeground = TRUE; + sGfxHasForeground = TRUE; static void * GfxGX2RAlloc(GX2RResourceFlags flags, @@ -79,11 +79,7 @@ GfxGX2RAlloc(GX2RResourceFlags flags, uint32_t alignment) { // Color, depth, scan buffers all belong in MEM1 - if ((flags & (GX2R_RESOURCE_BIND_COLOR_BUFFER - | GX2R_RESOURCE_BIND_DEPTH_BUFFER - | GX2R_RESOURCE_BIND_SCAN_BUFFER - | GX2R_RESOURCE_USAGE_FORCE_MEM1)) - && !(flags & GX2R_RESOURCE_USAGE_FORCE_MEM2)) { + if ((flags & (GX2R_RESOURCE_BIND_COLOR_BUFFER | GX2R_RESOURCE_BIND_DEPTH_BUFFER | GX2R_RESOURCE_BIND_SCAN_BUFFER | GX2R_RESOURCE_USAGE_FORCE_MEM1)) && !(flags & GX2R_RESOURCE_USAGE_FORCE_MEM2)) { return GfxHeapAllocMEM1(size, alignment); } else { return GfxHeapAllocMEM2(size, alignment); @@ -93,11 +89,7 @@ GfxGX2RAlloc(GX2RResourceFlags flags, static void GfxGX2RFree(GX2RResourceFlags flags, void *block) { - if ((flags & (GX2R_RESOURCE_BIND_COLOR_BUFFER - | GX2R_RESOURCE_BIND_DEPTH_BUFFER - | GX2R_RESOURCE_BIND_SCAN_BUFFER - | GX2R_RESOURCE_USAGE_FORCE_MEM1)) - && !(flags & GX2R_RESOURCE_USAGE_FORCE_MEM2)) { + if ((flags & (GX2R_RESOURCE_BIND_COLOR_BUFFER | GX2R_RESOURCE_BIND_DEPTH_BUFFER | GX2R_RESOURCE_BIND_SCAN_BUFFER | GX2R_RESOURCE_USAGE_FORCE_MEM1)) && !(flags & GX2R_RESOURCE_USAGE_FORCE_MEM2)) { return GfxHeapFreeMEM1(block); } else { return GfxHeapFreeMEM2(block); @@ -112,16 +104,16 @@ GfxInitTvColourBuffer(GX2ColorBuffer *cb, GX2AAMode aa) { memset(cb, 0, sizeof(GX2ColorBuffer)); - cb->surface.use = GX2_SURFACE_USE_TEXTURE_COLOR_BUFFER_TV; - cb->surface.dim = GX2_SURFACE_DIM_TEXTURE_2D; - cb->surface.width = width; - cb->surface.height = height; - cb->surface.depth = 1; + cb->surface.use = GX2_SURFACE_USE_TEXTURE_COLOR_BUFFER_TV; + cb->surface.dim = GX2_SURFACE_DIM_TEXTURE_2D; + cb->surface.width = width; + cb->surface.height = height; + cb->surface.depth = 1; cb->surface.mipLevels = 1; - cb->surface.format = format; - cb->surface.aa = aa; - cb->surface.tileMode = GX2_TILE_MODE_DEFAULT; - cb->viewNumSlices = 1; + cb->surface.format = format; + cb->surface.aa = aa; + cb->surface.tileMode = GX2_TILE_MODE_DEFAULT; + cb->viewNumSlices = 1; GX2CalcSurfaceSizeAndAlignment(&cb->surface); GX2InitColorBufferRegs(cb); } @@ -141,16 +133,16 @@ GfxInitDepthBuffer(GX2DepthBuffer *db, db->surface.use = GX2_SURFACE_USE_DEPTH_BUFFER | GX2_SURFACE_USE_TEXTURE; } - db->surface.dim = GX2_SURFACE_DIM_TEXTURE_2D; - db->surface.width = width; - db->surface.height = height; - db->surface.depth = 1; + db->surface.dim = GX2_SURFACE_DIM_TEXTURE_2D; + db->surface.width = width; + db->surface.height = height; + db->surface.depth = 1; db->surface.mipLevels = 1; - db->surface.format = format; - db->surface.aa = aa; - db->surface.tileMode = GX2_TILE_MODE_DEFAULT; - db->viewNumSlices = 1; - db->depthClear = 1.0f; + db->surface.format = format; + db->surface.aa = aa; + db->surface.tileMode = GX2_TILE_MODE_DEFAULT; + db->viewNumSlices = 1; + db->depthClear = 1.0f; GX2CalcSurfaceSizeAndAlignment(&db->surface); GX2InitDepthBufferRegs(db); } @@ -284,8 +276,7 @@ GfxProcCallbackReleased(void *context) return 0; } -BOOL -WHBGfxInit() +BOOL WHBGfxInit() { uint32_t drcWidth, drcHeight; uint32_t tvWidth, tvHeight; @@ -299,41 +290,39 @@ WHBGfxInit() } uint32_t initAttribs[] = { - GX2_INIT_CMD_BUF_BASE, (uintptr_t)sCommandBufferPool, - GX2_INIT_CMD_BUF_POOL_SIZE, WHB_GFX_COMMAND_BUFFER_POOL_SIZE, - GX2_INIT_ARGC, 0, - GX2_INIT_ARGV, 0, - GX2_INIT_END - }; + GX2_INIT_CMD_BUF_BASE, (uintptr_t) sCommandBufferPool, + GX2_INIT_CMD_BUF_POOL_SIZE, WHB_GFX_COMMAND_BUFFER_POOL_SIZE, + GX2_INIT_ARGC, 0, + GX2_INIT_ARGV, 0, + GX2_INIT_END}; GX2Init(initAttribs); - sDrcRenderMode = GX2GetSystemDRCScanMode(); - sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; + sDrcRenderMode = GX2GetSystemDRCScanMode(); + sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8; - switch(GX2GetSystemTVScanMode()) - { - case GX2_TV_SCAN_MODE_480I: - case GX2_TV_SCAN_MODE_480P: - sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_480P; - tvWidth = 854; - tvHeight = 480; - break; - case GX2_TV_SCAN_MODE_1080I: - case GX2_TV_SCAN_MODE_1080P: - sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_1080P; - tvWidth = 1920; - tvHeight = 1080; - break; - case GX2_TV_SCAN_MODE_720P: - default: - sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_720P; - tvWidth = 1280; - tvHeight = 720; - break; - } - - drcWidth = 854; + switch (GX2GetSystemTVScanMode()) { + case GX2_TV_SCAN_MODE_480I: + case GX2_TV_SCAN_MODE_480P: + sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_480P; + tvWidth = 854; + tvHeight = 480; + break; + case GX2_TV_SCAN_MODE_1080I: + case GX2_TV_SCAN_MODE_1080P: + sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_1080P; + tvWidth = 1920; + tvHeight = 1080; + break; + case GX2_TV_SCAN_MODE_720P: + default: + sTvRenderMode = GX2_TV_RENDER_MODE_WIDE_720P; + tvWidth = 1280; + tvHeight = 720; + break; + } + + drcWidth = 854; drcHeight = 480; // Setup TV and DRC buffers - they will be allocated in GfxProcCallbackAcquired. @@ -363,9 +352,9 @@ WHBGfxInit() GX2SetContextState(sTvContextState); GX2SetColorBuffer(&sTvColourBuffer, GX2_RENDER_TARGET_0); GX2SetDepthBuffer(&sTvDepthBuffer); - GX2SetViewport(0, 0, (float)sTvColourBuffer.surface.width, (float)sTvColourBuffer.surface.height, 0.0f, 1.0f); - GX2SetScissor(0, 0, (float)sTvColourBuffer.surface.width, (float)sTvColourBuffer.surface.height); - GX2SetTVScale((float)sTvColourBuffer.surface.width, (float)sTvColourBuffer.surface.height); + GX2SetViewport(0, 0, (float) sTvColourBuffer.surface.width, (float) sTvColourBuffer.surface.height, 0.0f, 1.0f); + GX2SetScissor(0, 0, (float) sTvColourBuffer.surface.width, (float) sTvColourBuffer.surface.height); + GX2SetTVScale((float) sTvColourBuffer.surface.width, (float) sTvColourBuffer.surface.height); // Initialise DRC context state. sDrcContextState = GfxHeapAllocMEM2(sizeof(GX2ContextState), GX2_CONTEXT_STATE_ALIGNMENT); @@ -377,9 +366,9 @@ WHBGfxInit() GX2SetContextState(sDrcContextState); GX2SetColorBuffer(&sDrcColourBuffer, GX2_RENDER_TARGET_0); GX2SetDepthBuffer(&sDrcDepthBuffer); - GX2SetViewport(0, 0, (float)sDrcColourBuffer.surface.width, (float)sDrcColourBuffer.surface.height, 0.0f, 1.0f); - GX2SetScissor(0, 0, (float)sDrcColourBuffer.surface.width, (float)sDrcColourBuffer.surface.height); - GX2SetDRCScale((float)sDrcColourBuffer.surface.width, (float)sDrcColourBuffer.surface.height); + GX2SetViewport(0, 0, (float) sDrcColourBuffer.surface.width, (float) sDrcColourBuffer.surface.height, 0.0f, 1.0f); + GX2SetScissor(0, 0, (float) sDrcColourBuffer.surface.width, (float) sDrcColourBuffer.surface.height); + GX2SetDRCScale((float) sDrcColourBuffer.surface.width, (float) sDrcColourBuffer.surface.height); // Set 60fps VSync GX2SetSwapInterval(1); @@ -435,8 +424,7 @@ WHBGfxInit() return FALSE; } -void -WHBGfxShutdown() +void WHBGfxShutdown() { if (sGpuTimedOut) { GX2ResetGPU(0); @@ -466,8 +454,7 @@ WHBGfxShutdown() } } -void -WHBGfxBeginRender() +void WHBGfxBeginRender() { uint32_t swapCount, flipCount; OSTime lastFlip, lastVsync; @@ -491,8 +478,7 @@ WHBGfxBeginRender() } } -void -WHBGfxFinishRender() +void WHBGfxFinishRender() { GX2SwapScanBuffers(); GX2Flush(); @@ -501,8 +487,7 @@ WHBGfxFinishRender() GX2SetDRCEnable(TRUE); } -void -WHBGfxClearColor(float r, float g, float b, float a) +void WHBGfxClearColor(float r, float g, float b, float a) { if (sDrawingTv) { GX2ClearColor(&sTvColourBuffer, r, g, b, a); @@ -515,28 +500,24 @@ WHBGfxClearColor(float r, float g, float b, float a) } } -void -WHBGfxBeginRenderDRC() +void WHBGfxBeginRenderDRC() { GX2SetContextState(sDrcContextState); sDrawingTv = FALSE; } -void -WHBGfxFinishRenderDRC() +void WHBGfxFinishRenderDRC() { GX2CopyColorBufferToScanBuffer(&sDrcColourBuffer, GX2_SCAN_TARGET_DRC); } -void -WHBGfxBeginRenderTV() +void WHBGfxBeginRenderTV() { GX2SetContextState(sTvContextState); sDrawingTv = TRUE; } -void -WHBGfxFinishRenderTV() +void WHBGfxFinishRenderTV() { GX2CopyColorBufferToScanBuffer(&sTvColourBuffer, GX2_SCAN_TARGET_TV); } diff --git a/libraries/libwhb/src/gfx_heap.c b/libraries/libwhb/src/gfx_heap.c index 8f8c71760..ca7e88d04 100644 --- a/libraries/libwhb/src/gfx_heap.c +++ b/libraries/libwhb/src/gfx_heap.c @@ -1,20 +1,19 @@ #include "gfx_heap.h" -#include #include #include #include +#include #include static void * -sGfxHeapMEM1 = NULL; + sGfxHeapMEM1 = NULL; static void * -sGfxHeapForeground = NULL; + sGfxHeapForeground = NULL; #define GFX_FRAME_HEAP_TAG (0x123DECAF) -BOOL -GfxHeapInitMEM1() +BOOL GfxHeapInitMEM1() { MEMHeapHandle heap = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM1); uint32_t size; @@ -46,8 +45,7 @@ GfxHeapInitMEM1() return TRUE; } -BOOL -GfxHeapDestroyMEM1() +BOOL GfxHeapDestroyMEM1() { MEMHeapHandle heap = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM1); @@ -60,8 +58,7 @@ GfxHeapDestroyMEM1() return TRUE; } -BOOL -GfxHeapInitForeground() +BOOL GfxHeapInitForeground() { MEMHeapHandle heap = MEMGetBaseHeapHandle(MEM_BASE_HEAP_FG); uint32_t size; @@ -88,8 +85,7 @@ GfxHeapInitForeground() return TRUE; } -BOOL -GfxHeapDestroyForeground() +BOOL GfxHeapDestroyForeground() { MEMHeapHandle foreground = MEMGetBaseHeapHandle(MEM_BASE_HEAP_FG); @@ -120,8 +116,7 @@ GfxHeapAllocMEM1(uint32_t size, return block; } -void -GfxHeapFreeMEM1(void *block) +void GfxHeapFreeMEM1(void *block) { if (!sGfxHeapMEM1) { return; @@ -148,8 +143,7 @@ GfxHeapAllocForeground(uint32_t size, return block; } -void -GfxHeapFreeForeground(void *block) +void GfxHeapFreeForeground(void *block) { if (!sGfxHeapForeground) { return; @@ -169,8 +163,7 @@ GfxHeapAllocMEM2(uint32_t size, return MEMAllocFromDefaultHeapEx(size, alignment); } -void -GfxHeapFreeMEM2(void *block) +void GfxHeapFreeMEM2(void *block) { MEMFreeToDefaultHeap(block); } diff --git a/libraries/libwhb/src/gfx_heap.h b/libraries/libwhb/src/gfx_heap.h index 4d4debbd5..5b273555e 100644 --- a/libraries/libwhb/src/gfx_heap.h +++ b/libraries/libwhb/src/gfx_heap.h @@ -1,35 +1,28 @@ #pragma once #include -BOOL -GfxHeapInitMEM1(); +BOOL GfxHeapInitMEM1(); -BOOL -GfxHeapDestroyMEM1(); +BOOL GfxHeapDestroyMEM1(); -BOOL -GfxHeapInitForeground(); +BOOL GfxHeapInitForeground(); -BOOL -GfxHeapDestroyForeground(); +BOOL GfxHeapDestroyForeground(); void * GfxHeapAllocMEM1(uint32_t size, uint32_t alignment); -void -GfxHeapFreeMEM1(void *block); +void GfxHeapFreeMEM1(void *block); void * GfxHeapAllocForeground(uint32_t size, uint32_t alignment); -void -GfxHeapFreeForeground(void *block); +void GfxHeapFreeForeground(void *block); void * GfxHeapAllocMEM2(uint32_t size, uint32_t alignment); -void -GfxHeapFreeMEM2(void *block); +void GfxHeapFreeMEM2(void *block); diff --git a/libraries/libwhb/src/gfx_shader.c b/libraries/libwhb/src/gfx_shader.c index 3c1ee6ca5..b9bf76db5 100644 --- a/libraries/libwhb/src/gfx_shader.c +++ b/libraries/libwhb/src/gfx_shader.c @@ -1,9 +1,9 @@ #include "gfx_heap.h" #include -#include #include #include #include +#include #include #include #include @@ -14,7 +14,7 @@ WHBGfxLoadGFDPixelShader(uint32_t index, { uint32_t headerSize, programSize; GX2PixelShader *shader = NULL; - void *program = NULL; + void *program = NULL; if (index >= GFDGetPixelShaderCount(file)) { WHBLogPrintf("%s: index %u >= %u GFDGetPixelShaderCount(file)", @@ -36,7 +36,7 @@ WHBGfxLoadGFDPixelShader(uint32_t index, goto error; } - shader = (GX2PixelShader *)GfxHeapAllocMEM2(headerSize, 64); + shader = (GX2PixelShader *) GfxHeapAllocMEM2(headerSize, 64); if (!shader) { WHBLogPrintf("%s: GfxHeapAllocMEM2(%u, 64) failed", __FUNCTION__, headerSize); @@ -47,9 +47,9 @@ WHBGfxLoadGFDPixelShader(uint32_t index, GX2R_RESOURCE_USAGE_CPU_READ | GX2R_RESOURCE_USAGE_CPU_WRITE | GX2R_RESOURCE_USAGE_GPU_READ; - shader->gx2rBuffer.elemSize = programSize; + shader->gx2rBuffer.elemSize = programSize; shader->gx2rBuffer.elemCount = 1; - shader->gx2rBuffer.buffer = NULL; + shader->gx2rBuffer.buffer = NULL; if (!GX2RCreateBuffer(&shader->gx2rBuffer)) { WHBLogPrintf("%s: GX2RCreateBuffer failed with programSize = %u", __FUNCTION__, programSize); @@ -66,7 +66,7 @@ WHBGfxLoadGFDPixelShader(uint32_t index, WHBLogPrintf("%s: GFDGetPixelShader failed", __FUNCTION__); GX2RUnlockBufferEx(&shader->gx2rBuffer, GX2R_RESOURCE_DISABLE_CPU_INVALIDATE | - GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); + GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); goto error; } @@ -89,8 +89,7 @@ WHBGfxLoadGFDPixelShader(uint32_t index, return NULL; } -BOOL -WHBGfxFreePixelShader(GX2PixelShader *shader) +BOOL WHBGfxFreePixelShader(GX2PixelShader *shader) { if (shader->gx2rBuffer.buffer) { GX2RDestroyBufferEx(&shader->gx2rBuffer, 0); @@ -106,7 +105,7 @@ WHBGfxLoadGFDVertexShader(uint32_t index, { uint32_t headerSize, programSize; GX2VertexShader *shader = NULL; - void *program = NULL; + void *program = NULL; if (index >= GFDGetVertexShaderCount(file)) { WHBLogPrintf("%s: index %u >= %u GFDGetVertexShaderCount(file)", @@ -128,7 +127,7 @@ WHBGfxLoadGFDVertexShader(uint32_t index, goto error; } - shader = (GX2VertexShader *)GfxHeapAllocMEM2(headerSize, 64); + shader = (GX2VertexShader *) GfxHeapAllocMEM2(headerSize, 64); if (!shader) { WHBLogPrintf("%s: GfxHeapAllocMEM2(%u, 64) failed", __FUNCTION__, headerSize); @@ -139,9 +138,9 @@ WHBGfxLoadGFDVertexShader(uint32_t index, GX2R_RESOURCE_USAGE_CPU_READ | GX2R_RESOURCE_USAGE_CPU_WRITE | GX2R_RESOURCE_USAGE_GPU_READ; - shader->gx2rBuffer.elemSize = programSize; + shader->gx2rBuffer.elemSize = programSize; shader->gx2rBuffer.elemCount = 1; - shader->gx2rBuffer.buffer = NULL; + shader->gx2rBuffer.buffer = NULL; if (!GX2RCreateBuffer(&shader->gx2rBuffer)) { WHBLogPrintf("%s: GX2RCreateBuffer failed with programSize = %u", __FUNCTION__, programSize); @@ -158,7 +157,7 @@ WHBGfxLoadGFDVertexShader(uint32_t index, WHBLogPrintf("%s: GFDGetVertexShader failed", __FUNCTION__); GX2RUnlockBufferEx(&shader->gx2rBuffer, GX2R_RESOURCE_DISABLE_CPU_INVALIDATE | - GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); + GX2R_RESOURCE_DISABLE_GPU_INVALIDATE); goto error; } @@ -181,8 +180,7 @@ WHBGfxLoadGFDVertexShader(uint32_t index, return NULL; } -BOOL -WHBGfxFreeVertexShader(GX2VertexShader *shader) +BOOL WHBGfxFreeVertexShader(GX2VertexShader *shader) { if (shader->gx2rBuffer.buffer) { GX2RDestroyBufferEx(&shader->gx2rBuffer, 0); @@ -192,14 +190,13 @@ WHBGfxFreeVertexShader(GX2VertexShader *shader) return TRUE; } -BOOL -WHBGfxLoadGFDShaderGroup(WHBGfxShaderGroup *group, - uint32_t index, - const void *file) +BOOL WHBGfxLoadGFDShaderGroup(WHBGfxShaderGroup *group, + uint32_t index, + const void *file) { memset(group, 0, sizeof(WHBGfxShaderGroup)); group->vertexShader = WHBGfxLoadGFDVertexShader(index, file); - group->pixelShader = WHBGfxLoadGFDPixelShader(index, file); + group->pixelShader = WHBGfxLoadGFDPixelShader(index, file); if (!group->vertexShader || !group->pixelShader) { // A shader group requires at least a vertex shader and a pixel shader. @@ -214,34 +211,34 @@ static uint32_t GfxGetAttribFormatSel(GX2AttribFormat format) { switch (format) { - case GX2_ATTRIB_FORMAT_UNORM_8: - case GX2_ATTRIB_FORMAT_UINT_8: - case GX2_ATTRIB_FORMAT_SNORM_8: - case GX2_ATTRIB_FORMAT_SINT_8: - case GX2_ATTRIB_FORMAT_FLOAT_32: - return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); - case GX2_ATTRIB_FORMAT_UNORM_8_8: - case GX2_ATTRIB_FORMAT_UINT_8_8: - case GX2_ATTRIB_FORMAT_SNORM_8_8: - case GX2_ATTRIB_FORMAT_SINT_8_8: - case GX2_ATTRIB_FORMAT_FLOAT_32_32: - return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_0, GX2_SQ_SEL_1); - case GX2_ATTRIB_FORMAT_FLOAT_32_32_32: - return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_1); - case GX2_ATTRIB_FORMAT_UNORM_8_8_8_8: - case GX2_ATTRIB_FORMAT_UINT_8_8_8_8: - case GX2_ATTRIB_FORMAT_SNORM_8_8_8_8: - case GX2_ATTRIB_FORMAT_SINT_8_8_8_8: - case GX2_ATTRIB_FORMAT_FLOAT_32_32_32_32: - return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_W); - break; - default: - return GX2_SEL_MASK(GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); + case GX2_ATTRIB_FORMAT_UNORM_8: + case GX2_ATTRIB_FORMAT_UINT_8: + case GX2_ATTRIB_FORMAT_SNORM_8: + case GX2_ATTRIB_FORMAT_SINT_8: + case GX2_ATTRIB_FORMAT_FLOAT_32: + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); + case GX2_ATTRIB_FORMAT_UNORM_8_8: + case GX2_ATTRIB_FORMAT_UINT_8_8: + case GX2_ATTRIB_FORMAT_SNORM_8_8: + case GX2_ATTRIB_FORMAT_SINT_8_8: + case GX2_ATTRIB_FORMAT_FLOAT_32_32: + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_0, GX2_SQ_SEL_1); + case GX2_ATTRIB_FORMAT_FLOAT_32_32_32: + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_1); + case GX2_ATTRIB_FORMAT_UNORM_8_8_8_8: + case GX2_ATTRIB_FORMAT_UINT_8_8_8_8: + case GX2_ATTRIB_FORMAT_SNORM_8_8_8_8: + case GX2_ATTRIB_FORMAT_SINT_8_8_8_8: + case GX2_ATTRIB_FORMAT_FLOAT_32_32_32_32: + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_W); + break; + default: + return GX2_SEL_MASK(GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); } } static int32_t -GfxGetVertexAttribVarLocation(const GX2VertexShader* shader, +GfxGetVertexAttribVarLocation(const GX2VertexShader *shader, const char *name) { uint32_t i; @@ -255,12 +252,11 @@ GfxGetVertexAttribVarLocation(const GX2VertexShader* shader, return -1; } -BOOL -WHBGfxInitShaderAttribute(WHBGfxShaderGroup *group, - const char *name, - uint32_t buffer, - uint32_t offset, - GX2AttribFormat format) +BOOL WHBGfxInitShaderAttribute(WHBGfxShaderGroup *group, + const char *name, + uint32_t buffer, + uint32_t offset, + GX2AttribFormat format) { GX2AttribStream *attrib; int32_t location; @@ -270,24 +266,23 @@ WHBGfxInitShaderAttribute(WHBGfxShaderGroup *group, return FALSE; } - attrib = &group->attributes[group->numAttributes++]; - attrib->location = location; - attrib->buffer = buffer; - attrib->offset = offset; - attrib->format = format; - attrib->type = GX2_ATTRIB_INDEX_PER_VERTEX; + attrib = &group->attributes[group->numAttributes++]; + attrib->location = location; + attrib->buffer = buffer; + attrib->offset = offset; + attrib->format = format; + attrib->type = GX2_ATTRIB_INDEX_PER_VERTEX; attrib->aluDivisor = 0; - attrib->mask = GfxGetAttribFormatSel(format); + attrib->mask = GfxGetAttribFormatSel(format); attrib->endianSwap = GX2_ENDIAN_SWAP_DEFAULT; return TRUE; } -BOOL -WHBGfxInitFetchShader(WHBGfxShaderGroup *group) +BOOL WHBGfxInitFetchShader(WHBGfxShaderGroup *group) { - uint32_t size = GX2CalcFetchShaderSizeEx(group->numAttributes, - GX2_FETCH_SHADER_TESSELLATION_NONE, - GX2_TESSELLATION_MODE_DISCRETE); + uint32_t size = GX2CalcFetchShaderSizeEx(group->numAttributes, + GX2_FETCH_SHADER_TESSELLATION_NONE, + GX2_TESSELLATION_MODE_DISCRETE); group->fetchShaderProgram = GfxHeapAllocMEM2(size, GX2_SHADER_PROGRAM_ALIGNMENT); GX2InitFetchShaderEx(&group->fetchShader, @@ -301,8 +296,7 @@ WHBGfxInitFetchShader(WHBGfxShaderGroup *group) return TRUE; } -BOOL -WHBGfxFreeShaderGroup(WHBGfxShaderGroup *group) +BOOL WHBGfxFreeShaderGroup(WHBGfxShaderGroup *group) { if (group->fetchShaderProgram) { GfxHeapFreeMEM2(group->fetchShaderProgram); diff --git a/libraries/libwhb/src/gfx_texture.c b/libraries/libwhb/src/gfx_texture.c index 2eb9fb012..acceafbe3 100644 --- a/libraries/libwhb/src/gfx_texture.c +++ b/libraries/libwhb/src/gfx_texture.c @@ -1,9 +1,9 @@ #include "gfx_heap.h" #include -#include #include -#include +#include #include +#include GX2Texture * WHBGfxLoadGFDTexture(uint32_t index, @@ -18,13 +18,13 @@ WHBGfxLoadGFDTexture(uint32_t index, } headerSize = GFDGetTextureHeaderSize(index, file); - imageSize = GFDGetTextureImageSize(index, file); + imageSize = GFDGetTextureImageSize(index, file); if (!headerSize || !imageSize) { goto error; } - texture = (GX2Texture *)GfxHeapAllocMEM2(headerSize, 64); + texture = (GX2Texture *) GfxHeapAllocMEM2(headerSize, 64); if (!texture) { WHBLogPrintf("%s: GfxHeapAllocMEM2(0x%X, 64) failed", __FUNCTION__, headerSize); @@ -46,8 +46,7 @@ WHBGfxLoadGFDTexture(uint32_t index, return NULL; } -BOOL -WHBGfxFreeTexture(GX2Texture *texture) +BOOL WHBGfxFreeTexture(GX2Texture *texture) { GX2RDestroySurfaceEx(&texture->surface, 0); GfxHeapFreeMEM2(texture); diff --git a/libraries/libwhb/src/libmanager.c b/libraries/libwhb/src/libmanager.c index c3fac9937..b26e55024 100644 --- a/libraries/libwhb/src/libmanager.c +++ b/libraries/libwhb/src/libmanager.c @@ -1,9 +1,7 @@ -void -WHBInitializeSocketLibrary() +void WHBInitializeSocketLibrary() { } -void -WHBDeinitializeSocketLibrary() +void WHBDeinitializeSocketLibrary() { } diff --git a/libraries/libwhb/src/log.c b/libraries/libwhb/src/log.c index 660f225f8..93afb8d6e 100644 --- a/libraries/libwhb/src/log.c +++ b/libraries/libwhb/src/log.c @@ -4,14 +4,14 @@ #include #include -#define MAX_HANDLERS 16 +#define MAX_HANDLERS 16 #define PRINTF_BUFFER_LENGTH 2048 static LogHandlerFn -sHandlers[MAX_HANDLERS] = { 0 }; + sHandlers[MAX_HANDLERS] = {0}; static inline void -dispatchMessage(const char * str) +dispatchMessage(const char *str) { int i; for (i = 0; i < MAX_HANDLERS; ++i) { @@ -21,14 +21,13 @@ dispatchMessage(const char * str) } } -BOOL -WHBAddLogHandler(LogHandlerFn fn) +BOOL WHBAddLogHandler(LogHandlerFn fn) { int i; for (i = 0; i < MAX_HANDLERS; ++i) { - if(sHandlers[i] == fn){ - return TRUE; + if (sHandlers[i] == fn) { + return TRUE; } if (!sHandlers[i]) { sHandlers[i] = fn; @@ -39,13 +38,12 @@ WHBAddLogHandler(LogHandlerFn fn) return FALSE; } -BOOL -WHBRemoveLogHandler(LogHandlerFn fn) +BOOL WHBRemoveLogHandler(LogHandlerFn fn) { int i; - for(i = 0; i < MAX_HANDLERS; ++i) { - if(sHandlers[i] == fn) { + for (i = 0; i < MAX_HANDLERS; ++i) { + if (sHandlers[i] == fn) { sHandlers[i] = NULL; return TRUE; } @@ -54,18 +52,16 @@ WHBRemoveLogHandler(LogHandlerFn fn) return FALSE; } -BOOL -WHBLogWrite(const char *str) +BOOL WHBLogWrite(const char *str) { dispatchMessage(str); return TRUE; } -BOOL -WHBLogPrint(const char *str) +BOOL WHBLogPrint(const char *str) { char *buf = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4); - if(!buf) { + if (!buf) { return FALSE; } @@ -76,8 +72,7 @@ WHBLogPrint(const char *str) return TRUE; } -BOOL -WHBLogWritef(const char *fmt, ...) +BOOL WHBLogWritef(const char *fmt, ...) { char *buf = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4); va_list va; @@ -95,8 +90,7 @@ WHBLogWritef(const char *fmt, ...) return TRUE; } -BOOL -WHBLogPrintf(const char *fmt, ...) +BOOL WHBLogPrintf(const char *fmt, ...) { char *buf1 = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4); char *buf2 = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4); @@ -106,7 +100,7 @@ WHBLogPrintf(const char *fmt, ...) return FALSE; } - if(!buf2) { + if (!buf2) { MEMFreeToDefaultHeap(buf1); return FALSE; } diff --git a/libraries/libwhb/src/log_cafe.c b/libraries/libwhb/src/log_cafe.c index 34d067e56..df6ca1a3c 100644 --- a/libraries/libwhb/src/log_cafe.c +++ b/libraries/libwhb/src/log_cafe.c @@ -4,26 +4,23 @@ #include static void -cafeLogHandler(const char * msg) +cafeLogHandler(const char *msg) { int length = strlen(msg); - if(msg[length-1] != '\n') { + if (msg[length - 1] != '\n') { OSReport("%s\n", msg); - } - else { + } else { OSReport(msg); } } -BOOL -WHBLogCafeInit() +BOOL WHBLogCafeInit() { return WHBAddLogHandler(cafeLogHandler); } -BOOL -WHBLogCafeDeinit() +BOOL WHBLogCafeDeinit() { return WHBRemoveLogHandler(cafeLogHandler); } diff --git a/libraries/libwhb/src/log_module.c b/libraries/libwhb/src/log_module.c index cb91be87b..37e3eb815 100644 --- a/libraries/libwhb/src/log_module.c +++ b/libraries/libwhb/src/log_module.c @@ -1,28 +1,27 @@ -#include #include -#include +#include #include +#include -static OSDynLoad_Module sModuleHandle = NULL; +static OSDynLoad_Module sModuleHandle = NULL; static void (*sWUMSLogWrite)(const char *, size_t) = NULL; static void moduleLogHandler(const char *msg) { - if(sWUMSLogWrite != NULL) { + if (sWUMSLogWrite != NULL) { sWUMSLogWrite(msg, strlen(msg)); } } -BOOL -WHBLogModuleInit() -{ +BOOL WHBLogModuleInit() +{ if (OSDynLoad_Acquire("homebrew_logging", &sModuleHandle) != OS_DYNLOAD_OK) { OSReport("WHBLogModuleInit: OSDynLoad_Acquire failed.\n"); return false; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "WUMSLogWrite", (void**) &sWUMSLogWrite) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, FALSE, "WUMSLogWrite", (void **) &sWUMSLogWrite) != OS_DYNLOAD_OK) { OSReport("WHBLogModuleInit: OSDynLoad_FindExport failed.\n"); return false; } @@ -30,8 +29,7 @@ WHBLogModuleInit() return WHBAddLogHandler(moduleLogHandler); } -BOOL -WHBLogModuleDeinit() +BOOL WHBLogModuleDeinit() { return WHBRemoveLogHandler(moduleLogHandler); } \ No newline at end of file diff --git a/libraries/libwhb/src/log_udp.c b/libraries/libwhb/src/log_udp.c index 4027d9b37..7779951fe 100644 --- a/libraries/libwhb/src/log_udp.c +++ b/libraries/libwhb/src/log_udp.c @@ -1,18 +1,18 @@ +#include #include #include -#include #include -#include #include +#include +#include #include #include -#include static int -sSocket = -1; + sSocket = -1; static struct sockaddr_in -sSendAddr; + sSendAddr; #define SERVER_PORT 4405 @@ -23,16 +23,15 @@ udpLogHandler(const char *msg) msg, strlen(msg), 0, - (struct sockaddr *)&sSendAddr, + (struct sockaddr *) &sSendAddr, sizeof(struct sockaddr_in)); } -BOOL -WHBLogUdpInit() +BOOL WHBLogUdpInit() { int broadcastEnable = 1; - sSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); if (sSocket < 0) { return FALSE; } @@ -40,17 +39,16 @@ WHBLogUdpInit() setsockopt(sSocket, SOL_SOCKET, SO_BROADCAST, &broadcastEnable, sizeof(broadcastEnable)); memset(&sSendAddr, 0, sizeof(struct sockaddr_in)); - sSendAddr.sin_family = AF_INET; - sSendAddr.sin_port = htons(SERVER_PORT); + sSendAddr.sin_family = AF_INET; + sSendAddr.sin_port = htons(SERVER_PORT); sSendAddr.sin_addr.s_addr = htonl(INADDR_BROADCAST); return WHBAddLogHandler(udpLogHandler); } -BOOL -WHBLogUdpDeinit() +BOOL WHBLogUdpDeinit() { - if(shutdown(sSocket, SHUT_WR) != 0) { + if (shutdown(sSocket, SHUT_WR) != 0) { return FALSE; } diff --git a/libraries/libwhb/src/proc.c b/libraries/libwhb/src/proc.c index ad66d744b..60af83c20 100644 --- a/libraries/libwhb/src/proc.c +++ b/libraries/libwhb/src/proc.c @@ -10,19 +10,19 @@ #include #include -#define HBL_TITLE_ID (0x0005000013374842) +#define HBL_TITLE_ID (0x0005000013374842) #define MII_MAKER_JPN_TITLE_ID (0x000500101004A000) #define MII_MAKER_USA_TITLE_ID (0x000500101004A100) #define MII_MAKER_EUR_TITLE_ID (0x000500101004A200) static uint32_t -sMainCore; + sMainCore; static BOOL -sRunning = FALSE; + sRunning = FALSE; static BOOL -sFromHBL = FALSE; + sFromHBL = FALSE; static uint32_t procSaveCallback(void *context) @@ -42,8 +42,7 @@ procHomeButtonDenied(void *context) return 0; } -void -WHBProcInit() +void WHBProcInit() { uint64_t titleID = OSGetTitleID(); @@ -60,7 +59,7 @@ WHBProcInit() } sMainCore = OSGetCoreId(); - sRunning = TRUE; + sRunning = TRUE; ProcUIInitEx(&procSaveCallback, NULL); if (sFromHBL) { @@ -69,8 +68,7 @@ WHBProcInit() } } -void -WHBProcShutdown() +void WHBProcShutdown() { sRunning = FALSE; @@ -81,14 +79,12 @@ WHBProcShutdown() } } -void -WHBProcStopRunning() +void WHBProcStopRunning() { sRunning = FALSE; } -BOOL -WHBProcIsRunning() +BOOL WHBProcIsRunning() { ProcUIStatus status; diff --git a/libraries/libwhb/src/sdcard.c b/libraries/libwhb/src/sdcard.c index 3c0582c54..f00ad50fa 100644 --- a/libraries/libwhb/src/sdcard.c +++ b/libraries/libwhb/src/sdcard.c @@ -1,18 +1,17 @@ #include -#include #include +#include static BOOL -sMounted = FALSE; + sMounted = FALSE; static char -sMountPath[128] = { 0 }; + sMountPath[128] = {0}; static FSClient -sClient; + sClient; -BOOL -WHBMountSdCard() +BOOL WHBMountSdCard() { FSCmdBlock cmd; FSMountSource mountSource; @@ -57,8 +56,7 @@ WHBGetSdCardMountPath() return sMountPath; } -BOOL -WHBUnmountSdCard() +BOOL WHBUnmountSdCard() { FSCmdBlock cmd; FSStatus result; @@ -74,7 +72,7 @@ WHBUnmountSdCard() WHBLogPrintf("%s: FSUnmount error %d", __FUNCTION__, result); return FALSE; } - + result = FSDelClient(&sClient, FS_ERROR_FLAG_ALL); if (result < 0) { WHBLogPrintf("%s: FSDelClient error %d", __FUNCTION__, result); diff --git a/libraries/nn_erreula/nn_erreula.cpp b/libraries/nn_erreula/nn_erreula.cpp index 89ccfb284..291b02463 100644 --- a/libraries/nn_erreula/nn_erreula.cpp +++ b/libraries/nn_erreula/nn_erreula.cpp @@ -1,359 +1,317 @@ -#include #include +#include #include #include #include -namespace nn -{ -namespace erreula -{ - -static const uint32_t kWorkMemorySize = 0x1F00000; -static const uint32_t kRplAcquireBufferSize = 0xC80000; - -static MEMHeapHandle sHeapHandle = NULL; -static OSDynLoad_Module sModuleHandle = NULL; - -static void *sAppearError = NULL; -static void *sAppearHomeNixSign = NULL; -static void *sCalc = NULL; -static void *sChangeLang = NULL; -static void *sCreate = NULL; -static void *sDestroy = NULL; -static void *sDisappearError = NULL; -static void *sDisappearHomeNixSign = NULL; -static void *sDrawDRC = NULL; -static void *sDrawTV = NULL; -static void *sGetResultCode = NULL; -static void *sGetResultType = NULL; -static void *sGetSelectButtonNumError = NULL; -static void *sGetStateErrorViewer = NULL; -static void *sIsAppearHomeNixSign = NULL; -static void *sIsDecideSelectButtonError = NULL; -static void *sIsDecideSelectLeftButtonError = NULL; -static void *sIsDecideSelectRightButtonError = NULL; -static void *sIsSelectCursorActive = NULL; -static void *sJump = NULL; -static void *sPlayAppearSE = NULL; -static void *sSetControllerRemo = NULL; -static void *sSetVersion = NULL; - -static OSDynLoad_Error -allocForDynLoad(int32_t size, - int32_t align, - void **outAddr) -{ - void *addr = MEMAllocFromExpHeapEx(sHeapHandle, size, align); - if (!addr) { - return OS_DYNLOAD_OUT_OF_MEMORY; - } - - *outAddr = addr; - return OS_DYNLOAD_OK; -} - -static void -freeForDynLoad(void *addr) -{ - MEMFreeToExpHeap(sHeapHandle, addr); -} - -static void -Create(void *workMemory, - RegionType region, - LangType language, - FSClient *fsClient) -{ - - return reinterpret_cast(sCreate)( - workMemory, region, language, fsClient); -} - -static void -SetVersion(int version) -{ - return reinterpret_cast(sSetVersion)( - version); -} - -bool -Create(const CreateArg &args) -{ - OSDynLoadAllocFn prevDynLoadAlloc = NULL; - OSDynLoadFreeFn prevDynLoadFree = NULL; - uint32_t dynloadAcquireUseSize = 0; - void *workMemory = NULL; - bool result = true; - - if (!args.workMemory) { - OSReport("ERREULA: Create failed. CreateArg.workMemory is NULL."); - return false; - } - - if (!args.fsClient) { - OSReport("ERREULA: Create failed. CreateArg.fsClient is NULL."); - return false; - } - - sHeapHandle = MEMCreateExpHeapEx(args.workMemory, kWorkMemorySize, 0); - OSDynLoad_GetAllocator(&prevDynLoadAlloc, &prevDynLoadFree); - OSDynLoad_SetAllocator(allocForDynLoad, freeForDynLoad); - - if (OSDynLoad_Error error = OSDynLoad_Acquire("erreula.rpl", &sModuleHandle)) { - OSReport("ERREULA: Create failed. OSDynLoad_Acquire() return error(%d).\n", - error); - result = false; - goto out; - } - - dynloadAcquireUseSize = kWorkMemorySize - - MEMGetAllocatableSizeForExpHeapEx(sHeapHandle, 4); - OSReport("ERREULA: OSDynLoad_Acquire() use [%d/%d]\n", - dynloadAcquireUseSize, kRplAcquireBufferSize); - - if (dynloadAcquireUseSize > kRplAcquireBufferSize) { - OSReport("ERREULA: Create failed. dynload_acquire_use_size > kRplAcquireBufferSize."); - result = false; - goto out; - } - - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaAppearError__3RplFRCQ3_2nn7erreula9AppearArg", &sAppearError); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaCalc__3RplFRCQ3_2nn7erreula14ControllerInfo", &sCalc); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaCreate__3RplFPUcQ3_2nn7erreula10RegionTypeQ3_2nn7erreula8LangTypeP8FSClient", &sCreate); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDestroy__3RplFv", &sDestroy); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDisappearError__3RplFv", &sDisappearError); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDrawDRC__3RplFv", &sDrawDRC); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDrawTV__3RplFv", &sDrawTV); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetStateErrorViewer__3RplFv", &sGetStateErrorViewer); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsDecideSelectButtonError__3RplFv", &sIsDecideSelectButtonError); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsDecideSelectLeftButtonError__3RplFv", &sIsDecideSelectLeftButtonError); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsDecideSelectRightButtonError__3RplFv", &sIsDecideSelectRightButtonError); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaSetControllerRemo__3RplFQ3_2nn7erreula14ControllerType", &sSetControllerRemo); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaAppearHomeNixSign__3RplFRCQ3_2nn7erreula14HomeNixSignArg", &sAppearHomeNixSign); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsAppearHomeNixSign__3RplFv", &sIsAppearHomeNixSign); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDisappearHomeNixSign__3RplFv", &sDisappearHomeNixSign); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaChangeLang__3RplFQ3_2nn7erreula8LangType", &sChangeLang); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsSelectCursorActive__3RplFv", &sIsSelectCursorActive); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetResultType__3RplFv", &sGetResultType); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetResultCode__3RplFv", &sGetResultCode); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetSelectButtonNumError__3RplFv", &sGetSelectButtonNumError); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaSetVersion__3RplFi", &sSetVersion); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaPlayAppearSE__3RplFb", &sPlayAppearSE); - OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaJump__3RplFPCcUi", &sJump); - - workMemory = MEMAllocFromExpHeapEx(sHeapHandle, - kWorkMemorySize - kRplAcquireBufferSize, - 4); - if (!workMemory) { - OSReport("ERREULA: Create failed. framework_buffer == NULL."); - result = false; - goto out; - } else { - SetVersion(3); - Create(workMemory, args.region, args.language, args.fsClient); - result = true; - } - -out: - if (!result) { - if (sModuleHandle) { - OSDynLoad_Release(sModuleHandle); - sModuleHandle = NULL; +namespace nn { + namespace erreula { + + static const uint32_t kWorkMemorySize = 0x1F00000; + static const uint32_t kRplAcquireBufferSize = 0xC80000; + + static MEMHeapHandle sHeapHandle = NULL; + static OSDynLoad_Module sModuleHandle = NULL; + + static void *sAppearError = NULL; + static void *sAppearHomeNixSign = NULL; + static void *sCalc = NULL; + static void *sChangeLang = NULL; + static void *sCreate = NULL; + static void *sDestroy = NULL; + static void *sDisappearError = NULL; + static void *sDisappearHomeNixSign = NULL; + static void *sDrawDRC = NULL; + static void *sDrawTV = NULL; + static void *sGetResultCode = NULL; + static void *sGetResultType = NULL; + static void *sGetSelectButtonNumError = NULL; + static void *sGetStateErrorViewer = NULL; + static void *sIsAppearHomeNixSign = NULL; + static void *sIsDecideSelectButtonError = NULL; + static void *sIsDecideSelectLeftButtonError = NULL; + static void *sIsDecideSelectRightButtonError = NULL; + static void *sIsSelectCursorActive = NULL; + static void *sJump = NULL; + static void *sPlayAppearSE = NULL; + static void *sSetControllerRemo = NULL; + static void *sSetVersion = NULL; + + static OSDynLoad_Error + allocForDynLoad(int32_t size, + int32_t align, + void **outAddr) + { + void *addr = MEMAllocFromExpHeapEx(sHeapHandle, size, align); + if (!addr) { + return OS_DYNLOAD_OUT_OF_MEMORY; + } + + *outAddr = addr; + return OS_DYNLOAD_OK; + } + + static void + freeForDynLoad(void *addr) + { + MEMFreeToExpHeap(sHeapHandle, addr); + } + + static void + Create(void *workMemory, + RegionType region, + LangType language, + FSClient *fsClient) + { + + return reinterpret_cast(sCreate)( + workMemory, region, language, fsClient); + } + + static void + SetVersion(int version) + { + return reinterpret_cast(sSetVersion)( + version); + } + + bool + Create(const CreateArg &args) + { + OSDynLoadAllocFn prevDynLoadAlloc = NULL; + OSDynLoadFreeFn prevDynLoadFree = NULL; + uint32_t dynloadAcquireUseSize = 0; + void *workMemory = NULL; + bool result = true; + + if (!args.workMemory) { + OSReport("ERREULA: Create failed. CreateArg.workMemory is NULL."); + return false; + } + + if (!args.fsClient) { + OSReport("ERREULA: Create failed. CreateArg.fsClient is NULL."); + return false; + } + + sHeapHandle = MEMCreateExpHeapEx(args.workMemory, kWorkMemorySize, 0); + OSDynLoad_GetAllocator(&prevDynLoadAlloc, &prevDynLoadFree); + OSDynLoad_SetAllocator(allocForDynLoad, freeForDynLoad); + + if (OSDynLoad_Error error = OSDynLoad_Acquire("erreula.rpl", &sModuleHandle)) { + OSReport("ERREULA: Create failed. OSDynLoad_Acquire() return error(%d).\n", + error); + result = false; + goto out; + } + + dynloadAcquireUseSize = kWorkMemorySize - + MEMGetAllocatableSizeForExpHeapEx(sHeapHandle, 4); + OSReport("ERREULA: OSDynLoad_Acquire() use [%d/%d]\n", + dynloadAcquireUseSize, kRplAcquireBufferSize); + + if (dynloadAcquireUseSize > kRplAcquireBufferSize) { + OSReport("ERREULA: Create failed. dynload_acquire_use_size > kRplAcquireBufferSize."); + result = false; + goto out; + } + + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaAppearError__3RplFRCQ3_2nn7erreula9AppearArg", &sAppearError); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaCalc__3RplFRCQ3_2nn7erreula14ControllerInfo", &sCalc); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaCreate__3RplFPUcQ3_2nn7erreula10RegionTypeQ3_2nn7erreula8LangTypeP8FSClient", &sCreate); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDestroy__3RplFv", &sDestroy); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDisappearError__3RplFv", &sDisappearError); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDrawDRC__3RplFv", &sDrawDRC); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDrawTV__3RplFv", &sDrawTV); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetStateErrorViewer__3RplFv", &sGetStateErrorViewer); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsDecideSelectButtonError__3RplFv", &sIsDecideSelectButtonError); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsDecideSelectLeftButtonError__3RplFv", &sIsDecideSelectLeftButtonError); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsDecideSelectRightButtonError__3RplFv", &sIsDecideSelectRightButtonError); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaSetControllerRemo__3RplFQ3_2nn7erreula14ControllerType", &sSetControllerRemo); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaAppearHomeNixSign__3RplFRCQ3_2nn7erreula14HomeNixSignArg", &sAppearHomeNixSign); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsAppearHomeNixSign__3RplFv", &sIsAppearHomeNixSign); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaDisappearHomeNixSign__3RplFv", &sDisappearHomeNixSign); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaChangeLang__3RplFQ3_2nn7erreula8LangType", &sChangeLang); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaIsSelectCursorActive__3RplFv", &sIsSelectCursorActive); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetResultType__3RplFv", &sGetResultType); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetResultCode__3RplFv", &sGetResultCode); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaGetSelectButtonNumError__3RplFv", &sGetSelectButtonNumError); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaSetVersion__3RplFi", &sSetVersion); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaPlayAppearSE__3RplFb", &sPlayAppearSE); + OSDynLoad_FindExport(sModuleHandle, FALSE, "ErrEulaJump__3RplFPCcUi", &sJump); + + workMemory = MEMAllocFromExpHeapEx(sHeapHandle, + kWorkMemorySize - kRplAcquireBufferSize, + 4); + if (!workMemory) { + OSReport("ERREULA: Create failed. framework_buffer == NULL."); + result = false; + goto out; + } else { + SetVersion(3); + Create(workMemory, args.region, args.language, args.fsClient); + result = true; + } + + out: + if (!result) { + if (sModuleHandle) { + OSDynLoad_Release(sModuleHandle); + sModuleHandle = NULL; + } + + if (sHeapHandle) { + MEMDestroyExpHeap(sHeapHandle); + sHeapHandle = NULL; + } + } + + OSDynLoad_SetAllocator(prevDynLoadAlloc, prevDynLoadFree); + return result; + } + + void + AppearErrorViewer(const AppearArg &arg) + { + return reinterpret_cast(sAppearError)(arg); + } + + void + AppearHomeNixSign(const HomeNixSignArg &arg) + { + return reinterpret_cast(sAppearHomeNixSign)(arg); + } + + void + Calc(const ControllerInfo &controllerInfo) + { + return reinterpret_cast(sCalc)(controllerInfo); + } + + void + ChangeLangError(LangType language) + { + return reinterpret_cast(sChangeLang)(language); + } + + void + Destroy() + { + reinterpret_cast(sDestroy)(); + + if (sModuleHandle) { + OSDynLoad_Release(sModuleHandle); + sModuleHandle = NULL; + } + + if (sHeapHandle) { + MEMDestroyExpHeap(sHeapHandle); + sHeapHandle = NULL; + } + } + + void + DisappearErrorViewer() + { + return reinterpret_cast(sDisappearError)(); + } + + void + DisappearHomeNixSign() + { + return reinterpret_cast(sDisappearHomeNixSign)(); + } + + void + DrawDRC() + { + return reinterpret_cast(sDrawDRC)(); + } + + void + DrawTV() + { + return reinterpret_cast(sDrawTV)(); + } + + int32_t + GetResultCode() + { + return reinterpret_cast(sGetResultCode)(); + } + + ResultType + GetResultType() + { + return reinterpret_cast(sGetResultType)(); + } + + int32_t + GetSelectButtonNumError() + { + return reinterpret_cast(sGetSelectButtonNumError)(); + } + + State + GetStateErrorViewer() + { + return reinterpret_cast(sGetStateErrorViewer)(); + } + + uint32_t + GetWorkMemorySize() + { + return kWorkMemorySize; + } + + bool + IsAppearHomeNixSign() + { + return reinterpret_cast(sIsAppearHomeNixSign)(); + } + + bool + IsDecideSelectButtonError() + { + return reinterpret_cast(sIsDecideSelectButtonError)(); + } + + bool + IsDecideSelectLeftButtonError() + { + return reinterpret_cast(sIsDecideSelectLeftButtonError)(); + } + + bool + IsDecideSelectRightButtonError() + { + return reinterpret_cast(sIsDecideSelectRightButtonError)(); } - if (sHeapHandle) { - MEMDestroyExpHeap(sHeapHandle); - sHeapHandle = NULL; + bool + IsSelectCursorActive() + { + return reinterpret_cast(sIsSelectCursorActive)(); } - } - - OSDynLoad_SetAllocator(prevDynLoadAlloc, prevDynLoadFree); - return result; -} - -void -AppearErrorViewer(const AppearArg &arg) -{ - return reinterpret_cast - (sAppearError) - (arg); -} - -void -AppearHomeNixSign(const HomeNixSignArg &arg) -{ - return reinterpret_cast - (sAppearHomeNixSign) - (arg); -} - -void -Calc(const ControllerInfo &controllerInfo) -{ - return reinterpret_cast - (sCalc) - (controllerInfo); -} - -void -ChangeLangError(LangType language) -{ - return reinterpret_cast - (sChangeLang) - (language); -} - -void -Destroy() -{ - reinterpret_cast(sDestroy)(); - - if (sModuleHandle) { - OSDynLoad_Release(sModuleHandle); - sModuleHandle = NULL; - } - - if (sHeapHandle) { - MEMDestroyExpHeap(sHeapHandle); - sHeapHandle = NULL; - } -} - -void -DisappearErrorViewer() -{ - return reinterpret_cast - (sDisappearError) - (); -} - -void -DisappearHomeNixSign() -{ - return reinterpret_cast - (sDisappearHomeNixSign) - (); -} - -void -DrawDRC() -{ - return reinterpret_cast - (sDrawDRC) - (); -} - -void -DrawTV() -{ - return reinterpret_cast - (sDrawTV) - (); -} - -int32_t -GetResultCode() -{ - return reinterpret_cast - (sGetResultCode) - (); -} - -ResultType -GetResultType() -{ - return reinterpret_cast - (sGetResultType) - (); -} - -int32_t -GetSelectButtonNumError() -{ - return reinterpret_cast - (sGetSelectButtonNumError) - (); -} - -State -GetStateErrorViewer() -{ - return reinterpret_cast - (sGetStateErrorViewer) - (); -} - -uint32_t -GetWorkMemorySize() -{ - return kWorkMemorySize; -} - -bool -IsAppearHomeNixSign() -{ - return reinterpret_cast - (sIsAppearHomeNixSign) - (); -} - -bool -IsDecideSelectButtonError() -{ - return reinterpret_cast - (sIsDecideSelectButtonError) - (); -} - -bool -IsDecideSelectLeftButtonError() -{ - return reinterpret_cast - (sIsDecideSelectLeftButtonError) - (); -} - -bool -IsDecideSelectRightButtonError() -{ - return reinterpret_cast - (sIsDecideSelectRightButtonError) - (); -} - -bool -IsSelectCursorActive() -{ - return reinterpret_cast - (sIsSelectCursorActive) - (); -} - -bool -Jump(const char *buffer, uint32_t bufferSize) -{ - return reinterpret_cast - (sJump) - (buffer, bufferSize); -} - -void -PlayAppearSE(bool playAppearSoundEffect) -{ - return reinterpret_cast - (sPlayAppearSE) - (playAppearSoundEffect); -} - -void -SetControllerRemo(ControllerType controller) -{ - return reinterpret_cast - (sSetControllerRemo) - (controller); -} - -} // namespace erreula + + bool + Jump(const char *buffer, uint32_t bufferSize) + { + return reinterpret_cast(sJump)(buffer, bufferSize); + } + + void + PlayAppearSE(bool playAppearSoundEffect) + { + return reinterpret_cast(sPlayAppearSE)(playAppearSoundEffect); + } + + void + SetControllerRemo(ControllerType controller) + { + return reinterpret_cast(sSetControllerRemo)(controller); + } + + } // namespace erreula } // namespace nn diff --git a/libraries/nn_swkbd/nn_swkbd.cpp b/libraries/nn_swkbd/nn_swkbd.cpp index 3e5be64e4..f8fc6ad86 100644 --- a/libraries/nn_swkbd/nn_swkbd.cpp +++ b/libraries/nn_swkbd/nn_swkbd.cpp @@ -4,501 +4,433 @@ #include #include -namespace nn -{ -namespace swkbd -{ - -static const uint32_t sRplAcquireBufferSize = 0x380000; - -static MEMHeapHandle sHeapHandle = NULL; -static OSDynLoad_Module sModuleHandle = NULL; - -static void *sAppearInputForm = NULL; -static void *sAppearKeyboard = NULL; -static void *sCalcSubThreadFont = NULL; -static void *sCalcSubThreadPredict = NULL; -static void *sCalc = NULL; -static void *sConfirmUnfixAll = NULL; -static void *sCreate = NULL; -static void *sDestroy = NULL; -static void *sDisappearInputForm = NULL; -static void *sDisappearKeyboard = NULL; -static void *sDrawDRC = NULL; -static void *sDrawTV = NULL; -static void *sGetDrawStringInfo = NULL; -static void *sGetInputFormString = NULL; -static void *sGetKeyboardCondition = NULL; -static void *sGetStateInputForm = NULL; -static void *sGetStateKeyboard = NULL; -static void *sInactivateSelectCursor = NULL; -static void *sInitLearnDic = NULL; -static void *sIsCoveredWithSubWindow = NULL; -static void *sIsDecideCancelButton = NULL; -static void *sIsDecideOkButton = NULL; -static void *sIsKeyboardTarget = NULL; -static void *sIsNeedCalcSubThreadFont = NULL; -static void *sIsNeedCalcSubThreadPredict = NULL; -static void *sIsSelectCursorActive = NULL; -static void *sMuteAllSound = NULL; -static void *sSetControllerRemo = NULL; -static void *sSetCursorPos = NULL; -static void *sSetEnableOkButton = NULL; -static void *sSetInputFormString = NULL; -static void *sSetReceiver = NULL; -static void *sSetSelectFrom = NULL; -static void *sSetUserControllerEventObj = NULL; -static void *sSetUserSoundObj = NULL; -static void *sSetVersion = NULL; - -static OSDynLoad_Error -allocForDynLoad(int32_t size, - int32_t align, - void **outAddr) -{ - void *addr = MEMAllocFromExpHeapEx(sHeapHandle, size, align); - if (!addr) { - return OS_DYNLOAD_OUT_OF_MEMORY; - } - - *outAddr = addr; - return OS_DYNLOAD_OK; -} - -static void -freeForDynLoad(void *addr) -{ - MEMFreeToExpHeap(sHeapHandle, addr); -} - -static void -Create(void *buffer, - nn::swkbd::RegionType regionType, - uint32_t unk, - FSClient *fsClient) -{ - - return reinterpret_cast(sCreate)( - buffer, regionType, unk, fsClient); -} - -static void -SetVersion(int version) -{ - return reinterpret_cast(sSetVersion)( - version); -} - -bool -Create(const CreateArg &args) -{ - OSDynLoadAllocFn prevDynLoadAlloc = NULL; - OSDynLoadFreeFn prevDynLoadFree = NULL; - uint32_t dynloadAcquireUseSize = 0; - void *workMemory = NULL; - bool result = true; - - if (!args.workMemory) { - OSReport("SWKBD: Create failed. CreateArg.workMemory is NULL."); - return false; - } - - if (!args.fsClient) { - OSReport("SWKBD: Create failed. CreateArg.fsClient is NULL."); - return false; - } - - // Create work memory heap - sHeapHandle = MEMCreateExpHeapEx(args.workMemory, - GetWorkMemorySize(args.unk_0x08), - 0); - - // Save the old DynLoad allocator functions - OSDynLoad_GetAllocator(&prevDynLoadAlloc, &prevDynLoadFree); - - // Set new DynLoad allocator functions - OSDynLoad_SetAllocator(allocForDynLoad, freeForDynLoad); - - if (OSDynLoad_Error error = OSDynLoad_Acquire("swkbd.rpl", &sModuleHandle)) { - OSReport("SWKBD: Create failed. OSDynLoad_Acquire() return error(%d).\n", - error); - result = false; - goto out; - } - - dynloadAcquireUseSize = GetWorkMemorySize(args.unk_0x08) - - MEMGetAllocatableSizeForExpHeapEx(sHeapHandle, 4); - OSReport("SWKBD: OSDynLoad_Acquire() use [%d/%d]\n", - dynloadAcquireUseSize, sRplAcquireBufferSize); - - if (dynloadAcquireUseSize > sRplAcquireBufferSize) { - OSReport("SWKBD: Create failed. dynload_acquire_use_size > sRplAcquireBufferSize."); - result = false; - goto out; - } - - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdAppearInputForm__3RplFRCQ3_2nn5swkbd9AppearArg", &sAppearInputForm); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdAppearKeyboard__3RplFRCQ3_2nn5swkbd11KeyboardArg", &sAppearKeyboard); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCalcSubThreadFont__3RplFv", &sCalcSubThreadFont); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCalcSubThreadPredict__3RplFv", &sCalcSubThreadPredict); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCalc__3RplFRCQ3_2nn5swkbd14ControllerInfo", &sCalc); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdConfirmUnfixAll__3RplFv", &sConfirmUnfixAll); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCreate__3RplFPUcQ3_2nn5swkbd10RegionTypeUiP8FSClient", &sCreate); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDestroy__3RplFv", &sDestroy); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDisappearInputForm__3RplFv", &sDisappearInputForm); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDisappearKeyboard__3RplFv", &sDisappearKeyboard); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDrawDRC__3RplFv", &sDrawDRC); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDrawTV__3RplFv", &sDrawTV); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetDrawStringInfo__3RplFPQ3_2nn5swkbd14DrawStringInfo", &sGetDrawStringInfo); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetInputFormString__3RplFv", &sGetInputFormString); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetKeyboardCondition__3RplFPQ3_2nn5swkbd17KeyboardCondition", &sGetKeyboardCondition); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetStateInputForm__3RplFv", &sGetStateInputForm); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetStateKeyboard__3RplFv", &sGetStateKeyboard); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdInactivateSelectCursor__3RplFv", &sInactivateSelectCursor); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdInitLearnDic__3RplFPv", &sInitLearnDic); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsCoveredWithSubWindow__3RplFv", &sIsCoveredWithSubWindow); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsDecideCancelButton__3RplFPb", &sIsDecideCancelButton); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsDecideOkButton__3RplFPb", &sIsDecideOkButton); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsKeyboardTarget__3RplFPQ3_2nn5swkbd14IEventReceiver", &sIsKeyboardTarget); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsNeedCalcSubThreadFont__3RplFv", &sIsNeedCalcSubThreadFont); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsNeedCalcSubThreadPredict__3RplFv", &sIsNeedCalcSubThreadPredict); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsSelectCursorActive__3RplFv", &sIsSelectCursorActive); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdMuteAllSound__3RplFb", &sMuteAllSound); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetControllerRemo__3RplFQ3_2nn5swkbd14ControllerType", &sSetControllerRemo); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetCursorPos__3RplFi", &sSetCursorPos); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetEnableOkButton__3RplFb", &sSetEnableOkButton); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetInputFormString__3RplFPCw", &sSetInputFormString); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetReceiver__3RplFRCQ3_2nn5swkbd11ReceiverArg", &sSetReceiver); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetSelectFrom__3RplFi", &sSetSelectFrom); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetUserControllerEventObj__3RplFPQ3_2nn5swkbd19IControllerEventObj", &sSetUserControllerEventObj); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetUserSoundObj__3RplFPQ3_2nn5swkbd9ISoundObj", &sSetUserSoundObj); - OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetVersion__3RplFi", &sSetVersion); - - workMemory = MEMAllocFromExpHeapEx(sHeapHandle, - GetWorkMemorySize(args.unk_0x08) - sRplAcquireBufferSize, - 4); - if (!workMemory) { - OSReport("SWKBD: Create failed. framework_buffer == NULL."); - result = false; - goto out; - } else { - SetVersion(3); - Create(workMemory, args.regionType, args.unk_0x08, args.fsClient); - result = true; - } - -out: - if (!result) { - if (sModuleHandle) { - OSDynLoad_Release(sModuleHandle); - sModuleHandle = NULL; - } - - if (sHeapHandle) { - MEMDestroyExpHeap(sHeapHandle); - sHeapHandle = NULL; - } - } - - OSDynLoad_SetAllocator(prevDynLoadAlloc, prevDynLoadFree); - return result; -} - -bool -AppearInputForm(const AppearArg& args) -{ - return reinterpret_cast - (sAppearInputForm) - (args); -} - -bool -AppearKeyboard(const KeyboardArg& args) -{ - return reinterpret_cast - (sAppearKeyboard) - (args); -} - -void -CalcSubThreadFont() -{ - return reinterpret_cast - (sCalcSubThreadFont) - (); -} - -void -CalcSubThreadPredict() -{ - return reinterpret_cast - (sCalcSubThreadPredict) - (); -} - -void -Calc(const ControllerInfo &controllerInfo) -{ - return reinterpret_cast - (sCalc) - (controllerInfo); -} - -void -ConfirmUnfixAll() -{ - return reinterpret_cast - (sConfirmUnfixAll) - (); -} - -void -Destroy() -{ - reinterpret_cast(sDestroy)(); - - if (sModuleHandle) { - OSDynLoad_Release(sModuleHandle); - sModuleHandle = NULL; - } - - if (sHeapHandle) { - MEMDestroyExpHeap(sHeapHandle); - sHeapHandle = NULL; - } -} - -bool -DisappearInputForm() -{ - return reinterpret_cast - (sDisappearInputForm) - (); -} - -bool -DisappearKeyboard() -{ - return reinterpret_cast - (sDisappearKeyboard) - (); -} - -void -DrawDRC() -{ - return reinterpret_cast - (sDrawDRC) - (); -} - -void -DrawTV() -{ - return reinterpret_cast - (sDrawTV) - (); -} - -void -GetDrawStringInfo(DrawStringInfo *drawStringInfo) -{ - return reinterpret_cast - (sGetDrawStringInfo) - (drawStringInfo); -} - -const char16_t * -GetInputFormString() -{ - return reinterpret_cast - (sGetInputFormString) - (); -} - -void -GetKeyboardCondition(KeyboardCondition *keyboardCondition) -{ - return reinterpret_cast - (sGetKeyboardCondition) - (keyboardCondition); -} - -State -GetStateInputForm() -{ - return reinterpret_cast - (sGetStateInputForm) - (); -} - -State -GetStateKeyboard() -{ - return reinterpret_cast - (sGetStateKeyboard) - (); -} - -uint32_t -GetWorkMemorySize(uint32_t unk) -{ - uint32_t size = 0; - - if (size & 1) { - size = 0xA0000; - } - - if (size & 2) { - size += 0x120000; - } - - return 0x1980000 - size; -} - -void -InactivateSelectCursor() -{ - return reinterpret_cast - (sInactivateSelectCursor) - (); -} - -bool -InitLearnDic(void *dictionary) -{ - return reinterpret_cast - (sInitLearnDic) - (dictionary); -} - -bool -IsCoveredWithSubWindow() -{ - return reinterpret_cast - (sIsCoveredWithSubWindow) - (); -} - -bool -IsDecideCancelButton(bool *outIsSelected) -{ - return reinterpret_cast - (sIsDecideCancelButton) - (outIsSelected); -} - -bool -IsDecideOkButton(bool *outIsSelected) -{ - return reinterpret_cast - (sIsDecideOkButton) - (outIsSelected); -} - -bool -IsKeyboardTarget(IEventReceiver *eventReceiver) -{ - return reinterpret_cast - (sIsKeyboardTarget) - (eventReceiver); -} - -bool -IsNeedCalcSubThreadFont() -{ - return reinterpret_cast - (sIsNeedCalcSubThreadFont) - (); -} - -bool -IsNeedCalcSubThreadPredict() -{ - return reinterpret_cast - (sIsNeedCalcSubThreadPredict) - (); -} - -bool -IsSelectCursorActive() -{ - return reinterpret_cast - (sIsSelectCursorActive) - (); -} - -void -MuteAllSound(bool muted) -{ - return reinterpret_cast - (sMuteAllSound) - (muted); -} - -void -SetControllerRemo(ControllerType type) -{ - return reinterpret_cast - (sSetControllerRemo) - (type); -} - -void -SetCursorPos(int pos) -{ - return reinterpret_cast - (sSetCursorPos) - (pos); -} - -void -SetEnableOkButton(bool enable) -{ - return reinterpret_cast - (sSetEnableOkButton) - (enable); -} - -void -SetInputFormString(const char16_t *str) -{ - return reinterpret_cast - (sSetInputFormString) - (str); -} - -void -SetReceiver(const ReceiverArg &receiver) -{ - return reinterpret_cast - (sSetReceiver) - (receiver); -} - -void -SetSelectFrom(int from) -{ - return reinterpret_cast - (sSetSelectFrom) - (from); -} - -void -SetUserControllerEventObj(IControllerEventObj *controllerEventObj) -{ - return reinterpret_cast - (sSetUserControllerEventObj) - (controllerEventObj); -} - -void -SetUserSoundObj(ISoundObj *soundObj) -{ - return reinterpret_cast - (sSetUserSoundObj) - (soundObj); -} - -} // namespace swkbd +namespace nn { + namespace swkbd { + + static const uint32_t sRplAcquireBufferSize = 0x380000; + + static MEMHeapHandle sHeapHandle = NULL; + static OSDynLoad_Module sModuleHandle = NULL; + + static void *sAppearInputForm = NULL; + static void *sAppearKeyboard = NULL; + static void *sCalcSubThreadFont = NULL; + static void *sCalcSubThreadPredict = NULL; + static void *sCalc = NULL; + static void *sConfirmUnfixAll = NULL; + static void *sCreate = NULL; + static void *sDestroy = NULL; + static void *sDisappearInputForm = NULL; + static void *sDisappearKeyboard = NULL; + static void *sDrawDRC = NULL; + static void *sDrawTV = NULL; + static void *sGetDrawStringInfo = NULL; + static void *sGetInputFormString = NULL; + static void *sGetKeyboardCondition = NULL; + static void *sGetStateInputForm = NULL; + static void *sGetStateKeyboard = NULL; + static void *sInactivateSelectCursor = NULL; + static void *sInitLearnDic = NULL; + static void *sIsCoveredWithSubWindow = NULL; + static void *sIsDecideCancelButton = NULL; + static void *sIsDecideOkButton = NULL; + static void *sIsKeyboardTarget = NULL; + static void *sIsNeedCalcSubThreadFont = NULL; + static void *sIsNeedCalcSubThreadPredict = NULL; + static void *sIsSelectCursorActive = NULL; + static void *sMuteAllSound = NULL; + static void *sSetControllerRemo = NULL; + static void *sSetCursorPos = NULL; + static void *sSetEnableOkButton = NULL; + static void *sSetInputFormString = NULL; + static void *sSetReceiver = NULL; + static void *sSetSelectFrom = NULL; + static void *sSetUserControllerEventObj = NULL; + static void *sSetUserSoundObj = NULL; + static void *sSetVersion = NULL; + + static OSDynLoad_Error + allocForDynLoad(int32_t size, + int32_t align, + void **outAddr) + { + void *addr = MEMAllocFromExpHeapEx(sHeapHandle, size, align); + if (!addr) { + return OS_DYNLOAD_OUT_OF_MEMORY; + } + + *outAddr = addr; + return OS_DYNLOAD_OK; + } + + static void + freeForDynLoad(void *addr) + { + MEMFreeToExpHeap(sHeapHandle, addr); + } + + static void + Create(void *buffer, + nn::swkbd::RegionType regionType, + uint32_t unk, + FSClient *fsClient) + { + + return reinterpret_cast(sCreate)( + buffer, regionType, unk, fsClient); + } + + static void + SetVersion(int version) + { + return reinterpret_cast(sSetVersion)( + version); + } + + bool + Create(const CreateArg &args) + { + OSDynLoadAllocFn prevDynLoadAlloc = NULL; + OSDynLoadFreeFn prevDynLoadFree = NULL; + uint32_t dynloadAcquireUseSize = 0; + void *workMemory = NULL; + bool result = true; + + if (!args.workMemory) { + OSReport("SWKBD: Create failed. CreateArg.workMemory is NULL."); + return false; + } + + if (!args.fsClient) { + OSReport("SWKBD: Create failed. CreateArg.fsClient is NULL."); + return false; + } + + // Create work memory heap + sHeapHandle = MEMCreateExpHeapEx(args.workMemory, + GetWorkMemorySize(args.unk_0x08), + 0); + + // Save the old DynLoad allocator functions + OSDynLoad_GetAllocator(&prevDynLoadAlloc, &prevDynLoadFree); + + // Set new DynLoad allocator functions + OSDynLoad_SetAllocator(allocForDynLoad, freeForDynLoad); + + if (OSDynLoad_Error error = OSDynLoad_Acquire("swkbd.rpl", &sModuleHandle)) { + OSReport("SWKBD: Create failed. OSDynLoad_Acquire() return error(%d).\n", + error); + result = false; + goto out; + } + + dynloadAcquireUseSize = GetWorkMemorySize(args.unk_0x08) - + MEMGetAllocatableSizeForExpHeapEx(sHeapHandle, 4); + OSReport("SWKBD: OSDynLoad_Acquire() use [%d/%d]\n", + dynloadAcquireUseSize, sRplAcquireBufferSize); + + if (dynloadAcquireUseSize > sRplAcquireBufferSize) { + OSReport("SWKBD: Create failed. dynload_acquire_use_size > sRplAcquireBufferSize."); + result = false; + goto out; + } + + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdAppearInputForm__3RplFRCQ3_2nn5swkbd9AppearArg", &sAppearInputForm); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdAppearKeyboard__3RplFRCQ3_2nn5swkbd11KeyboardArg", &sAppearKeyboard); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCalcSubThreadFont__3RplFv", &sCalcSubThreadFont); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCalcSubThreadPredict__3RplFv", &sCalcSubThreadPredict); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCalc__3RplFRCQ3_2nn5swkbd14ControllerInfo", &sCalc); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdConfirmUnfixAll__3RplFv", &sConfirmUnfixAll); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdCreate__3RplFPUcQ3_2nn5swkbd10RegionTypeUiP8FSClient", &sCreate); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDestroy__3RplFv", &sDestroy); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDisappearInputForm__3RplFv", &sDisappearInputForm); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDisappearKeyboard__3RplFv", &sDisappearKeyboard); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDrawDRC__3RplFv", &sDrawDRC); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdDrawTV__3RplFv", &sDrawTV); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetDrawStringInfo__3RplFPQ3_2nn5swkbd14DrawStringInfo", &sGetDrawStringInfo); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetInputFormString__3RplFv", &sGetInputFormString); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetKeyboardCondition__3RplFPQ3_2nn5swkbd17KeyboardCondition", &sGetKeyboardCondition); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetStateInputForm__3RplFv", &sGetStateInputForm); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdGetStateKeyboard__3RplFv", &sGetStateKeyboard); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdInactivateSelectCursor__3RplFv", &sInactivateSelectCursor); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdInitLearnDic__3RplFPv", &sInitLearnDic); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsCoveredWithSubWindow__3RplFv", &sIsCoveredWithSubWindow); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsDecideCancelButton__3RplFPb", &sIsDecideCancelButton); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsDecideOkButton__3RplFPb", &sIsDecideOkButton); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsKeyboardTarget__3RplFPQ3_2nn5swkbd14IEventReceiver", &sIsKeyboardTarget); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsNeedCalcSubThreadFont__3RplFv", &sIsNeedCalcSubThreadFont); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsNeedCalcSubThreadPredict__3RplFv", &sIsNeedCalcSubThreadPredict); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdIsSelectCursorActive__3RplFv", &sIsSelectCursorActive); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdMuteAllSound__3RplFb", &sMuteAllSound); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetControllerRemo__3RplFQ3_2nn5swkbd14ControllerType", &sSetControllerRemo); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetCursorPos__3RplFi", &sSetCursorPos); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetEnableOkButton__3RplFb", &sSetEnableOkButton); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetInputFormString__3RplFPCw", &sSetInputFormString); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetReceiver__3RplFRCQ3_2nn5swkbd11ReceiverArg", &sSetReceiver); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetSelectFrom__3RplFi", &sSetSelectFrom); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetUserControllerEventObj__3RplFPQ3_2nn5swkbd19IControllerEventObj", &sSetUserControllerEventObj); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetUserSoundObj__3RplFPQ3_2nn5swkbd9ISoundObj", &sSetUserSoundObj); + OSDynLoad_FindExport(sModuleHandle, FALSE, "SwkbdSetVersion__3RplFi", &sSetVersion); + + workMemory = MEMAllocFromExpHeapEx(sHeapHandle, + GetWorkMemorySize(args.unk_0x08) - sRplAcquireBufferSize, + 4); + if (!workMemory) { + OSReport("SWKBD: Create failed. framework_buffer == NULL."); + result = false; + goto out; + } else { + SetVersion(3); + Create(workMemory, args.regionType, args.unk_0x08, args.fsClient); + result = true; + } + + out: + if (!result) { + if (sModuleHandle) { + OSDynLoad_Release(sModuleHandle); + sModuleHandle = NULL; + } + + if (sHeapHandle) { + MEMDestroyExpHeap(sHeapHandle); + sHeapHandle = NULL; + } + } + + OSDynLoad_SetAllocator(prevDynLoadAlloc, prevDynLoadFree); + return result; + } + + bool + AppearInputForm(const AppearArg &args) + { + return reinterpret_cast(sAppearInputForm)(args); + } + + bool + AppearKeyboard(const KeyboardArg &args) + { + return reinterpret_cast(sAppearKeyboard)(args); + } + + void + CalcSubThreadFont() + { + return reinterpret_cast(sCalcSubThreadFont)(); + } + + void + CalcSubThreadPredict() + { + return reinterpret_cast(sCalcSubThreadPredict)(); + } + + void + Calc(const ControllerInfo &controllerInfo) + { + return reinterpret_cast(sCalc)(controllerInfo); + } + + void + ConfirmUnfixAll() + { + return reinterpret_cast(sConfirmUnfixAll)(); + } + + void + Destroy() + { + reinterpret_cast(sDestroy)(); + + if (sModuleHandle) { + OSDynLoad_Release(sModuleHandle); + sModuleHandle = NULL; + } + + if (sHeapHandle) { + MEMDestroyExpHeap(sHeapHandle); + sHeapHandle = NULL; + } + } + + bool + DisappearInputForm() + { + return reinterpret_cast(sDisappearInputForm)(); + } + + bool + DisappearKeyboard() + { + return reinterpret_cast(sDisappearKeyboard)(); + } + + void + DrawDRC() + { + return reinterpret_cast(sDrawDRC)(); + } + + void + DrawTV() + { + return reinterpret_cast(sDrawTV)(); + } + + void + GetDrawStringInfo(DrawStringInfo *drawStringInfo) + { + return reinterpret_cast(sGetDrawStringInfo)(drawStringInfo); + } + + const char16_t * + GetInputFormString() + { + return reinterpret_cast(sGetInputFormString)(); + } + + void + GetKeyboardCondition(KeyboardCondition *keyboardCondition) + { + return reinterpret_cast(sGetKeyboardCondition)(keyboardCondition); + } + + State + GetStateInputForm() + { + return reinterpret_cast(sGetStateInputForm)(); + } + + State + GetStateKeyboard() + { + return reinterpret_cast(sGetStateKeyboard)(); + } + + uint32_t + GetWorkMemorySize(uint32_t unk) + { + uint32_t size = 0; + + if (size & 1) { + size = 0xA0000; + } + + if (size & 2) { + size += 0x120000; + } + + return 0x1980000 - size; + } + + void + InactivateSelectCursor() + { + return reinterpret_cast(sInactivateSelectCursor)(); + } + + bool + InitLearnDic(void *dictionary) + { + return reinterpret_cast(sInitLearnDic)(dictionary); + } + + bool + IsCoveredWithSubWindow() + { + return reinterpret_cast(sIsCoveredWithSubWindow)(); + } + + bool + IsDecideCancelButton(bool *outIsSelected) + { + return reinterpret_cast(sIsDecideCancelButton)(outIsSelected); + } + + bool + IsDecideOkButton(bool *outIsSelected) + { + return reinterpret_cast(sIsDecideOkButton)(outIsSelected); + } + + bool + IsKeyboardTarget(IEventReceiver *eventReceiver) + { + return reinterpret_cast(sIsKeyboardTarget)(eventReceiver); + } + + bool + IsNeedCalcSubThreadFont() + { + return reinterpret_cast(sIsNeedCalcSubThreadFont)(); + } + + bool + IsNeedCalcSubThreadPredict() + { + return reinterpret_cast(sIsNeedCalcSubThreadPredict)(); + } + + bool + IsSelectCursorActive() + { + return reinterpret_cast(sIsSelectCursorActive)(); + } + + void + MuteAllSound(bool muted) + { + return reinterpret_cast(sMuteAllSound)(muted); + } + + void + SetControllerRemo(ControllerType type) + { + return reinterpret_cast(sSetControllerRemo)(type); + } + + void + SetCursorPos(int pos) + { + return reinterpret_cast(sSetCursorPos)(pos); + } + + void + SetEnableOkButton(bool enable) + { + return reinterpret_cast(sSetEnableOkButton)(enable); + } + + void + SetInputFormString(const char16_t *str) + { + return reinterpret_cast(sSetInputFormString)(str); + } + + void + SetReceiver(const ReceiverArg &receiver) + { + return reinterpret_cast(sSetReceiver)(receiver); + } + + void + SetSelectFrom(int from) + { + return reinterpret_cast(sSetSelectFrom)(from); + } + + void + SetUserControllerEventObj(IControllerEventObj *controllerEventObj) + { + return reinterpret_cast(sSetUserControllerEventObj)(controllerEventObj); + } + + void + SetUserSoundObj(ISoundObj *soundObj) + { + return reinterpret_cast(sSetUserSoundObj)(soundObj); + } + + } // namespace swkbd } // namespace nn diff --git a/libraries/wutdevoptab/devoptab_fs.c b/libraries/wutdevoptab/devoptab_fs.c index 8d17596f3..69671401f 100644 --- a/libraries/wutdevoptab/devoptab_fs.c +++ b/libraries/wutdevoptab/devoptab_fs.c @@ -1,41 +1,41 @@ #include "devoptab_fs.h" static devoptab_t -__wut_fs_devoptab = -{ - .name = "fs", - .structSize = sizeof(__wut_fs_file_t), - .open_r = __wut_fs_open, - .close_r = __wut_fs_close, - .write_r = __wut_fs_write, - .read_r = __wut_fs_read, - .seek_r = __wut_fs_seek, - .fstat_r = __wut_fs_fstat, - .stat_r = __wut_fs_stat, - .link_r = __wut_fs_link, - .unlink_r = __wut_fs_unlink, - .chdir_r = __wut_fs_chdir, - .rename_r = __wut_fs_rename, - .mkdir_r = __wut_fs_mkdir, - .dirStateSize = sizeof(__wut_fs_dir_t), - .diropen_r = __wut_fs_diropen, - .dirreset_r = __wut_fs_dirreset, - .dirnext_r = __wut_fs_dirnext, - .dirclose_r = __wut_fs_dirclose, - .statvfs_r = __wut_fs_statvfs, - .ftruncate_r = __wut_fs_ftruncate, - .fsync_r = __wut_fs_fsync, - .deviceData = NULL, - .chmod_r = __wut_fs_chmod, - .fchmod_r = __wut_fs_fchmod, - .rmdir_r = __wut_fs_rmdir, + __wut_fs_devoptab = + { + .name = "fs", + .structSize = sizeof(__wut_fs_file_t), + .open_r = __wut_fs_open, + .close_r = __wut_fs_close, + .write_r = __wut_fs_write, + .read_r = __wut_fs_read, + .seek_r = __wut_fs_seek, + .fstat_r = __wut_fs_fstat, + .stat_r = __wut_fs_stat, + .link_r = __wut_fs_link, + .unlink_r = __wut_fs_unlink, + .chdir_r = __wut_fs_chdir, + .rename_r = __wut_fs_rename, + .mkdir_r = __wut_fs_mkdir, + .dirStateSize = sizeof(__wut_fs_dir_t), + .diropen_r = __wut_fs_diropen, + .dirreset_r = __wut_fs_dirreset, + .dirnext_r = __wut_fs_dirnext, + .dirclose_r = __wut_fs_dirclose, + .statvfs_r = __wut_fs_statvfs, + .ftruncate_r = __wut_fs_ftruncate, + .fsync_r = __wut_fs_fsync, + .deviceData = NULL, + .chmod_r = __wut_fs_chmod, + .fchmod_r = __wut_fs_fchmod, + .rmdir_r = __wut_fs_rmdir, }; FSClient * -__wut_devoptab_fs_client = NULL; + __wut_devoptab_fs_client = NULL; static BOOL -__wut_fs_initialised = FALSE; + __wut_fs_initialised = FALSE; FSStatus __init_wut_devoptab() @@ -65,12 +65,12 @@ __init_wut_devoptab() if (rc >= 0) { int dev = AddDevice(&__wut_fs_devoptab); - if(dev != -1) { + if (dev != -1) { setDefaultDevice(dev); __wut_fs_initialised = TRUE; // Mount the SD card - rc = FSGetMountSource(__wut_devoptab_fs_client, &fsCmd, FS_MOUNT_SOURCE_SD, &mountSource, -1); + rc = FSGetMountSource(__wut_devoptab_fs_client, &fsCmd, FS_MOUNT_SOURCE_SD, &mountSource, -1); if (rc < 0) { return rc; @@ -105,11 +105,11 @@ __fini_wut_devoptab() FSDelClient(__wut_devoptab_fs_client, -1); free(__wut_devoptab_fs_client); - + RemoveDevice(__wut_fs_devoptab.name); - - __wut_devoptab_fs_client = NULL; - __wut_fs_initialised = FALSE; - + + __wut_devoptab_fs_client = NULL; + __wut_fs_initialised = FALSE; + return rc; } diff --git a/libraries/wutdevoptab/devoptab_fs.h b/libraries/wutdevoptab/devoptab_fs.h index a1274ed2d..a8be7f47b 100644 --- a/libraries/wutdevoptab/devoptab_fs.h +++ b/libraries/wutdevoptab/devoptab_fs.h @@ -4,9 +4,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -46,38 +46,38 @@ typedef struct #define FS_DIRITER_MAGIC 0x77696975 extern FSClient * -__wut_devoptab_fs_client; + __wut_devoptab_fs_client; -int __wut_fs_open(struct _reent *r, void *fileStruct, const char *path, - int flags, int mode); -int __wut_fs_close(struct _reent *r, void *fd); -ssize_t __wut_fs_write(struct _reent *r, void *fd, const char *ptr, - size_t len); -ssize_t __wut_fs_read(struct _reent *r, void *fd, char *ptr, size_t len); -off_t __wut_fs_seek(struct _reent *r, void *fd, off_t pos, int dir); -int __wut_fs_fstat(struct _reent *r, void *fd, struct stat *st); -int __wut_fs_stat(struct _reent *r, const char *file, struct stat *st); -int __wut_fs_link(struct _reent *r, const char *existing, - const char *newLink); -int __wut_fs_unlink(struct _reent *r, const char *name); -int __wut_fs_chdir(struct _reent *r, const char *name); -int __wut_fs_rename(struct _reent *r, const char *oldName, - const char *newName); -int __wut_fs_mkdir(struct _reent *r, const char *path, int mode); -DIR_ITER* __wut_fs_diropen(struct _reent *r, DIR_ITER *dirState, +int __wut_fs_open(struct _reent *r, void *fileStruct, const char *path, + int flags, int mode); +int __wut_fs_close(struct _reent *r, void *fd); +ssize_t __wut_fs_write(struct _reent *r, void *fd, const char *ptr, + size_t len); +ssize_t __wut_fs_read(struct _reent *r, void *fd, char *ptr, size_t len); +off_t __wut_fs_seek(struct _reent *r, void *fd, off_t pos, int dir); +int __wut_fs_fstat(struct _reent *r, void *fd, struct stat *st); +int __wut_fs_stat(struct _reent *r, const char *file, struct stat *st); +int __wut_fs_link(struct _reent *r, const char *existing, + const char *newLink); +int __wut_fs_unlink(struct _reent *r, const char *name); +int __wut_fs_chdir(struct _reent *r, const char *name); +int __wut_fs_rename(struct _reent *r, const char *oldName, + const char *newName); +int __wut_fs_mkdir(struct _reent *r, const char *path, int mode); +DIR_ITER *__wut_fs_diropen(struct _reent *r, DIR_ITER *dirState, const char *path); -int __wut_fs_dirreset(struct _reent *r, DIR_ITER *dirState); -int __wut_fs_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename, - struct stat *filestat); -int __wut_fs_dirclose(struct _reent *r, DIR_ITER *dirState); -int __wut_fs_statvfs(struct _reent *r, const char *path, - struct statvfs *buf); -int __wut_fs_ftruncate(struct _reent *r, void *fd, off_t len); -int __wut_fs_fsync(struct _reent *r, void *fd); -int __wut_fs_chmod(struct _reent *r, const char *path, mode_t mode); -int __wut_fs_fchmod(struct _reent *r, void *fd, mode_t mode); -int __wut_fs_rmdir(struct _reent *r, const char *name); +int __wut_fs_dirreset(struct _reent *r, DIR_ITER *dirState); +int __wut_fs_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename, + struct stat *filestat); +int __wut_fs_dirclose(struct _reent *r, DIR_ITER *dirState); +int __wut_fs_statvfs(struct _reent *r, const char *path, + struct statvfs *buf); +int __wut_fs_ftruncate(struct _reent *r, void *fd, off_t len); +int __wut_fs_fsync(struct _reent *r, void *fd); +int __wut_fs_chmod(struct _reent *r, const char *path, mode_t mode); +int __wut_fs_fchmod(struct _reent *r, void *fd, mode_t mode); +int __wut_fs_rmdir(struct _reent *r, const char *name); // devoptab_fs_utils.c -char * __wut_fs_fixpath(struct _reent *r, const char *path); -int __wut_fs_translate_error(FSStatus error); +char *__wut_fs_fixpath(struct _reent *r, const char *path); +int __wut_fs_translate_error(FSStatus error); diff --git a/libraries/wutdevoptab/devoptab_fs_chdir.c b/libraries/wutdevoptab/devoptab_fs_chdir.c index 6a1f13eb8..82b9bb64c 100644 --- a/libraries/wutdevoptab/devoptab_fs_chdir.c +++ b/libraries/wutdevoptab/devoptab_fs_chdir.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_chdir(struct _reent *r, - const char *path) +int __wut_fs_chdir(struct _reent *r, + const char *path) { FSStatus status; FSCmdBlock cmd; diff --git a/libraries/wutdevoptab/devoptab_fs_chmod.c b/libraries/wutdevoptab/devoptab_fs_chmod.c index 43a269203..55543c9a2 100644 --- a/libraries/wutdevoptab/devoptab_fs_chmod.c +++ b/libraries/wutdevoptab/devoptab_fs_chmod.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_chmod(struct _reent *r, - const char *path, - mode_t mode) +int __wut_fs_chmod(struct _reent *r, + const char *path, + mode_t mode) { FSStatus status; FSCmdBlock cmd; @@ -20,7 +19,7 @@ __wut_fs_chmod(struct _reent *r, FSInitCmdBlock(&cmd); status = FSChangeMode(__wut_devoptab_fs_client, &cmd, fixedPath, - (FSMode)mode, FS_ERROR_FLAG_ALL); + (FSMode) mode, FS_ERROR_FLAG_ALL); free(fixedPath); if (status < 0) { r->_errno = __wut_fs_translate_error(status); diff --git a/libraries/wutdevoptab/devoptab_fs_close.c b/libraries/wutdevoptab/devoptab_fs_close.c index 490f7c741..cde540a8b 100644 --- a/libraries/wutdevoptab/devoptab_fs_close.c +++ b/libraries/wutdevoptab/devoptab_fs_close.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_close(struct _reent *r, - void *fd) +int __wut_fs_close(struct _reent *r, + void *fd) { FSStatus status; FSCmdBlock cmd; @@ -14,7 +13,7 @@ __wut_fs_close(struct _reent *r, } FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; status = FSCloseFile(__wut_devoptab_fs_client, &cmd, file->fd, FS_ERROR_FLAG_ALL); if (status < 0) { r->_errno = __wut_fs_translate_error(status); diff --git a/libraries/wutdevoptab/devoptab_fs_dirclose.c b/libraries/wutdevoptab/devoptab_fs_dirclose.c index 6380d010b..f257ed2c3 100644 --- a/libraries/wutdevoptab/devoptab_fs_dirclose.c +++ b/libraries/wutdevoptab/devoptab_fs_dirclose.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_dirclose(struct _reent *r, - DIR_ITER *dirState) +int __wut_fs_dirclose(struct _reent *r, + DIR_ITER *dirState) { FSStatus status; FSCmdBlock cmd; @@ -14,7 +13,7 @@ __wut_fs_dirclose(struct _reent *r, } FSInitCmdBlock(&cmd); - dir = (__wut_fs_dir_t *)(dirState->dirStruct); + dir = (__wut_fs_dir_t *) (dirState->dirStruct); status = FSCloseDir(__wut_devoptab_fs_client, &cmd, dir->fd, FS_ERROR_FLAG_ALL); if (status < 0) { r->_errno = __wut_fs_translate_error(status); diff --git a/libraries/wutdevoptab/devoptab_fs_dirnext.c b/libraries/wutdevoptab/devoptab_fs_dirnext.c index 83f57b788..4da1254ce 100644 --- a/libraries/wutdevoptab/devoptab_fs_dirnext.c +++ b/libraries/wutdevoptab/devoptab_fs_dirnext.c @@ -1,10 +1,9 @@ #include "devoptab_fs.h" -int -__wut_fs_dirnext(struct _reent *r, - DIR_ITER *dirState, - char *filename, - struct stat *filestat) +int __wut_fs_dirnext(struct _reent *r, + DIR_ITER *dirState, + char *filename, + struct stat *filestat) { FSStatus status; FSCmdBlock cmd; @@ -16,7 +15,7 @@ __wut_fs_dirnext(struct _reent *r, } FSInitCmdBlock(&cmd); - dir = (__wut_fs_dir_t *)(dirState->dirStruct); + dir = (__wut_fs_dir_t *) (dirState->dirStruct); memset(&dir->entry_data, 0, sizeof(dir->entry_data)); status = FSReadDir(__wut_devoptab_fs_client, &cmd, dir->fd, &dir->entry_data, FS_ERROR_FLAG_ALL); @@ -35,8 +34,8 @@ __wut_fs_dirnext(struct _reent *r, filestat->st_mode = S_IFREG; } - filestat->st_uid = dir->entry_data.info.owner; - filestat->st_gid = dir->entry_data.info.group; + filestat->st_uid = dir->entry_data.info.owner; + filestat->st_gid = dir->entry_data.info.group; filestat->st_size = dir->entry_data.info.size; memset(filename, 0, NAME_MAX); diff --git a/libraries/wutdevoptab/devoptab_fs_diropen.c b/libraries/wutdevoptab/devoptab_fs_diropen.c index 6a830b1fc..9f8d34764 100644 --- a/libraries/wutdevoptab/devoptab_fs_diropen.c +++ b/libraries/wutdevoptab/devoptab_fs_diropen.c @@ -21,7 +21,7 @@ __wut_fs_diropen(struct _reent *r, } FSInitCmdBlock(&cmd); - dir = (__wut_fs_dir_t *)(dirState->dirStruct); + dir = (__wut_fs_dir_t *) (dirState->dirStruct); status = FSOpenDir(__wut_devoptab_fs_client, &cmd, fixedPath, &fd, FS_ERROR_FLAG_ALL); free(fixedPath); if (status < 0) { diff --git a/libraries/wutdevoptab/devoptab_fs_dirreset.c b/libraries/wutdevoptab/devoptab_fs_dirreset.c index 143678b46..4d5796011 100644 --- a/libraries/wutdevoptab/devoptab_fs_dirreset.c +++ b/libraries/wutdevoptab/devoptab_fs_dirreset.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_dirreset(struct _reent *r, - DIR_ITER *dirState) +int __wut_fs_dirreset(struct _reent *r, + DIR_ITER *dirState) { FSStatus status; FSCmdBlock cmd; @@ -14,7 +13,7 @@ __wut_fs_dirreset(struct _reent *r, } FSInitCmdBlock(&cmd); - dir = (__wut_fs_dir_t *)(dirState->dirStruct); + dir = (__wut_fs_dir_t *) (dirState->dirStruct); status = FSRewindDir(__wut_devoptab_fs_client, &cmd, dir->fd, FS_ERROR_FLAG_ALL); if (status < 0) { r->_errno = __wut_fs_translate_error(status); diff --git a/libraries/wutdevoptab/devoptab_fs_fchmod.c b/libraries/wutdevoptab/devoptab_fs_fchmod.c index a15ffeb6f..598ad41ee 100644 --- a/libraries/wutdevoptab/devoptab_fs_fchmod.c +++ b/libraries/wutdevoptab/devoptab_fs_fchmod.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_fchmod(struct _reent *r, - void *fd, - mode_t mode) +int __wut_fs_fchmod(struct _reent *r, + void *fd, + mode_t mode) { // TODO: FSChangeMode and FSStatFile? r->_errno = ENOSYS; diff --git a/libraries/wutdevoptab/devoptab_fs_fstat.c b/libraries/wutdevoptab/devoptab_fs_fstat.c index c60d81eb3..5cc09d3fd 100644 --- a/libraries/wutdevoptab/devoptab_fs_fstat.c +++ b/libraries/wutdevoptab/devoptab_fs_fstat.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_fstat(struct _reent *r, - void *fd, - struct stat *st) +int __wut_fs_fstat(struct _reent *r, + void *fd, + struct stat *st) { FSStatus status; FSStat fsStat; @@ -16,7 +15,7 @@ __wut_fs_fstat(struct _reent *r, } FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; status = FSGetStatFile(__wut_devoptab_fs_client, &cmd, file->fd, &fsStat, FS_ERROR_FLAG_ALL); if (status < 0) { @@ -25,10 +24,10 @@ __wut_fs_fstat(struct _reent *r, } memset(st, 0, sizeof(struct stat)); - st->st_size = fsStat.size; - st->st_uid = fsStat.owner; - st->st_gid = fsStat.group; + st->st_size = fsStat.size; + st->st_uid = fsStat.owner; + st->st_gid = fsStat.group; st->st_nlink = 1; - st->st_mode = fsStat.mode | S_IFREG; + st->st_mode = fsStat.mode | S_IFREG; return 0; } diff --git a/libraries/wutdevoptab/devoptab_fs_fsync.c b/libraries/wutdevoptab/devoptab_fs_fsync.c index a464d8ea7..83106f97b 100644 --- a/libraries/wutdevoptab/devoptab_fs_fsync.c +++ b/libraries/wutdevoptab/devoptab_fs_fsync.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_fsync(struct _reent *r, - void *fd) +int __wut_fs_fsync(struct _reent *r, + void *fd) { FSStatus status; FSCmdBlock cmd; @@ -14,7 +13,7 @@ __wut_fs_fsync(struct _reent *r, } FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; status = FSFlushFile(__wut_devoptab_fs_client, &cmd, file->fd, FS_ERROR_FLAG_ALL); if (status < 0) { r->_errno = __wut_fs_translate_error(status); diff --git a/libraries/wutdevoptab/devoptab_fs_getmtime.c b/libraries/wutdevoptab/devoptab_fs_getmtime.c index c590b74eb..f7085766c 100644 --- a/libraries/wutdevoptab/devoptab_fs_getmtime.c +++ b/libraries/wutdevoptab/devoptab_fs_getmtime.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_getmtime(const char *name, - uint64_t *mtime) +int __wut_fs_getmtime(const char *name, + uint64_t *mtime) { // TODO: Last modified time can probably be get via FSGetStatFile return -1; diff --git a/libraries/wutdevoptab/devoptab_fs_link.c b/libraries/wutdevoptab/devoptab_fs_link.c index da772fe90..2be702e76 100644 --- a/libraries/wutdevoptab/devoptab_fs_link.c +++ b/libraries/wutdevoptab/devoptab_fs_link.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_link(struct _reent *r, - const char *existing, - const char *newLink) +int __wut_fs_link(struct _reent *r, + const char *existing, + const char *newLink) { r->_errno = ENOSYS; return -1; diff --git a/libraries/wutdevoptab/devoptab_fs_mkdir.c b/libraries/wutdevoptab/devoptab_fs_mkdir.c index 174c0e264..297493567 100644 --- a/libraries/wutdevoptab/devoptab_fs_mkdir.c +++ b/libraries/wutdevoptab/devoptab_fs_mkdir.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_mkdir(struct _reent *r, - const char *path, - int mode) +int __wut_fs_mkdir(struct _reent *r, + const char *path, + int mode) { FSError status; FSCmdBlock cmd; diff --git a/libraries/wutdevoptab/devoptab_fs_open.c b/libraries/wutdevoptab/devoptab_fs_open.c index c66285271..5d39688be 100644 --- a/libraries/wutdevoptab/devoptab_fs_open.c +++ b/libraries/wutdevoptab/devoptab_fs_open.c @@ -1,11 +1,10 @@ #include "devoptab_fs.h" -int -__wut_fs_open(struct _reent *r, - void *fileStruct, - const char *path, - int flags, - int mode) +int __wut_fs_open(struct _reent *r, + void *fileStruct, + const char *path, + int flags, + int mode) { FSFileHandle fd; FSStatus status; @@ -25,18 +24,18 @@ __wut_fs_open(struct _reent *r, fsMode = "r+"; } else if (flags == 0x601) { fsMode = "w"; - } else if(flags == 0x602) { + } else if (flags == 0x602) { fsMode = "w+"; - } else if(flags == 0x209) { + } else if (flags == 0x209) { fsMode = "a"; - } else if(flags == 0x20A) { + } else if (flags == 0x20A) { fsMode = "a+"; } else { r->_errno = EINVAL; return -1; } - char *fixedPath = __wut_fs_fixpath(r,path); + char *fixedPath = __wut_fs_fixpath(r, path); if (!fixedPath) { return -1; } @@ -51,9 +50,9 @@ __wut_fs_open(struct _reent *r, return -1; } - file = (__wut_fs_file_t *)fileStruct; - file->fd = fd; - file->flags = (flags & (O_ACCMODE|O_APPEND|O_SYNC)); + file = (__wut_fs_file_t *) fileStruct; + file->fd = fd; + file->flags = (flags & (O_ACCMODE | O_APPEND | O_SYNC)); FSGetPosFile(__wut_devoptab_fs_client, &cmd, fd, &file->offset, FS_ERROR_FLAG_ALL); return 0; } diff --git a/libraries/wutdevoptab/devoptab_fs_read.c b/libraries/wutdevoptab/devoptab_fs_read.c index 1a21813c2..d103a291d 100644 --- a/libraries/wutdevoptab/devoptab_fs_read.c +++ b/libraries/wutdevoptab/devoptab_fs_read.c @@ -18,7 +18,7 @@ __wut_fs_read(struct _reent *r, } FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; bytesRead = 0; // Check that the file was opened with read access @@ -27,46 +27,46 @@ __wut_fs_read(struct _reent *r, return -1; } - if((((uintptr_t) ptr) & 0x3F) == 0){ + if ((((uintptr_t) ptr) & 0x3F) == 0) { status = FSReadFile(__wut_devoptab_fs_client, &cmd, (uint8_t *) ptr, 1, - len, file->fd, 0, FS_ERROR_FLAG_ALL); - if(status > 0){ + len, file->fd, 0, FS_ERROR_FLAG_ALL); + if (status > 0) { bytesRead = (uint32_t) status; file->offset += bytesRead; } } else { // Copy to internal buffer due to alignment requirement and read in chunks. // Using a buffer smaller than 128KiB takes a performance hit. - int buffer_size = len < 128*1024 ? len : 128*1024; + int buffer_size = len < 128 * 1024 ? len : 128 * 1024; alignedReadBuffer = memalign(0x40, buffer_size); - if(!alignedReadBuffer){ + if (!alignedReadBuffer) { r->_errno = ENOMEM; return -1; } while (len > 0) { - size_t toRead = len > buffer_size ? buffer_size : len; + size_t toRead = len > buffer_size ? buffer_size : len; - // Write the data - status = FSReadFile(__wut_devoptab_fs_client, &cmd, alignedReadBuffer, 1, - toRead, file->fd, 0, FS_ERROR_FLAG_ALL); - if (status <= 0) { - break; - } + // Write the data + status = FSReadFile(__wut_devoptab_fs_client, &cmd, alignedReadBuffer, 1, + toRead, file->fd, 0, FS_ERROR_FLAG_ALL); + if (status <= 0) { + break; + } - // Copy to internal buffer - bytes = (uint32_t)status; - memcpy(ptr, alignedReadBuffer, bytes); + // Copy to internal buffer + bytes = (uint32_t) status; + memcpy(ptr, alignedReadBuffer, bytes); - file->offset += bytes; - bytesRead += bytes; - ptr += bytes; - len -= bytes; + file->offset += bytes; + bytesRead += bytes; + ptr += bytes; + len -= bytes; - if (bytes < toRead) { - // If we did not read the full requested toRead bytes then we reached - // the end of the file. - break; - } + if (bytes < toRead) { + // If we did not read the full requested toRead bytes then we reached + // the end of the file. + break; + } } free(alignedReadBuffer); } diff --git a/libraries/wutdevoptab/devoptab_fs_rename.c b/libraries/wutdevoptab/devoptab_fs_rename.c index 2f2538d77..808a05e57 100644 --- a/libraries/wutdevoptab/devoptab_fs_rename.c +++ b/libraries/wutdevoptab/devoptab_fs_rename.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_rename(struct _reent *r, - const char *oldName, - const char *newName) +int __wut_fs_rename(struct _reent *r, + const char *oldName, + const char *newName) { FSStatus status; FSCmdBlock cmd; diff --git a/libraries/wutdevoptab/devoptab_fs_rmdir.c b/libraries/wutdevoptab/devoptab_fs_rmdir.c index 70b89eb62..718998e51 100644 --- a/libraries/wutdevoptab/devoptab_fs_rmdir.c +++ b/libraries/wutdevoptab/devoptab_fs_rmdir.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_rmdir(struct _reent *r, - const char *name) +int __wut_fs_rmdir(struct _reent *r, + const char *name) { FSStatus status; FSCmdBlock cmd; diff --git a/libraries/wutdevoptab/devoptab_fs_seek.c b/libraries/wutdevoptab/devoptab_fs_seek.c index bea680c63..36c1f1d4c 100644 --- a/libraries/wutdevoptab/devoptab_fs_seek.c +++ b/libraries/wutdevoptab/devoptab_fs_seek.c @@ -1,10 +1,9 @@ #include "devoptab_fs.h" -off_t -__wut_fs_seek(struct _reent *r, - void *fd, - off_t pos, - int whence) +off_t __wut_fs_seek(struct _reent *r, + void *fd, + off_t pos, + int whence) { FSStatus status; FSCmdBlock cmd; @@ -18,7 +17,7 @@ __wut_fs_seek(struct _reent *r, } FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; status = FSGetStatFile(__wut_devoptab_fs_client, &cmd, file->fd, &fsStat, FS_ERROR_FLAG_ALL); if (status < 0) { @@ -27,30 +26,30 @@ __wut_fs_seek(struct _reent *r, } // Find the offset to see from - switch(whence) { - // Set absolute position; start offset is 0 - case SEEK_SET: - offset = 0; - break; + switch (whence) { + // Set absolute position; start offset is 0 + case SEEK_SET: + offset = 0; + break; - // Set position relative to the current position - case SEEK_CUR: - offset = file->offset; - break; + // Set position relative to the current position + case SEEK_CUR: + offset = file->offset; + break; - // Set position relative to the end of the file - case SEEK_END: - offset = fsStat.size; - break; + // Set position relative to the end of the file + case SEEK_END: + offset = fsStat.size; + break; - // An invalid option was provided - default: - r->_errno = EINVAL; - return -1; + // An invalid option was provided + default: + r->_errno = EINVAL; + return -1; } // TODO: A better check that prevents overflow. - if(pos < 0 && offset < -pos) { + if (pos < 0 && offset < -pos) { // Don't allow seek to before the beginning of the file r->_errno = EINVAL; return -1; @@ -58,8 +57,8 @@ __wut_fs_seek(struct _reent *r, // Update the current offset file->offset = offset + pos; - status = FSSetPosFile(__wut_devoptab_fs_client, &cmd, file->fd, file->offset, - FS_ERROR_FLAG_ALL); + status = FSSetPosFile(__wut_devoptab_fs_client, &cmd, file->fd, file->offset, + FS_ERROR_FLAG_ALL); if (status < 0) { r->_errno = __wut_fs_translate_error(status); return -1; diff --git a/libraries/wutdevoptab/devoptab_fs_stat.c b/libraries/wutdevoptab/devoptab_fs_stat.c index fd331577e..5414bd8f7 100644 --- a/libraries/wutdevoptab/devoptab_fs_stat.c +++ b/libraries/wutdevoptab/devoptab_fs_stat.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_stat(struct _reent *r, - const char *path, - struct stat *st) +int __wut_fs_stat(struct _reent *r, + const char *path, + struct stat *st) { int fd; FSStatus status; @@ -15,7 +14,7 @@ __wut_fs_stat(struct _reent *r, } char *fixedPath = __wut_fs_fixpath(r, path); - if (!fixedPath) { + if (!fixedPath) { return -1; } @@ -23,10 +22,10 @@ __wut_fs_stat(struct _reent *r, // First try open as file status = FSOpenFile(__wut_devoptab_fs_client, &cmd, fixedPath, "r", - (FSFileHandle*)&fd, FS_ERROR_FLAG_ALL); + (FSFileHandle *) &fd, FS_ERROR_FLAG_ALL); if (status >= 0) { - __wut_fs_file_t tmpfd = { .fd = fd }; - status = __wut_fs_fstat(r, &tmpfd, st); + __wut_fs_file_t tmpfd = {.fd = fd}; + status = __wut_fs_fstat(r, &tmpfd, st); FSCloseFile(__wut_devoptab_fs_client, &cmd, fd, FS_ERROR_FLAG_ALL); free(fixedPath); return status; @@ -34,7 +33,7 @@ __wut_fs_stat(struct _reent *r, // File failed, so lets try open as directory status = FSOpenDir(__wut_devoptab_fs_client, &cmd, fixedPath, - (FSDirectoryHandle*)&fd, FS_ERROR_FLAG_ALL); + (FSDirectoryHandle *) &fd, FS_ERROR_FLAG_ALL); free(fixedPath); if (status < 0) { r->_errno = __wut_fs_translate_error(status); @@ -43,7 +42,7 @@ __wut_fs_stat(struct _reent *r, memset(st, 0, sizeof(struct stat)); st->st_nlink = 1; - st->st_mode = S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO; + st->st_mode = S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO; FSCloseDir(__wut_devoptab_fs_client, &cmd, fd, FS_ERROR_FLAG_ALL); return 0; } diff --git a/libraries/wutdevoptab/devoptab_fs_statvfs.c b/libraries/wutdevoptab/devoptab_fs_statvfs.c index bc38cf414..246f3831d 100644 --- a/libraries/wutdevoptab/devoptab_fs_statvfs.c +++ b/libraries/wutdevoptab/devoptab_fs_statvfs.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_statvfs(struct _reent *r, - const char *path, - struct statvfs *buf) +int __wut_fs_statvfs(struct _reent *r, + const char *path, + struct statvfs *buf) { //TODO: FSGetFileSystemInfo r->_errno = ENOSYS; diff --git a/libraries/wutdevoptab/devoptab_fs_truncate.c b/libraries/wutdevoptab/devoptab_fs_truncate.c index fee1a9dc4..5d822b9bb 100644 --- a/libraries/wutdevoptab/devoptab_fs_truncate.c +++ b/libraries/wutdevoptab/devoptab_fs_truncate.c @@ -1,9 +1,8 @@ #include "devoptab_fs.h" -int -__wut_fs_ftruncate(struct _reent *r, - void *fd, - off_t len) +int __wut_fs_ftruncate(struct _reent *r, + void *fd, + off_t len) { FSStatus status; FSCmdBlock cmd; @@ -17,7 +16,7 @@ __wut_fs_ftruncate(struct _reent *r, // Set the new file size FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; status = FSSetPosFile(__wut_devoptab_fs_client, &cmd, file->fd, len, FS_ERROR_FLAG_ALL); if (status < 0) { r->_errno = __wut_fs_translate_error(status); diff --git a/libraries/wutdevoptab/devoptab_fs_unlink.c b/libraries/wutdevoptab/devoptab_fs_unlink.c index ae0c0da90..188b19ed8 100644 --- a/libraries/wutdevoptab/devoptab_fs_unlink.c +++ b/libraries/wutdevoptab/devoptab_fs_unlink.c @@ -1,8 +1,7 @@ #include "devoptab_fs.h" -int -__wut_fs_unlink(struct _reent *r, - const char *name) +int __wut_fs_unlink(struct _reent *r, + const char *name) { FSStatus status; FSCmdBlock cmd; diff --git a/libraries/wutdevoptab/devoptab_fs_utils.c b/libraries/wutdevoptab/devoptab_fs_utils.c index a932bed10..5cfe99af6 100644 --- a/libraries/wutdevoptab/devoptab_fs_utils.c +++ b/libraries/wutdevoptab/devoptab_fs_utils.c @@ -14,7 +14,7 @@ __wut_fs_fixpath(struct _reent *r, p = strchr(path, ':') + 1; if (!strchr(path, ':')) { - p = (char*)path; + p = (char *) path; } if (strlen(p) > PATH_MAX) { @@ -33,45 +33,44 @@ __wut_fs_fixpath(struct _reent *r, return fixedPath; } -int -__wut_fs_translate_error(FSStatus error) +int __wut_fs_translate_error(FSStatus error) { - switch ((int32_t)error) { - case FS_STATUS_END: - return ENOENT; - case FS_STATUS_CANCELLED: - return EINVAL; - case FS_STATUS_EXISTS: - return EEXIST; - case FS_STATUS_MEDIA_ERROR: - return EIO; - case FS_STATUS_NOT_FOUND: - return ENOENT; - case FS_STATUS_PERMISSION_ERROR: - return EPERM; - case FS_STATUS_STORAGE_FULL: - return ENOSPC; - case FS_ERROR_ALREADY_EXISTS: - return EEXIST; - case FS_ERROR_BUSY: - return EBUSY; - case FS_ERROR_CANCELLED: - return ECANCELED; - case FS_STATUS_FILE_TOO_BIG: - return EFBIG; - case FS_ERROR_INVALID_PATH: - return ENAMETOOLONG; - case FS_ERROR_NOT_DIR: - return ENOTDIR; - case FS_ERROR_NOT_FILE: - return EISDIR; - case FS_ERROR_OUT_OF_RANGE: - return ESPIPE; - case FS_ERROR_UNSUPPORTED_COMMAND: - return ENOTSUP; - case FS_ERROR_WRITE_PROTECTED: - return EROFS; - default: - return (int)error; + switch ((int32_t) error) { + case FS_STATUS_END: + return ENOENT; + case FS_STATUS_CANCELLED: + return EINVAL; + case FS_STATUS_EXISTS: + return EEXIST; + case FS_STATUS_MEDIA_ERROR: + return EIO; + case FS_STATUS_NOT_FOUND: + return ENOENT; + case FS_STATUS_PERMISSION_ERROR: + return EPERM; + case FS_STATUS_STORAGE_FULL: + return ENOSPC; + case FS_ERROR_ALREADY_EXISTS: + return EEXIST; + case FS_ERROR_BUSY: + return EBUSY; + case FS_ERROR_CANCELLED: + return ECANCELED; + case FS_STATUS_FILE_TOO_BIG: + return EFBIG; + case FS_ERROR_INVALID_PATH: + return ENAMETOOLONG; + case FS_ERROR_NOT_DIR: + return ENOTDIR; + case FS_ERROR_NOT_FILE: + return EISDIR; + case FS_ERROR_OUT_OF_RANGE: + return ESPIPE; + case FS_ERROR_UNSUPPORTED_COMMAND: + return ENOTSUP; + case FS_ERROR_WRITE_PROTECTED: + return EROFS; + default: + return (int) error; } } diff --git a/libraries/wutdevoptab/devoptab_fs_write.c b/libraries/wutdevoptab/devoptab_fs_write.c index a63f2d8be..12bd5ee21 100644 --- a/libraries/wutdevoptab/devoptab_fs_write.c +++ b/libraries/wutdevoptab/devoptab_fs_write.c @@ -18,7 +18,7 @@ __wut_fs_write(struct _reent *r, } FSInitCmdBlock(&cmd); - file = (__wut_fs_file_t *)fd; + file = (__wut_fs_file_t *) fd; bytesWritten = 0; // Check that the file was opened with write access @@ -27,19 +27,19 @@ __wut_fs_write(struct _reent *r, return -1; } - if((((uintptr_t) ptr) & 0x3F) == 0){ + if ((((uintptr_t) ptr) & 0x3F) == 0) { status = FSWriteFile(__wut_devoptab_fs_client, &cmd, (uint8_t *) ptr, - 1, len, file->fd, 0, FS_ERROR_FLAG_ALL); - if(status > 0){ + 1, len, file->fd, 0, FS_ERROR_FLAG_ALL); + if (status > 0) { bytesWritten = (uint32_t) status; file->offset += bytesWritten; } } else { // Copy to internal buffer due to alignment requirement and read in chunks. // Using a buffer smaller than 128KiB takes a performance hit. - int buffer_size = len < 128*1024 ? len : 128*1024; + int buffer_size = len < 128 * 1024 ? len : 128 * 1024; alignedWriteBuffer = memalign(0x40, buffer_size); - if(!alignedWriteBuffer){ + if (!alignedWriteBuffer) { r->_errno = ENOMEM; return -1; } @@ -56,11 +56,11 @@ __wut_fs_write(struct _reent *r, break; } - bytes = (uint32_t)status; + bytes = (uint32_t) status; file->offset += bytes; bytesWritten += bytes; - ptr += bytes; - len -= bytes; + ptr += bytes; + len -= bytes; if (bytes < toWrite) { break; diff --git a/libraries/wutmalloc/wut_malloc.c b/libraries/wutmalloc/wut_malloc.c index c4857218d..cc4abc356 100644 --- a/libraries/wutmalloc/wut_malloc.c +++ b/libraries/wutmalloc/wut_malloc.c @@ -1,20 +1,18 @@ -#include #include +#include #include +#include #include #include -#include // Limit sbrk heap to 128kb uint32_t __wut_heap_max_size = 128 * 1024; -void -__init_wut_malloc(void) +void __init_wut_malloc(void) { } -void -__fini_wut_malloc(void) +void __fini_wut_malloc(void) { } @@ -28,8 +26,7 @@ _malloc_r(struct _reent *r, size_t size) return ptr; } -void -_free_r(struct _reent *r, void *ptr) +void _free_r(struct _reent *r, void *ptr) { if (ptr) { MEMFreeToDefaultHeap(ptr); @@ -74,17 +71,15 @@ _memalign_r(struct _reent *r, size_t align, size_t size) struct mallinfo _mallinfo_r(struct _reent *r) { - struct mallinfo info = { 0 }; + struct mallinfo info = {0}; return info; } -void -_malloc_stats_r(struct _reent *r) +void _malloc_stats_r(struct _reent *r) { } -int -_mallopt_r(struct _reent *r, int param, int value) +int _mallopt_r(struct _reent *r, int param, int value) { return 0; } @@ -107,8 +102,7 @@ _pvalloc_r(struct _reent *r, size_t size) return MEMAllocFromDefaultHeapEx((size + (OS_PAGE_SIZE - 1)) & ~(OS_PAGE_SIZE - 1), OS_PAGE_SIZE); } -int -_malloc_trim_r(struct _reent *r, size_t pad) +int _malloc_trim_r(struct _reent *r, size_t pad) { return 0; } diff --git a/libraries/wutnewlib/wut_clock.c b/libraries/wutnewlib/wut_clock.c index 505fb6d3c..eb8a59608 100644 --- a/libraries/wutnewlib/wut_clock.c +++ b/libraries/wutnewlib/wut_clock.c @@ -1,25 +1,24 @@ -#include "wut_newlib.h" #include "wut_clock.h" +#include "wut_newlib.h" #include #include -int -__wut_clock_gettime(clockid_t clock_id, - struct timespec *tp) +int __wut_clock_gettime(clockid_t clock_id, + struct timespec *tp) { if (clock_id == CLOCK_MONOTONIC) { OSTime time = OSGetSystemTime(); - tp->tv_sec = (time_t)OSTicksToSeconds(time); + tp->tv_sec = (time_t) OSTicksToSeconds(time); time -= OSSecondsToTicks(tp->tv_sec); - tp->tv_nsec = (long)OSTicksToNanoseconds(time); + tp->tv_nsec = (long) OSTicksToNanoseconds(time); } else if (clock_id == CLOCK_REALTIME) { OSTime time = OSGetTime(); - tp->tv_sec = (time_t)OSTicksToSeconds(time); + tp->tv_sec = (time_t) OSTicksToSeconds(time); time -= OSSecondsToTicks(tp->tv_sec); - tp->tv_nsec = (long)OSTicksToNanoseconds(time); + tp->tv_nsec = (long) OSTicksToNanoseconds(time); tp->tv_sec += EPOCH_DIFF_SECS; } else { @@ -29,23 +28,21 @@ __wut_clock_gettime(clockid_t clock_id, return 0; } -int -__wut_clock_settime(clockid_t clock_id, - const struct timespec *tp) +int __wut_clock_settime(clockid_t clock_id, + const struct timespec *tp) { return EPERM; } -int -__wut_clock_getres(clockid_t clock_id, - struct timespec *res) +int __wut_clock_getres(clockid_t clock_id, + struct timespec *res) { if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) { return EINVAL; } - res->tv_sec = 0; - res->tv_nsec = (long)((1000000000ull + (uint64_t)OSTimerClockSpeed) / (uint64_t)OSTimerClockSpeed); + res->tv_sec = 0; + res->tv_nsec = (long) ((1000000000ull + (uint64_t) OSTimerClockSpeed) / (uint64_t) OSTimerClockSpeed); return 0; } diff --git a/libraries/wutnewlib/wut_clock.h b/libraries/wutnewlib/wut_clock.h index 01c381618..f2d3946b6 100644 --- a/libraries/wutnewlib/wut_clock.h +++ b/libraries/wutnewlib/wut_clock.h @@ -1,17 +1,17 @@ #pragma once // The Wii U epoch is at 2000, so we must map it to 1970 for gettime -#define WIIU_EPOCH_YEAR (2000) +#define WIIU_EPOCH_YEAR (2000) -#define EPOCH_YEAR (1970) -#define EPOCH_YEARS_SINCE_LEAP 2 -#define EPOCH_YEARS_SINCE_CENTURY 70 +#define EPOCH_YEAR (1970) +#define EPOCH_YEARS_SINCE_LEAP 2 +#define EPOCH_YEARS_SINCE_CENTURY 70 #define EPOCH_YEARS_SINCE_LEAP_CENTURY 370 -#define EPOCH_DIFF_YEARS (2000 - EPOCH_YEAR) -#define EPOCH_DIFF_DAYS \ - ((EPOCH_DIFF_YEARS * 365) + \ - (EPOCH_DIFF_YEARS - 1 + EPOCH_YEARS_SINCE_LEAP) / 4 - \ +#define EPOCH_DIFF_YEARS (2000 - EPOCH_YEAR) +#define EPOCH_DIFF_DAYS \ + ((EPOCH_DIFF_YEARS * 365) + \ + (EPOCH_DIFF_YEARS - 1 + EPOCH_YEARS_SINCE_LEAP) / 4 - \ (EPOCH_DIFF_YEARS - 1 + EPOCH_YEARS_SINCE_CENTURY) / 100 + \ (EPOCH_DIFF_YEARS - 1 + EPOCH_YEARS_SINCE_LEAP_CENTURY) / 400) -#define EPOCH_DIFF_SECS (60ull * 60ull * 24ull * (uint64_t)EPOCH_DIFF_DAYS) +#define EPOCH_DIFF_SECS (60ull * 60ull * 24ull * (uint64_t) EPOCH_DIFF_DAYS) diff --git a/libraries/wutnewlib/wut_gettod_r.c b/libraries/wutnewlib/wut_gettod_r.c index e93bfd090..468cb3147 100644 --- a/libraries/wutnewlib/wut_gettod_r.c +++ b/libraries/wutnewlib/wut_gettod_r.c @@ -1,27 +1,26 @@ -#include "wut_newlib.h" #include "wut_clock.h" +#include "wut_newlib.h" #include -int -__wut_gettod_r(struct _reent *ptr, - struct timeval *tp, - struct timezone *tz) +int __wut_gettod_r(struct _reent *ptr, + struct timeval *tp, + struct timezone *tz) { OSTime time = OSGetTime(); if (tp != NULL) { - tp->tv_sec = (time_t)OSTicksToSeconds(time); + tp->tv_sec = (time_t) OSTicksToSeconds(time); time -= OSSecondsToTicks(tp->tv_sec); - tp->tv_usec = (long)OSTicksToMicroseconds(time); + tp->tv_usec = (long) OSTicksToMicroseconds(time); tp->tv_sec += EPOCH_DIFF_SECS; } if (tz != NULL) { tz->tz_minuteswest = 0; - tz->tz_dsttime = 0; + tz->tz_dsttime = 0; } return 0; diff --git a/libraries/wutnewlib/wut_lock.c b/libraries/wutnewlib/wut_lock.c index 4b9f0a240..9b3ac25eb 100644 --- a/libraries/wutnewlib/wut_lock.c +++ b/libraries/wutnewlib/wut_lock.c @@ -3,41 +3,38 @@ #include #include -int -__wut_lock_init(int *lock, - int recursive) +int __wut_lock_init(int *lock, + int recursive) { OSMutex *mutex = NULL; if (!lock) { return -1; } - mutex = (OSMutex *)malloc(sizeof(OSMutex)); + mutex = (OSMutex *) malloc(sizeof(OSMutex)); if (!mutex) { return -1; } OSInitMutex(mutex); - *lock = (int)mutex; + *lock = (int) mutex; return 0; } -int -__wut_lock_close(int *lock) +int __wut_lock_close(int *lock) { if (!lock || *lock == 0) { return -1; } - free((void *)*lock); + free((void *) *lock); *lock = 0; return 0; } -int -__wut_lock_acquire(int *lock) +int __wut_lock_acquire(int *lock) { - OSMutex *mutex = (OSMutex *)*lock; + OSMutex *mutex = (OSMutex *) *lock; if (!lock || *lock == 0) { return -1; } @@ -46,10 +43,9 @@ __wut_lock_acquire(int *lock) return 0; } -int -__wut_lock_release(int *lock) +int __wut_lock_release(int *lock) { - OSMutex *mutex = (OSMutex *)*lock; + OSMutex *mutex = (OSMutex *) *lock; if (!lock || *lock == 0) { return -1; } diff --git a/libraries/wutnewlib/wut_malloc_lock.c b/libraries/wutnewlib/wut_malloc_lock.c index 5a7244dee..b088a0c12 100644 --- a/libraries/wutnewlib/wut_malloc_lock.c +++ b/libraries/wutnewlib/wut_malloc_lock.c @@ -4,20 +4,17 @@ static OSMutex sMallocMutex; -void -__wut_malloc_lock(struct _reent *r) +void __wut_malloc_lock(struct _reent *r) { OSLockMutex(&sMallocMutex); } -void -__wut_malloc_unlock(struct _reent *r) +void __wut_malloc_unlock(struct _reent *r) { OSUnlockMutex(&sMallocMutex); } -void -__init_wut_malloc_lock() +void __init_wut_malloc_lock() { OSInitMutex(&sMallocMutex); } diff --git a/libraries/wutnewlib/wut_nanosleep.c b/libraries/wutnewlib/wut_nanosleep.c index 3fa6991fb..3b1faca0e 100644 --- a/libraries/wutnewlib/wut_nanosleep.c +++ b/libraries/wutnewlib/wut_nanosleep.c @@ -1,16 +1,15 @@ #include "wut_newlib.h" -#include #include +#include #include -int -__wut_nanosleep(const struct timespec *req, - struct timespec *rem) +int __wut_nanosleep(const struct timespec *req, + struct timespec *rem) { OSSleepTicks(OSSecondsToTicks(req->tv_sec) + OSNanosecondsToTicks(req->tv_nsec)); - rem->tv_sec = 0; + rem->tv_sec = 0; rem->tv_nsec = 0; return 0; } diff --git a/libraries/wutnewlib/wut_newlib.c b/libraries/wutnewlib/wut_newlib.c index c19362db2..bcc865f6b 100644 --- a/libraries/wutnewlib/wut_newlib.c +++ b/libraries/wutnewlib/wut_newlib.c @@ -1,46 +1,51 @@ #include "wut_newlib.h" #include -void(*__wut_exit)(int rc); +void (*__wut_exit)(int rc); extern void __fini_wut(void); -int __syscall_lock_init(int *lock, int recursive) { - return __wut_lock_init(lock,recursive); +int __syscall_lock_init(int *lock, int recursive) +{ + return __wut_lock_init(lock, recursive); } -int __syscall_lock_close(int *lock) { - return __wut_lock_close(lock); +int __syscall_lock_close(int *lock) +{ + return __wut_lock_close(lock); } -int __syscall_lock_release(int *lock) { - return __wut_lock_release(lock); +int __syscall_lock_release(int *lock) +{ + return __wut_lock_release(lock); } -int __syscall_lock_acquire(int *lock) { - return __wut_lock_acquire(lock); +int __syscall_lock_acquire(int *lock) +{ + return __wut_lock_acquire(lock); } -void __syscall_exit(int rc) { - __fini_wut(); - __wut_exit(rc); +void __syscall_exit(int rc) +{ + __fini_wut(); + __wut_exit(rc); } -int __syscall_gettod_r(struct _reent *ptr, struct timeval *tp, struct timezone *tz){ - return __wut_gettod_r(ptr,tp,tz); +int __syscall_gettod_r(struct _reent *ptr, struct timeval *tp, struct timezone *tz) +{ + return __wut_gettod_r(ptr, tp, tz); } -int __syscall_nanosleep(const struct timespec *req, struct timespec *rem){ - return __wut_nanosleep(req, rem); +int __syscall_nanosleep(const struct timespec *req, struct timespec *rem) +{ + return __wut_nanosleep(req, rem); } -void -__init_wut_newlib() +void __init_wut_newlib() { __wut_exit = RPLWRAP(exit); } -void -__fini_wut_newlib() +void __fini_wut_newlib() { } diff --git a/libraries/wutnewlib/wut_newlib.h b/libraries/wutnewlib/wut_newlib.h index eb930196f..f35ad42d8 100644 --- a/libraries/wutnewlib/wut_newlib.h +++ b/libraries/wutnewlib/wut_newlib.h @@ -2,26 +2,26 @@ #define __WUT_NEWLIB_H #include +#include #include #include -#include -void * __wut_sbrk_r(struct _reent *r, ptrdiff_t incr); -int __wut_lock_init(int *lock, int recursive); -int __wut_lock_close(int *lock); -int __wut_lock_acquire(int *lock); -int __wut_lock_release(int *lock); -void __wut_malloc_lock(struct _reent *r); -void __wut_malloc_unlock(struct _reent *r); -int __wut_gettod_r(struct _reent *ptr, struct timeval *tp, - struct timezone *tz); -int __wut_clock_gettime(clockid_t clock_id, struct timespec *tp); -int __wut_clock_settime(clockid_t clock_id, const struct timespec *tp); -int __wut_clock_getres(clockid_t clock_id, struct timespec *res); -int __wut_nanosleep(const struct timespec *req, struct timespec *rem); +void *__wut_sbrk_r(struct _reent *r, ptrdiff_t incr); +int __wut_lock_init(int *lock, int recursive); +int __wut_lock_close(int *lock); +int __wut_lock_acquire(int *lock); +int __wut_lock_release(int *lock); +void __wut_malloc_lock(struct _reent *r); +void __wut_malloc_unlock(struct _reent *r); +int __wut_gettod_r(struct _reent *ptr, struct timeval *tp, + struct timezone *tz); +int __wut_clock_gettime(clockid_t clock_id, struct timespec *tp); +int __wut_clock_settime(clockid_t clock_id, const struct timespec *tp); +int __wut_clock_getres(clockid_t clock_id, struct timespec *res); +int __wut_nanosleep(const struct timespec *req, struct timespec *rem); -void __init_wut_malloc_lock(); -void __init_wut_sbrk_heap(); -void __fini_wut_sbrk_heap(); +void __init_wut_malloc_lock(); +void __init_wut_sbrk_heap(); +void __fini_wut_sbrk_heap(); #endif // ifndef __WUT_NEWLIB_H diff --git a/libraries/wutnewlib/wut_sbrk.c b/libraries/wutnewlib/wut_sbrk.c index 47f8d0451..7d6dfb6a8 100644 --- a/libraries/wutnewlib/wut_sbrk.c +++ b/libraries/wutnewlib/wut_sbrk.c @@ -1,15 +1,15 @@ #include "wut_newlib.h" #include -#include #include #include +#include extern uint32_t __attribute__((weak)) __wut_heap_max_size; -static MEMHeapHandle sHeapHandle = NULL; -static void *sHeapBase = NULL; -static uint32_t sHeapMaxSize = 0; +static MEMHeapHandle sHeapHandle = NULL; +static void *sHeapBase = NULL; +static uint32_t sHeapMaxSize = 0; static volatile uint32_t sHeapSize = 0; void * @@ -24,15 +24,14 @@ __wut_sbrk_r(struct _reent *r, if (newSize > sHeapMaxSize) { r->_errno = ENOMEM; - return (void *)-1; + return (void *) -1; } } while (!OSCompareAndSwapAtomic(&sHeapSize, oldSize, newSize)); - return ((uint8_t *)sHeapBase) + oldSize; + return ((uint8_t *) sHeapBase) + oldSize; } -void -__init_wut_sbrk_heap() +void __init_wut_sbrk_heap() { if (sHeapBase) { // Already initialised @@ -41,23 +40,22 @@ __init_wut_sbrk_heap() if (&__wut_heap_max_size) { // Use default heap - sHeapBase = MEMAllocFromDefaultHeap(__wut_heap_max_size); + sHeapBase = MEMAllocFromDefaultHeap(__wut_heap_max_size); sHeapMaxSize = __wut_heap_max_size; } else { // No max size specified, use 90% of base MEM2 heap - sHeapHandle = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM2); + sHeapHandle = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM2); uint32_t freeSize = MEMGetAllocatableSizeForExpHeapEx(sHeapHandle, 4); - sHeapMaxSize = (uint32_t)(0.9f * (float)freeSize) & ~0xFFF; + sHeapMaxSize = (uint32_t) (0.9f * (float) freeSize) & ~0xFFF; - sHeapBase = MEMAllocFromExpHeapEx(sHeapHandle, sHeapMaxSize, 4); + sHeapBase = MEMAllocFromExpHeapEx(sHeapHandle, sHeapMaxSize, 4); } sHeapSize = 0; } -void -__fini_wut_sbrk_heap() +void __fini_wut_sbrk_heap() { if (!sHeapBase) { // Already finalised @@ -70,7 +68,7 @@ __fini_wut_sbrk_heap() MEMFreeToDefaultHeap(sHeapBase); } - sHeapBase = NULL; - sHeapSize = 0; + sHeapBase = NULL; + sHeapSize = 0; sHeapMaxSize = 0; } diff --git a/libraries/wutsocket/NSSLCreateConnection.c b/libraries/wutsocket/NSSLCreateConnection.c index 69441bb2e..76de7a224 100644 --- a/libraries/wutsocket/NSSLCreateConnection.c +++ b/libraries/wutsocket/NSSLCreateConnection.c @@ -2,12 +2,12 @@ #include NSSLConnectionHandle -RPLWRAP(NSSLCreateConnection)(NSSLContextHandle context, - const char *host, - int32_t hostLength, - int32_t options, - int32_t socket, - int32_t block); + RPLWRAP(NSSLCreateConnection)(NSSLContextHandle context, + const char *host, + int32_t hostLength, + int32_t options, + int32_t socket, + int32_t block); NSSLConnectionHandle NSSLCreateConnection(NSSLContextHandle context, diff --git a/libraries/wutsocket/accept.c b/libraries/wutsocket/accept.c index 8339ce80e..098494d7e 100644 --- a/libraries/wutsocket/accept.c +++ b/libraries/wutsocket/accept.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -accept(int sockfd, - struct sockaddr *address, - socklen_t *addrlen) +int accept(int sockfd, + struct sockaddr *address, + socklen_t *addrlen) { int rc, fd, dev; @@ -12,10 +11,10 @@ accept(int sockfd, return -1; } - dev = __get_handle(sockfd)->device; + dev = __get_handle(sockfd)->device; sockfd = fd; - fd = __alloc_handle(dev); + fd = __alloc_handle(dev); if (fd == -1) { return -1; } @@ -25,8 +24,7 @@ accept(int sockfd, __release_handle(fd); return __wut_get_nsysnet_result(NULL, rc); } - - *(int *)__get_handle(fd)->fileStruct = rc; + + *(int *) __get_handle(fd)->fileStruct = rc; return fd; } - diff --git a/libraries/wutsocket/addrinfo.c b/libraries/wutsocket/addrinfo.c index a866f906b..683855c40 100644 --- a/libraries/wutsocket/addrinfo.c +++ b/libraries/wutsocket/addrinfo.c @@ -1,12 +1,11 @@ #include "wut_socket.h" -#include #include +#include -int -getaddrinfo(const char *node, - const char *service, - const struct addrinfo *hints, - struct addrinfo **res) +int getaddrinfo(const char *node, + const char *service, + const struct addrinfo *hints, + struct addrinfo **res) { int rc; @@ -24,23 +23,22 @@ getaddrinfo(const char *node, return rc; } -void -freeaddrinfo(struct addrinfo *res) +void freeaddrinfo(struct addrinfo *res) { - RPLWRAP(freeaddrinfo)(res); + RPLWRAP(freeaddrinfo) + (res); } -int -getnameinfo(const struct sockaddr *addr, - socklen_t addrlen, - char *host, - socklen_t hostlen, - char *serv, - socklen_t servlen, - int flags) +int getnameinfo(const struct sockaddr *addr, + socklen_t addrlen, + char *host, + socklen_t hostlen, + char *serv, + socklen_t servlen, + int flags) { int rc; - + rc = RPLWRAP(getnameinfo)(addr, addrlen, host, hostlen, serv, servlen, flags); return rc; diff --git a/libraries/wutsocket/bind.c b/libraries/wutsocket/bind.c index 57b139efe..1a475d8f4 100644 --- a/libraries/wutsocket/bind.c +++ b/libraries/wutsocket/bind.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -bind(int sockfd, - const struct sockaddr *addr, - socklen_t addrlen) +int bind(int sockfd, + const struct sockaddr *addr, + socklen_t addrlen) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -13,4 +12,3 @@ bind(int sockfd, rc = RPLWRAP(bind)(sockfd, addr, addrlen); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/connect.c b/libraries/wutsocket/connect.c index 6f83f8e45..5c33ab2f8 100644 --- a/libraries/wutsocket/connect.c +++ b/libraries/wutsocket/connect.c @@ -12,4 +12,3 @@ int connect(int sockfd, rc = RPLWRAP(connect)(sockfd, addr, addrlen); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/fcntl.c b/libraries/wutsocket/fcntl.c index 804b34937..1e80e7262 100644 --- a/libraries/wutsocket/fcntl.c +++ b/libraries/wutsocket/fcntl.c @@ -1,8 +1,7 @@ #include "wut_socket.h" -int -fcntl(int fd, - int cmd, ...) +int fcntl(int fd, + int cmd, ...) { va_list args; int sockfd, rc, flags, nonblock; @@ -25,7 +24,7 @@ fcntl(int fd, va_end(args); nonblock = !!(flags & O_NONBLOCK); - rc = RPLWRAP(setsockopt)(sockfd, + rc = RPLWRAP(setsockopt)(sockfd, SOL_SOCKET, SO_NONBLOCK, &nonblock, @@ -45,4 +44,3 @@ fcntl(int fd, flags = (nonblock) ? O_NONBLOCK : 0; return flags; } - diff --git a/libraries/wutsocket/getpeername.c b/libraries/wutsocket/getpeername.c index f5b0e3617..36dd1cbef 100644 --- a/libraries/wutsocket/getpeername.c +++ b/libraries/wutsocket/getpeername.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -getpeername(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen) +int getpeername(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -13,4 +12,3 @@ getpeername(int sockfd, rc = RPLWRAP(getpeername)(sockfd, addr, addrlen); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/getsockname.c b/libraries/wutsocket/getsockname.c index e9cc3bfea..051b5c953 100644 --- a/libraries/wutsocket/getsockname.c +++ b/libraries/wutsocket/getsockname.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -getsockname(int sockfd, - struct sockaddr *addr, - socklen_t *addrlen) +int getsockname(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -13,4 +12,3 @@ getsockname(int sockfd, rc = RPLWRAP(getsockname)(sockfd, addr, addrlen); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/getsockopt.c b/libraries/wutsocket/getsockopt.c index 13f8c51a3..dafc0b170 100644 --- a/libraries/wutsocket/getsockopt.c +++ b/libraries/wutsocket/getsockopt.c @@ -1,11 +1,10 @@ #include "wut_socket.h" -int -getsockopt(int sockfd, - int level, - int optname, - void *optval, - socklen_t *optlen) +int getsockopt(int sockfd, + int level, + int optname, + void *optval, + socklen_t *optlen) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -15,4 +14,3 @@ getsockopt(int sockfd, rc = RPLWRAP(getsockopt)(sockfd, level, optname, optval, optlen); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/host.c b/libraries/wutsocket/host.c index 8342ebb2c..e080f3e24 100644 --- a/libraries/wutsocket/host.c +++ b/libraries/wutsocket/host.c @@ -19,7 +19,7 @@ gethostbyaddr(const void *addr, struct hostent *ent = RPLWRAP(gethostbyaddr)(addr, len, type); - h_errno = *RPLWRAP(get_h_errno)(); + h_errno = *RPLWRAP(get_h_errno)(); return ent; } @@ -34,7 +34,7 @@ gethostbyname(const char *name) struct hostent *ent = RPLWRAP(gethostbyname)(name); - h_errno = *RPLWRAP(get_h_errno)(); + h_errno = *RPLWRAP(get_h_errno)(); return ent; } diff --git a/libraries/wutsocket/hostid.c b/libraries/wutsocket/hostid.c index 1dd16ec83..a6e3e1178 100644 --- a/libraries/wutsocket/hostid.c +++ b/libraries/wutsocket/hostid.c @@ -2,20 +2,18 @@ #include -long -gethostid(void) +long gethostid(void) { uint32_t ip = UINT32_MAX; ACGetAssignedAddress(&ip); - return (long)ip; + return (long) ip; } -int -gethostname(char *name, - size_t len) +int gethostname(char *name, + size_t len) { struct in_addr in; - in.s_addr = gethostid(); + in.s_addr = gethostid(); const char *hostname = inet_ntop(AF_INET, &in, name, len); return hostname ? 0 : -1; } diff --git a/libraries/wutsocket/inet_addr.c b/libraries/wutsocket/inet_addr.c index 53dc7c1f7..415705aaf 100644 --- a/libraries/wutsocket/inet_addr.c +++ b/libraries/wutsocket/inet_addr.c @@ -4,7 +4,7 @@ in_addr_t inet_addr(const char *cp) { struct in_addr addr = { - .s_addr = INADDR_NONE, + .s_addr = INADDR_NONE, }; inet_aton(cp, &addr); return addr.s_addr; diff --git a/libraries/wutsocket/inet_pton.c b/libraries/wutsocket/inet_pton.c index 9aa0e497d..718c0a6a3 100644 --- a/libraries/wutsocket/inet_pton.c +++ b/libraries/wutsocket/inet_pton.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -inet_pton(int af, - const char *src, - void *dst) +int inet_pton(int af, + const char *src, + void *dst) { int rc = RPLWRAP(inet_pton)(af, src, dst); if (rc < 0) { diff --git a/libraries/wutsocket/ioctl.c b/libraries/wutsocket/ioctl.c index 0feb08d7d..1b1329ec8 100644 --- a/libraries/wutsocket/ioctl.c +++ b/libraries/wutsocket/ioctl.c @@ -1,10 +1,9 @@ #include "wut_socket.h" #include -int -ioctl(int fd, - int request, - ...) +int ioctl(int fd, + int request, + ...) { void *data; va_list args; @@ -15,7 +14,7 @@ ioctl(int fd, data = (request & IOC_INOUT) ? va_arg(args, void *) : NULL; va_end(args); - if(data == NULL && (request & IOC_INOUT) && IOCPARM_LEN(request) != 0) { + if (data == NULL && (request & IOC_INOUT) && IOCPARM_LEN(request) != 0) { errno = EFAULT; return -1; } @@ -25,18 +24,18 @@ ioctl(int fd, return -1; } - switch(request) { + switch (request) { case FIONBIO: { int flags = fcntl(fd, F_GETFL, 0); - if(flags == -1) { + if (flags == -1) { return -1; } - flags = *(int *)data != 0 ? (flags | O_NONBLOCK) : (flags & ~O_NONBLOCK); + flags = *(int *) data != 0 ? (flags | O_NONBLOCK) : (flags & ~O_NONBLOCK); return fcntl(fd, F_SETFL, flags); } case FIONREAD: { socklen_t optlen = sizeof(int32_t); - rc = RPLWRAP(getsockopt)(sockfd, + rc = RPLWRAP(getsockopt)(sockfd, SOL_SOCKET, SO_RXDATA, data, @@ -45,7 +44,7 @@ ioctl(int fd, } case FIONWRITE: { socklen_t optlen = sizeof(int32_t); - rc = RPLWRAP(getsockopt)(sockfd, + rc = RPLWRAP(getsockopt)(sockfd, SOL_SOCKET, SO_TXDATA, data, diff --git a/libraries/wutsocket/listen.c b/libraries/wutsocket/listen.c index 61562b230..1af9dd071 100644 --- a/libraries/wutsocket/listen.c +++ b/libraries/wutsocket/listen.c @@ -1,8 +1,7 @@ #include "wut_socket.h" -int -listen(int sockfd, - int backlog) +int listen(int sockfd, + int backlog) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -12,4 +11,3 @@ listen(int sockfd, rc = RPLWRAP(listen)(sockfd, backlog); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/poll.c b/libraries/wutsocket/poll.c index 27c2672ec..c6b897678 100644 --- a/libraries/wutsocket/poll.c +++ b/libraries/wutsocket/poll.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -poll(struct pollfd *fds, - nfds_t nfds, - int timeout) +int poll(struct pollfd *fds, + nfds_t nfds, + int timeout) { int cnv_nfds = 0, rc, i; nsysnet_fd_set cnv_rd, cnv_wr, cnv_ex; diff --git a/libraries/wutsocket/recv.c b/libraries/wutsocket/recv.c index 2475bddb3..5a6d67be8 100644 --- a/libraries/wutsocket/recv.c +++ b/libraries/wutsocket/recv.c @@ -12,6 +12,5 @@ recv(int sockfd, return -1; } rc = RPLWRAP(recv)(sockfd, buf, len, flags); - return (ssize_t)__wut_get_nsysnet_result(NULL, rc); + return (ssize_t) __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/recvfrom.c b/libraries/wutsocket/recvfrom.c index 54039d0fe..cdf900ba3 100644 --- a/libraries/wutsocket/recvfrom.c +++ b/libraries/wutsocket/recvfrom.c @@ -14,6 +14,5 @@ recvfrom(int sockfd, return -1; } rc = RPLWRAP(recvfrom)(sockfd, buf, len, flags, src_addr, addrlen); - return (ssize_t)__wut_get_nsysnet_result(NULL, rc); + return (ssize_t) __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/select.c b/libraries/wutsocket/select.c index 4190f9939..46eba338f 100644 --- a/libraries/wutsocket/select.c +++ b/libraries/wutsocket/select.c @@ -1,11 +1,10 @@ #include "wut_socket.h" -int -select(int nfds, - fd_set *readfds, - fd_set *writefds, - fd_set *exceptfds, - struct timeval *timeout) +int select(int nfds, + fd_set *readfds, + fd_set *writefds, + fd_set *exceptfds, + struct timeval *timeout) { int cnv_nfds = 0, rc, i; nsysnet_fd_set cnv_rd, cnv_wr, cnv_ex; @@ -52,7 +51,7 @@ select(int nfds, } if (timeout) { - cnv_timeout.tv_sec = timeout->tv_sec; + cnv_timeout.tv_sec = timeout->tv_sec; cnv_timeout.tv_usec = timeout->tv_usec; } diff --git a/libraries/wutsocket/send.c b/libraries/wutsocket/send.c index 729a88b0c..9b1e52970 100644 --- a/libraries/wutsocket/send.c +++ b/libraries/wutsocket/send.c @@ -2,7 +2,7 @@ ssize_t send(int sockfd, - const void* buf, + const void *buf, size_t len, int flags) { @@ -12,6 +12,5 @@ send(int sockfd, return -1; } rc = RPLWRAP(send)(sockfd, buf, len, flags); - return (ssize_t)__wut_get_nsysnet_result(NULL, rc); + return (ssize_t) __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/sendto.c b/libraries/wutsocket/sendto.c index 7208c36e7..9152017dc 100644 --- a/libraries/wutsocket/sendto.c +++ b/libraries/wutsocket/sendto.c @@ -14,6 +14,5 @@ sendto(int sockfd, return -1; } rc = RPLWRAP(sendto)(sockfd, buf, len, flags, dest_addr, addrlen); - return (ssize_t)__wut_get_nsysnet_result(NULL, rc); + return (ssize_t) __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/setsockopt.c b/libraries/wutsocket/setsockopt.c index 20c4dc3f5..064226e2a 100644 --- a/libraries/wutsocket/setsockopt.c +++ b/libraries/wutsocket/setsockopt.c @@ -1,11 +1,10 @@ #include "wut_socket.h" -int -setsockopt(int sockfd, - int level, - int optname, - const void *optval, - socklen_t optlen) +int setsockopt(int sockfd, + int level, + int optname, + const void *optval, + socklen_t optlen) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -15,4 +14,3 @@ setsockopt(int sockfd, rc = RPLWRAP(setsockopt)(sockfd, level, optname, optval, optlen); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/shutdown.c b/libraries/wutsocket/shutdown.c index 38c1228b6..3b9c100d2 100644 --- a/libraries/wutsocket/shutdown.c +++ b/libraries/wutsocket/shutdown.c @@ -1,8 +1,7 @@ #include "wut_socket.h" -int -shutdown(int sockfd, - int how) +int shutdown(int sockfd, + int how) { int rc; sockfd = __wut_get_nsysnet_fd(sockfd); @@ -12,4 +11,3 @@ shutdown(int sockfd, rc = RPLWRAP(shutdown)(sockfd, how); return __wut_get_nsysnet_result(NULL, rc); } - diff --git a/libraries/wutsocket/sockatmark.c b/libraries/wutsocket/sockatmark.c index fa062d5bb..2357cc2ac 100644 --- a/libraries/wutsocket/sockatmark.c +++ b/libraries/wutsocket/sockatmark.c @@ -7,7 +7,7 @@ int sockatmark(int sockfd) sockfd = __wut_get_nsysnet_fd(sockfd); - rc = RPLWRAP(recv)(sockfd, buf, sizeof(buf), MSG_OOB | MSG_PEEK | MSG_DONTWAIT); + rc = RPLWRAP(recv)(sockfd, buf, sizeof(buf), MSG_OOB | MSG_PEEK | MSG_DONTWAIT); if (rc > 0) { return 1; } diff --git a/libraries/wutsocket/socket.c b/libraries/wutsocket/socket.c index c06e42da3..e35f9a808 100644 --- a/libraries/wutsocket/socket.c +++ b/libraries/wutsocket/socket.c @@ -1,9 +1,8 @@ #include "wut_socket.h" -int -socket(int domain, - int type, - int protocol) +int socket(int domain, + int type, + int protocol) { int rc, fd, dev; @@ -23,7 +22,6 @@ socket(int domain, return __wut_get_nsysnet_result(NULL, rc); } - *(int *)__get_handle(fd)->fileStruct = rc; + *(int *) __get_handle(fd)->fileStruct = rc; return fd; } - diff --git a/libraries/wutsocket/stubs.c b/libraries/wutsocket/stubs.c index e9e0ec950..cb06b334b 100644 --- a/libraries/wutsocket/stubs.c +++ b/libraries/wutsocket/stubs.c @@ -6,7 +6,7 @@ getservbyname(const char *name, const char *proto) { h_errno = NO_RECOVERY; - errno = ENOSYS; + errno = ENOSYS; return NULL; } @@ -15,22 +15,22 @@ getservbyport(int port, const char *proto) { h_errno = NO_RECOVERY; - errno = ENOSYS; + errno = ENOSYS; return NULL; } struct servent * getservent(void) -{ +{ h_errno = NO_RECOVERY; - errno = ENOSYS; - return NULL; + errno = ENOSYS; + return NULL; } struct hostent * gethostent(void) { h_errno = NO_RECOVERY; - errno = ENOSYS; + errno = ENOSYS; return NULL; } diff --git a/libraries/wutsocket/wut_socket.h b/libraries/wutsocket/wut_socket.h index bf47bb547..850e28612 100644 --- a/libraries/wutsocket/wut_socket.h +++ b/libraries/wutsocket/wut_socket.h @@ -1,20 +1,19 @@ #pragma once -#include +#include #include -#include -#include +#include #include -#include #include #include +#include +#include #define __LINUX_ERRNO_EXTENSIONS__ #include -int __wut_get_nsysnet_fd(int fd); -int __wut_get_nsysnet_result(struct _reent *r, int rc); +int __wut_get_nsysnet_fd(int fd); +int __wut_get_nsysnet_result(struct _reent *r, int rc); -int __wut_socket_open(struct _reent *r, void *fileStruct, const char *path, int flags, int mode); -int __wut_socket_close(struct _reent *r, void *fd); +int __wut_socket_open(struct _reent *r, void *fileStruct, const char *path, int flags, int mode); +int __wut_socket_close(struct _reent *r, void *fd); ssize_t __wut_socket_write(struct _reent *r, void *fd, const char *ptr, size_t len); ssize_t __wut_socket_read(struct _reent *r, void *fd, char *ptr, size_t len); - diff --git a/libraries/wutsocket/wut_socket_close.c b/libraries/wutsocket/wut_socket_close.c index 7826771d8..ce4b64b09 100644 --- a/libraries/wutsocket/wut_socket_close.c +++ b/libraries/wutsocket/wut_socket_close.c @@ -1,11 +1,9 @@ #include "wut_socket.h" -int -__wut_socket_close(struct _reent *r, - void *fd) +int __wut_socket_close(struct _reent *r, + void *fd) { - int sockfd = *(int *)fd; - int rc = RPLWRAP(socketclose)(sockfd); + int sockfd = *(int *) fd; + int rc = RPLWRAP(socketclose)(sockfd); return __wut_get_nsysnet_result(r, rc); } - diff --git a/libraries/wutsocket/wut_socket_common.c b/libraries/wutsocket/wut_socket_common.c index f558b3f44..9e1c14aac 100644 --- a/libraries/wutsocket/wut_socket_common.c +++ b/libraries/wutsocket/wut_socket_common.c @@ -5,81 +5,79 @@ int h_errno; static devoptab_t -__wut_socket_devoptab = -{ - .name = "soc", - .structSize = sizeof(int), - .open_r = __wut_socket_open, - .close_r = __wut_socket_close, - .write_r = __wut_socket_write, - .read_r = __wut_socket_read, + __wut_socket_devoptab = + { + .name = "soc", + .structSize = sizeof(int), + .open_r = __wut_socket_open, + .close_r = __wut_socket_close, + .write_r = __wut_socket_write, + .read_r = __wut_socket_read, }; static unsigned char -__wut_nsysnet_error_code_map[] = -{ - 0, // 0 - ENOBUFS, - ETIMEDOUT, - EISCONN, - EOPNOTSUPP, - ECONNABORTED, // 5 - EWOULDBLOCK, - ECONNREFUSED, - ECONNRESET, - ENOTCONN, - EALREADY, // 10 - EINVAL, - EMSGSIZE, - EPIPE, - EDESTADDRREQ, - ESHUTDOWN, // 15 - ENOPROTOOPT, - EBUSY, - ENOMEM, - EADDRNOTAVAIL, - EADDRINUSE, // 20 - EAFNOSUPPORT, - EINPROGRESS, - EIO, - ENOTSOCK, - EINVAL, // 25 - EINVAL, - EIO, - ETOOMANYREFS, - EFAULT, - ENETUNREACH, // 30 - EPROTONOSUPPORT, - EPROTOTYPE, - EINVAL, - EINVAL, - EINVAL, // 35 - EINVAL, - EINVAL, - EINVAL, - EINVAL, - EINVAL, // 40 - EINVAL, - ENODEV, - EBUSY, - EBUSY, - EINVAL, // 45 - EINVAL, - EINVAL, - ENOMEM, - EBADFD, - ECANCELED, // 50 - EMFILE, + __wut_nsysnet_error_code_map[] = + { + 0, // 0 + ENOBUFS, + ETIMEDOUT, + EISCONN, + EOPNOTSUPP, + ECONNABORTED, // 5 + EWOULDBLOCK, + ECONNREFUSED, + ECONNRESET, + ENOTCONN, + EALREADY, // 10 + EINVAL, + EMSGSIZE, + EPIPE, + EDESTADDRREQ, + ESHUTDOWN, // 15 + ENOPROTOOPT, + EBUSY, + ENOMEM, + EADDRNOTAVAIL, + EADDRINUSE, // 20 + EAFNOSUPPORT, + EINPROGRESS, + EIO, + ENOTSOCK, + EINVAL, // 25 + EINVAL, + EIO, + ETOOMANYREFS, + EFAULT, + ENETUNREACH, // 30 + EPROTONOSUPPORT, + EPROTOTYPE, + EINVAL, + EINVAL, + EINVAL, // 35 + EINVAL, + EINVAL, + EINVAL, + EINVAL, + EINVAL, // 40 + EINVAL, + ENODEV, + EBUSY, + EBUSY, + EINVAL, // 45 + EINVAL, + EINVAL, + ENOMEM, + EBADFD, + ECANCELED, // 50 + EMFILE, }; -void -__wut_socket_init_devoptab() +void __wut_socket_init_devoptab() { AddDevice(&__wut_socket_devoptab); } -void -__wut_socket_fini_devoptab() +void __wut_socket_fini_devoptab() { RemoveDevice("soc:"); } @@ -102,8 +100,7 @@ __fini_wut_socket() socket_lib_finish(); } -int -__wut_get_nsysnet_fd(int fd) +int __wut_get_nsysnet_fd(int fd) { __handle *handle = __get_handle(fd); if (handle == NULL) { @@ -114,12 +111,11 @@ __wut_get_nsysnet_fd(int fd) errno = ENOTSOCK; return -1; } - return *(int *)handle->fileStruct; + return *(int *) handle->fileStruct; } -int -__wut_get_nsysnet_result(struct _reent *r, - int rc) +int __wut_get_nsysnet_result(struct _reent *r, + int rc) { int sockerror, error; diff --git a/libraries/wutsocket/wut_socket_open.c b/libraries/wutsocket/wut_socket_open.c index 0fdb6ad2b..ac83d488e 100644 --- a/libraries/wutsocket/wut_socket_open.c +++ b/libraries/wutsocket/wut_socket_open.c @@ -1,13 +1,11 @@ #include "wut_socket.h" -int -__wut_socket_open(struct _reent *r, - void *fileStruct, - const char *path, - int flags, - int mode) +int __wut_socket_open(struct _reent *r, + void *fileStruct, + const char *path, + int flags, + int mode) { r->_errno = ENOSYS; return -1; } - diff --git a/libraries/wutsocket/wut_socket_read.c b/libraries/wutsocket/wut_socket_read.c index a10e25919..0cbe1e4f8 100644 --- a/libraries/wutsocket/wut_socket_read.c +++ b/libraries/wutsocket/wut_socket_read.c @@ -6,8 +6,7 @@ __wut_socket_read(struct _reent *r, char *ptr, size_t len) { - int sockfd = *(int *)fd; - int rc = RPLWRAP(recv)(sockfd, ptr, len, 0); - return (ssize_t)__wut_get_nsysnet_result(r, rc); + int sockfd = *(int *) fd; + int rc = RPLWRAP(recv)(sockfd, ptr, len, 0); + return (ssize_t) __wut_get_nsysnet_result(r, rc); } - diff --git a/libraries/wutsocket/wut_socket_write.c b/libraries/wutsocket/wut_socket_write.c index b19438b27..06443a4a7 100644 --- a/libraries/wutsocket/wut_socket_write.c +++ b/libraries/wutsocket/wut_socket_write.c @@ -6,8 +6,7 @@ __wut_socket_write(struct _reent *r, const char *ptr, size_t len) { - int sockfd = *(int *)fd; - int rc = RPLWRAP(send)(sockfd, ptr, len, 0); - return (ssize_t)__wut_get_nsysnet_result(r, rc); + int sockfd = *(int *) fd; + int rc = RPLWRAP(send)(sockfd, ptr, len, 0); + return (ssize_t) __wut_get_nsysnet_result(r, rc); } - diff --git a/libraries/wutstdc++/wut_gthread.cpp b/libraries/wutstdc++/wut_gthread.cpp index 9d628f1b9..ffa3e64a8 100644 --- a/libraries/wutstdc++/wut_gthread.cpp +++ b/libraries/wutstdc++/wut_gthread.cpp @@ -1,128 +1,157 @@ #include "wut_gthread.h" -#include #include +#include static constexpr __wut_key_t gthread_key_to_wut(__gthread_key_t key) { - __wut_key_t dst={}; - static_assert(sizeof(__wut_key_t) == sizeof(__gthread_key_t), "Incompatible definition of thread local key type"); - __builtin_memcpy(&dst, &key, sizeof(dst)); - return dst; + __wut_key_t dst = {}; + static_assert(sizeof(__wut_key_t) == sizeof(__gthread_key_t), "Incompatible definition of thread local key type"); + __builtin_memcpy(&dst, &key, sizeof(dst)); + return dst; } extern "C" { -int __gthr_impl_active (void) { +int __gthr_impl_active(void) +{ return 1; } -int __gthr_impl_create (__gthread_t *__threadid, void *(*__func) (void*), void *__args) { - return __wut_thread_create((OSThread**)__threadid, __func, __args); +int __gthr_impl_create(__gthread_t *__threadid, void *(*__func)(void *), void *__args) +{ + return __wut_thread_create((OSThread **) __threadid, __func, __args); } -int __gthr_impl_join (__gthread_t __threadid, void **__value_ptr) { - return __wut_thread_join((OSThread*)__threadid, __value_ptr); +int __gthr_impl_join(__gthread_t __threadid, void **__value_ptr) +{ + return __wut_thread_join((OSThread *) __threadid, __value_ptr); } -int __gthr_impl_detach (__gthread_t __threadid) { - return __wut_thread_detach((OSThread*)__threadid); +int __gthr_impl_detach(__gthread_t __threadid) +{ + return __wut_thread_detach((OSThread *) __threadid); } -int __gthr_impl_equal (__gthread_t __t1, __gthread_t __t2) { - return __wut_thread_equal( (OSThread*)__t1, (OSThread*)__t2); +int __gthr_impl_equal(__gthread_t __t1, __gthread_t __t2) +{ + return __wut_thread_equal((OSThread *) __t1, (OSThread *) __t2); } -__gthread_t __gthr_impl_self (void) { +__gthread_t __gthr_impl_self(void) +{ return __wut_thread_self(); } -int __gthr_impl_yield (void) { +int __gthr_impl_yield(void) +{ return __wut_thread_yield(); } -int __gthr_impl_once (__gthread_once_t *__once, void (*__func) (void)) { - return __wut_once((__wut_once_t*)__once, __func); +int __gthr_impl_once(__gthread_once_t *__once, void (*__func)(void)) +{ + return __wut_once((__wut_once_t *) __once, __func); } -int __gth_impl_key_create (__gthread_key_t *__key, void (*__dtor) (void *)) { - return __wut_key_create((__wut_key_t*)__key, __dtor); +int __gth_impl_key_create(__gthread_key_t *__key, void (*__dtor)(void *)) +{ + return __wut_key_create((__wut_key_t *) __key, __dtor); } -int __gthr_impl_key_delete (__gthread_key_t __key) { - return __wut_key_delete( gthread_key_to_wut(__key) ); +int __gthr_impl_key_delete(__gthread_key_t __key) +{ + return __wut_key_delete(gthread_key_to_wut(__key)); } -void *__gthr_impl_getspecific (__gthread_key_t __key) { - return __wut_getspecific( gthread_key_to_wut(__key) ); +void *__gthr_impl_getspecific(__gthread_key_t __key) +{ + return __wut_getspecific(gthread_key_to_wut(__key)); } -int __gthr_impl_setspecific (__gthread_key_t __key, const void *__ptr) { +int __gthr_impl_setspecific(__gthread_key_t __key, const void *__ptr) +{ return __wut_setspecific(gthread_key_to_wut(__key), __ptr); } -void __gthr_impl_mutex_init_function (__gthread_mutex_t *__mutex) { - return __wut_mutex_init_function((OSMutex*)__mutex); +void __gthr_impl_mutex_init_function(__gthread_mutex_t *__mutex) +{ + return __wut_mutex_init_function((OSMutex *) __mutex); } -int __gthr_impl_mutex_destroy (__gthread_mutex_t *__mutex) { - return __wut_mutex_destroy((OSMutex*)__mutex); +int __gthr_impl_mutex_destroy(__gthread_mutex_t *__mutex) +{ + return __wut_mutex_destroy((OSMutex *) __mutex); } -int __gthr_impl_mutex_lock (__gthread_mutex_t *__mutex) { - return __wut_mutex_lock((OSMutex*)__mutex); +int __gthr_impl_mutex_lock(__gthread_mutex_t *__mutex) +{ + return __wut_mutex_lock((OSMutex *) __mutex); } -int __gthr_impl_mutex_trylock (__gthread_mutex_t *__mutex) { - return __wut_mutex_trylock((OSMutex*)__mutex); +int __gthr_impl_mutex_trylock(__gthread_mutex_t *__mutex) +{ + return __wut_mutex_trylock((OSMutex *) __mutex); } -int __gthr_impl_mutex_unlock (__gthread_mutex_t *__mutex) { - return __wut_mutex_unlock((OSMutex*)__mutex); +int __gthr_impl_mutex_unlock(__gthread_mutex_t *__mutex) +{ + return __wut_mutex_unlock((OSMutex *) __mutex); } -int __gthr_impl_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) { - return __wut_recursive_mutex_init_function((OSMutex*)__mutex); +int __gthr_impl_recursive_mutex_init_function(__gthread_recursive_mutex_t *__mutex) +{ + return __wut_recursive_mutex_init_function((OSMutex *) __mutex); } -int __gthr_impl_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) { - return __wut_recursive_mutex_lock((OSMutex*)__mutex); +int __gthr_impl_recursive_mutex_lock(__gthread_recursive_mutex_t *__mutex) +{ + return __wut_recursive_mutex_lock((OSMutex *) __mutex); } -int __gthr_impl_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) { - return __wut_recursive_mutex_trylock((OSMutex*)__mutex); +int __gthr_impl_recursive_mutex_trylock(__gthread_recursive_mutex_t *__mutex) +{ + return __wut_recursive_mutex_trylock((OSMutex *) __mutex); } -int __gthr_impl_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) { - return __wut_recursive_mutex_unlock((OSMutex*)__mutex); +int __gthr_impl_recursive_mutex_unlock(__gthread_recursive_mutex_t *__mutex) +{ + return __wut_recursive_mutex_unlock((OSMutex *) __mutex); } -int __gthr_impl_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex) { - return __wut_recursive_mutex_destroy((OSMutex*)__mutex); +int __gthr_impl_recursive_mutex_destroy(__gthread_recursive_mutex_t *__mutex) +{ + return __wut_recursive_mutex_destroy((OSMutex *) __mutex); } -void __gthr_impl_cond_init_function (__gthread_cond_t *__cond) { - return __wut_cond_init_function((OSCondition*)__cond); +void __gthr_impl_cond_init_function(__gthread_cond_t *__cond) +{ + return __wut_cond_init_function((OSCondition *) __cond); } -int __gthr_impl_cond_broadcast (__gthread_cond_t *__cond) { - return __wut_cond_broadcast((OSCondition*)__cond); +int __gthr_impl_cond_broadcast(__gthread_cond_t *__cond) +{ + return __wut_cond_broadcast((OSCondition *) __cond); } -int __gthr_impl_cond_signal (__gthread_cond_t *__cond) { - return __wut_cond_signal((OSCondition*)__cond); +int __gthr_impl_cond_signal(__gthread_cond_t *__cond) +{ + return __wut_cond_signal((OSCondition *) __cond); } -int __gthr_impl_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex) { - return __wut_cond_wait((OSCondition*)__cond, (OSMutex*)__mutex); +int __gthr_impl_cond_wait(__gthread_cond_t *__cond, __gthread_mutex_t *__mutex) +{ + return __wut_cond_wait((OSCondition *) __cond, (OSMutex *) __mutex); } -int __gthr_impl_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex, const __gthread_time_t *__abs_timeout) { - return __wut_cond_timedwait((OSCondition*)__cond, (OSMutex*)__mutex, __abs_timeout); +int __gthr_impl_cond_timedwait(__gthread_cond_t *__cond, __gthread_mutex_t *__mutex, const __gthread_time_t *__abs_timeout) +{ + return __wut_cond_timedwait((OSCondition *) __cond, (OSMutex *) __mutex, __abs_timeout); } -int __gthr_impl_cond_wait_recursive (__gthread_cond_t *__cond, __gthread_recursive_mutex_t *__mutex) { - return __wut_cond_wait_recursive((OSCondition*)__cond, (OSMutex*)__mutex); +int __gthr_impl_cond_wait_recursive(__gthread_cond_t *__cond, __gthread_recursive_mutex_t *__mutex) +{ + return __wut_cond_wait_recursive((OSCondition *) __cond, (OSMutex *) __mutex); } -int __gthr_impl_cond_destroy (__gthread_cond_t* __cond) { - return __wut_cond_destroy((OSCondition*)__cond); +int __gthr_impl_cond_destroy(__gthread_cond_t *__cond) +{ + return __wut_cond_destroy((OSCondition *) __cond); } @@ -133,6 +162,4 @@ void __init_wut_stdcpp() void __fini_wut_stdcpp() { } - } - diff --git a/libraries/wutstdc++/wut_gthread.h b/libraries/wutstdc++/wut_gthread.h index 0235b7b1c..48188a287 100644 --- a/libraries/wutstdc++/wut_gthread.h +++ b/libraries/wutstdc++/wut_gthread.h @@ -3,123 +3,95 @@ #include #include -#include #include +#include -#define __WUT_MAX_KEYS (128) -#define __WUT_STACK_SIZE (4096*1024) +#define __WUT_MAX_KEYS (128) +#define __WUT_STACK_SIZE (4096 * 1024) -#define __WUT_ONCE_VALUE_INIT (0) -#define __WUT_ONCE_VALUE_STARTED (1) -#define __WUT_ONCE_VALUE_DONE (2) +#define __WUT_ONCE_VALUE_INIT (0) +#define __WUT_ONCE_VALUE_STARTED (1) +#define __WUT_ONCE_VALUE_DONE (2) #define __WUT_KEY_THREAD_SPECIFIC_ID (0) typedef volatile uint32_t __wut_once_t; -typedef struct { +typedef struct +{ uint32_t index; } __wut_key_t; -void -__init_wut_gthread(); +void __init_wut_gthread(); -int -__wut_active_p(); +int __wut_active_p(); -int -__wut_thread_create(OSThread **outThread, - void *(*func) (void*), - void *args); +int __wut_thread_create(OSThread **outThread, + void *(*func)(void *), + void *args); -int -__wut_thread_join(OSThread * thread, - void **outValue); +int __wut_thread_join(OSThread *thread, + void **outValue); -int -__wut_thread_detach(OSThread * thread); +int __wut_thread_detach(OSThread *thread); -int -__wut_thread_equal(OSThread *thread1, - OSThread *thread2); +int __wut_thread_equal(OSThread *thread1, + OSThread *thread2); OSThread * __wut_thread_self(); -int -__wut_thread_yield(); +int __wut_thread_yield(); -int -__wut_once(__wut_once_t *once, - void (*func) (void)); +int __wut_once(__wut_once_t *once, + void (*func)(void)); -void -__wut_key_cleanup(OSThread *thread); +void __wut_key_cleanup(OSThread *thread); -int -__wut_key_create(__wut_key_t *key, - void (*dtor) (void *)); +int __wut_key_create(__wut_key_t *key, + void (*dtor)(void *)); -int -__wut_key_delete(__wut_key_t key); +int __wut_key_delete(__wut_key_t key); void * __wut_getspecific(__wut_key_t key); -int -__wut_setspecific(__wut_key_t key, - const void *ptr); +int __wut_setspecific(__wut_key_t key, + const void *ptr); -void -__wut_mutex_init_function(OSMutex *mutex); +void __wut_mutex_init_function(OSMutex *mutex); -int -__wut_mutex_destroy(OSMutex *mutex); +int __wut_mutex_destroy(OSMutex *mutex); -int -__wut_mutex_lock(OSMutex *mutex); +int __wut_mutex_lock(OSMutex *mutex); -int -__wut_mutex_trylock(OSMutex *mutex); +int __wut_mutex_trylock(OSMutex *mutex); -int -__wut_mutex_unlock(OSMutex *mutex); +int __wut_mutex_unlock(OSMutex *mutex); -int -__wut_recursive_mutex_init_function(OSMutex *mutex); +int __wut_recursive_mutex_init_function(OSMutex *mutex); -int -__wut_recursive_mutex_lock(OSMutex *mutex); +int __wut_recursive_mutex_lock(OSMutex *mutex); -int -__wut_recursive_mutex_trylock(OSMutex *mutex); +int __wut_recursive_mutex_trylock(OSMutex *mutex); -int -__wut_recursive_mutex_unlock(OSMutex *mutex); +int __wut_recursive_mutex_unlock(OSMutex *mutex); -int -__wut_recursive_mutex_destroy(OSMutex *mutex); +int __wut_recursive_mutex_destroy(OSMutex *mutex); -void -__wut_cond_init_function(OSCondition *cond); +void __wut_cond_init_function(OSCondition *cond); -int -__wut_cond_broadcast(OSCondition *cond); +int __wut_cond_broadcast(OSCondition *cond); -int -__wut_cond_signal(OSCondition *cond); +int __wut_cond_signal(OSCondition *cond); -int -__wut_cond_wait(OSCondition *cond, - OSMutex *mutex); +int __wut_cond_wait(OSCondition *cond, + OSMutex *mutex); -int -__wut_cond_timedwait(OSCondition *cond, - OSMutex *mutex, - const __gthread_time_t *abs_timeout); +int __wut_cond_timedwait(OSCondition *cond, + OSMutex *mutex, + const __gthread_time_t *abs_timeout); -int -__wut_cond_wait_recursive(OSCondition *cond, - OSMutex *mutex); +int __wut_cond_wait_recursive(OSCondition *cond, + OSMutex *mutex); -int -__wut_cond_destroy(OSCondition* cond); +int __wut_cond_destroy(OSCondition *cond); diff --git a/libraries/wutstdc++/wut_gthread_cond.cpp b/libraries/wutstdc++/wut_gthread_cond.cpp index e4e20086e..851fa475e 100644 --- a/libraries/wutstdc++/wut_gthread_cond.cpp +++ b/libraries/wutstdc++/wut_gthread_cond.cpp @@ -7,29 +7,25 @@ #include #include -void -__wut_cond_init_function(OSCondition *cond) +void __wut_cond_init_function(OSCondition *cond) { OSInitCond(cond); } -int -__wut_cond_broadcast(OSCondition *cond) +int __wut_cond_broadcast(OSCondition *cond) { OSSignalCond(cond); return 0; } -int -__wut_cond_signal(OSCondition *cond) +int __wut_cond_signal(OSCondition *cond) { OSSignalCond(cond); return 0; } -int -__wut_cond_wait(OSCondition *cond, - OSMutex *mutex) +int __wut_cond_wait(OSCondition *cond, + OSMutex *mutex) { OSWaitCond(cond, mutex); return 0; @@ -45,23 +41,22 @@ static void __wut_cond_timedwait_alarm_callback(OSAlarm *alarm, OSContext *context) { - __wut_cond_timedwait_data_t *data = (__wut_cond_timedwait_data_t *)OSGetAlarmUserData(alarm); - data->timed_out = true; + __wut_cond_timedwait_data_t *data = (__wut_cond_timedwait_data_t *) OSGetAlarmUserData(alarm); + data->timed_out = true; OSSignalCond(data->cond); } -int -__wut_cond_timedwait(OSCondition *cond, OSMutex *mutex, - const __gthread_time_t *abs_timeout) +int __wut_cond_timedwait(OSCondition *cond, OSMutex *mutex, + const __gthread_time_t *abs_timeout) { __wut_cond_timedwait_data_t data; data.timed_out = false; - data.cond = cond; + data.cond = cond; - OSTime time = OSGetTime(); + OSTime time = OSGetTime(); OSTime timeout = - OSSecondsToTicks(abs_timeout->tv_sec) + - OSNanosecondsToTicks(abs_timeout->tv_nsec); + OSSecondsToTicks(abs_timeout->tv_sec) + + OSNanosecondsToTicks(abs_timeout->tv_nsec); // Already timed out! if (timeout <= time) { @@ -82,16 +77,14 @@ __wut_cond_timedwait(OSCondition *cond, OSMutex *mutex, return data.timed_out ? ETIMEDOUT : 0; } -int -__wut_cond_wait_recursive(OSCondition *cond, - OSMutex *mutex) +int __wut_cond_wait_recursive(OSCondition *cond, + OSMutex *mutex) { OSWaitCond(cond, mutex); return 0; } -int -__wut_cond_destroy(OSCondition* cond) +int __wut_cond_destroy(OSCondition *cond) { return 0; } diff --git a/libraries/wutstdc++/wut_gthread_keys.cpp b/libraries/wutstdc++/wut_gthread_keys.cpp index 7ea5cda62..8ec154cd0 100644 --- a/libraries/wutstdc++/wut_gthread_keys.cpp +++ b/libraries/wutstdc++/wut_gthread_keys.cpp @@ -7,7 +7,7 @@ struct __wut_key_table_entry { bool in_use; - void (*dtor) (void *); + void (*dtor)(void *); }; static __wut_key_table_entry key_table[__WUT_MAX_KEYS]; @@ -21,9 +21,8 @@ static void init() memset(key_table, 0, sizeof(key_table)); } -int -__wut_key_create(__wut_key_t *key, - void (*dtor) (void *)) +int __wut_key_create(__wut_key_t *key, + void (*dtor)(void *)) { int res = EAGAIN; __wut_once(&init_once_control, init); @@ -35,10 +34,10 @@ __wut_key_create(__wut_key_t *key, } key_table[i].in_use = 1; - key_table[i].dtor = dtor; + key_table[i].dtor = dtor; - res = 0; - key->index = i; + res = 0; + key->index = i; break; } @@ -46,12 +45,11 @@ __wut_key_create(__wut_key_t *key, return res; } -int -__wut_key_delete(__wut_key_t key) +int __wut_key_delete(__wut_key_t key) { __wut_mutex_lock(&key_mutex); key_table[key.index].in_use = 0; - key_table[key.index].dtor = NULL; + key_table[key.index].dtor = NULL; __wut_mutex_unlock(&key_mutex); return -1; } @@ -59,9 +57,9 @@ __wut_key_delete(__wut_key_t key) static const void ** __wut_get_thread_keys() { - const void **keys = (const void **)OSGetThreadSpecific(__WUT_KEY_THREAD_SPECIFIC_ID); + const void **keys = (const void **) OSGetThreadSpecific(__WUT_KEY_THREAD_SPECIFIC_ID); if (!keys) { - keys = (const void **)malloc(sizeof(void *) * sizeof(__WUT_MAX_KEYS)); + keys = (const void **) malloc(sizeof(void *) * sizeof(__WUT_MAX_KEYS)); if (!keys) { return NULL; } @@ -81,12 +79,11 @@ __wut_getspecific(__wut_key_t key) return NULL; } - return (void *)(keys[key.index]); + return (void *) (keys[key.index]); } -int -__wut_setspecific(__wut_key_t key, - const void *ptr) +int __wut_setspecific(__wut_key_t key, + const void *ptr) { const void **keys = __wut_get_thread_keys(); if (!keys) { @@ -97,10 +94,9 @@ __wut_setspecific(__wut_key_t key, return 0; } -void -__wut_key_cleanup(OSThread *thread) +void __wut_key_cleanup(OSThread *thread) { - void **keys = (void **)OSGetThreadSpecific(__WUT_KEY_THREAD_SPECIFIC_ID); + void **keys = (void **) OSGetThreadSpecific(__WUT_KEY_THREAD_SPECIFIC_ID); if (!keys) { return; } diff --git a/libraries/wutstdc++/wut_gthread_mutex.cpp b/libraries/wutstdc++/wut_gthread_mutex.cpp index 1dae3f890..9d4bb0ce9 100644 --- a/libraries/wutstdc++/wut_gthread_mutex.cpp +++ b/libraries/wutstdc++/wut_gthread_mutex.cpp @@ -1,20 +1,17 @@ #include "wut_gthread.h" -void -__wut_mutex_init_function(OSMutex *mutex) +void __wut_mutex_init_function(OSMutex *mutex) { OSInitMutex(mutex); } -int -__wut_mutex_lock(OSMutex *mutex) +int __wut_mutex_lock(OSMutex *mutex) { OSLockMutex(mutex); return 0; } -int -__wut_mutex_trylock(OSMutex *mutex) +int __wut_mutex_trylock(OSMutex *mutex) { if (!OSTryLockMutex(mutex)) { return -1; @@ -23,15 +20,13 @@ __wut_mutex_trylock(OSMutex *mutex) return 0; } -int -__wut_mutex_unlock(OSMutex *mutex) +int __wut_mutex_unlock(OSMutex *mutex) { OSUnlockMutex(mutex); return 0; } -int -__wut_mutex_destroy(OSMutex *mutex) +int __wut_mutex_destroy(OSMutex *mutex) { return 0; } diff --git a/libraries/wutstdc++/wut_gthread_once.cpp b/libraries/wutstdc++/wut_gthread_once.cpp index 5e7a03c57..fc3707db2 100644 --- a/libraries/wutstdc++/wut_gthread_once.cpp +++ b/libraries/wutstdc++/wut_gthread_once.cpp @@ -1,8 +1,7 @@ #include "wut_gthread.h" -int -__wut_once(__wut_once_t *once, - void (*func) (void)) +int __wut_once(__wut_once_t *once, + void (*func)(void)) { uint32_t value = 0; @@ -17,7 +16,8 @@ __wut_once(__wut_once_t *once, } else if (value != __WUT_ONCE_VALUE_DONE) { while (!OSCompareAndSwapAtomic(once, __WUT_ONCE_VALUE_DONE, - __WUT_ONCE_VALUE_DONE)); + __WUT_ONCE_VALUE_DONE)) + ; } return 0; diff --git a/libraries/wutstdc++/wut_gthread_recursive_mutex.cpp b/libraries/wutstdc++/wut_gthread_recursive_mutex.cpp index 7664b479b..32e040230 100644 --- a/libraries/wutstdc++/wut_gthread_recursive_mutex.cpp +++ b/libraries/wutstdc++/wut_gthread_recursive_mutex.cpp @@ -1,21 +1,18 @@ #include "wut_gthread.h" -int -__wut_recursive_mutex_init_function(OSMutex *mutex) +int __wut_recursive_mutex_init_function(OSMutex *mutex) { OSInitMutex(mutex); return 0; } -int -__wut_recursive_mutex_lock(OSMutex *mutex) +int __wut_recursive_mutex_lock(OSMutex *mutex) { OSLockMutex(mutex); return 0; } -int -__wut_recursive_mutex_trylock(OSMutex *mutex) +int __wut_recursive_mutex_trylock(OSMutex *mutex) { if (!OSTryLockMutex(mutex)) { return -1; @@ -24,15 +21,13 @@ __wut_recursive_mutex_trylock(OSMutex *mutex) return 0; } -int -__wut_recursive_mutex_unlock(OSMutex *mutex) +int __wut_recursive_mutex_unlock(OSMutex *mutex) { OSUnlockMutex(mutex); return 0; } -int -__wut_recursive_mutex_destroy(OSMutex *mutex) +int __wut_recursive_mutex_destroy(OSMutex *mutex) { return 0; } diff --git a/libraries/wutstdc++/wut_gthread_thread.cpp b/libraries/wutstdc++/wut_gthread_thread.cpp index 5cc0c8304..a319aea6a 100644 --- a/libraries/wutstdc++/wut_gthread_thread.cpp +++ b/libraries/wutstdc++/wut_gthread_thread.cpp @@ -18,18 +18,17 @@ __wut_thread_cleanup(OSThread *thread, void *stack) __wut_key_cleanup(thread); } -int -__wut_thread_create(OSThread **outThread, - void *(*entryPoint) (void*), - void *entryArgs) +int __wut_thread_create(OSThread **outThread, + void *(*entryPoint)(void *), + void *entryArgs) { - OSThread *thread = (OSThread *)memalign(16, sizeof(OSThread)); - char *stack = (char *)memalign(16, __WUT_STACK_SIZE); + OSThread *thread = (OSThread *) memalign(16, sizeof(OSThread)); + char *stack = (char *) memalign(16, __WUT_STACK_SIZE); memset(thread, 0, sizeof(OSThread)); if (!OSCreateThread(thread, - (OSThreadEntryPointFn)entryPoint, - (int)entryArgs, + (OSThreadEntryPointFn) entryPoint, + (int) entryArgs, NULL, stack + __WUT_STACK_SIZE, __WUT_STACK_SIZE, @@ -52,27 +51,24 @@ __wut_thread_create(OSThread **outThread, return 0; } -int -__wut_thread_join(OSThread *thread, - void **outValue) +int __wut_thread_join(OSThread *thread, + void **outValue) { - if (!OSJoinThread(thread, (int *)outValue)) { + if (!OSJoinThread(thread, (int *) outValue)) { return EINVAL; } return 0; } -int -__wut_thread_detach(OSThread * thread) +int __wut_thread_detach(OSThread *thread) { OSDetachThread(thread); return 0; } -int -__wut_thread_equal(OSThread *thread1, - OSThread *thread2) +int __wut_thread_equal(OSThread *thread1, + OSThread *thread2) { return thread1 == thread2; } @@ -83,8 +79,7 @@ __wut_thread_self() return OSGetCurrentThread(); } -int -__wut_thread_yield() +int __wut_thread_yield() { OSYieldThread(); return 0; diff --git a/samples/cmake/custom_default_heap/main.c b/samples/cmake/custom_default_heap/main.c index 6761752c5..954b6716b 100644 --- a/samples/cmake/custom_default_heap/main.c +++ b/samples/cmake/custom_default_heap/main.c @@ -1,19 +1,19 @@ #include -#include #include #include #include +#include #include -#include #include +#include -#include #include #include +#include static MEMHeapHandle sCustomHeap = NULL; -static uint32_t sCustomHeapAddr = 0; -static uint32_t sCustomHeapSize = 0; +static uint32_t sCustomHeapAddr = 0; +static uint32_t sCustomHeapSize = 0; static void * CustomAllocFromDefaultHeap(uint32_t size) @@ -29,7 +29,7 @@ CustomAllocFromDefaultHeapEx(uint32_t size, } static void -CustomFreeToDefaultHeap(void* ptr) +CustomFreeToDefaultHeap(void *ptr) { MEMFreeToExpHeap(sCustomHeap, ptr); } @@ -62,50 +62,47 @@ CustomDynLoadFree(void *addr) MEMFreeToDefaultHeap(addr); } -void -__preinit_user(MEMHeapHandle *mem1, - MEMHeapHandle *foreground, - MEMHeapHandle *mem2) +void __preinit_user(MEMHeapHandle *mem1, + MEMHeapHandle *foreground, + MEMHeapHandle *mem2) { uint32_t addr, size; - MEMAllocFromDefaultHeap = CustomAllocFromDefaultHeap; + MEMAllocFromDefaultHeap = CustomAllocFromDefaultHeap; MEMAllocFromDefaultHeapEx = CustomAllocFromDefaultHeapEx; - MEMFreeToDefaultHeap = CustomFreeToDefaultHeap; + MEMFreeToDefaultHeap = CustomFreeToDefaultHeap; if (OSGetForegroundBucket(NULL, NULL)) { OSGetMemBound(OS_MEM1, &addr, &size); - *mem1 = MEMCreateFrmHeapEx((void *)addr, size, 0); + *mem1 = MEMCreateFrmHeapEx((void *) addr, size, 0); OSGetForegroundBucketFreeArea(&addr, &size); - *foreground = MEMCreateFrmHeapEx((void *)addr, size, 0); + *foreground = MEMCreateFrmHeapEx((void *) addr, size, 0); } OSGetMemBound(OS_MEM2, &addr, &size); - sCustomHeap = MEMCreateExpHeapEx((void *)addr, size, MEM_HEAP_FLAG_USE_LOCK); + sCustomHeap = MEMCreateExpHeapEx((void *) addr, size, MEM_HEAP_FLAG_USE_LOCK); sCustomHeapAddr = addr; sCustomHeapSize = size; - *mem2 = sCustomHeap; + *mem2 = sCustomHeap; OSDynLoad_SetAllocator(CustomDynLoadAlloc, CustomDynLoadFree); OSDynLoad_SetTLSAllocator(CustomDynLoadAlloc, CustomDynLoadFree); } -void -heapBlockVisitor(void *block, - MEMHeapHandle heap, - void *context) +void heapBlockVisitor(void *block, + MEMHeapHandle heap, + void *context) { WHBLogPrintf("Block 0x%08X, size 0x%08X, group 0x%04X, direction %d", - (uint32_t)block, + (uint32_t) block, MEMGetSizeForMBlockExpHeap(block), MEMGetGroupIDForMBlockExpHeap(block), MEMGetAllocDirForMBlockExpHeap(block)); } -int -main(int argc, char **argv) +int main(int argc, char **argv) { WHBProcInit(); WHBLogConsoleInit(); @@ -117,7 +114,7 @@ main(int argc, char **argv) MEMVisitAllocatedForExpHeap(sCustomHeap, heapBlockVisitor, NULL); - while(WHBProcIsRunning()) { + while (WHBProcIsRunning()) { WHBLogConsoleDraw(); OSSleepTicks(OSMillisecondsToTicks(100)); } diff --git a/samples/cmake/erreula/main.cpp b/samples/cmake/erreula/main.cpp index 2529c9460..0d2120f16 100644 --- a/samples/cmake/erreula/main.cpp +++ b/samples/cmake/erreula/main.cpp @@ -3,10 +3,10 @@ #include #include -#include #include #include #include +#include int main(int argc, char **argv) { @@ -17,15 +17,15 @@ int main(int argc, char **argv) VPADInit(); // Create FSClient for erreula - FSClient *fsClient = (FSClient *)MEMAllocFromDefaultHeap(sizeof(FSClient)); + FSClient *fsClient = (FSClient *) MEMAllocFromDefaultHeap(sizeof(FSClient)); FSAddClient(fsClient, FS_ERROR_FLAG_NONE); // Create erreula nn::erreula::CreateArg createArg; - createArg.region = nn::erreula::RegionType::Europe; - createArg.language = nn::erreula::LangType::English; + createArg.region = nn::erreula::RegionType::Europe; + createArg.language = nn::erreula::LangType::English; createArg.workMemory = MEMAllocFromDefaultHeap(nn::erreula::GetWorkMemorySize()); - createArg.fsClient = fsClient; + createArg.fsClient = fsClient; if (!nn::erreula::Create(createArg)) { WHBLogPrintf("nn::erreula::Create failed"); WHBProcShutdown(); @@ -34,13 +34,13 @@ int main(int argc, char **argv) // Show the error viewer nn::erreula::AppearArg appearArg; - appearArg.errorArg.errorType = nn::erreula::ErrorType::Message2Button; - appearArg.errorArg.renderTarget = nn::erreula::RenderTarget::Both; + appearArg.errorArg.errorType = nn::erreula::ErrorType::Message2Button; + appearArg.errorArg.renderTarget = nn::erreula::RenderTarget::Both; appearArg.errorArg.controllerType = nn::erreula::ControllerType::DrcGamepad; - appearArg.errorArg.errorMessage = u"This is my error message"; - appearArg.errorArg.button1Label = u"Left Button"; - appearArg.errorArg.button2Label = u"Right Button"; - appearArg.errorArg.errorTitle = u"Title"; + appearArg.errorArg.errorMessage = u"This is my error message"; + appearArg.errorArg.button1Label = u"Left Button"; + appearArg.errorArg.button2Label = u"Right Button"; + appearArg.errorArg.errorTitle = u"Title"; nn::erreula::AppearErrorViewer(appearArg); WHBLogPrintf("Begin rendering..."); @@ -52,7 +52,7 @@ int main(int argc, char **argv) // Update erreula nn::erreula::ControllerInfo controllerInfo; - controllerInfo.vpad = &vpadStatus; + controllerInfo.vpad = &vpadStatus; controllerInfo.kpad[0] = nullptr; controllerInfo.kpad[1] = nullptr; controllerInfo.kpad[2] = nullptr; @@ -80,7 +80,7 @@ int main(int argc, char **argv) } nn::erreula::ResultType resultType = nn::erreula::GetResultType(); - int32_t resultCode = nn::erreula::GetResultCode(); + int32_t resultCode = nn::erreula::GetResultCode(); WHBLogPrintf("Result type: %d, result code: %d", static_cast(resultType), resultCode); diff --git a/samples/cmake/gx2_triangle/main.c b/samples/cmake/gx2_triangle/main.c index 5f43a4d68..552b01a66 100644 --- a/samples/cmake/gx2_triangle/main.c +++ b/samples/cmake/gx2_triangle/main.c @@ -1,23 +1,24 @@ #include #include -#include #include #include -#include +#include #include -#include +#include #include +#include #include -#include -#include #include #include #include +#include +#include #include #include #include +// clang-format off static const float sPositionData[] = { 1.0f, -1.0f, 0.0f, 1.0f, @@ -31,15 +32,16 @@ static const float sColourData[] = 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, }; +// clang-format on int main(int argc, char **argv) { - GX2RBuffer positionBuffer = { 0 }; - GX2RBuffer colourBuffer = { 0 }; - WHBGfxShaderGroup group = { 0 }; - void *buffer = NULL; - char *gshFileData = NULL; - char *sdRootPath = NULL; + GX2RBuffer positionBuffer = {0}; + GX2RBuffer colourBuffer = {0}; + WHBGfxShaderGroup group = {0}; + void *buffer = NULL; + char *gshFileData = NULL; + char *sdRootPath = NULL; char path[256]; int result = 0; @@ -73,14 +75,14 @@ int main(int argc, char **argv) WHBGfxInitFetchShader(&group); WHBFreeWholeFile(gshFileData); - gshFileData = NULL; + gshFileData = NULL; // Set vertex position positionBuffer.flags = GX2R_RESOURCE_BIND_VERTEX_BUFFER | GX2R_RESOURCE_USAGE_CPU_READ | GX2R_RESOURCE_USAGE_CPU_WRITE | GX2R_RESOURCE_USAGE_GPU_READ; - positionBuffer.elemSize = 4 * 4; + positionBuffer.elemSize = 4 * 4; positionBuffer.elemCount = 3; GX2RCreateBuffer(&positionBuffer); buffer = GX2RLockBufferEx(&positionBuffer, 0); @@ -92,7 +94,7 @@ int main(int argc, char **argv) GX2R_RESOURCE_USAGE_CPU_READ | GX2R_RESOURCE_USAGE_CPU_WRITE | GX2R_RESOURCE_USAGE_GPU_READ; - colourBuffer.elemSize = 4 * 4; + colourBuffer.elemSize = 4 * 4; colourBuffer.elemCount = 3; GX2RCreateBuffer(&colourBuffer); buffer = GX2RLockBufferEx(&colourBuffer, 0); @@ -102,21 +104,21 @@ int main(int argc, char **argv) WHBLogPrintf("Begin rendering..."); while (WHBProcIsRunning()) { // Animate colours... - float *colours = (float *)GX2RLockBufferEx(&colourBuffer, 0); - colours[0] = 1.0f; - colours[1] = colours[1] >= 1.0f ? 0.0f : (colours[1] + 0.01f); - colours[2] = colours[2] >= 1.0f ? 0.0f : (colours[2] + 0.01f); - colours[3] = 1.0f; - - colours[4] = colours[4] >= 1.0f ? 0.0f : (colours[4] + 0.01f); - colours[5] = 1.0f; - colours[6] = colours[6] >= 1.0f ? 0.0f : (colours[6] + 0.01f); - colours[7] = 1.0f; - - colours[8] = colours[8] >= 1.0f ? 0.0f : (colours[8] + 0.01f); - colours[9] = colours[9] >= 1.0f ? 0.0f : (colours[9] + 0.01f); - colours[10] = 1.0f; - colours[11] = 1.0f; + float *colours = (float *) GX2RLockBufferEx(&colourBuffer, 0); + colours[0] = 1.0f; + colours[1] = colours[1] >= 1.0f ? 0.0f : (colours[1] + 0.01f); + colours[2] = colours[2] >= 1.0f ? 0.0f : (colours[2] + 0.01f); + colours[3] = 1.0f; + + colours[4] = colours[4] >= 1.0f ? 0.0f : (colours[4] + 0.01f); + colours[5] = 1.0f; + colours[6] = colours[6] >= 1.0f ? 0.0f : (colours[6] + 0.01f); + colours[7] = 1.0f; + + colours[8] = colours[8] >= 1.0f ? 0.0f : (colours[8] + 0.01f); + colours[9] = colours[9] >= 1.0f ? 0.0f : (colours[9] + 0.01f); + colours[10] = 1.0f; + colours[11] = 1.0f; GX2RUnlockBufferEx(&colourBuffer, 0); // Render! diff --git a/samples/cmake/helloworld/main.c b/samples/cmake/helloworld/main.c index 489fc4780..7f858bcb9 100644 --- a/samples/cmake/helloworld/main.c +++ b/samples/cmake/helloworld/main.c @@ -1,12 +1,11 @@ #include #include -#include #include #include +#include -int -main(int argc, char **argv) +int main(int argc, char **argv) { int last_tm_sec = -1; OSCalendarTime tm; @@ -15,7 +14,7 @@ main(int argc, char **argv) WHBLogConsoleInit(); WHBLogPrintf("Hello World!"); - while(WHBProcIsRunning()) { + while (WHBProcIsRunning()) { OSTicksToCalendarTime(OSGetTime(), &tm); if (tm.tm_sec != last_tm_sec) { @@ -23,7 +22,7 @@ main(int argc, char **argv) tm.tm_mday, tm.tm_mon, tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec); last_tm_sec = tm.tm_sec; - } + } WHBLogConsoleDraw(); OSSleepTicks(OSMillisecondsToTicks(100)); diff --git a/samples/cmake/helloworld_cpp/main.cpp b/samples/cmake/helloworld_cpp/main.cpp index 9938773f7..d11cdf0f1 100644 --- a/samples/cmake/helloworld_cpp/main.cpp +++ b/samples/cmake/helloworld_cpp/main.cpp @@ -1,19 +1,18 @@ +#include #include #include -#include #include -#include #include #include +#include #include -int -hello_thread() +int hello_thread() { int last_tm_sec = -1; - uint32_t ip = 0; + uint32_t ip = 0; WHBLogPrintf("Hello World from a std::thread!"); if (!nn::ac::GetAssignedAddress(&ip)) { @@ -23,10 +22,10 @@ hello_thread() WHBLogPrintf("My IP is: %u.%u.%u.%u", (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, - (ip >> 8) & 0xFF, - (ip >> 0) & 0xFF); + (ip >> 8) & 0xFF, + (ip >> 0) & 0xFF); - while(WHBProcIsRunning()) { + while (WHBProcIsRunning()) { OSCalendarTime tm; OSTicksToCalendarTime(OSGetTime(), &tm); @@ -47,8 +46,7 @@ hello_thread() return 0; } -int -main(int argc, char **argv) +int main(int argc, char **argv) { nn::ac::ConfigIdNum configId; diff --git a/samples/cmake/my_first_rpl/my_first_rpl.c b/samples/cmake/my_first_rpl/my_first_rpl.c index 51ca2330b..47adf9ab9 100644 --- a/samples/cmake/my_first_rpl/my_first_rpl.c +++ b/samples/cmake/my_first_rpl/my_first_rpl.c @@ -8,9 +8,8 @@ my_first_export() return "Hello from my_first_rpl!"; } -int -rpl_entry(OSDynLoad_Module module, - OSDynLoad_EntryReason reason) +int rpl_entry(OSDynLoad_Module module, + OSDynLoad_EntryReason reason) { if (reason == OS_DYNLOAD_LOADED) { // Do stuff on load diff --git a/samples/cmake/my_first_rpl/my_first_rpl.h b/samples/cmake/my_first_rpl/my_first_rpl.h index b2af8b026..c5404848c 100644 --- a/samples/cmake/my_first_rpl/my_first_rpl.h +++ b/samples/cmake/my_first_rpl/my_first_rpl.h @@ -1,6 +1,7 @@ #ifndef MY_FIRST_RPL_H #define MY_FIRST_RPL_H -const char *my_first_export(); +const char * +my_first_export(); #endif // MY_FIRST_RPL_H diff --git a/samples/cmake/my_first_rpl/my_first_rpx.c b/samples/cmake/my_first_rpl/my_first_rpx.c index d8a201f27..d782080ff 100644 --- a/samples/cmake/my_first_rpl/my_first_rpx.c +++ b/samples/cmake/my_first_rpl/my_first_rpx.c @@ -3,18 +3,17 @@ #include #include -#include #include #include +#include -int -main(int argc, char **argv) +int main(int argc, char **argv) { WHBProcInit(); WHBLogConsoleInit(); WHBLogPrintf(my_first_export()); - while(WHBProcIsRunning()) { + while (WHBProcIsRunning()) { WHBLogConsoleDraw(); OSSleepTicks(OSMillisecondsToTicks(30)); } diff --git a/samples/cmake/swkbd/main.cpp b/samples/cmake/swkbd/main.cpp index 69835186b..df689a756 100644 --- a/samples/cmake/swkbd/main.cpp +++ b/samples/cmake/swkbd/main.cpp @@ -1,13 +1,13 @@ #include #include #include -#include #include +#include -#include #include #include #include +#include int main(int argc, char **argv) { @@ -19,14 +19,14 @@ int main(int argc, char **argv) AXInit(); // Create FSClient for swkbd - FSClient *fsClient = (FSClient *)MEMAllocFromDefaultHeap(sizeof(FSClient)); + FSClient *fsClient = (FSClient *) MEMAllocFromDefaultHeap(sizeof(FSClient)); FSAddClient(fsClient, FS_ERROR_FLAG_NONE); // Create swkbd nn::swkbd::CreateArg createArg; createArg.regionType = nn::swkbd::RegionType::Europe; createArg.workMemory = MEMAllocFromDefaultHeap(nn::swkbd::GetWorkMemorySize(0)); - createArg.fsClient = fsClient; + createArg.fsClient = fsClient; if (!nn::swkbd::Create(createArg)) { WHBLogPrintf("nn::swkbd::Create failed"); WHBProcShutdown(); @@ -39,7 +39,7 @@ int main(int argc, char **argv) // Show the keyboard nn::swkbd::AppearArg appearArg; appearArg.keyboardArg.configArg.languageType = nn::swkbd::LanguageType::English; - appearArg.inputFormArg.hintText = u"I'm a hint."; + appearArg.inputFormArg.hintText = u"I'm a hint."; if (!nn::swkbd::AppearInputForm(appearArg)) { WHBLogPrintf("nn::swkbd::AppearInputForm failed"); WHBProcShutdown(); @@ -55,7 +55,7 @@ int main(int argc, char **argv) // Update keyboard nn::swkbd::ControllerInfo controllerInfo; - controllerInfo.vpad = &vpadStatus; + controllerInfo.vpad = &vpadStatus; controllerInfo.kpad[0] = nullptr; controllerInfo.kpad[1] = nullptr; controllerInfo.kpad[2] = nullptr; diff --git a/samples/make/helloworld/source/main.c b/samples/make/helloworld/source/main.c index 489fc4780..7f858bcb9 100644 --- a/samples/make/helloworld/source/main.c +++ b/samples/make/helloworld/source/main.c @@ -1,12 +1,11 @@ #include #include -#include #include #include +#include -int -main(int argc, char **argv) +int main(int argc, char **argv) { int last_tm_sec = -1; OSCalendarTime tm; @@ -15,7 +14,7 @@ main(int argc, char **argv) WHBLogConsoleInit(); WHBLogPrintf("Hello World!"); - while(WHBProcIsRunning()) { + while (WHBProcIsRunning()) { OSTicksToCalendarTime(OSGetTime(), &tm); if (tm.tm_sec != last_tm_sec) { @@ -23,7 +22,7 @@ main(int argc, char **argv) tm.tm_mday, tm.tm_mon, tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec); last_tm_sec = tm.tm_sec; - } + } WHBLogConsoleDraw(); OSSleepTicks(OSMillisecondsToTicks(100)); diff --git a/samples/make/helloworld_cpp/source/main.cpp b/samples/make/helloworld_cpp/source/main.cpp index 9938773f7..d11cdf0f1 100644 --- a/samples/make/helloworld_cpp/source/main.cpp +++ b/samples/make/helloworld_cpp/source/main.cpp @@ -1,19 +1,18 @@ +#include #include #include -#include #include -#include #include #include +#include #include -int -hello_thread() +int hello_thread() { int last_tm_sec = -1; - uint32_t ip = 0; + uint32_t ip = 0; WHBLogPrintf("Hello World from a std::thread!"); if (!nn::ac::GetAssignedAddress(&ip)) { @@ -23,10 +22,10 @@ hello_thread() WHBLogPrintf("My IP is: %u.%u.%u.%u", (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, - (ip >> 8) & 0xFF, - (ip >> 0) & 0xFF); + (ip >> 8) & 0xFF, + (ip >> 0) & 0xFF); - while(WHBProcIsRunning()) { + while (WHBProcIsRunning()) { OSCalendarTime tm; OSTicksToCalendarTime(OSGetTime(), &tm); @@ -47,8 +46,7 @@ hello_thread() return 0; } -int -main(int argc, char **argv) +int main(int argc, char **argv) { nn::ac::ConfigIdNum configId;