mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-08 02:10:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Discover gbpak and rumble functions

Browse Source
This commit is contained in:
Ryan Dwyer
2021-09-23 18:36:28 +10:00
parent 6e216d3f09
commit d1a5f42edd
31 changed files with 581 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/joy.c
+91 -79
View File
@@ -46,16 +46,16 @@ u32 var80099eb0;
u32 var80099eb4;
OSMesg var80099eb8;
u32 var80099ebc;
OSMesgQueue var80099ec0;
OSMesgQueue g_JoyStopCyclicPollingMesgQueue;
OSMesg var80099ed8;
u32 var80099edc;
OSMesgQueue var80099ee0;
OSMesgQueue g_JoyStopCyclicPollingDoneMesgQueue;
OSMesg var80099ef8;
u32 var80099efc;
OSMesgQueue var80099f00;
OSMesgQueue g_JoyStartCyclicPollingMesgQueue;
OSMesg var80099f18;
u32 var80099f1c;
OSMesgQueue var80099f20;
OSMesgQueue g_JoyStartCyclicPollingDoneMesgQueue;
OSContStatus var80099f38[4];
u8 g_JoyPfsStates[100];
u32 var80099fac;
@@ -79,7 +79,7 @@ u8 g_JoyConnectedControllers = 0;
bool g_JoyQueuesCreated = false;
bool g_JoyInitDone = false;
bool g_JoyNeedsInit = true;
u32 var8005eebc = 0;
u32 g_JoyCyclicPollDisableCount = 0;
u32 var8005eec0 = 1;
s32 (*var8005eec4)(struct contsample *samples, s32 samplenum) = NULL;
void (*var8005eec8)(struct contsample *samples, s32 samplenum, s32 samplenum2) = NULL;
@@ -98,7 +98,7 @@ u32 var8005eef0 = 1;
void joy00013900(void)
{
if (var8005eef0) {
joyGetLock();
joyDisableCyclicPolling();
var8005eef0 = false;
}
}
@@ -106,7 +106,7 @@ void joy00013900(void)
void joy00013938(void)
{
if (!var8005eef0) {
joyReleaseLock();
joyEnableCyclicPolling();
var8005eef0 = true;
}
}
@@ -213,7 +213,7 @@ void joyCheckPfs(s32 arg0)
u32 value;
if (var8005eedc
&& (arg0 == 2 || (var8005eee0 && (arg0 || ((var8005eebc == 0 || var8005eef0 == 0) && var8005eeec))))
&& (arg0 == 2 || (var8005eee0 && (arg0 || ((g_JoyCyclicPollDisableCount == 0 || var8005eef0 == 0) && var8005eeec))))
&& !doingit) {
doingit = true;
prevcount = thiscount;
@@ -235,13 +235,13 @@ void joyCheckPfs(s32 arg0)
var8005eee8++;
if (arg0) {
joyGetLock();
joyDisableCyclicPolling();
}
osPfsIsPlug(&var80099e78, &bitpattern);
if (arg0) {
joyReleaseLock();
joyEnableCyclicPolling();
}
bitpattern |= 0x10;
@@ -299,10 +299,10 @@ void joySystemInit(void)
s32 i;
s32 j;
osCreateMesgQueue(&var80099ec0, &var80099eb8, 1);
osCreateMesgQueue(&var80099ee0, &var80099ed8, 1);
osCreateMesgQueue(&var80099f00, &var80099ef8, 1);
osCreateMesgQueue(&var80099f20, &var80099f18, 1);
osCreateMesgQueue(&g_JoyStopCyclicPollingMesgQueue, &var80099eb8, 1);
osCreateMesgQueue(&g_JoyStopCyclicPollingDoneMesgQueue, &var80099ed8, 1);
osCreateMesgQueue(&g_JoyStartCyclicPollingMesgQueue, &var80099ef8, 1);
osCreateMesgQueue(&g_JoyStartCyclicPollingDoneMesgQueue, &var80099f18, 1);
osCreateMesgQueue(&var80099e78, &var80099e90, 10);
osSetEventMesg(OS_EVENT_SI, &var80099e78, NULL);
@@ -354,13 +354,13 @@ void joy00013dfc(void)
OSMesg msg;
if (g_JoyQueuesCreated) {
osSendMesg(&var80099ec0, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&var80099ee0, &msg, OS_MESG_BLOCK);
osSendMesg(&g_JoyStopCyclicPollingMesgQueue, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&g_JoyStopCyclicPollingDoneMesgQueue, &msg, OS_MESG_BLOCK);
joy00013e84();
osSendMesg(&var80099f00, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&var80099f20, &msg, OS_MESG_BLOCK);
osSendMesg(&g_JoyStartCyclicPollingMesgQueue, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&g_JoyStartCyclicPollingDoneMesgQueue, &msg, OS_MESG_BLOCK);
var8005eec0 = 1;
}
@@ -380,7 +380,7 @@ void joy00013e84(void)
g_JoyInitDone = true;
for (i = 0; i < 4; i++) {
joy000153c4(i, 0);
joyStopRumble(i, false);
}
} else {
u32 slots = 0xf;
@@ -560,7 +560,7 @@ void joy00014238(void)
}
if (var8005eec4 == NULL) {
joy0001561c();
joysTickRumble();
}
doingit = false;
@@ -594,22 +594,22 @@ void joyDebugJoy(void)
var8005eec8(g_JoyData[0].samples, g_JoyData[0].curstart, g_JoyData[0].curlast);
}
if (joy000150c4() && var8005eec0 && joyGetNumSamples() <= 0) {
if (joyIsCyclicPollingEnabled() && var8005eec0 && joyGetNumSamples() <= 0) {
#if VERSION >= VERSION_NTSC_FINAL
joyGetLock();
joyDisableCyclicPolling();
joy00014238();
joyReleaseLock();
joyEnableCyclicPolling();
joyConsumeSamples(&g_JoyData[0]);
#elif VERSION >= VERSION_NTSC_1_0
joyGetLock();
joyReleaseLock();
joyDisableCyclicPolling();
joyEnableCyclicPolling();
joyConsumeSamples(&g_JoyData[0]);
joy00014238();
#else
joyGetLock(500, "joy.c");
joyDisableCyclicPolling(500, "joy.c");
joy00014238();
func0001509cnb();
joyReleaseLock(507, "joy.c");
joyEnableCyclicPolling(507, "joy.c");
joyConsumeSamples(&g_JoyData[0]);
#endif
}
@@ -654,12 +654,12 @@ void joyReadData(void)
}
#if VERSION >= VERSION_NTSC_1_0
void joyPoll(void)
void joysTick(void)
{
OSMesg msg;
s8 i;
if (osRecvMesg(&var80099ec0, &msg, OS_MESG_NOBLOCK) == 0) {
if (osRecvMesg(&g_JoyStopCyclicPollingMesgQueue, &msg, OS_MESG_NOBLOCK) == 0) {
if (g_JoyBusy) {
osRecvMesg(&var80099e78, &msg, OS_MESG_BLOCK);
@@ -676,7 +676,7 @@ void joyPoll(void)
}
}
osSendMesg(&var80099ee0, &msg, OS_MESG_NOBLOCK);
osSendMesg(&g_JoyStopCyclicPollingDoneMesgQueue, &msg, OS_MESG_NOBLOCK);
var8005ee68++;
@@ -684,7 +684,7 @@ void joyPoll(void)
return;
}
if (osRecvMesg(&var80099f00, &msg, OS_MESG_NOBLOCK) == 0) {
if (osRecvMesg(&g_JoyStartCyclicPollingMesgQueue, &msg, OS_MESG_NOBLOCK) == 0) {
var8005ee68--;
if (var8005ee68 == 0) {
@@ -692,7 +692,7 @@ void joyPoll(void)
g_JoyBusy = true;
}
osSendMesg(&var80099f20, &msg, OS_MESG_NOBLOCK);
osSendMesg(&g_JoyStartCyclicPollingDoneMesgQueue, &msg, OS_MESG_NOBLOCK);
return;
}
@@ -744,7 +744,7 @@ void joyPoll(void)
}
#else
GLOBAL_ASM(
glabel joyPoll
glabel joysTick
/* 1536c: 3c028006 */ lui $v0,0x8006
/* 15370: 244212c0 */ addiu $v0,$v0,0x12c0
/* 15374: 8c4e0000 */ lw $t6,0x0($v0)
@@ -1233,12 +1233,19 @@ glabel func00015fa4nb
);
#endif
s32 joy000150c4(void)
bool joyIsCyclicPollingEnabled(void)
{
return var8005eebc ? false : true;
return g_JoyCyclicPollDisableCount ? false : true;
}
void joyGetLock(
/**
* If cyclic polling is enabled, send a message to the scheduler thread telling
* it to update the joy state (connected controllers, PFS etc). Then block while
* waiting for its done message to come back, and increment the disable count.
*
* If cyclic polling was already disabled, simply increase the disable count.
*/
void joyDisableCyclicPolling(
#if VERSION >= VERSION_NTSC_1_0
void
#else
@@ -1248,15 +1255,19 @@ void joyGetLock(
{
OSMesg msg;
if (var8005eebc == 0) {
osSendMesg(&var80099ec0, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&var80099ee0, &msg, OS_MESG_BLOCK);
if (g_JoyCyclicPollDisableCount == 0) {
osSendMesg(&g_JoyStopCyclicPollingMesgQueue, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&g_JoyStopCyclicPollingDoneMesgQueue, &msg, OS_MESG_BLOCK);
}
var8005eebc++;
g_JoyCyclicPollDisableCount++;
}
void joyReleaseLock(
/**
* Indicate that the caller is done with cyclic polling being disabled,
* and enable cyclic polling if there are no callers left who want it disabled.
*/
void joyEnableCyclicPolling(
#if VERSION >= VERSION_NTSC_1_0
void
#else
@@ -1266,11 +1277,11 @@ void joyReleaseLock(
{
OSMesg msg;
var8005eebc--;
g_JoyCyclicPollDisableCount--;
if (var8005eebc == 0) {
osSendMesg(&var80099f00, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&var80099f20, &msg, OS_MESG_BLOCK);
if (g_JoyCyclicPollDisableCount == 0) {
osSendMesg(&g_JoyStartCyclicPollingMesgQueue, &msg, OS_MESG_NOBLOCK);
osRecvMesg(&g_JoyStartCyclicPollingDoneMesgQueue, &msg, OS_MESG_BLOCK);
}
}
@@ -1340,14 +1351,14 @@ void joyGetContpadNumsForPlayer(s8 playernum, s32 *pad1, s32 *pad2)
#endif
#if VERSION >= VERSION_NTSC_1_0
void joy000153c4(s8 device, s32 arg1)
void joyStopRumble(s8 device, bool disablepolling)
{
u32 stack;
if (device != SAVEDEVICE_GAMEPAK) {
if (g_Paks[device].unk000 != 2 && g_Paks[device].unk000 != 3) {
if (arg1) {
joyGetLock();
if (g_Paks[device].type != PAKTYPE_MEMORY && g_Paks[device].type != PAKTYPE_GAMEBOY) {
if (disablepolling) {
joyDisableCyclicPolling();
}
if (osMotorProbe(&var80099e78, PFS(device), device) == 0) {
@@ -1356,15 +1367,16 @@ void joy000153c4(s8 device, s32 arg1)
osMotorStop(PFS(device));
}
if (arg1) {
joyReleaseLock();
if (disablepolling) {
joyEnableCyclicPolling();
}
if (g_Paks[device].unk004 != 6 && g_Paks[device].unk004 != 7) {
g_Paks[device].unk004 = 5;
if (g_Paks[device].rumblestate != RUMBLESTATE_DISABLED_STOPPING
&& g_Paks[device].rumblestate != RUMBLESTATE_DISABLED_STOPPED) {
g_Paks[device].rumblestate = RUMBLESTATE_ENABLED_STOPPING;
}
g_Paks[device].unk2b4 = -1;
g_Paks[device].rumblettl = -1;
}
}
@@ -1374,7 +1386,7 @@ void joy000153c4(s8 device, s32 arg1)
}
#else
GLOBAL_ASM(
glabel joy000153c4
glabel joyStopRumble
/* 162b0: 27bdffd8 */ addiu $sp,$sp,-40
/* 162b4: 00047600 */ sll $t6,$a0,0x18
/* 162b8: 000e7e03 */ sra $t7,$t6,0x18
@@ -1407,7 +1419,7 @@ glabel joy000153c4
/* 16324: 2404041e */ addiu $a0,$zero,0x41e
/* 16328: 3c057005 */ lui $a1,0x7005
/* 1632c: 24a55958 */ addiu $a1,$a1,0x5958
/* 16330: 0c00581b */ jal joyGetLock
/* 16330: 0c00581b */ jal joyDisableCyclicPolling
/* 16334: afa60024 */ sw $a2,0x24($sp)
/* 16338: 8fa60024 */ lw $a2,0x24($sp)
.NB0001633c:
@@ -1493,7 +1505,7 @@ glabel joy000153c4
/* 16454: 3c057005 */ lui $a1,0x7005
/* 16458: 51000004 */ beqzl $t0,.NB0001646c
/* 1645c: 8fa3001c */ lw $v1,0x1c($sp)
/* 16460: 0c005834 */ jal joyReleaseLock
/* 16460: 0c005834 */ jal joyEnableCyclicPolling
/* 16464: 24a55960 */ addiu $a1,$a1,0x5960
/* 16468: 8fa3001c */ lw $v1,0x1c($sp)
.NB0001646c:
@@ -1528,49 +1540,49 @@ s32 joy000155f4(s8 device)
return joy000155b4(device);
}
void joy0001561c(void)
void joysTickRumble(void)
{
s32 i;
for (i = 0; i < 4; i++) {
if (g_Paks[i].unk010 == 11 && g_Paks[i].unk000 == 1) {
switch (g_Paks[i].unk004) {
case 3:
g_Paks[i].unk004 = 4;
if (g_Paks[i].unk010 == 11 && g_Paks[i].type == PAKTYPE_RUMBLE) {
switch (g_Paks[i].rumblestate) {
case RUMBLESTATE_ENABLED_STARTING:
g_Paks[i].rumblestate = RUMBLESTATE_ENABLED_RUMBLING;
osMotorStart(PFS(i));
break;
case 4:
if (g_Paks[i].unk284 != -1) {
if (g_Paks[i].unk28c == 0) {
case RUMBLESTATE_ENABLED_RUMBLING:
if (g_Paks[i].rumblepulsestopat != -1) {
if (g_Paks[i].rumblepulsetimer == 0) {
osMotorStart(PFS(i));
} else if (g_Paks[i].unk284 == g_Paks[i].unk28c) {
} else if (g_Paks[i].rumblepulsestopat == g_Paks[i].rumblepulsetimer) {
osMotorStop(PFS(i));
}
g_Paks[i].unk28c++;
g_Paks[i].rumblepulsetimer++;
if (g_Paks[i].unk288 == g_Paks[i].unk28c) {
g_Paks[i].unk28c = 0;
if (g_Paks[i].rumblepulselen == g_Paks[i].rumblepulsetimer) {
g_Paks[i].rumblepulsetimer = 0;
}
}
g_Paks[i].unk2b4--;
g_Paks[i].rumblettl--;
if (g_Paks[i].unk2b4 < 0) {
g_Paks[i].unk004 = 5;
if (g_Paks[i].rumblettl < 0) {
g_Paks[i].rumblestate = RUMBLESTATE_ENABLED_STOPPING;
}
break;
case 5:
g_Paks[i].unk004 = 2;
case RUMBLESTATE_ENABLED_STOPPING:
g_Paks[i].rumblestate = RUMBLESTATE_ENABLED_STOPPED;
osMotorStop(PFS(i));
break;
case 6:
case RUMBLESTATE_DISABLED_STOPPING:
osMotorStop(PFS(i));
g_Paks[i].unk004 = 7;
g_Paks[i].rumblestate = RUMBLESTATE_DISABLED_STOPPED;
break;
case 8:
g_Paks[i].unk004 = 2;
g_Paks[i].unk2b4 = -1;
case RUMBLESTATE_ENABLING:
g_Paks[i].rumblestate = RUMBLESTATE_ENABLED_STOPPED;
g_Paks[i].rumblettl = -1;
break;
}
}
src/lib/lib_51570.c
-1
View File
@@ -4,7 +4,6 @@
#include "bss.h"
#include "lib/lib_4b170.h"
#include "lib/lib_4e090.h"
#include "lib/lib_513b0.h"
#include "lib/lib_52360.h"
#include "data.h"
#include "types.h"
src/lib/sched.c
+1 -1
View File
@@ -284,7 +284,7 @@ void func00002078(OSSched *sc)
func00009ed4();
}
joyPoll();
joysTick();
snd0000fe18();
func00001b98(sc->frameCount);
}
src/lib/lib_50f20.c → src/lib/ultra/io/gbpakcheckconnector.c
+11 -13
View File
@@ -1,15 +1,13 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/lib_06330.h"
#include "lib/libc/ll.h"
#include "lib/lib_4e090.h"
#include "lib/lib_513b0.h"
#include "data.h"
#include "types.h"
GLOBAL_ASM(
glabel func50f20
glabel osGbpakCheckConnector
/* 50f20: 27bdfdf0 */ addiu $sp,$sp,-528
/* 50f24: afbf0044 */ sw $ra,0x44($sp)
/* 50f28: 240e0001 */ addiu $t6,$zero,0x1
@@ -26,13 +24,13 @@ glabel func50f20
/* 50f54: afa50214 */ sw $a1,0x214($sp)
/* 50f58: afae0208 */ sw $t6,0x208($sp)
/* 50f5c: afa00204 */ sw $zero,0x204($sp)
/* 50f60: 0c0142f8 */ jal func00050be0
/* 50f60: 0c0142f8 */ jal osGbpakGetStatus
/* 50f64: a7a00200 */ sh $zero,0x200($sp)
/* 50f68: 2401000d */ addiu $at,$zero,0xd
/* 50f6c: 14410005 */ bne $v0,$at,.L00050f84
/* 50f70: 00401825 */ or $v1,$v0,$zero
/* 50f74: 8fa40210 */ lw $a0,0x210($sp)
/* 50f78: 0c0142f8 */ jal func00050be0
/* 50f78: 0c0142f8 */ jal osGbpakGetStatus
/* 50f7c: 8fa50214 */ lw $a1,0x214($sp)
/* 50f80: 00401825 */ or $v1,$v0,$zero
.L00050f84:
@@ -49,7 +47,7 @@ glabel func50f20
/* 50fa8: 33190001 */ andi $t9,$t8,0x1
/* 50fac: 57200008 */ bnezl $t9,.L00050fd0
/* 50fb0: 27a40070 */ addiu $a0,$sp,0x70
/* 50fb4: 0c0018cc */ jal func00006330
/* 50fb4: 0c0018cc */ jal osGbpakPower
/* 50fb8: 24050001 */ addiu $a1,$zero,0x1
/* 50fbc: 50400004 */ beqzl $v0,.L00050fd0
/* 50fc0: 27a40070 */ addiu $a0,$sp,0x70
@@ -83,7 +81,7 @@ glabel func50f20
/* 51024: 02a03825 */ or $a3,$s5,$zero
/* 51028: 8fa40210 */ lw $a0,0x210($sp)
/* 5102c: 00002825 */ or $a1,$zero,$zero
/* 51030: 0c0144ec */ jal func000513b0
/* 51030: 0c0144ec */ jal osGbpakReadWrite
/* 51034: 0240a025 */ or $s4,$s2,$zero
/* 51038: 10400003 */ beqz $v0,.L00051048
/* 5103c: 8fae0208 */ lw $t6,0x208($sp)
@@ -113,7 +111,7 @@ glabel func50f20
/* 51098: 30d8ffff */ andi $t8,$a2,0xffff
/* 5109c: 03003025 */ or $a2,$t8,$zero
/* 510a0: 00002825 */ or $a1,$zero,$zero
/* 510a4: 0c0144ec */ jal func000513b0
/* 510a4: 0c0144ec */ jal osGbpakReadWrite
/* 510a8: 02503821 */ addu $a3,$s2,$s0
/* 510ac: 50400004 */ beqzl $v0,.L000510c0
/* 510b0: a2360000 */ sb $s6,0x0($s1)
@@ -160,7 +158,7 @@ glabel func50f20
/* 51140: 240f0020 */ addiu $t7,$zero,0x20
/* 51144: afaf0010 */ sw $t7,0x10($sp)
/* 51148: 03ce3821 */ addu $a3,$s8,$t6
/* 5114c: 0c0144ec */ jal func000513b0
/* 5114c: 0c0144ec */ jal osGbpakReadWrite
/* 51150: 01a03025 */ or $a2,$t5,$zero
/* 51154: 50400004 */ beqzl $v0,.L00051168
/* 51158: a2160000 */ sb $s6,0x0($s0)
@@ -179,7 +177,7 @@ glabel func50f20
/* 51188: 240a0020 */ addiu $t2,$zero,0x20
/* 5118c: afaa0010 */ sw $t2,0x10($sp)
/* 51190: 02093821 */ addu $a3,$s0,$t1
/* 51194: 0c0144ec */ jal func000513b0
/* 51194: 0c0144ec */ jal osGbpakReadWrite
/* 51198: 3246ffff */ andi $a2,$s2,0xffff
/* 5119c: 50400004 */ beqzl $v0,.L000511b0
/* 511a0: a2360000 */ sb $s6,0x0($s1)
@@ -258,7 +256,7 @@ glabel func50f20
/* 512a8: 02a03825 */ or $a3,$s5,$zero
/* 512ac: 8fa40210 */ lw $a0,0x210($sp)
/* 512b0: 00002825 */ or $a1,$zero,$zero
/* 512b4: 0c0144ec */ jal func000513b0
/* 512b4: 0c0144ec */ jal osGbpakReadWrite
/* 512b8: 0240a025 */ or $s4,$s2,$zero
/* 512bc: 10400003 */ beqz $v0,.L000512cc
/* 512c0: 8fa40210 */ lw $a0,0x210($sp)
@@ -276,7 +274,7 @@ glabel func50f20
/* 512ec: afaf0010 */ sw $t7,0x10($sp)
/* 512f0: 01603025 */ or $a2,$t3,$zero
/* 512f4: 02203825 */ or $a3,$s1,$zero
/* 512f8: 0c0144ec */ jal func000513b0
/* 512f8: 0c0144ec */ jal osGbpakReadWrite
/* 512fc: 00002825 */ or $a1,$zero,$zero
/* 51300: 10400003 */ beqz $v0,.L00051310
/* 51304: 02a02025 */ or $a0,$s5,$zero
@@ -305,7 +303,7 @@ glabel func50f20
/* 51354: 24020004 */ addiu $v0,$zero,0x4
/* 51358: 8fa40210 */ lw $a0,0x210($sp)
.L0005135c:
/* 5135c: 0c0142f8 */ jal func00050be0
/* 5135c: 0c0142f8 */ jal osGbpakGetStatus
/* 51360: 8fa50214 */ lw $a1,0x214($sp)
/* 51364: 2401000d */ addiu $at,$zero,0xd
/* 51368: 14410002 */ bne $v0,$at,.L00051374
src/lib/lib_50be0.c → src/lib/ultra/io/gbpakgetstatus.c
+1 -3
View File
@@ -3,15 +3,13 @@
#include "constants.h"
#include "bss.h"
#include "lib/lib_06100.h"
#include "lib/lib_06330.h"
#include "lib/lib_4b170.h"
#include "lib/lib_4e090.h"
#include "lib/lib_513b0.h"
#include "data.h"
#include "types.h"
GLOBAL_ASM(
glabel func00050be0
glabel osGbpakGetStatus
/* 50be0: 27bdffb0 */ addiu $sp,$sp,-80
/* 50be4: afbf001c */ sw $ra,0x1c($sp)
/* 50be8: afb10018 */ sw $s1,0x18($sp)
src/lib/lib_06330.c → src/lib/ultra/io/gbpakpower.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "types.h"
GLOBAL_ASM(
glabel func00006330
glabel osGbpakPower
/* 6330: 27bdffa0 */ addiu $sp,$sp,-96
/* 6334: afb10028 */ sw $s1,0x28($sp)
/* 6338: afb00024 */ sw $s0,0x24($sp)
src/lib/lib_50d60.c → src/lib/ultra/io/gbpakreadid.c
+6 -8
View File
@@ -3,10 +3,8 @@
#include "constants.h"
#include "bss.h"
#include "lib/lib_06100.h"
#include "lib/lib_06330.h"
#include "lib/lib_4b170.h"
#include "lib/lib_4e090.h"
#include "lib/lib_513b0.h"
#include "data.h"
#include "types.h"
@@ -30,19 +28,19 @@ u32 var8006122c = 0xffffff03;
u32 var80061230 = 0x03030303;
GLOBAL_ASM(
glabel func00050d60
glabel osGbpakReadId
/* 50d60: 27bdff70 */ addiu $sp,$sp,-144
/* 50d64: afbf001c */ sw $ra,0x1c($sp)
/* 50d68: afa50094 */ sw $a1,0x94($sp)
/* 50d6c: afa40090 */ sw $a0,0x90($sp)
/* 50d70: afa60098 */ sw $a2,0x98($sp)
/* 50d74: 0c0142f8 */ jal func00050be0
/* 50d74: 0c0142f8 */ jal osGbpakGetStatus
/* 50d78: 00c02825 */ or $a1,$a2,$zero
/* 50d7c: 2401000d */ addiu $at,$zero,0xd
/* 50d80: 14410005 */ bne $v0,$at,.L00050d98
/* 50d84: 00403825 */ or $a3,$v0,$zero
/* 50d88: 8fa40090 */ lw $a0,0x90($sp)
/* 50d8c: 0c0142f8 */ jal func00050be0
/* 50d8c: 0c0142f8 */ jal osGbpakGetStatus
/* 50d90: 8fa50098 */ lw $a1,0x98($sp)
/* 50d94: 00403825 */ or $a3,$v0,$zero
.L00050d98:
@@ -59,7 +57,7 @@ glabel func00050d60
/* 50dbc: 31f80001 */ andi $t8,$t7,0x1
/* 50dc0: 57000008 */ bnezl $t8,.L00050de4
/* 50dc4: 24190060 */ addiu $t9,$zero,0x60
/* 50dc8: 0c0018cc */ jal func00006330
/* 50dc8: 0c0018cc */ jal osGbpakPower
/* 50dcc: 24050001 */ addiu $a1,$zero,0x1
/* 50dd0: 50400004 */ beqzl $v0,.L00050de4
/* 50dd4: 24190060 */ addiu $t9,$zero,0x60
@@ -71,14 +69,14 @@ glabel func00050d60
/* 50de8: 8fa40090 */ lw $a0,0x90($sp)
/* 50dec: 00002825 */ or $a1,$zero,$zero
/* 50df0: 24060100 */ addiu $a2,$zero,0x100
/* 50df4: 0c0144ec */ jal func000513b0
/* 50df4: 0c0144ec */ jal osGbpakReadWrite
/* 50df8: 27a70024 */ addiu $a3,$sp,0x24
/* 50dfc: 10400003 */ beqz $v0,.L00050e0c
/* 50e00: 8fa40090 */ lw $a0,0x90($sp)
/* 50e04: 10000041 */ b .L00050f0c
/* 50e08: 8fbf001c */ lw $ra,0x1c($sp)
.L00050e0c:
/* 50e0c: 0c0142f8 */ jal func00050be0
/* 50e0c: 0c0142f8 */ jal osGbpakGetStatus
/* 50e10: 8fa50098 */ lw $a1,0x98($sp)
/* 50e14: 2401000d */ addiu $at,$zero,0xd
/* 50e18: 14410002 */ bne $v0,$at,.L00050e24
src/lib/lib_513b0.c → src/lib/ultra/io/gbpakreadwrite.c
+1 -2
View File
@@ -4,13 +4,12 @@
#include "bss.h"
#include "lib/lib_4b170.h"
#include "lib/lib_4e090.h"
#include "lib/lib_513b0.h"
#include "lib/lib_52360.h"
#include "data.h"
#include "types.h"
GLOBAL_ASM(
glabel func000513b0
glabel osGbpakReadWrite
/* 513b0: 27bdffc0 */ addiu $sp,$sp,-64
/* 513b4: afb10020 */ sw $s1,0x20($sp)
/* 513b8: afbf0034 */ sw $ra,0x34($sp)
src/lib/ultra/io/pfsfilestate.c
-2
View File
@@ -3,10 +3,8 @@
#include "constants.h"
#include "bss.h"
#include "lib/lib_06100.h"
#include "lib/lib_06330.h"
#include "lib/lib_4b170.h"
#include "lib/lib_4e090.h"
#include "lib/lib_513b0.h"
#include "data.h"
#include "types.h"