izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Split controller and contrreaddata

Browse Source
This commit is contained in:
Ryan Myers
2021-09-30 22:09:54 -04:00
parent 2ea8ecc10e
commit 062442b02f
4 changed files with 135 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/os/contreaddata.c
+11
View File
@@ -0,0 +1,11 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800CCFE0 */
#include "types.h"
#include "macros.h"
#include "libultra_internal.h"
#include "controller.h"
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContStartReadData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContGetReadData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osPackReadData.s")
lib/src/os/controller.c
+123
View File
@@ -0,0 +1,123 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800CCC20 */
#include "types.h"
#include "macros.h"
#include "libultra_internal.h"
#define HALF_A_SECOND OS_USEC_TO_CYCLES(500000)
// u32 __osContinitialized = 0;
// OSPifRam __osContPifRam;
// u8 __osContLastCmd;
// u8 __osMaxControllers; // 8012CD91
// s32 D_8012CD94;
// s32 D_8012CD98[6];
// s32 D_8012CDB0;
// s32 D_8012CDB4;
// OSMesgQueue __osEepromTimerQ;
// OSMesg __osEepromTimerMsg;
// OSPifRam __osPfsPifRam; // 8012CDE0
s32 D_800E38C0 = 0;
s32 D_8012CD50[15];
s32 D_8012CD8C;
s8 __osContLastCmd;
s8 __osMaxControllers; // 8012CD91
s32 D_8012CD94;
s32 D_8012CD98[6];
s32 D_8012CDB0;
s32 D_8012CDB4;
s32 D_8012CDB8;
s32 D_8012CDBC;
s32 D_8012CDC0[4];
s32 D_8012CDD0[4];
s32 __osPfsPifRam; // 8012CDE0
s32 D_8012CDE4;
s32 D_8012CDE8[12];
s32 D_8012CE18;
s32 D_8012CE1C;
#if 1
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osContGetInitData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osPackRequestData.s")
#else
s32 osContInit(OSMesgQueue *mq, u8 *bitpattern, OSContStatus *data) {
OSMesg dummy;
s32 ret;
OSTime t;
OSTimer mytimer;
OSMesgQueue timerMesgQueue;
ret = 0;
if (__osContinitialized)
return ret;
__osContinitialized = TRUE;
t = osGetTime();
if (t < HALF_A_SECOND) {
osCreateMesgQueue(&timerMesgQueue, &dummy, 1);
osSetTimer(&mytimer, HALF_A_SECOND - t, 0, &timerMesgQueue, &dummy);
osRecvMesg(&timerMesgQueue, &dummy, OS_MESG_BLOCK);
}
__osMaxControllers = MAXCONTROLLERS;
__osPackRequestData(CONT_CMD_REQUEST_STATUS);
ret = __osSiRawStartDma(OS_WRITE, &__osContPifRam);
osRecvMesg(mq, &dummy, OS_MESG_BLOCK);
ret = __osSiRawStartDma(OS_READ, &__osContPifRam);
osRecvMesg(mq, &dummy, OS_MESG_BLOCK);
__osContGetInitData(bitpattern, data);
__osContLastCmd = CONT_CMD_REQUEST_STATUS;
__osSiCreateAccessQueue();
osCreateMesgQueue(&__osEepromTimerQ, &__osEepromTimerMsg, 1);
return ret;
}
void __osContGetInitData(u8 *pattern, OSContStatus *data) {
u8 *ptr;
__OSContRequesFormat requestformat;
int i;
u8 bits;
bits = 0;
ptr = (u8 *)&__osContPifRam;
for (i = 0; i < __osMaxControllers; i++, ptr += sizeof(__OSContRequesFormat), data++) {
requestformat = *(__OSContRequesFormat *)ptr;
data->errno = CHNL_ERR(requestformat);
if (data->errno == 0)
{
data->type = (requestformat.typel << 8) | requestformat.typeh;
data->status = requestformat.status;
bits |= 1 << i;
}
}
*pattern = bits;
}
void __osPackRequestData(u8 cmd) {
u8 *ptr;
__OSContRequesFormat requestformat;
int i;
for (i = 0; i < ARRLEN(__osContPifRam.ramarray); i++) {
__osContPifRam.ramarray[i] = 0;
}
__osContPifRam.pifstatus = CONT_CMD_EXE;
ptr = (u8 *)&__osContPifRam.ramarray;
requestformat.dummy = CONT_CMD_NOP;
requestformat.txsize = CONT_CMD_REQUEST_STATUS_TX;
requestformat.rxsize = CONT_CMD_REQUEST_STATUS_RX;
requestformat.cmd = cmd;
requestformat.typeh = CONT_CMD_NOP;
requestformat.typel = CONT_CMD_NOP;
requestformat.status = CONT_CMD_NOP;
requestformat.dummy1 = CONT_CMD_NOP;
for (i = 0; i < __osMaxControllers; i++) {
*(__OSContRequesFormat *)ptr = requestformat;
ptr += sizeof(__OSContRequesFormat);
}
ptr[0] = CONT_CMD_END;
}
#endif
lib/src/os/unknown_0CD820.c
-32
View File
@@ -1,32 +0,0 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800CCC20 */
#include "types.h"
#include "macros.h"
s32 D_800E38C0 = 0;
s32 D_8012CD50[15];
s32 D_8012CD8C;
s8 __osContLastCmd;
s8 __osMaxControllers; // 8012CD91
s32 D_8012CD94;
s32 D_8012CD98[6];
s32 D_8012CDB0;
s32 D_8012CDB4;
s32 D_8012CDB8;
s32 D_8012CDBC;
s32 D_8012CDC0[4];
s32 D_8012CDD0[4];
s32 __osPfsPifRam; // 8012CDE0
s32 D_8012CDE4;
s32 D_8012CDE8[12];
s32 D_8012CE18;
s32 D_8012CE1C;
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osContGetInitData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osPackRequestData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContStartReadData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContGetReadData.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osPackReadData.s")
tools/python/generate_ld.py
+1 -1
View File
@@ -30,7 +30,7 @@ LATE_DATA_FILES = [
BSS_LIB_ORDER_FILES = [
BUILD_DIR + '/lib/src/os/osViMgr.o',
BUILD_DIR + '/lib/src/os/osSetEventMesg.o',
BUILD_DIR + '/lib/src/os/unknown_0CD820.o',
BUILD_DIR + '/lib/src/os/controller.o',
BUILD_DIR + '/lib/src/os/unknown_0CE200.o'
]