From a1c8c570d0240a1a822863a2157c244ab838dfe5 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Thu, 30 Sep 2021 09:12:46 -0400 Subject: [PATCH] Replace some tabs with spaces --- lib/src/os/contramread.c | 10 ++-- lib/src/os/osAiSetFrequency.c | 10 ++-- lib/src/os/osAiSetNextBuffer.c | 24 ++++----- lib/src/os/osPfsChecker.c | 2 +- lib/src/os/osPfsFindFile.c | 4 +- lib/src/os/osPiRawWriteIo.c | 2 +- lib/src/os/osSetEventMesg.c | 12 ++--- lib/src/os/osViMgr.c | 76 +++++++++++++------------- lib/src/os/unknown_0D29F0.c | 98 +++++++++++++++++----------------- lib/src/os/unknown_0D6C90.c | 2 +- lib/src/unknown_0D3020.c | 16 +++--- 11 files changed, 128 insertions(+), 128 deletions(-) diff --git a/lib/src/os/contramread.c b/lib/src/os/contramread.c index d2bfbe2f..2e88c70e 100644 --- a/lib/src/os/contramread.c +++ b/lib/src/os/contramread.c @@ -23,10 +23,10 @@ s32 __osContRamRead(OSMesgQueue *mq, int channel, u16 address, u8 *buffer) { ret = __osSiRawStartDma(OS_WRITE, &__osPfsPifRam); osRecvMesg(mq, NULL, OS_MESG_BLOCK); do { - for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus - __osPfsPifRam.ramarray[i] = 0xFFU; - } - D_8012CE1C = 0; + for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus + __osPfsPifRam.ramarray[i] = 0xFFU; + } + D_8012CE1C = 0; ret = __osSiRawStartDma(OS_READ, &__osPfsPifRam); osRecvMesg(mq, NULL, OS_MESG_BLOCK); ptr = (u8 *)&__osPfsPifRam; @@ -70,7 +70,7 @@ static void __osPackRamReadData(int channel, u16 address) { for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus __osPfsPifRam.ramarray[i] = 0; } - + __osPfsPifRam.pifstatus = CONT_CMD_EXE; ramreadformat.dummy = CONT_CMD_NOP; ramreadformat.txsize = CONT_CMD_READ_MEMPACK_TX; diff --git a/lib/src/os/osAiSetFrequency.c b/lib/src/os/osAiSetFrequency.c index 21868d97..25188052 100644 --- a/lib/src/os/osAiSetFrequency.c +++ b/lib/src/os/osAiSetFrequency.c @@ -9,20 +9,20 @@ s32 osAiSetFrequency(u32 frequency) { register u8 bitRate; register float f; - f = osViClock / (float)frequency + .5f; + f = osViClock / (float)frequency + .5f; dacRate = f; - if (dacRate < AI_MIN_DAC_RATE) + if (dacRate < AI_MIN_DAC_RATE) return -1; - bitRate = (dacRate / 66); + bitRate = (dacRate / 66); - if (bitRate > AI_MAX_BIT_RATE) + if (bitRate > AI_MAX_BIT_RATE) bitRate = AI_MAX_BIT_RATE; IO_WRITE(AI_DACRATE_REG, dacRate - 1); IO_WRITE(AI_BITRATE_REG, bitRate - 1); IO_WRITE(AI_CONTROL_REG, AI_CONTROL_DMA_ON); - return osViClock / (s32)dacRate; + return osViClock / (s32)dacRate; } diff --git a/lib/src/os/osAiSetNextBuffer.c b/lib/src/os/osAiSetNextBuffer.c index cf93fef8..b4a15580 100644 --- a/lib/src/os/osAiSetNextBuffer.c +++ b/lib/src/os/osAiSetNextBuffer.c @@ -23,19 +23,19 @@ u8 hdwrBugFlag = 0; * because it is now patched by osAiSetNextBuffer. */ s32 osAiSetNextBuffer(void *bufPtr, u32 size) { - char *bptr = bufPtr; - if (hdwrBugFlag != 0) - bptr -= 0x2000; + char *bptr = bufPtr; + if (hdwrBugFlag != 0) + bptr -= 0x2000; - if ((((u32)bufPtr + size) & 0x3fff) == 0x2000) - hdwrBugFlag = 1; - else - hdwrBugFlag = 0; + if ((((u32)bufPtr + size) & 0x3fff) == 0x2000) + hdwrBugFlag = 1; + else + hdwrBugFlag = 0; - if (__osAiDeviceBusy()) - return -1; + if (__osAiDeviceBusy()) + return -1; - IO_WRITE(AI_DRAM_ADDR_REG, osVirtualToPhysical(bptr)); - IO_WRITE(AI_LEN_REG, size); - return 0; + IO_WRITE(AI_DRAM_ADDR_REG, osVirtualToPhysical(bptr)); + IO_WRITE(AI_LEN_REG, size); + return 0; } diff --git a/lib/src/os/osPfsChecker.c b/lib/src/os/osPfsChecker.c index 31fe9b00..bd57a283 100644 --- a/lib/src/os/osPfsChecker.c +++ b/lib/src/os/osPfsChecker.c @@ -150,7 +150,7 @@ s32 corrupted_init(OSPfs *pfs, __OSInodeCache *cache) { } } } - + return 0; } diff --git a/lib/src/os/osPfsFindFile.c b/lib/src/os/osPfsFindFile.c index 661db5ac..bc1c1967 100644 --- a/lib/src/os/osPfsFindFile.c +++ b/lib/src/os/osPfsFindFile.c @@ -13,7 +13,7 @@ s32 osPfsFindFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 ret = 0; PFS_CHECK_ID; - for (j = 0; j < pfs->dir_size; j++) { + for (j = 0; j < pfs->dir_size; j++) { ERRCK(__osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + j, (u8*)&dir)); if ((dir.company_code == company_code) && dir.game_code == game_code) { fail = FALSE; @@ -40,7 +40,7 @@ s32 osPfsFindFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 } } - *file_no = -1; + *file_no = -1; return PFS_ERR_INVALID; } diff --git a/lib/src/os/osPiRawWriteIo.c b/lib/src/os/osPiRawWriteIo.c index 849d7fd7..553f8ad5 100644 --- a/lib/src/os/osPiRawWriteIo.c +++ b/lib/src/os/osPiRawWriteIo.c @@ -9,5 +9,5 @@ s32 osPiRawWriteIo(u32 devAddr, u32 *data) { register u32 stat; WAIT_ON_IOBUSY(stat); *data = IO_READ((u32)osRomBase | devAddr); - return 0; + return 0; } diff --git a/lib/src/os/osSetEventMesg.c b/lib/src/os/osSetEventMesg.c index 5b33da27..47339dbf 100644 --- a/lib/src/os/osSetEventMesg.c +++ b/lib/src/os/osSetEventMesg.c @@ -10,11 +10,11 @@ typedef struct __OSEventState { __OSEventState __osEventStateTab[15]; // __osEventStateTab[OS_NUM_EVENTS]; void osSetEventMesg(OSEvent event, OSMesgQueue *mq, OSMesg msg) { - register u32 saveMask = __osDisableInt(); - __OSEventState *es; + register u32 saveMask = __osDisableInt(); + __OSEventState *es; - es = &__osEventStateTab[event]; - es->messageQueue = mq; - es->message = msg; - __osRestoreInt(saveMask); + es = &__osEventStateTab[event]; + es->messageQueue = mq; + es->message = msg; + __osRestoreInt(saveMask); } diff --git a/lib/src/os/osViMgr.c b/lib/src/os/osViMgr.c index 320e31b2..49a1a551 100644 --- a/lib/src/os/osViMgr.c +++ b/lib/src/os/osViMgr.c @@ -26,42 +26,42 @@ extern OSIoMesg viCounterMsg; //viCounterMsg void viMgrMain(void *arg); void osCreateViManager(OSPri pri) { - u32 savedMask; - OSPri oldPri; - OSPri myPri; - if (__osViDevMgr.active == 0) { - __osTimerServicesInit(); - osCreateMesgQueue(&viEventQueue, viEventBuf, 5); - viRetraceMsg.hdr.type = OS_MESG_TYPE_VRETRACE; - viRetraceMsg.hdr.pri = OS_MESG_PRI_NORMAL; - viRetraceMsg.hdr.retQueue = NULL; - viCounterMsg.hdr.type = OS_MESG_TYPE_COUNTER; - viCounterMsg.hdr.pri = OS_MESG_PRI_NORMAL; - viCounterMsg.hdr.retQueue = NULL; - osSetEventMesg(OS_EVENT_VI, &viEventQueue, &viRetraceMsg); - osSetEventMesg(OS_EVENT_COUNTER, &viEventQueue, &viCounterMsg); - oldPri = -1; - myPri = osGetThreadPri(NULL); - if (myPri < pri) { - oldPri = myPri; - osSetThreadPri(NULL, pri); - } - savedMask = __osDisableInt(); - __osViDevMgr.active = 1; - __osViDevMgr.thread = &viThread; - __osViDevMgr.cmdQueue = &viEventQueue; - __osViDevMgr.evtQueue = &viEventQueue; - __osViDevMgr.acsQueue = NULL; - __osViDevMgr.dma = NULL; - __osViDevMgr.edma = NULL; - osCreateThread(&viThread, 0, viMgrMain, &__osViDevMgr, &viThreadStack[OS_VIM_STACKSIZE], pri); - __osViInit(); - osStartThread(&viThread); - __osRestoreInt(savedMask); - if (oldPri != -1) { - osSetThreadPri(0, oldPri); - } - } + u32 savedMask; + OSPri oldPri; + OSPri myPri; + if (__osViDevMgr.active == 0) { + __osTimerServicesInit(); + osCreateMesgQueue(&viEventQueue, viEventBuf, 5); + viRetraceMsg.hdr.type = OS_MESG_TYPE_VRETRACE; + viRetraceMsg.hdr.pri = OS_MESG_PRI_NORMAL; + viRetraceMsg.hdr.retQueue = NULL; + viCounterMsg.hdr.type = OS_MESG_TYPE_COUNTER; + viCounterMsg.hdr.pri = OS_MESG_PRI_NORMAL; + viCounterMsg.hdr.retQueue = NULL; + osSetEventMesg(OS_EVENT_VI, &viEventQueue, &viRetraceMsg); + osSetEventMesg(OS_EVENT_COUNTER, &viEventQueue, &viCounterMsg); + oldPri = -1; + myPri = osGetThreadPri(NULL); + if (myPri < pri) { + oldPri = myPri; + osSetThreadPri(NULL, pri); + } + savedMask = __osDisableInt(); + __osViDevMgr.active = 1; + __osViDevMgr.thread = &viThread; + __osViDevMgr.cmdQueue = &viEventQueue; + __osViDevMgr.evtQueue = &viEventQueue; + __osViDevMgr.acsQueue = NULL; + __osViDevMgr.dma = NULL; + __osViDevMgr.edma = NULL; + osCreateThread(&viThread, 0, viMgrMain, &__osViDevMgr, &viThreadStack[OS_VIM_STACKSIZE], pri); + __osViInit(); + osStartThread(&viThread); + __osRestoreInt(savedMask); + if (oldPri != -1) { + osSetThreadPri(0, oldPri); + } + } } #ifdef NON_MATCHING @@ -78,7 +78,7 @@ void viMgrMain(void *arg) { mesg = NULL; first = FALSE; vc = __osViGetCurrentContext(); - retrace = vc->retraceCount; + retrace = vc->retraceCount; if (retrace == 0) retrace = 1; @@ -90,7 +90,7 @@ void viMgrMain(void *arg) { switch (mesg->hdr.type) { case OS_MESG_TYPE_VRETRACE: __osViSwapContext(); - retrace--; + retrace--; if (retrace == 0) { vc = __osViGetCurrentContext(); if (vc->msgq != NULL) { diff --git a/lib/src/os/unknown_0D29F0.c b/lib/src/os/unknown_0D29F0.c index 66e3f434..19aa0489 100644 --- a/lib/src/os/unknown_0D29F0.c +++ b/lib/src/os/unknown_0D29F0.c @@ -60,76 +60,76 @@ void *osViGetNextFramebuffer(void){ //TODO Split into sptask.c and seperate header -#define OS_TASK_YIELDED 0x0001 +#define OS_TASK_YIELDED 0x0001 -#define SP_CLR_HALT 0x00001 /* Bit 0: clear halt */ -#define SP_CLR_BROKE 0x00004 /* Bit 2: clear broke */ -#define SP_CLR_SSTEP 0x00020 /* Bit 5: clear sstep */ -#define SP_SET_INTR_BREAK 0x00100 /* Bit 8: set intr on break */ -#define SP_CLR_SIG0 0x00200 /* Bit 9: clear signal 0 */ -#define SP_CLR_SIG1 0x00800 /* Bit 11: clear signal 1 */ -#define SP_CLR_SIG2 0x02000 /* Bit 11: clear signal 1 */ +#define SP_CLR_HALT 0x00001 /* Bit 0: clear halt */ +#define SP_CLR_BROKE 0x00004 /* Bit 2: clear broke */ +#define SP_CLR_SSTEP 0x00020 /* Bit 5: clear sstep */ +#define SP_SET_INTR_BREAK 0x00100 /* Bit 8: set intr on break */ +#define SP_CLR_SIG0 0x00200 /* Bit 9: clear signal 0 */ +#define SP_CLR_SIG1 0x00800 /* Bit 11: clear signal 1 */ +#define SP_CLR_SIG2 0x02000 /* Bit 11: clear signal 1 */ -#define SP_CLR_YIELD SP_CLR_SIG0 -#define SP_CLR_YIELDED SP_CLR_SIG1 -#define SP_CLR_TASKDONE SP_CLR_SIG2 +#define SP_CLR_YIELD SP_CLR_SIG0 +#define SP_CLR_YIELDED SP_CLR_SIG1 +#define SP_CLR_TASKDONE SP_CLR_SIG2 -#define SP_IMEM_START 0x04001000 /* read/write */ +#define SP_IMEM_START 0x04001000 /* read/write */ #define _osVirtualToPhysical(ptr) \ - if (ptr != NULL) \ - { \ - ptr = (void *)osVirtualToPhysical(ptr); \ - } + if (ptr != NULL) \ + { \ + ptr = (void *)osVirtualToPhysical(ptr); \ + } extern OSTask D_8012D1A0; OSTask *_VirtualToPhysicalTask(OSTask *intp) { - OSTask *tp; - tp = &D_8012D1A0; - bcopy(intp, tp, sizeof(OSTask)); + OSTask *tp; + tp = &D_8012D1A0; + bcopy(intp, tp, sizeof(OSTask)); - _osVirtualToPhysical(tp->t.ucode); - _osVirtualToPhysical(tp->t.ucode_data); - _osVirtualToPhysical(tp->t.dram_stack); - _osVirtualToPhysical(tp->t.output_buff); - _osVirtualToPhysical(tp->t.output_buff_size); - _osVirtualToPhysical(tp->t.data_ptr); - _osVirtualToPhysical(tp->t.yield_data_ptr); - return tp; + _osVirtualToPhysical(tp->t.ucode); + _osVirtualToPhysical(tp->t.ucode_data); + _osVirtualToPhysical(tp->t.dram_stack); + _osVirtualToPhysical(tp->t.output_buff); + _osVirtualToPhysical(tp->t.output_buff_size); + _osVirtualToPhysical(tp->t.data_ptr); + _osVirtualToPhysical(tp->t.yield_data_ptr); + return tp; } void osSpTaskLoad(OSTask *intp){ - OSTask *tp; - tp = _VirtualToPhysicalTask(intp); - if (tp->t.flags & OS_TASK_YIELDED) - { - tp->t.ucode_data = tp->t.yield_data_ptr; - tp->t.ucode_data_size = tp->t.yield_data_size; - intp->t.flags &= ~OS_TASK_YIELDED; - } - osWritebackDCache(tp, sizeof(OSTask)); - __osSpSetStatus(SP_CLR_YIELD | SP_CLR_YIELDED | SP_CLR_TASKDONE | SP_SET_INTR_BREAK); - while (__osSpSetPc(SP_IMEM_START) == -1) - ; + OSTask *tp; + tp = _VirtualToPhysicalTask(intp); + if (tp->t.flags & OS_TASK_YIELDED) + { + tp->t.ucode_data = tp->t.yield_data_ptr; + tp->t.ucode_data_size = tp->t.yield_data_size; + intp->t.flags &= ~OS_TASK_YIELDED; + } + osWritebackDCache(tp, sizeof(OSTask)); + __osSpSetStatus(SP_CLR_YIELD | SP_CLR_YIELDED | SP_CLR_TASKDONE | SP_SET_INTR_BREAK); + while (__osSpSetPc(SP_IMEM_START) == -1) + ; - while (__osSpRawStartDma(1, (SP_IMEM_START - sizeof(*tp)), tp, - sizeof(OSTask)) == -1) - ; + while (__osSpRawStartDma(1, (SP_IMEM_START - sizeof(*tp)), tp, + sizeof(OSTask)) == -1) + ; - while (__osSpDeviceBusy()) - ; + while (__osSpDeviceBusy()) + ; - while (__osSpRawStartDma(1, SP_IMEM_START, tp->t.ucode_boot, - tp->t.ucode_boot_size) == -1) - ; + while (__osSpRawStartDma(1, SP_IMEM_START, tp->t.ucode_boot, + tp->t.ucode_boot_size) == -1) + ; } void osSpTaskStartGo(OSTask *tp) { - while (__osSpDeviceBusy()); + while (__osSpDeviceBusy()); - __osSpSetStatus(SP_SET_INTR_BREAK | SP_CLR_SSTEP | SP_CLR_BROKE | SP_CLR_HALT); + __osSpSetStatus(SP_SET_INTR_BREAK | SP_CLR_SSTEP | SP_CLR_BROKE | SP_CLR_HALT); } diff --git a/lib/src/os/unknown_0D6C90.c b/lib/src/os/unknown_0D6C90.c index 7f05b926..1954a0b0 100644 --- a/lib/src/os/unknown_0D6C90.c +++ b/lib/src/os/unknown_0D6C90.c @@ -27,7 +27,7 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osResetGlobalIntMask.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/osEPiRawWriteIo.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/osYieldThread.s") /*extern void __osEnqueueAndYield(OSThread **); -extern void __osRestoreInt(u32); +extern void __osRestoreInt(u32); void osYieldThread(void){ register u32 saveMask = __osDisableInt(); __osRunningThread->state = OS_STATE_RUNNABLE; diff --git a/lib/src/unknown_0D3020.c b/lib/src/unknown_0D3020.c index 8a74a7ba..c410d68e 100644 --- a/lib/src/unknown_0D3020.c +++ b/lib/src/unknown_0D3020.c @@ -10,20 +10,20 @@ extern u32 __osPiAccessQueueEnabled;//__osPiAccessQueueEnabled extern OSMesg D_8012D1E0[PI_Q_BUF_LEN];//piAccessBuf extern OSMesgQueue piAccessQueue; //__osPiAccessQueue void __osPiCreateAccessQueue(void) { - __osPiAccessQueueEnabled = 1; - osCreateMesgQueue(&piAccessQueue, D_8012D1E0, PI_Q_BUF_LEN); - osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK); + __osPiAccessQueueEnabled = 1; + osCreateMesgQueue(&piAccessQueue, D_8012D1E0, PI_Q_BUF_LEN); + osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK); } void __osPiGetAccess(void) { - OSMesg dummyMesg; - if (!__osPiAccessQueueEnabled) - __osPiCreateAccessQueue(); - osRecvMesg(&piAccessQueue, &dummyMesg, OS_MESG_BLOCK); + OSMesg dummyMesg; + if (!__osPiAccessQueueEnabled) + __osPiCreateAccessQueue(); + osRecvMesg(&piAccessQueue, &dummyMesg, OS_MESG_BLOCK); } void __osPiRelAccess(void) { - osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK); + osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK); } /**********************************************************************/