From e6bdbec61eb76c535b9b3cc6ce5b84f9dc067786 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:52:36 -0600 Subject: [PATCH] clang format (#680) Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> --- include/PR/gbi.h | 17 ++++++++++------- src/os/__osDequeueThread.c | 16 ++++++++-------- src/os/controller.h | 4 ++-- src/os/libultra_internal.h | 13 ++++++------- src/os/osContInit.c | 10 +++++----- src/os/osContStartReadData.c | 8 ++++---- src/os/osCreateMesgQueue.c | 4 ++-- src/racing/math_util.c | 4 ++-- 8 files changed, 39 insertions(+), 37 deletions(-) diff --git a/include/PR/gbi.h b/include/PR/gbi.h index 5cf453b7f..4a25c5986 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -2102,12 +2102,14 @@ typedef union { /*** *** 1 Quadrangle ***/ -#define gSP1Quadrangle(v0, v1, v2, v3, flag) \ - { { Gfx* _g = (Gfx*) (pkt); \ - \ - _g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \ - _g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \ - } \ +#define gSP1Quadrangle(v0, v1, v2, v3, flag) \ + { \ + { \ + Gfx* _g = (Gfx*) (pkt); \ + \ + _g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \ + _g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \ + } \ } #define gsSP1Quadrangle(v0, v1, v2, v3, flag) \ @@ -2611,7 +2613,8 @@ typedef union { #define gsSPLookAtY(l) gsDma1p(G_MOVEMEM, l, sizeof(Light), G_MV_LOOKATY) #endif /* F3DEX_GBI_2 */ -#define gSPLookAt(pkt, la) { gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) } +#define gSPLookAt(pkt, la) \ + { gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) } #define gsSPLookAt(la) gsSPLookAtX(la), gsSPLookAtY((char*) (la) + 16) #define gDPSetHilite1Tile(pkt, tile, hilite, width, height) \ diff --git a/src/os/__osDequeueThread.c b/src/os/__osDequeueThread.c index e8544b3d5..009114aab 100644 --- a/src/os/__osDequeueThread.c +++ b/src/os/__osDequeueThread.c @@ -1,16 +1,16 @@ #include "libultra_internal.h" struct __osThreadTail __osThreadTail = { NULL, -1 }; -OSThread *__osRunQueue = (OSThread *) &__osThreadTail; -OSThread *__osActiveQueue = (OSThread *) &__osThreadTail; -OSThread *__osRunningThread = { 0 }; -OSThread *__osFaultedThread = { 0 }; +OSThread* __osRunQueue = (OSThread*) &__osThreadTail; +OSThread* __osActiveQueue = (OSThread*) &__osThreadTail; +OSThread* __osRunningThread = { 0 }; +OSThread* __osFaultedThread = { 0 }; -void __osDequeueThread(register OSThread **queue, register OSThread *t) { - register OSThread *pred; - register OSThread *succ; +void __osDequeueThread(register OSThread** queue, register OSThread* t) { + register OSThread* pred; + register OSThread* succ; - pred = (OSThread *) queue; + pred = (OSThread*) queue; succ = pred->next; while (succ != NULL) { diff --git a/src/os/controller.h b/src/os/controller.h index e48bcddbf..b24e630ae 100644 --- a/src/os/controller.h +++ b/src/os/controller.h @@ -151,8 +151,8 @@ s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 start_page, u16* sum, u s32 __osBlockSum(OSPfs* pfs, u8 page_no, u16* sum, u8 bank); s32 __osContRamRead(OSMesgQueue* mq, int channel, u16 address, u8* buffer); s32 __osContRamWrite(OSMesgQueue* mq, int channel, u16 address, u8* buffer, int force); -void __osContGetInitData(u8* pattern, OSContStatus* data); -void __osPackRequestData(u8 cmd); +void __osContGetInitData(u8* bitpattern, OSContStatus* status); +void __osPackRequestData(u8 command); void __osPfsRequestData(u8 cmd); void __osPfsGetInitData(u8* pattern, OSContStatus* data); u8 __osContAddressCrc(u16 addr); diff --git a/src/os/libultra_internal.h b/src/os/libultra_internal.h index 854ce53bf..7cca8023f 100644 --- a/src/os/libultra_internal.h +++ b/src/os/libultra_internal.h @@ -9,9 +9,8 @@ typedef struct __OSEventState { OSMesg message; } __OSEventState; -extern struct __osThreadTail -{ - OSThread *next; +extern struct __osThreadTail { + OSThread* next; OSPri priority; } __osThreadTail; @@ -31,10 +30,10 @@ typedef struct { } OSThread_ListHead; // Original OSThread_ListHead definitions -extern OSThread *__osRunningThread; -extern OSThread *__osActiveQueue; -extern OSThread *__osFaultedThread; -extern OSThread *__osRunQueue; +extern OSThread* __osRunningThread; +extern OSThread* __osActiveQueue; +extern OSThread* __osFaultedThread; +extern OSThread* __osRunQueue; // Original EEPROM definitions extern u32 D_80365E00[15]; diff --git a/src/os/osContInit.c b/src/os/osContInit.c index 7e9e7bd1b..04cb65ddf 100644 --- a/src/os/osContInit.c +++ b/src/os/osContInit.c @@ -46,15 +46,15 @@ s32 osContInit(OSMesgQueue* mq, u8* bitpattern, OSContStatus* status) { return ret; } void __osContGetInitData(u8* bitpattern, OSContStatus* status) { - u8 *ptr; + u8* ptr; __OSContRequesFormat response; s32 i; u8 bits; bits = 0; - ptr = (u8 *) __osContPifRam.ramarray; + ptr = (u8*) __osContPifRam.ramarray; for (i = 0; i < _osContNumControllers; i++, ptr += sizeof(response), status++) { - response = *((__OSContRequesFormat*)(ptr)); + response = *((__OSContRequesFormat*) (ptr)); status->errnum = CHNL_ERR(response); if (status->errnum == 0) { status->type = response.typel << 8 | response.typeh; @@ -76,7 +76,7 @@ void __osPackRequestData(u8 command) { } __osContPifRam.pifstatus = CONT_CMD_EXE; - ptr = (u8*)__osContPifRam.ramarray; + ptr = (u8*) __osContPifRam.ramarray; requestHeader.dummy = CONT_CMD_NOP; requestHeader.txsize = CONT_CMD_RESET_TX; requestHeader.rxsize = CONT_CMD_RESET_RX; @@ -87,7 +87,7 @@ void __osPackRequestData(u8 command) { requestHeader.dummy1 = CONT_CMD_NOP; for (i = 0; i < _osContNumControllers; i++) { - *(__OSContRequesFormat*)ptr = requestHeader; + *(__OSContRequesFormat*) ptr = requestHeader; ptr += sizeof(requestHeader); } *ptr = CONT_CMD_END; diff --git a/src/os/osContStartReadData.c b/src/os/osContStartReadData.c index 7119ba347..f559a6347 100644 --- a/src/os/osContStartReadData.c +++ b/src/os/osContStartReadData.c @@ -31,12 +31,12 @@ s32 osContStartReadData(OSMesgQueue* mesg) { return ret; } void osContGetReadData(OSContPad* pad) { - u8 *ptr = (u8 *) __osContPifRam.ramarray; + u8* ptr = (u8*) __osContPifRam.ramarray; __OSContReadFormat readformat; s32 i; for (i = 0; i < _osContNumControllers; i++, ptr += sizeof(readformat), pad++) { - readformat = * (__OSContReadFormat *) ptr; + readformat = *(__OSContReadFormat*) ptr; pad->errno = CHNL_ERR(readformat); if (pad->errno != 0) { @@ -49,7 +49,7 @@ void osContGetReadData(OSContPad* pad) { } } void __osPackReadData() { - u8 *ptr = (u8 *) __osContPifRam.ramarray; + u8* ptr = (u8*) __osContPifRam.ramarray; __OSContReadFormat readformat; s32 i; @@ -67,7 +67,7 @@ void __osPackReadData() { readformat.stick_y = -1; for (i = 0; i < _osContNumControllers; i++) { - * (__OSContReadFormat *) ptr = readformat; + *(__OSContReadFormat*) ptr = readformat; ptr += sizeof(readformat); } *ptr = CONT_CMD_END; diff --git a/src/os/osCreateMesgQueue.c b/src/os/osCreateMesgQueue.c index 06dc45cc5..865a49b2b 100644 --- a/src/os/osCreateMesgQueue.c +++ b/src/os/osCreateMesgQueue.c @@ -1,8 +1,8 @@ #include "libultra_internal.h" void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msgBuf, s32 count) { - mq->mtqueue = (OSThread *) &__osThreadTail.next; - mq->fullqueue = (OSThread *) &__osThreadTail.next; + mq->mtqueue = (OSThread*) &__osThreadTail.next; + mq->fullqueue = (OSThread*) &__osThreadTail.next; mq->validCount = 0; mq->first = 0; mq->msgCount = count; diff --git a/src/racing/math_util.c b/src/racing/math_util.c index be8147dd5..2f7bd510e 100644 --- a/src/racing/math_util.c +++ b/src/racing/math_util.c @@ -420,10 +420,10 @@ void func_802B5CAC(s16 arg0, s16 arg1, Vec3f arg2) { } void func_802B5D30(s16 arg0, s16 arg1, s32 arg2) { - func_802B5D64((Lights1 *)0x9000000, arg0, arg1, arg2); + func_802B5D64((Lights1*) 0x9000000, arg0, arg1, arg2); } -void func_802B5D64(Lights1 *addr, s16 arg1, s16 arg2, s32 arg3) { +void func_802B5D64(Lights1* addr, s16 arg1, s16 arg2, s32 arg3) { u32 segment = SEGMENT_NUMBER2(addr); u32 offset = SEGMENT_OFFSET(addr); UNUSED s32 pad;