mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix size of leoDiskStack (#2143)

Browse source
This commit is contained in:
cadmic 2024-09-06 10:32:29 -07:00 committed by GitHub
parent 2ce648a7c6
commit d374e71cb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ultra64/leodrive.h
View file

@ -187,7 +187,7 @@ extern const s32 LEORAM_BYTE[];
extern s32 __leoActive; extern s32 __leoActive;
extern LEOVersion __leoVersion; extern LEOVersion __leoVersion;
extern STACK(leoDiskStack, 0xFF0); extern STACK(leoDiskStack, 0x1000);
extern OSPiHandle* LEOPiInfo; extern OSPiHandle* LEOPiInfo;

3
src/libleo/api/cacreateleomanager.c
View file

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "ultra64/asm.h"
#include "ultra64/leo.h" #include "ultra64/leo.h"
#include "ultra64/leoappli.h" #include "ultra64/leoappli.h"
#include "ultra64/leodrive.h" #include "ultra64/leodrive.h"
@ -25,7 +26,7 @@ s32 LeoCACreateLeoManager(s32 comPri, s32 intPri, OSMesg* cmdBuf, s32 cmdMsgCnt)
driveRomHandle = osDriveRomInit(); driveRomHandle = osDriveRomInit();
__leoActive = true; __leoActive = true;
__osSetHWIntrRoutine(OS_INTR_CART, __osLeoInterrupt, STACK_TOP(leoDiskStack)); __osSetHWIntrRoutine(OS_INTR_CART, __osLeoInterrupt, (u8*)STACK_TOP(leoDiskStack) - FRAMESZ(SZREG * NARGSAVE));
leoInitialize(comPri, intPri, cmdBuf, cmdMsgCnt); leoInitialize(comPri, intPri, cmdBuf, cmdMsgCnt);
if (osResetType == 1) { // NMI if (osResetType == 1) { // NMI

3
src/libleo/api/cjcreateleomanager.c
View file

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "ultra64/asm.h"
#include "ultra64/leo.h" #include "ultra64/leo.h"
#include "ultra64/leoappli.h" #include "ultra64/leoappli.h"
#include "ultra64/leodrive.h" #include "ultra64/leodrive.h"
@ -25,7 +26,7 @@ s32 LeoCJCreateLeoManager(s32 comPri, s32 intPri, OSMesg* cmdBuf, s32 cmdMsgCnt)
driveRomHandle = osDriveRomInit(); driveRomHandle = osDriveRomInit();
__leoActive = true; __leoActive = true;
__osSetHWIntrRoutine(OS_INTR_CART, __osLeoInterrupt, STACK_TOP(leoDiskStack)); __osSetHWIntrRoutine(OS_INTR_CART, __osLeoInterrupt, (u8*)STACK_TOP(leoDiskStack) - FRAMESZ(SZREG * NARGSAVE));
leoInitialize(comPri, intPri, cmdBuf, cmdMsgCnt); leoInitialize(comPri, intPri, cmdBuf, cmdMsgCnt);
if (osResetType == 1) { // NMI if (osResetType == 1) { // NMI

2
src/libleo/leo/leointerrupt.c
View file

@ -9,7 +9,7 @@ extern OSHWIntr __OSGlobalIntMask;
void __osLeoAbnormalResume(void); void __osLeoAbnormalResume(void);
void __osLeoResume(void); void __osLeoResume(void);
STACK(leoDiskStack, 0xFF0); STACK(leoDiskStack, 0x1000);
s32 __osLeoInterrupt(void) { s32 __osLeoInterrupt(void) {
u32 stat = 0; u32 stat = 0;