falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clang format (#680) 

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
github-actions[bot] 2024-09-11 16:52:36 -06:00 committed by GitHub
parent bf9f8e37c8
commit e6bdbec61e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/PR/gbi.h
View File

@ -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) \

16
src/os/__osDequeueThread.c
View File

@ -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) {

4
src/os/controller.h
View File

@ -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);

13
src/os/libultra_internal.h
View File

@ -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];

10
src/os/osContInit.c
View File

@ -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;

8
src/os/osContStartReadData.c
View File

@ -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;

4
src/os/osCreateMesgQueue.c
View File

@ -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;

4
src/racing/math_util.c
View File

@ -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;