PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link DolphinCDvdFile 

Former-commit-id: 47cf20409d082764145b30afe3a7a0ec6ac92be6
This commit is contained in:
Luke Street 2023-10-11 17:32:57 -04:00
parent 994e423a0b
commit fcca7681cc
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/GM8E01_00/config.yml
View File

@ -3,7 +3,8 @@ hash: 949c5ed7368aef547e0b0db1c3678f466e2afbff
symbols: config/GM8E01_00/symbols.txt symbols: config/GM8E01_00/symbols.txt
splits: config/GM8E01_00/splits.txt splits: config/GM8E01_00/splits.txt
mw_comment_version: 8 mw_comment_version: 8
fill_gaps: false quick_analysis: true # Faster reruns after full analysis
fill_gaps: false # Alignments known
#modules: #modules:
#- object: orig/GM8E01_00/files/NESemuP.rel #- object: orig/GM8E01_00/files/NESemuP.rel

2
configure.py
View File

@ -905,7 +905,7 @@ config.libs = [
Object(NonMatching, "Kyoto/DolphinCMemoryCardSys.cpp"), Object(NonMatching, "Kyoto/DolphinCMemoryCardSys.cpp"),
Object(Matching, "Kyoto/Input/DolphinIController.cpp"), Object(Matching, "Kyoto/Input/DolphinIController.cpp"),
Object(Matching, "Kyoto/Input/CDolphinController.cpp"), Object(Matching, "Kyoto/Input/CDolphinController.cpp"),
Object(NonMatching, "Kyoto/DolphinCDvdFile.cpp"), Object(Matching, "Kyoto/DolphinCDvdFile.cpp"),
Object(NonMatching, "Kyoto/Alloc/CMediumAllocPool.cpp"), Object(NonMatching, "Kyoto/Alloc/CMediumAllocPool.cpp"),
Object(Matching, "Kyoto/Alloc/CSmallAllocPool.cpp"), Object(Matching, "Kyoto/Alloc/CSmallAllocPool.cpp"),
Object(NonMatching, "Kyoto/Alloc/CGameAllocator.cpp"), Object(NonMatching, "Kyoto/Alloc/CGameAllocator.cpp"),

2
include/Kyoto/CDvdRequest.hpp
View File

@ -21,7 +21,7 @@ public:
void PostCancelRequest(); void PostCancelRequest();
int GetMediaType() const; int GetMediaType() const;
DVDFileInfo& FileInfo() { return mFileInfo; } DVDFileInfo* FileInfo() { return &mFileInfo; }
private: private:
DVDFileInfo mFileInfo; DVDFileInfo mFileInfo;

14
src/Kyoto/DolphinCDvdFile.cpp
View File

@ -60,7 +60,7 @@ void CDvdFile::DVDARAMXferCallback(s32 result, DVDFileInfo* info) {
}; };
DVDClose(info); DVDClose(info);
reinterpret_cast<Hack*>(info)->file->HandleDVDInterrupt(); reinterpret_cast< Hack* >(info)->file->HandleDVDInterrupt();
} }
void CDvdFile::ARAMARAMXferCallback(u32 addr) { void CDvdFile::ARAMARAMXferCallback(u32 addr) {
@ -127,7 +127,7 @@ void CDvdFile::TryARAMFile() {
if (CARAMManager::GetInvalidAlloc() == x4_) { if (CARAMManager::GetInvalidAlloc() == x4_) {
return; return;
} }
xc_ = new CDvdFileARAM(); xc_ = NEW CDvdFileARAM();
CDvdFileARAM* arfile = xc_.get(); CDvdFileARAM* arfile = xc_.get();
arfile->x5c_file = this; arfile->x5c_file = this;
arfile->x78_ = true; arfile->x78_ = true;
@ -254,13 +254,13 @@ CDvdRequest* CDvdFile::AsyncSeekRead(void* dest, uint len, ESeekOrigin origin, i
if (x8_) { if (x8_) {
int roundedLen = (len + 31) & ~31; int roundedLen = (len + 31) & ~31;
DCFlushRange(dest, roundedLen); DCFlushRange(dest, roundedLen);
request = new CARAMDvdRequest( request = NEW CARAMDvdRequest(
CARAMManager::DMAToMRAM(x4_ + x10_offset, dest, roundedLen, CARAMManager::kDMAPrio_One)); CARAMManager::DMAToMRAM(x4_ + x10_offset, dest, roundedLen, CARAMManager::kDMAPrio_One));
} else { } else {
CRealDvdRequest* req = new CRealDvdRequest(); CRealDvdRequest* req = NEW CRealDvdRequest();
DVDFileInfo& info = req->FileInfo(); DVDFileInfo* info = req->FileInfo();
DVDFastOpen(x0_fileEntry, &info); DVDFastOpen(x0_fileEntry, info);
DVDReadAsync(&info, dest, (len + 31) & ~31, x10_offset, internalCallback); DVDReadAsync(info, dest, (len + 31) & ~31, x10_offset, internalCallback);
request = req; request = req;
} }