Fix Wii splits for EXI2_GDEV_GCN/main.c (#3102)

This commit is contained in:
Max Roncace
2026-02-18 02:04:42 -05:00
committed by GitHub
parent a790efafc5
commit 95c3626771
5 changed files with 19 additions and 12 deletions
+1 -1
View File
@@ -4121,7 +4121,7 @@ TRK_MINNOW_revolution/debugger/embedded/MetroTRK/Os/revolution/target_options.c:
TRK_MINNOW_revolution/debugger/embedded/MetroTRK/Os/revolution/UDP_Stubs.c:
.text start:0x80395078 end:0x803950C0
TRK_MINNOW_revolution/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
TRK_MINNOW_revolution/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
.text start:0x803950C0 end:0x80395380
.bss start:0x804F72A0 end:0x804F77BC
.sbss start:0x804FBAC8 end:0x804FBAD0
+1 -1
View File
@@ -4343,7 +4343,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
.text start:0x803B7BF8 end:0x803B7C40
TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
.text start:0x803B7C40 end:0x803B7F00
.bss start:0x8051D080 end:0x8051D59C
.sbss start:0x80521998 end:0x805219A0
+1 -1
View File
@@ -4337,7 +4337,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
.text start:0x803B96A8 end:0x803B96F0
TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
.text start:0x803B96F0 end:0x803B99B0
.bss start:0x8051AF00 end:0x8051B41C
.sbss start:0x8051F808 end:0x8051F810
+1 -1
View File
@@ -4340,7 +4340,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
.text start:0x803B8078 end:0x803B80C0
TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
.text start:0x803B80C0 end:0x803B8380
.bss start:0x8051D980 end:0x8051DE9C
.sbss start:0x80522158 end:0x80522160
@@ -1,10 +1,17 @@
#include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h"
#include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
#include "global.h"
#include <dolphin/db.h>
#include <dolphin/amc/AmcExi2Comm.h>
#define GDEV_BUF_SIZE (0x500)
#if PLATFORM_GCN
#define TRACE(...) MWTRACE(__VA_ARGS__)
#else
#define TRACE(...) ((void)0)
#endif
static CircleBuffer gRecvCB;
static u8 gRecvBuf[GDEV_BUF_SIZE];
@@ -12,9 +19,9 @@ static u8 gRecvBuf[GDEV_BUF_SIZE];
static BOOL gIsInitialized;
int gdev_cc_initialize(void* inputPendingPtrRef, EXICallback monitorCallback) {
MWTRACE(1, "CALLING EXI2_Init\n");
TRACE(1, "CALLING EXI2_Init\n");
DBInitComm(inputPendingPtrRef, (int*)monitorCallback);
MWTRACE(1, "DONE CALLING EXI2_Init\n");
TRACE(1, "DONE CALLING EXI2_Init\n");
CircleBufferInitialize(&gRecvCB, gRecvBuf, GDEV_BUF_SIZE);
return 0;
}
@@ -47,7 +54,7 @@ int gdev_cc_read(u8* data, int size) {
return -0x2711;
}
MWTRACE(1, "Expected packet size : 0x%08x (%ld)\n", size, size);
TRACE(1, "Expected packet size : 0x%08x (%ld)\n", size, size);
p1 = size;
p2 = size;
@@ -65,7 +72,7 @@ int gdev_cc_read(u8* data, int size) {
if (retval == 0) {
CircleBufferReadBytes(&gRecvCB, data, p1);
} else {
MWTRACE(8, "cc_read : error reading bytes from EXI2 %ld\n", retval);
TRACE(8, "cc_read : error reading bytes from EXI2 %ld\n", retval);
}
return retval;
@@ -80,14 +87,14 @@ int gdev_cc_write(const u8* bytes, int length) {
n_copy = length;
if (gIsInitialized == FALSE) {
MWTRACE(8, "cc not initialized\n");
TRACE(8, "cc not initialized\n");
return -0x2711;
}
MWTRACE(8, "cc_write : Output data 0x%08x %ld bytes\n", bytes, length);
TRACE(8, "cc_write : Output data 0x%08x %ld bytes\n", bytes, length);
while (n_copy > 0) {
MWTRACE(1, "cc_write sending %ld bytes\n", n_copy);
TRACE(1, "cc_write sending %ld bytes\n", n_copy);
exi2Len = DBWrite((const void*)hexCopy, n_copy);
if (exi2Len == AMC_EXI_NO_ERROR) {
break;
@@ -110,7 +117,7 @@ int gdev_cc_post_stop() {
}
int gdev_cc_peek() {
int poll;
s32 poll;
u8 buff[GDEV_BUF_SIZE];
poll = DBQueryData();