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

Fix __osPfsPifRam declaration

Browse Source
This commit is contained in:
Ryan Myers
2021-09-30 22:12:11 -04:00
parent 062442b02f
commit 6344358559
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/os/contramread.c
+1 -2
View File
@@ -5,7 +5,6 @@
#include "controller.h"
#include "siint.h"
extern s32 D_8012CE1C;
static void __osPackRamReadData(int channel, u16 address);
s32 __osContRamRead(OSMesgQueue *mq, int channel, u16 address, u8 *buffer) {
s32 ret;
@@ -25,7 +24,7 @@ s32 __osContRamRead(OSMesgQueue *mq, int channel, u16 address, u8 *buffer) {
for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus
__osPfsPifRam.ramarray[i] = 0xFFU;
}
D_8012CE1C = 0;
__osPfsPifRam.pifstatus = 0;
ret = __osSiRawStartDma(OS_READ, &__osPfsPifRam);
osRecvMesg(mq, NULL, OS_MESG_BLOCK);
ptr = (u8 *)&__osPfsPifRam;
lib/src/os/contramwrite.c
+1 -2
View File
@@ -5,7 +5,6 @@
#include "controller.h"
#include "siint.h"
extern s32 D_8012CE1C;
static void __osPackRamWriteData(int channel, u16 address, u8 *buffer);
s32 __osContRamWrite(OSMesgQueue *mq, int channel, u16 address, u8 *buffer, int force) {
@@ -29,7 +28,7 @@ s32 __osContRamWrite(OSMesgQueue *mq, int channel, u16 address, u8 *buffer, int
for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus
__osPfsPifRam.ramarray[i] = 0xFFU;
}
D_8012CE1C = 0;
__osPfsPifRam.pifstatus = 0;
ret = __osSiRawStartDma(OS_READ, &__osPfsPifRam);
osRecvMesg(mq, NULL, OS_MESG_BLOCK);
ptr = (u8 *)&__osPfsPifRam;
lib/src/os/controller.c
+4 -7
View File
@@ -4,6 +4,7 @@
#include "types.h"
#include "macros.h"
#include "libultra_internal.h"
#include "controller.h"
#define HALF_A_SECOND OS_USEC_TO_CYCLES(500000)
@@ -23,8 +24,8 @@ s32 D_800E38C0 = 0;
s32 D_8012CD50[15];
s32 D_8012CD8C;
s8 __osContLastCmd;
s8 __osMaxControllers; // 8012CD91
u8 __osContLastCmd;
u8 __osMaxControllers; // 8012CD91
s32 D_8012CD94;
s32 D_8012CD98[6];
s32 D_8012CDB0;
@@ -33,11 +34,7 @@ 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;
OSPifRam __osPfsPifRam; // 8012CDE0
#if 1
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s")