From fcb17e5826f13f46250751988fe6ed5a2f41f464 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 11 Mar 2018 16:46:31 +0100 Subject: [PATCH] Formatting --- Makefile | 2 +- source/acp_functions.c | 8 ++-- source/acp_functions.h | 7 ++-- source/aoc_functions.c | 8 ++-- source/ax_functions.c | 21 +++++------ source/curl_functions.c | 8 ++-- source/fs_defs.h | 15 +++----- source/fs_functions.c | 6 ++- source/gx2_functions.c | 12 +++--- source/gx2_functions.h | 16 +++----- source/gx2_types.h | 9 ++--- source/nfp_functions.c | 8 ++-- source/nn_act_functions.c | 8 ++-- source/nn_nim_functions.c | 8 ++-- source/nn_save_functions.c | 8 ++-- source/ntag_functions.c | 8 ++-- source/os_defs.h | 6 +-- source/os_functions.c | 38 ++++++------------- source/os_types.h | 75 ++++++++++++++++++------------------- source/padscore_functions.c | 8 ++-- source/padscore_functions.h | 17 +++------ source/proc_ui_functions.c | 8 ++-- source/socket_functions.c | 8 ++-- source/socket_functions.h | 7 ++-- source/sys_functions.c | 8 ++-- source/syshid_functions.c | 12 +++--- source/syshid_functions.h | 6 +-- source/vpad_functions.c | 8 ++-- source/vpad_functions.h | 24 ++++-------- 29 files changed, 180 insertions(+), 197 deletions(-) diff --git a/Makefile b/Makefile index f509614..8c92b4e 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ LIB := lib #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O2 -Wall -D__wiiu__ $(MACHDEP) $(INCLUDE) +CFLAGS = -g -Os -Wall -D__wiiu__ $(MACHDEP) $(INCLUDE) CXXFLAGS = $(CFLAGS) ASFLAGS := -g diff --git a/source/acp_functions.c b/source/acp_functions.c index 91f5b2c..850806a 100644 --- a/source/acp_functions.c +++ b/source/acp_functions.c @@ -28,12 +28,14 @@ u32 acp_handle __attribute__((section(".data"))) = 0; EXPORT_DECL(void, GetMetaXml, ACPMetaXml * _ACPMetaXml); -void InitAcquireACP(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireACP(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nn_acp.rpl", &acp_handle); } -void InitACPFunctionPointers(void){ +void InitACPFunctionPointers(void) { InitAcquireACP(); OSDynLoad_FindExport(acp_handle,0,"GetMetaXml__Q2_2nn3acpFP11_ACPMetaXml",&GetMetaXml); } diff --git a/source/acp_functions.h b/source/acp_functions.h index 96007c5..fdd5f14 100644 --- a/source/acp_functions.h +++ b/source/acp_functions.h @@ -31,10 +31,9 @@ extern "C" { #include "os_types.h" -typedef struct ACPMetaXml_ -{ - u8 data[0x3440]; -}ACPMetaXml; +typedef struct ACPMetaXml_ { + u8 data[0x3440]; +} ACPMetaXml; extern u32 acp_handle; extern void (*GetMetaXml)(ACPMetaXml * _ACPMetaXml); diff --git a/source/aoc_functions.c b/source/aoc_functions.c index bdad537..2a2588c 100644 --- a/source/aoc_functions.c +++ b/source/aoc_functions.c @@ -35,12 +35,14 @@ EXPORT_DECL(s32, AOC_CloseTitle, void * title); EXPORT_DECL(s32, AOC_DeleteContent, u64 title_id, u16 contentIndexes[], u32 numberOfContent, void* buffer, u32 buffer_size); EXPORT_DECL(s32, AOC_GetPurchaseInfo, u32 * bResult, u64 title_id, u16 contentIndexes[], u32 numberOfContent, void * buffer, u32 buffer_size); -void InitAcquireAoc(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireAoc(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nn_aoc.rpl", &aoc_handle); } -void InitAocFunctionPointers(void){ +void InitAocFunctionPointers(void) { InitAcquireAoc(); if(aoc_handle == 0) return; diff --git a/source/ax_functions.c b/source/ax_functions.c index a4c470b..bca0582 100644 --- a/source/ax_functions.c +++ b/source/ax_functions.c @@ -49,21 +49,20 @@ EXPORT_DECL(u32, AXGetVoiceLoopCount, void *v); EXPORT_DECL(void, AXSetVoiceEndOffset, void *v, u32 offset); EXPORT_DECL(void, AXSetVoiceLoopOffset, void *v, u32 offset); -void InitAcquireAX(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireAX(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; u32 *funcPointer = 0; - if(OS_FIRMWARE >= 400) - { + if(OS_FIRMWARE >= 400) { AXInit = 0; OSDynLoad_Acquire("snd_core.rpl", &sound_handle_old); OSDynLoad_Acquire("sndcore2.rpl", &sound_handle); OS_FIND_EXPORT(sound_handle, AXInitWithParams); OS_FIND_EXPORT(sound_handle, AXGetInputSamplesPerSec); - } - else - { + } else { AXInitWithParams = 0; AXGetInputSamplesPerSec = 0; @@ -73,7 +72,7 @@ void InitAcquireAX(void){ } } -void InitAXFunctionPointers(void){ +void InitAXFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireAX(); @@ -97,8 +96,7 @@ void InitAXFunctionPointers(void){ OS_FIND_EXPORT(sound_handle, AXSetVoiceLoopOffset); } -void ProperlyEndTransitionAudio(void) -{ +void ProperlyEndTransitionAudio(void) { bool (* check_os_audio_transition_flag_old)(void); void (* AXInit_old)(void); void (* AXQuit_old)(void); @@ -111,8 +109,7 @@ void ProperlyEndTransitionAudio(void) OS_FIND_EXPORT_EX(sound_handle, AXInit, AXInit_old); OS_FIND_EXPORT_EX(sound_handle, AXQuit, AXQuit_old); - if (check_os_audio_transition_flag_old()) - { + if (check_os_audio_transition_flag_old()) { AXInit_old(); AXQuit_old(); } diff --git a/source/curl_functions.c b/source/curl_functions.c index a89cb70..06afb1b 100644 --- a/source/curl_functions.c +++ b/source/curl_functions.c @@ -38,12 +38,14 @@ EXPORT_DECL(void, n_curl_formfree, struct curl_httppost *form); EXPORT_DECL(struct curl_slist *, n_curl_slist_append, struct curl_slist *list, const char *string); EXPORT_DECL(void, n_curl_slist_free_all, struct curl_slist *list); -void InitAcquireCurl(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireCurl(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nlibcurl", &libcurl_handle); } -void InitCurlFunctionPointers(void){ +void InitCurlFunctionPointers(void) { InitAcquireCurl(); u32 *funcPointer = 0; diff --git a/source/fs_defs.h b/source/fs_defs.h index a75e772..bf53899 100644 --- a/source/fs_defs.h +++ b/source/fs_defs.h @@ -36,14 +36,13 @@ extern "C" { typedef struct FSClient_ { u8 buffer[FS_CLIENT_SIZE]; -}FSClient; +} FSClient; typedef struct FSCmdBlock_ { u8 buffer[FS_CMD_BLOCK_SIZE]; } FSCmdBlock; -typedef struct -{ +typedef struct { u32 flag; u32 permission; u32 owner_id; @@ -57,28 +56,26 @@ typedef struct u8 attributes[48]; } __attribute__((packed)) FSStat; -typedef struct -{ +typedef struct { FSStat stat; char name[FS_MAX_ENTNAME_SIZE]; } FSDirEntry; typedef void (*FSAsyncCallback)(FSClient * pClient, FSCmdBlock * pCmd, s32 result, void *context); -typedef struct -{ +typedef struct { FSAsyncCallback userCallback; void *userContext; OSMessageQueue *ioMsgQueue; } FSAsyncParams; -typedef struct{ +typedef struct { void* data; // pointer to a FSAsyncResult; u32 unkwn1; u32 unkwn2; u32 unkwn3; // always 0x08 } __attribute__((packed)) FSMessage; -typedef struct FSAsyncResult_{ +typedef struct FSAsyncResult_ { FSAsyncParams userParams; FSMessage ioMsg; diff --git a/source/fs_functions.c b/source/fs_functions.c index 8478360..9a105da 100644 --- a/source/fs_functions.c +++ b/source/fs_functions.c @@ -78,8 +78,10 @@ EXPORT_DECL(s32, FSMakeQuotaAsync ,void *pClient, void *pCmd, const char *path,u EXPORT_DECL(s32, FSGetCwd,void * client,void * block,char * buffer,u32 bufferSize,u32 flags); -void InitFSFunctionPointers(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitFSFunctionPointers(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; u32 *funcPointer = 0; OS_FIND_EXPORT(coreinit_handle, FSInit); diff --git a/source/gx2_functions.c b/source/gx2_functions.c index dfbc437..7f74b8c 100644 --- a/source/gx2_functions.c +++ b/source/gx2_functions.c @@ -82,8 +82,8 @@ EXPORT_DECL(void, GX2SetDRCEnable, s32 enable); EXPORT_DECL(void, GX2SetPolygonControl, s32 front_face_mode, s32 cull_front, s32 cull_back, s32 enable_mode, s32 mode_font, s32 mode_back, s32 poly_offset_front, s32 poly_offset_back, s32 point_line_offset); EXPORT_DECL(void, GX2SetCullOnlyControl, s32 front_face_mode, s32 cull_front, s32 cull_back); EXPORT_DECL(void, GX2SetDepthStencilControl, s32 enable_depth_test, s32 enable_depth_write, s32 depth_comp_function, s32 stencil_test_enable, s32 back_stencil_enable, - s32 font_stencil_func, s32 front_stencil_z_pass, s32 front_stencil_z_fail, s32 front_stencil_fail, - s32 back_stencil_func, s32 back_stencil_z_pass, s32 back_stencil_z_fail, s32 back_stencil_fail); + s32 font_stencil_func, s32 front_stencil_z_pass, s32 front_stencil_z_fail, s32 front_stencil_fail, + s32 back_stencil_func, s32 back_stencil_z_pass, s32 back_stencil_z_fail, s32 back_stencil_fail); EXPORT_DECL(void, GX2SetStencilMask, u8 mask_front, u8 write_mask_front, u8 ref_front, u8 mask_back, u8 write_mask_back, u8 ref_back); EXPORT_DECL(void, GX2SetLineWidth, f32 width); EXPORT_DECL(void, GX2SetTVGamma, f32 val); @@ -102,12 +102,14 @@ EXPORT_DECL(void, GX2ResolveAAColorBuffer, const GX2ColorBuffer * srcBuffer, GX2 EXPORT_DECL(void, GX2ClearBuffersEx, GX2ColorBuffer * colorBuffer,GX2DepthBuffer * depthBuffer,f32 r, f32 g, f32 b, f32 a,f32 depthValue,u8 stencilValue,s32 clearFlags); -void InitAcquireGX2(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireGX2(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("gx2.rpl", &gx2_handle); } -void InitGX2FunctionPointers(void){ +void InitGX2FunctionPointers(void) { u32 *funcPointer = 0; InitAcquireGX2(); diff --git a/source/gx2_functions.h b/source/gx2_functions.h index 5e84d4f..1e1563c 100644 --- a/source/gx2_functions.h +++ b/source/gx2_functions.h @@ -92,8 +92,8 @@ extern void (* GX2SetDRCEnable)(s32 enable); extern void (* GX2SetPolygonControl)(s32 front_face_mode, s32 cull_front, s32 cull_back, s32 enable_mode, s32 mode_font, s32 mode_back, s32 poly_offset_front, s32 poly_offset_back, s32 point_line_offset); extern void (* GX2SetCullOnlyControl)(s32 front_face_mode, s32 cull_front, s32 cull_back); extern void (* GX2SetDepthStencilControl)(s32 enable_depth_test, s32 enable_depth_write, s32 depth_comp_function, s32 stencil_test_enable, s32 back_stencil_enable, - s32 font_stencil_func, s32 front_stencil_z_pass, s32 front_stencil_z_fail, s32 front_stencil_fail, - s32 back_stencil_func, s32 back_stencil_z_pass, s32 back_stencil_z_fail, s32 back_stencil_fail); + s32 font_stencil_func, s32 front_stencil_z_pass, s32 front_stencil_z_fail, s32 front_stencil_fail, + s32 back_stencil_func, s32 back_stencil_z_pass, s32 back_stencil_z_fail, s32 back_stencil_fail); extern void (* GX2SetStencilMask)(u8 mask_front, u8 write_mask_front, u8 ref_front, u8 mask_back, u8 write_mask_back, u8 ref_back); extern void (* GX2SetLineWidth)(f32 width); extern void (* GX2SetTVGamma)(f32 val); @@ -110,8 +110,7 @@ extern void (*GX2CallDisplayList)(void * list, u32 size); extern void (*GX2ExpandAAColorBuffer)(GX2ColorBuffer * buffer); extern void (*GX2ResolveAAColorBuffer)(const GX2ColorBuffer * srcBuffer, GX2Surface * dstSurface,u32 dstMip,u32 dstSlice); -static inline void GX2InitDepthBuffer(GX2DepthBuffer *depthBuffer, s32 dimension, u32 width, u32 height, u32 depth, s32 format, s32 aa) -{ +static inline void GX2InitDepthBuffer(GX2DepthBuffer *depthBuffer, s32 dimension, u32 width, u32 height, u32 depth, s32 format, s32 aa) { depthBuffer->surface.dimension = dimension; depthBuffer->surface.width = width; depthBuffer->surface.height = height; @@ -133,8 +132,7 @@ static inline void GX2InitDepthBuffer(GX2DepthBuffer *depthBuffer, s32 dimension GX2InitDepthBufferRegs(depthBuffer); } -static inline void GX2InitColorBuffer(GX2ColorBuffer *colorBuffer, s32 dimension, u32 width, u32 height, u32 depth, s32 format, s32 aa) -{ +static inline void GX2InitColorBuffer(GX2ColorBuffer *colorBuffer, s32 dimension, u32 width, u32 height, u32 depth, s32 format, s32 aa) { colorBuffer->surface.dimension = dimension; colorBuffer->surface.width = width; colorBuffer->surface.height = height; @@ -166,8 +164,7 @@ static inline void GX2InitColorBuffer(GX2ColorBuffer *colorBuffer, s32 dimension GX2InitColorBufferRegs(colorBuffer); } -static inline void GX2InitAttribStream(GX2AttribStream* attr, u32 location, u32 buffer, u32 offset, s32 format) -{ +static inline void GX2InitAttribStream(GX2AttribStream* attr, u32 location, u32 buffer, u32 offset, s32 format) { attr->location = location; attr->buffer = buffer; attr->offset = offset; @@ -178,8 +175,7 @@ static inline void GX2InitAttribStream(GX2AttribStream* attr, u32 location, u32 attr->endian_swap = GX2_ENDIANSWAP_DEFAULT; } -static inline void GX2InitTexture(GX2Texture *tex, u32 width, u32 height, u32 depth, u32 num_mips, s32 format, s32 dimension, s32 tile) -{ +static inline void GX2InitTexture(GX2Texture *tex, u32 width, u32 height, u32 depth, u32 num_mips, s32 format, s32 dimension, s32 tile) { tex->surface.dimension = dimension; tex->surface.width = width; tex->surface.height = height; diff --git a/source/gx2_types.h b/source/gx2_types.h index a01262d..9893d2a 100644 --- a/source/gx2_types.h +++ b/source/gx2_types.h @@ -590,8 +590,7 @@ typedef struct _GX2FetchShader { u32 divisor[3]; } GX2FetchShader; -typedef struct _GX2AttribVar -{ +typedef struct _GX2AttribVar { const char *name; s32 var_type; u32 array_count; @@ -610,15 +609,13 @@ typedef struct _GX2UniformInitialValue { u32 offset; } GX2UniformInitialValue; -typedef struct _GX2SamplerVar -{ +typedef struct _GX2SamplerVar { const char *name; s32 sampler_type; u32 location; } GX2SamplerVar; -typedef struct _GX2UniformVar -{ +typedef struct _GX2UniformVar { const char *name; s32 var_type; u32 array_count; diff --git a/source/nfp_functions.c b/source/nfp_functions.c index 0fcb4ef..627155d 100644 --- a/source/nfp_functions.c +++ b/source/nfp_functions.c @@ -26,12 +26,14 @@ u32 nfp_handle __attribute__((section(".data"))) = 0; -void InitAcquireNFP(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireNFP(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nn_nfp.rpl", &nfp_handle); } -void InitNFPFunctionPointers(void){ +void InitNFPFunctionPointers(void) { // u32 *funcPointer = 0; InitAcquireNFP(); } diff --git a/source/nn_act_functions.c b/source/nn_act_functions.c index 81102da..872ff2a 100644 --- a/source/nn_act_functions.c +++ b/source/nn_act_functions.c @@ -32,12 +32,14 @@ EXPORT_DECL(u8, nn_act_GetSlotNo, void); EXPORT_DECL(u8, nn_act_GetDefaultAccount, void); EXPORT_DECL(u32, nn_act_GetPersistentIdEx, u8 slot); -void InitAcquireACT(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireACT(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nn_act.rpl", &nn_act_handle); } -void InitACTFunctionPointers(void){ +void InitACTFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireACT(); diff --git a/source/nn_nim_functions.c b/source/nn_nim_functions.c index 2e82130..e5b9890 100644 --- a/source/nn_nim_functions.c +++ b/source/nn_nim_functions.c @@ -26,12 +26,14 @@ u32 nn_nim_handle __attribute__((section(".data"))) = 0; -void InitAcquireNim(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireNim(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nn_nim.rpl", &nn_nim_handle); } -void InitNimFunctionPointers(void){ +void InitNimFunctionPointers(void) { // u32 *funcPointer = 0; InitAcquireNim(); } diff --git a/source/nn_save_functions.c b/source/nn_save_functions.c index e6ccfab..d1431c6 100644 --- a/source/nn_save_functions.c +++ b/source/nn_save_functions.c @@ -30,12 +30,14 @@ u32 nn_save_handle __attribute__((section(".data"))) = 0; EXPORT_DECL(void, SAVEInit, void); EXPORT_DECL(int, SAVEOpenFile, void *pClient, void *pCmd, unsigned char user, const char *path, const char *mode, int *fd, int errHandling); -void InitAcquireSave(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireSave(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nn_save.rpl", &nn_save_handle); } -void InitSaveFunctionPointers(void){ +void InitSaveFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireSave(); OS_FIND_EXPORT(nn_save_handle, SAVEInit); diff --git a/source/ntag_functions.c b/source/ntag_functions.c index 5f3715c..f250e3d 100644 --- a/source/ntag_functions.c +++ b/source/ntag_functions.c @@ -26,12 +26,14 @@ u32 ntag_handle __attribute__((section(".data"))) = 0; -void InitAcquireNTAG(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireNTAG(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("ntag.rpl", &ntag_handle); } -void InitNTAGFunctionPointers(void){ +void InitNTAGFunctionPointers(void) { // u32 *funcPointer = 0; InitAcquireNTAG(); } diff --git a/source/os_defs.h b/source/os_defs.h index 7226a4c..d536cca 100644 --- a/source/os_defs.h +++ b/source/os_defs.h @@ -5,8 +5,7 @@ extern "C" { #endif -typedef struct _OsSpecifics -{ +typedef struct _OsSpecifics { unsigned int addr_OSDynLoad_Acquire; unsigned int addr_OSDynLoad_FindExport; unsigned int addr_OSTitle_main_entry; @@ -18,8 +17,7 @@ typedef struct _OsSpecifics unsigned int addr_KernSyscallTbl5; } OsSpecifics; -typedef struct _s_mem_area -{ +typedef struct _s_mem_area { unsigned int address; unsigned int size; struct _s_mem_area* next; diff --git a/source/os_functions.c b/source/os_functions.c index c79c2c7..8562a1c 100644 --- a/source/os_functions.c +++ b/source/os_functions.c @@ -204,8 +204,7 @@ EXPORT_DECL(s32, IOS_IoctlAsync,s32 fd, u32 request, void *input_buffer,u32 inpu EXPORT_DECL(s32, IOS_Open,char *path, u32 mode); EXPORT_DECL(s32, IOS_Close,s32 fd); -void _os_find_export(u32 handle, const char *funcName, void *funcPointer) -{ +void _os_find_export(u32 handle, const char *funcName, void *funcPointer) { OSDynLoad_FindExport(handle, 0, funcName, funcPointer); if(!*(u32 *)funcPointer) { @@ -235,7 +234,7 @@ void _os_find_export(u32 handle, const char *funcName, void *funcPointer) } } -void InitAcquireOS(void){ +void InitAcquireOS(void) { //!---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- //! Lib handle functions //!---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -245,7 +244,7 @@ void InitAcquireOS(void){ OSDynLoad_Acquire("coreinit.rpl", &coreinit_handle); } -void InitOSFunctionPointers(void){ +void InitOSFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireOS(); @@ -406,8 +405,7 @@ void InitOSFunctionPointers(void){ //!---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- //! Special non library functions //!---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - if(OS_FIRMWARE == 550) - { + if(OS_FIRMWARE == 550) { EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x01010180); EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0101006C); EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x0100080C); @@ -415,9 +413,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19E80); EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE13DBC); - } - else if(OS_FIRMWARE == 532 || OS_FIRMWARE == 540) - { + } else if(OS_FIRMWARE == 532 || OS_FIRMWARE == 540) { EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x0100FFA4); // loader.elf EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0100FE90); // loader.elf EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x010007EC); // loader.elf @@ -425,9 +421,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19D00); // loader.elf EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE13C3C); // loader.elf - } - else if(OS_FIRMWARE == 500 || OS_FIRMWARE == 510) - { + } else if(OS_FIRMWARE == 500 || OS_FIRMWARE == 510) { EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x0100FBC4); EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0100FAB0); EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x010007EC); @@ -435,9 +429,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19D00); EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE13C3C); - } - else if(OS_FIRMWARE == 410) - { + } else if(OS_FIRMWARE == 410) { EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x0100F78C); EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0100F678); EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x010007F8); @@ -445,9 +437,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19CC0); EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE13BFC); - } - else if(OS_FIRMWARE == 400) //same for 402 and 403 - { + } else if(OS_FIRMWARE == 400) { //same for 402 and 403 EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x0100F78C); EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0100F678); EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x010007F8); @@ -455,9 +445,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19CC0); EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE13BFC); - } - else if(OS_FIRMWARE == 310) - { + } else if(OS_FIRMWARE == 310) { EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x0100C4E4); EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0100C3D4); EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x010004D8); @@ -465,9 +453,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19340); EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE1329C); - } - else if(OS_FIRMWARE == 300) - { + } else if(OS_FIRMWARE == 300) { EXPORT_FUNC_WRITE(LiWaitIopComplete, (s32 (*)(s32, s32 *))0x0100C4E4); EXPORT_FUNC_WRITE(LiWaitIopCompleteWithInterrupts, (s32 (*)(s32, s32 *))0x0100C3D4); EXPORT_FUNC_WRITE(addr_LiWaitOneChunk, (s32 (*)(s32, s32 *))0x010004D8); @@ -475,9 +461,7 @@ void InitOSFunctionPointers(void){ EXPORT_FUNC_WRITE(addr_sgIsLoadingBuffer, (s32 (*)(s32, s32 *))0xEFE19340); EXPORT_FUNC_WRITE(addr_gDynloadInitialized, (s32 (*)(s32, s32 *))0xEFE1329C); - } - else - { + } else { OSFatal("Missing all OS specific addresses."); } } diff --git a/source/os_types.h b/source/os_types.h index edf2140..5d57abf 100644 --- a/source/os_types.h +++ b/source/os_types.h @@ -82,7 +82,7 @@ typedef struct OSMessage_ { u32 data0; u32 data1; u32 data2; -}OSMessage; +} OSMessage; typedef struct OSMessageQueue_ { u32 tag; @@ -140,23 +140,22 @@ typedef struct OSContext_ { u32 mmcr1; } OSContext; -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, +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, } OSExceptionType; typedef int (*ThreadFunc)(int argc, void *argv); @@ -184,29 +183,29 @@ struct OSThread_ { }; typedef struct _OSCalendarTime { - int sec; - int min; - int hour; - int mday; - int mon; - int year; - int wday; - int yday; - int msec; - int usec; + int sec; + int min; + int hour; + int mday; + int mon; + int year; + int wday; + int yday; + int msec; + int usec; } OSCalendarTime; -typedef struct MCPTitleListType{ - u64 titleId; - u8 unknwn[4]; - s8 path[56]; - u32 appType; - u8 unknwn1[0x54 - 0x48]; - u8 device; - u8 unknwn2; - s8 indexedDevice[10]; - u8 unk0x60; +typedef struct MCPTitleListType { + u64 titleId; + u8 unknwn[4]; + s8 path[56]; + u32 appType; + u8 unknwn1[0x54 - 0x48]; + u8 device; + u8 unknwn2; + s8 indexedDevice[10]; + u8 unk0x60; } MCPTitleListType; #ifdef __cplusplus diff --git a/source/padscore_functions.c b/source/padscore_functions.c index 3279209..f63fcf6 100644 --- a/source/padscore_functions.c +++ b/source/padscore_functions.c @@ -37,12 +37,14 @@ EXPORT_DECL(s32, KPADReadEx, s32 chan, KPADData * data, u32 size, s32 *error); EXPORT_DECL(void,WPADSetAutoSleepTime,u8 minute); EXPORT_DECL(void,WPADDisconnect,s32 chan); -void InitAcquirePadScore(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquirePadScore(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("padscore.rpl", &padscore_handle); } -void InitPadScoreFunctionPointers(void){ +void InitPadScoreFunctionPointers(void) { u32 *funcPointer = 0; InitAcquirePadScore(); diff --git a/source/padscore_functions.h b/source/padscore_functions.h index 5185836..a5da4e4 100644 --- a/source/padscore_functions.h +++ b/source/padscore_functions.h @@ -103,8 +103,7 @@ extern u32 padscore_handle; #define WPAD_PRO_STICK_R_EMULATION_LEFT 0x00400000 #define WPAD_PRO_STICK_R_EMULATION_RIGHT 0x00800000 -typedef struct _KPADData -{ +typedef struct _KPADData { u32 btns_h; u32 btns_d; u32 btns_r; @@ -133,16 +132,13 @@ typedef struct _KPADData s8 pos_valid; u8 format; - union - { - struct - { + union { + struct { f32 stick_x; f32 stick_y; } nunchuck; - struct - { + struct { u32 btns_h; u32 btns_d; u32 btns_r; @@ -154,8 +150,7 @@ typedef struct _KPADData f32 rtrigger; } classic; - struct - { + struct { u32 btns_h; u32 btns_d; u32 btns_r; @@ -184,7 +179,7 @@ typedef struct WPADReadData_ { s16 r_stick_y; u8 unknown2[8]; u8 fmt; -}WPADReadData; +} WPADReadData; typedef WPADReadData KPADUnifiedWpadData; diff --git a/source/proc_ui_functions.c b/source/proc_ui_functions.c index a032d78..8feec6c 100644 --- a/source/proc_ui_functions.c +++ b/source/proc_ui_functions.c @@ -29,12 +29,14 @@ u32 proc_ui_handle __attribute__((section(".data"))) = 0; EXPORT_DECL(u32, ProcUIInForeground, void); EXPORT_DECL(void, ProcUIRegisterCallback, u32 type,ProcUICallback callback,void* param, u32 unkwn); -void InitAcquireProcUI(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireProcUI(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("proc_ui.rpl", &proc_ui_handle); } -void InitProcUIFunctionPointers(void){ +void InitProcUIFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireProcUI(); diff --git a/source/socket_functions.c b/source/socket_functions.c index 8efa8b7..9aed43a 100644 --- a/source/socket_functions.c +++ b/source/socket_functions.c @@ -52,12 +52,14 @@ EXPORT_DECL(s32, NSSLWrite, s32 connection, const void* buf, s32 len,s32 * writt EXPORT_DECL(s32, NSSLRead, s32 connection, const void* buf, s32 len,s32 * read); EXPORT_DECL(s32, NSSLCreateConnection, s32 context, const char* host, s32 hotlen,s32 options,s32 sock,s32 block); -void InitAcquireSocket(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireSocket(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("nsysnet.rpl", &nsysnet_handle); } -void InitSocketFunctionPointers(void){ +void InitSocketFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireSocket(); diff --git a/source/socket_functions.h b/source/socket_functions.h index 045e1ef..a030fa5 100644 --- a/source/socket_functions.h +++ b/source/socket_functions.h @@ -77,10 +77,9 @@ struct sockaddr_in { char sin_zero[8]; }; -struct sockaddr -{ - unsigned short sa_family; - char sa_data[14]; +struct sockaddr { + unsigned short sa_family; + char sa_data[14]; }; diff --git a/source/sys_functions.c b/source/sys_functions.c index 99ce0db..e4d613e 100644 --- a/source/sys_functions.c +++ b/source/sys_functions.c @@ -33,12 +33,14 @@ EXPORT_DECL(s32, SYSCheckTitleExists, u64 titleId); EXPORT_DECL(s32, SYSLaunchTitle, u64 titleId); EXPORT_DECL(s32, SYSLaunchSettings, s32 unk); -void InitAcquireSys(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireSys(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("sysapp.rpl", &sysapp_handle); } -void InitSysFunctionPointers(void){ +void InitSysFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireSys(); diff --git a/source/syshid_functions.c b/source/syshid_functions.c index a7d66a8..0d3ba62 100644 --- a/source/syshid_functions.c +++ b/source/syshid_functions.c @@ -46,15 +46,17 @@ EXPORT_DECL(s32, HIDSetIdle,u32 handle, u8 s32erface_index,u8 duration, HIDCallb EXPORT_DECL(s32, HIDRead,u32 handle, unsigned char *p_buffer, u32 buffer_length, HIDCallback hc, void *p_user); EXPORT_DECL(s32, HIDWrite,u32 handle, unsigned char *p_buffer, u32 buffer_length, HIDCallback hc, void *p_user); -void InitAcquireSysHID(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; - OSDynLoad_Acquire("nsyshid.rpl", &syshid_handle); +void InitAcquireSysHID(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; + OSDynLoad_Acquire("nsyshid.rpl", &syshid_handle); } -void InitSysHIDFunctionPointers(void){ +void InitSysHIDFunctionPointers(void) { InitAcquireSysHID(); - if(syshid_handle == 0){ + if(syshid_handle == 0) { return; } diff --git a/source/syshid_functions.h b/source/syshid_functions.h index 65f4884..9e4ce00 100644 --- a/source/syshid_functions.h +++ b/source/syshid_functions.h @@ -32,8 +32,7 @@ extern "C" { extern u32 syshid_handle; -typedef struct -{ +typedef struct { u32 handle; u32 physical_device_inst; u16 vid; @@ -54,8 +53,7 @@ typedef struct _HIDClient HIDClient; typedef s32 (*HIDAttachCallback)(HIDClient *p_hc,HIDDevice *p_hd,u32 attach); -struct _HIDClient -{ +struct _HIDClient { HIDClient *next; HIDAttachCallback attach_cb; }; diff --git a/source/vpad_functions.c b/source/vpad_functions.c index 39fa9ea..ffe5339 100644 --- a/source/vpad_functions.c +++ b/source/vpad_functions.c @@ -90,13 +90,15 @@ EXPORT_DECL(void, VPADBASESetSensorBarSetting, s32 chan, s8 setting); EXPORT_DECL(void, VPADBASEGetSensorBarSetting, s32 chan, s8 *setting); EXPORT_DECL(s32, VPADSetSensorBar, s32 chan, bool on); -void InitAcquireVPad(void){ - if(coreinit_handle == 0){ InitAcquireOS(); }; +void InitAcquireVPad(void) { + if(coreinit_handle == 0) { + InitAcquireOS(); + }; OSDynLoad_Acquire("vpad.rpl", &vpad_handle); OSDynLoad_Acquire("vpadbase.rpl", &vpadbase_handle); } -void InitVPadFunctionPointers(void){ +void InitVPadFunctionPointers(void) { u32 *funcPointer = 0; InitAcquireVPad(); diff --git a/source/vpad_functions.h b/source/vpad_functions.h index a666294..63dbd7d 100644 --- a/source/vpad_functions.h +++ b/source/vpad_functions.h @@ -68,52 +68,44 @@ extern u32 vpadbase_handle; #define VPAD_MASK_EMULATED_STICKS 0x7F800000 #define VPAD_MASK_BUTTONS ~VPAD_MASK_EMULATED_STICKS -typedef enum VPADTPResolution -{ +typedef enum VPADTPResolution { VPAD_TP_1920x1080, VPAD_TP_1280x720, VPAD_TP_854x480 } VPADTPResolution; -typedef enum VPADGyroZeroDriftMode -{ +typedef enum VPADGyroZeroDriftMode { VPAD_GYRO_ZERODRIFT_LOOSE, VPAD_GYRO_ZERODRIFT_STANDARD, VPAD_GYRO_ZERODRIFT_TIGHT } VPADGyroZeroDriftMode; -typedef struct -{ +typedef struct { f32 x,y; } Vec2D; -typedef struct -{ +typedef struct { f32 x,y,z; } Vec3D; -typedef struct -{ +typedef struct { Vec3D X,Y,Z; } VPADDir; -typedef struct -{ +typedef struct { u16 x, y; /* Touch coordinates */ u16 touched; /* 1 = Touched, 0 = Not touched */ u16 invalid; /* 0 = All valid, 1 = X invalid, 2 = Y invalid, 3 = Both invalid? */ } VPADTPData; -typedef struct -{ +typedef struct { s16 offsetX; s16 offsetY; f32 scaleX; f32 scaleY; } VPADTPCalibrationParam; -typedef struct -{ +typedef struct { u32 btns_h; /* Held buttons */ u32 btns_d; /* Buttons that are pressed at that instant */ u32 btns_r; /* Released buttons */