mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-30 16:03:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix mDvd createOrDie symbol (#122)

Browse Source
This commit is contained in:
robojumper
2025-03-02 20:45:04 +01:00
committed by GitHub
parent 43c9975704
commit 3461afd2b8
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DynamicLink.cpp
+4 -4
View File
@@ -129,8 +129,8 @@ void DynamicModuleControl::initialize(EGG::ExpHeap *heap) {
sTotalFreeSize = heap->getTotalFreeSize();
}
u32 DynamicModuleControl::callback(void *arg) {
return static_cast<DynamicModuleControl *>(arg)->do_load();
void *DynamicModuleControl::callback(void *arg) {
return reinterpret_cast<void *>(static_cast<DynamicModuleControl *>(arg)->do_load());
}
void DynamicModuleControl::checkHeapStatus() {
@@ -159,9 +159,9 @@ bool DynamicModuleControl::do_load() {
snprintf(buf, sizeof(buf), "%s/%sNP.rel", sRelsDir, mName);
if (mModule == nullptr) {
if (sArchive != nullptr) {
sDvdFile = mDvd_toMainRam_arc_c::createOrFail(sArchive, buf, 1, mHeap);
sDvdFile = mDvd_toMainRam_arc_c::createOrDie(sArchive, buf, 1, mHeap);
} else {
sDvdFile = mDvd_toMainRam_normal_c::createOrFail(buf, 1, mHeap);
sDvdFile = mDvd_toMainRam_normal_c::createOrDie(buf, 1, mHeap);
}
if (sDvdFile != nullptr) {
src/REL/d/d_s_boot.cpp
+2 -2
View File
@@ -88,11 +88,11 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb4() {
return sFPhaseBase::PHASE_NEXT;
}
u32 dScBoot_c::dvdCallback(void *data) {}
void *dScBoot_c::dvdCallback(void *data) {}
sFPhaseBase::sFPhaseState dScBoot_c::cb5() {
if (mpDvdCallback == nullptr) {
mpDvdCallback = mDvd_callback_c::createOrFail(&dvdCallback, nullptr);
mpDvdCallback = mDvd_callback_c::createOrDie(&dvdCallback, nullptr);
if (mpDvdCallback == nullptr) {
return sFPhaseBase::PHASE_RETRY;
}
src/d/d_dylink.cpp
+6 -6
View File
@@ -284,7 +284,7 @@ err:
return false;
}
u32 loadRelsArcCallback(void *arg) {
void *loadRelsArcCallback(void *arg) {
EGG::Archive *arc = nullptr;
EGG::Heap *heap = DynamicModuleControl::sDylinkHeap;
@@ -297,10 +297,10 @@ u32 loadRelsArcCallback(void *arg) {
if (arc != nullptr) {
DynamicModuleControl::sArchive = arc;
}
return (u32)arc;
return reinterpret_cast<void *>(arc);
}
u32 dvdCallback(void *arg) {
void *dvdCallback(void *arg) {
DynamicModuleControl::initialize(mHeap::g_dylinkHeap);
DynamicModuleControl::sRelsDir = relsDir;
DVDFileInfo info;
@@ -319,16 +319,16 @@ u32 dvdCallback(void *arg) {
do {
} while (!result);
Initialized = 1;
return true;
return reinterpret_cast<void *>(true);
}
void initModule() {
initDylinkHeap(0x2bf, DYNAMIC_NAME_TABLE, 0x27c, mHeap::g_dylinkHeap);
DVD = mDvd_callback_c::createOrFail(dvdCallback, mHeap::g_dylinkHeap);
DVD = mDvd_callback_c::createOrDie(dvdCallback, mHeap::g_dylinkHeap);
}
void initRelsArc() {
DVD = mDvd_callback_c::createOrFail(loadRelsArcCallback, nullptr);
DVD = mDvd_callback_c::createOrDie(loadRelsArcCallback, nullptr);
}
bool destroy() {
src/m/m_dvd.cpp
+3 -3
View File
@@ -345,7 +345,7 @@ mDvd_callback_c *mDvd_callback_c::create(dvdReadCallback cb, void *cbData) {
}
/** 802ef650 */
mDvd_callback_c *mDvd_callback_c::createOrFail(dvdReadCallback cb, void *cbData) {
mDvd_callback_c *mDvd_callback_c::createOrDie(dvdReadCallback cb, void *cbData) {
mDvd_callback_c *cmd = mDvd_callback_c::create(cb, cbData);
while (!cmd) {}
return cmd;
@@ -573,7 +573,7 @@ mDvd_toMainRam_arc_c::create(EGG::Archive *arc, const char *path, int mountDirec
/** 802efe90 */
mDvd_toMainRam_arc_c *
mDvd_toMainRam_arc_c::createOrFail(EGG::Archive *arc, const char *path, int mountDirection, EGG::Heap *heap) {
mDvd_toMainRam_arc_c::createOrDie(EGG::Archive *arc, const char *path, int mountDirection, EGG::Heap *heap) {
mDvd_toMainRam_arc_c *cmd = mDvd_toMainRam_arc_c::create(arc, path, mountDirection, heap);
while (!cmd) {}
return cmd;
@@ -613,7 +613,7 @@ mDvd_toMainRam_normal_c *mDvd_toMainRam_normal_c::create(const char *path, int m
}
/** 802f0030 */
mDvd_toMainRam_normal_c *mDvd_toMainRam_normal_c::createOrFail(const char *path, int mountDirection, EGG::Heap *heap) {
mDvd_toMainRam_normal_c *mDvd_toMainRam_normal_c::createOrDie(const char *path, int mountDirection, EGG::Heap *heap) {
mDvd_toMainRam_normal_c *cmd = mDvd_toMainRam_normal_c::create(path, mountDirection, heap);
while (!cmd) {}
return cmd;