mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-10 23:22:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

OS.h and JKRDvdFile (#19)

Browse Source 
* OS header

* JKRFile and JKRDvdFile
This commit is contained in:
Jonathan Wase
2020-12-06 06:40:34 +01:00
committed by GitHub
parent 89385fe8fd
commit 59a3d00209
12 changed files with 223 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/JKernel/JKRDvdFile.cpp
+119 -42
View File
@@ -1,68 +1,145 @@
#include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
#include "global.h"
asm JKRDvdFile::JKRDvdFile(void) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s"
JKRDvdFile::JKRDvdFile() : JKRFile(), mDvdLink(this) {
this->initiate();
}
asm JKRDvdFile::JKRDvdFile(char const *) {
#ifdef NONMATCHING
JKRDvdFile::JKRDvdFile(char const* param_1) : JKRFile(), mDvdLink(this) {
this->initiate();
bool result = this->open(param_1);
this->mIsOpen = result;
}
#else
asm JKRDvdFile::JKRDvdFile(char const*) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s"
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s"
}
#endif
#ifdef NONMATHCING
JKRDvdFile::JKRDvdFile(long param_1) : JKRFile(), mDvdLink(this) {
this->initiate();
bool result = this->open(param_1);
this->mIsOpen = result;
}
#else
asm JKRDvdFile::JKRDvdFile(long) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s"
}
#endif
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
JKRDvdFile::~JKRDvdFile() {
this->close();
}
asm JKRDvdFile::JKRDvdFile(long) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s"
void JKRDvdFile::initiate(void) {
this->mDvdFile = this;
OSInitMutex(&this->mMutex1);
OSInitMutex(&this->mMutex2);
OSInitMessageQueue(&this->mQueue2, this->mMessages2, 1);
OSInitMessageQueue(&this->mQueue1, this->mMessages1, 1);
this->mOSThread = NULL;
this->field_0x50 = 0;
this->field_0x58 = 0;
}
asm JKRDvdFile::~JKRDvdFile() {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s"
bool JKRDvdFile::open(char const* param_1) {
if (!this->mIsOpen) {
this->mIsOpen = DVDOpen(param_1, this->mDvdCommandBlock);
if (this->mIsOpen) {
lbl_8043436C.append(&this->mDvdLink);
this->getStatus();
}
}
return this->mIsOpen;
}
asm void JKRDvdFile::initiate(void) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s"
bool JKRDvdFile::open(long param_1) {
if (!this->mIsOpen) {
this->mIsOpen = DVDFastOpen(param_1, this->mDvdCommandBlock);
if (this->mIsOpen) {
lbl_8043436C.append(&this->mDvdLink);
this->getStatus();
}
}
return this->mIsOpen;
}
asm bool JKRDvdFile::open(char const *) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s"
void JKRDvdFile::close() {
if (this->mIsOpen) {
s32 result = DVDClose(this->mDvdCommandBlock);
if (result != 0) {
this->mIsOpen = false;
lbl_8043436C.remove(&this->mDvdLink);
} else {
const char* filename = lbl_8039D260; // "JKRDvdFile.cpp"
const char* format = lbl_8039D260 + 0x0F; // "%s"
const char* arg1 = lbl_8039D260 + 0x12; // "cannot close DVD file\n"
JUTException_NS_panic_f(filename, 0xd5, format, arg1);
}
}
}
asm bool JKRDvdFile::open(long) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s"
#define JUT_ASSERT(CONDITION)
//#include "JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s"
s32 JKRDvdFile::readData(void* param_1, long length, long param_3) {
JUT_ASSERT((length & 0x1f) == 0);
OSLockMutex(&this->mMutex1);
if (this->mOSThread) {
OSUnlockMutex(&this->mMutex1);
return -1;
}
this->mOSThread = OSGetCurrentThread();
s32 result = -1;
s32 readAsyncResult =
DVDReadAsyncPrio(this->mDvdCommandBlock, param_1, length, param_3, JKRDvdFile::doneProcess, 2);
if (readAsyncResult) {
result = this->sync();
}
this->mOSThread = NULL;
OSUnlockMutex(&this->mMutex1);
return result;
}
asm void JKRDvdFile::close(void) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s"
s32 JKRDvdFile::writeData(void const*, long, long) {
return -1;
}
asm void JKRDvdFile::readData(void *, long, long) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s"
s32 JKRDvdFile::sync(void) {
OSMessage message;
OSLockMutex(&this->mMutex1);
OSReceiveMessage(&this->mQueue2, &message, 1);
this->mOSThread = NULL;
OSUnlockMutex(&this->mMutex1);
return (int)message;
}
asm s32 JKRDvdFile::writeData(void const *, long, long) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s"
void JKRDvdFile::doneProcess(long id, DVDFileInfo* fileInfo) {
// fileInfo->field_0x3c looks like some kind of user pointer?
JKRDvdFile* dvdFile = *(JKRDvdFile**)((u8*)fileInfo + 0x3c);
OSSendMessage(&dvdFile->mQueue2, (OSMessage)id, 0);
}
asm void JKRDvdFile::sync(void) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s"
// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s"
s32 JKRDvdFile::getFileSize(void) const {
return this->mFileSize;
}
asm void JKRDvdFile::doneProcess(long, DVDFileInfo *) {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s"
}
asm s32 JKRDvdFile::getFileSize(void) const {
nofralloc
#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s"
}
libs/JSystem/JKernel/JKRFile.cpp
+9 -3
View File
@@ -1,8 +1,14 @@
#include "JSystem/JKernel/JKRFile/JKRFile.h"
#include "global.h"
asm s32 JKRFile::read(void *, long, long) {
nofralloc
#include "JSystem/JKernel/JKRFile/asm/func_802D9518.s"
// #include "JSystem/JKernel/JKRFile/asm/func_802D9518.s"
s32 JKRFile::read(void* data, s32 size, long param_3) {
while (true) {
s32 result = this->readData(data, size, param_3);
if (size != result)
VIWaitForRetrace();
else
return result;
}
}
libs/JSystem/JKernel/JKRHeap.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
// #include "JSystem/JKernel/JKRHeap/asm/func_802CE138.s"
JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_flag)
: JKRDisposer(), mChildTree(this), mDisposerList() {
OSInitMutex(this->mMutex);
OSInitMutex(&this->mMutex);
this->mSize = size;
this->mStart = (u32)data;
this->mEnd = (u32)data + size;
libs/JSystem/JKernel/JKRThread.cpp
+3 -3
View File
@@ -62,10 +62,10 @@ void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param
this->mHeap = heap;
this->mStackSize = stack_size & 0xffffffe0;
this->mStackPtr = JKRHeap::alloc(this->mStackSize, 0x20, this->mHeap);
this->mOsThread = (OSThread*)JKRHeap::alloc(sizeof(OSThread), 0x20, this->mHeap);
this->mOSThread = (OSThread*)JKRHeap::alloc(sizeof(OSThread), 0x20, this->mHeap);
void* stackBase = (void*)((int)this->mStackPtr + this->mStackSize);
OSCreateThread(this->mOsThread, start, this, stackBase, this->mStackSize, param_3, 1);
OSCreateThread(this->mOSThread, start, this, stackBase, this->mStackSize, param_3, 1);
}
// #include "JSystem/JKernel/JKRThread/asm/func_802D1934.s"
@@ -81,7 +81,7 @@ JKRThread* JKRThread::searchThread(OSThread* thread) {
JSUListIterator<JKRThread> iterator;
for (iterator = threadList; iterator != threadList->getEnd(); iterator++) {
JKRThread* jkrThread = iterator.getObject();
if (jkrThread->mOsThread == thread) {
if (jkrThread->mOSThread == thread) {
return jkrThread;
}
}