mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-10 22:11:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format everything (#141)

Browse Source 
* Add trailing comma

* Run format and add some missing trailing commas

* Enforce the same clang-format version for everybody

* z_en_m_fire1
This commit is contained in:
Anghelo Carvajal
2021-05-18 20:00:36 -04:00
committed by GitHub
parent 091219d742
commit c56934038a
639 changed files with 2537 additions and 2312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot_O2_g3/CIC6105.c
+4 -2
View File
@@ -1,9 +1,11 @@
#include <ultra64.h>
#include <global.h>
void CIC6105_Nop80081820(void) {}
void CIC6105_Nop80081820(void) {
}
void CIC6105_Nop80081828(void) {}
void CIC6105_Nop80081828(void) {
}
void CIC6105_PrintRomInfo(void) {
FaultDrawer_DrawText(80, 200, "SP_STATUS %08x", (UNK_PTR)(*(u32*)0xA4040010));
src/boot_O2_g3/boot_0x80081920.c
+6 -3
View File
@@ -3,6 +3,9 @@
// This file contains print functions that are used by fault.c, so they are placed in the fault module
void Fault_Nop80081920(UNK_TYPE4 param_1, ...) {}
void Fault_Log(char* str, ...) {}
void Fault_Nop80081958(UNK_TYPE4 param_1, ...) {}
void Fault_Nop80081920(UNK_TYPE4 param_1, ...) {
}
void Fault_Log(char* str, ...) {
}
void Fault_Nop80081958(UNK_TYPE4 param_1, ...) {
}
src/boot_O2_g3/boot_0x800968B0.c
+1 -1
View File
@@ -11,7 +11,7 @@ s32 func_800968B0(const char* str1, const char* str2) {
currentCharStr1 = *str1++;
currentCharStr2 = *str2++;
if (currentCharStr1 != currentCharStr2) {
return currentCharStr1 - currentCharStr2;
return currentCharStr1 - currentCharStr2;
}
} while (currentCharStr1);
src/boot_O2_g3/boot_main.c
+2 -1
View File
@@ -9,6 +9,7 @@ void bootproc(void) {
osUnmapTLBAll();
gCartHandle = osCartRomInit();
StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack + sizeof(sIdleThreadStack), 0, 256, "idle");
osCreateThread(&sIdleThread, Z_THREAD_ID_IDLE, Idle_ThreadEntry, NULL, sIdleThreadStack + sizeof(sIdleThreadStack), Z_PRIORITY_IDLE);
osCreateThread(&sIdleThread, Z_THREAD_ID_IDLE, Idle_ThreadEntry, NULL, sIdleThreadStack + sizeof(sIdleThreadStack),
Z_PRIORITY_IDLE);
osStartThread(&sIdleThread);
}
src/boot_O2_g3/idle.c
+20 -16
View File
@@ -52,7 +52,8 @@ void Idle_InitCodeAndMemory(void) {
oldSize = sDmaMgrDmaBuffSize;
sDmaMgrDmaBuffSize = 0;
DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)_codeSegmentRomStart, (u32)_codeSegmentRomEnd - (u32)_codeSegmentRomStart, 0, &queue, 0);
DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)_codeSegmentRomStart,
(u32)_codeSegmentRomEnd - (u32)_codeSegmentRomStart, 0, &queue, 0);
Idle_InitScreen();
Idle_InitMemory();
osRecvMesg(&queue, NULL, 1);
@@ -82,19 +83,19 @@ void Idle_InitVideo(void) {
gViConfigYScale = 1.0;
switch (osTvType) {
case 1:
D_8009B290 = 2;
gViConfigMode = osViModeNtscLan1;
break;
case 2:
D_8009B290 = 30;
gViConfigMode = osViModeMpalLan1;
break;
case 0:
D_8009B290 = 44;
gViConfigMode = osViModeFpalLan1;
gViConfigYScale = 0.833f;
break;
case 1:
D_8009B290 = 2;
gViConfigMode = osViModeNtscLan1;
break;
case 2:
D_8009B290 = 30;
gViConfigMode = osViModeMpalLan1;
break;
case 0:
D_8009B290 = 44;
gViConfigMode = osViModeFpalLan1;
gViConfigYScale = 0.833f;
break;
}
D_80096B20 = 1;
@@ -104,9 +105,12 @@ void Idle_ThreadEntry(void* arg) {
Idle_InitVideo();
osCreatePiManager(150, &gPiMgrCmdQ, sPiMgrCmdBuff, ARRAY_COUNT(sPiMgrCmdBuff));
StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack + sizeof(sMainStack), 0, 1024, "main");
osCreateThread(&gMainThread, Z_THREAD_ID_MAIN, Main_ThreadEntry, arg, sMainStack + sizeof(sMainStack), Z_PRIORITY_MAIN);
osCreateThread(&gMainThread, Z_THREAD_ID_MAIN, Main_ThreadEntry, arg, sMainStack + sizeof(sMainStack),
Z_PRIORITY_MAIN);
osStartThread(&gMainThread);
osSetThreadPri(NULL, 0);
for(;;);
for (;;) {
;
}
}
src/boot_O2_g3/irqmgr.c
+23 -21
View File
@@ -2,9 +2,9 @@
#include <global.h>
// TODO move out
#define OS_CLOCK_RATE 62500000LL
#define OS_CPU_COUNTER (OS_CLOCK_RATE*3/4)
#define OS_USEC_TO_CYCLES(n) (((u64)(n)*(OS_CPU_COUNTER/15625LL))/(1000000LL/15625LL))
#define OS_CLOCK_RATE 62500000LL
#define OS_CPU_COUNTER (OS_CLOCK_RATE * 3 / 4)
#define OS_USEC_TO_CYCLES(n) (((u64)(n) * (OS_CPU_COUNTER / 15625LL)) / (1000000LL / 15625LL))
vs32 gIrqMgrResetStatus = 0;
volatile OSTime sIrqMgrResetTime = 0;
@@ -122,7 +122,7 @@ void IrqMgr_HandleRetrace(IrqMgr* irqmgr) {
}
sIrqMgrRetraceCount += 1;
IrqMgr_SendMesgForClient(irqmgr,irqmgr);
IrqMgr_SendMesgForClient(irqmgr, irqmgr);
}
void IrqMgr_ThreadEntry(IrqMgr* irqmgr) {
@@ -132,25 +132,27 @@ void IrqMgr_ThreadEntry(IrqMgr* irqmgr) {
interrupt = 0;
stop = 0;
while (stop == 0) {
if (stop);
if (stop) {
;
}
osRecvMesg(&irqmgr->irqQueue, (OSMesg*)&interrupt, 1);
switch (interrupt) {
case 0x29A:
IrqMgr_HandleRetrace(irqmgr);
break;
case 0x29D:
IrqMgr_HandlePreNMI(irqmgr);
break;
case 0x29F:
IrqMgr_HandlePRENMI450(irqmgr);
break;
case 0x2A0:
IrqMgr_HandlePRENMI480(irqmgr);
break;
case 0x2A1:
IrqMgr_HandlePRENMI500(irqmgr);
break;
case 0x29A:
IrqMgr_HandleRetrace(irqmgr);
break;
case 0x29D:
IrqMgr_HandlePreNMI(irqmgr);
break;
case 0x29F:
IrqMgr_HandlePRENMI450(irqmgr);
break;
case 0x2A0:
IrqMgr_HandlePRENMI480(irqmgr);
break;
case 0x2A1:
IrqMgr_HandlePRENMI500(irqmgr);
break;
}
}
}
@@ -163,7 +165,7 @@ void IrqMgr_Init(IrqMgr* irqmgr, void* stack, OSPri pri, u8 retraceCount) {
irqmgr->prenmiStage = 0;
irqmgr->lastPrenmiTime = 0;
osCreateMesgQueue(&irqmgr->irqQueue,(OSMesg *)irqmgr->irqBuffer,8);
osCreateMesgQueue(&irqmgr->irqQueue, (OSMesg*)irqmgr->irqBuffer, 8);
osSetEventMesg(0xE, &irqmgr->irqQueue, (OSMesg)0x29D);
osViSetEvent(&irqmgr->irqQueue, (OSMesg)0x29A, retraceCount);
src/boot_O2_g3/viconfig.c
+9 -10
View File
@@ -4,16 +4,16 @@
void ViConfig_UpdateVi(u32 mode) {
if (mode != 0) {
switch (osTvType) {
case 2:
osViSetMode(&osViModeMpalLan1);
break;
case 0:
osViSetMode(&osViModePalLan1);
break;
case 1:
case 2:
osViSetMode(&osViModeMpalLan1);
break;
case 0:
osViSetMode(&osViModePalLan1);
break;
case 1:
default:
osViSetMode(&osViModeNtscLan1);
break;
osViSetMode(&osViModeNtscLan1);
break;
}
if (gViConfigFeatures != 0) {
@@ -46,7 +46,6 @@ void ViConfig_UpdateVi(u32 mode) {
gViConfigUseDefault = mode;
}
void ViConfig_UpdateBlack(void) {
if (gViConfigUseDefault != 0) {
osViBlack(1);
src/boot_O2_g3/yaz0.c
+2 -2
View File
@@ -60,9 +60,9 @@ void* Yaz0_NextDMA(void* curSrcPos) {
typedef struct {
/* 0x00 */ u32 magic; // Yaz0
/* 0x04 */ u32 decSize;
/* 0x08 */ u32 compInfoOffset; // only used in mio0
/* 0x08 */ u32 compInfoOffset; // only used in mio0
/* 0x0C */ u32 uncompDataOffset; // only used in mio0
} Yaz0Header; // size = 0x10
} Yaz0Header; // size = 0x10
#define YAZ0_MAGIC 0x59617A30 // "Yaz0"
src/boot_O2_g3/z_std_dma.c
+37 -26
View File
@@ -21,7 +21,9 @@ s32 DmaMgr_DMARomToRam(u32 rom, void* ram, u32 size) {
ioMsg.dramAddr = ram;
ioMsg.size = buffSize;
ret = osEPiStartDma(gCartHandle, &ioMsg, 0);
if (ret) goto END;
if (ret) {
goto END;
}
osRecvMesg(&queue, NULL, 1);
size -= buffSize;
@@ -35,7 +37,9 @@ s32 DmaMgr_DMARomToRam(u32 rom, void* ram, u32 size) {
ioMsg.dramAddr = ram;
ioMsg.size = (u32)size;
ret = osEPiStartDma(gCartHandle, &ioMsg, 0);
if (ret) goto END;
if (ret) {
goto END;
}
osRecvMesg(&queue, NULL, 1);
@@ -53,8 +57,12 @@ DmaEntry* DmaMgr_FindDmaEntry(u32 vrom) {
DmaEntry* curr;
for (curr = dmadata; curr->vromEnd != 0; curr++) {
if (vrom < curr->vromStart) continue;
if (vrom >= curr->vromEnd) continue;
if (vrom < curr->vromStart) {
continue;
}
if (vrom >= curr->vromEnd) {
continue;
}
return curr;
}
@@ -84,7 +92,7 @@ s32 DmaMgr_FindDmaIndex(u32 vrom) {
DmaEntry* entry = DmaMgr_FindDmaEntry(vrom);
if (entry != NULL) {
return entry - dmadata;
return entry - dmadata;
}
return -1;
@@ -149,17 +157,17 @@ void DmaMgr_ThreadEntry(void* a0) {
break;
}
req = (DmaRequest *)msg;
req = (DmaRequest*)msg;
DmaMgr_ProcessMsg(req);
if (req->notifyQueue) {
osSendMesg(req->notifyQueue, req->notifyMsg, OS_MESG_NOBLOCK);
}
}
}
s32 DmaMgr_SendRequestImpl(DmaRequest* request, void* vramStart, u32 vromStart, u32 size, UNK_TYPE4 unused, OSMesgQueue* queue, OSMesg msg) {
s32 DmaMgr_SendRequestImpl(DmaRequest* request, void* vramStart, u32 vromStart, u32 size, UNK_TYPE4 unused,
OSMesgQueue* queue, OSMesg msg) {
if (gIrqMgrResetStatus >= 2) {
return -2;
}
@@ -177,22 +185,22 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* request, void* vramStart, u32 vromStart,
}
s32 DmaMgr_SendRequest0(void* vramStart, u32 vromStart, u32 size) {
DmaRequest req;
DmaRequest req;
OSMesgQueue queue;
OSMesg msg[1];
s32 ret;
s32 ret;
osCreateMesgQueue(&queue, msg, ARRAY_COUNT(msg));
ret = DmaMgr_SendRequestImpl(&req, vramStart, vromStart, size, 0, &queue, NULL);
ret = DmaMgr_SendRequestImpl(&req, vramStart, vromStart, size, 0, &queue, NULL);
if (ret == -1) {
return ret;
} else {
osRecvMesg(&queue, NULL, OS_MESG_BLOCK);
}
if (ret == -1) {
return ret;
} else {
osRecvMesg(&queue, NULL, OS_MESG_BLOCK);
}
return 0;
return 0;
}
const char dmamgrThreadName[] = "dmamgr";
@@ -200,19 +208,22 @@ const char dmamgrThreadName[] = "dmamgr";
#ifdef NON_MATCHING
// TODO missing a useless move initializing v0, and some reorderings
void DmaMgr_Start() {
DmaEntry* iter;
u32 idx;
DmaEntry* iter;
u32 idx;
DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, dmadata, (u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart));
DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, dmadata, (u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart));
for (iter = dmadata, idx = 0; iter->vromEnd != 0; iter++, idx++);
for (iter = dmadata, idx = 0; iter->vromEnd != 0; iter++, idx++) {
;
}
numDmaEntries = idx;
numDmaEntries = idx;
osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs));
StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 256, dmamgrThreadName);
osCreateThread(&sDmaMgrThread, Z_THREAD_ID_DMAMGR, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack), Z_PRIORITY_DMAMGR);
osStartThread(&sDmaMgrThread);
osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs));
StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 256, dmamgrThreadName);
osCreateThread(&sDmaMgrThread, Z_THREAD_ID_DMAMGR, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack),
Z_PRIORITY_DMAMGR);
osStartThread(&sDmaMgrThread);
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/boot/z_std_dma/DmaMgr_Start.asm")