summaryrefslogtreecommitdiff
path: root/include/JSystem/JKernel
diff options
context:
space:
mode:
authorjdflyer <jdflyer10@gmail.com>2022-04-10 16:29:58 -0600
committerGitHub <noreply@github.com>2022-04-10 18:29:58 -0400
commit545da8536d13393c0a9e1d336c0a606fa42e1a21 (patch)
tree43f59d61e59e4113805201ea7f83a4aacc26b3f6 /include/JSystem/JKernel
parentdd8899033b0b70a262f4c89153ede57ceac9878e (diff)
Add Progress.md (#187)
* Match DynamicLink * finish merge * Add Progress.md and update readme
Diffstat (limited to 'include/JSystem/JKernel')
-rw-r--r--include/JSystem/JKernel/JKRArchive.h6
-rw-r--r--include/JSystem/JKernel/JKRDvdRipper.h9
-rw-r--r--include/JSystem/JKernel/JKRFileLoader.h8
3 files changed, 11 insertions, 12 deletions
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index 31991837d2..edd694ea7e 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -218,11 +218,11 @@ inline JKRCompression JKRConvertAttrToCompressionType(u32 attr) {
return JKRArchive::convertAttrToCompressionType(attr);
}
-inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) {
- return JKRArchive::getGlbResource(tag, name, arc);
+inline void* JKRGetResource(u32 node, const char* path, JKRArchive* archive) {
+ return JKRArchive::getGlbResource(node,path,archive);
}
-inline void* JKRGetResource(u32 tag, const char* name, JKRArchive* arc) {
+inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) {
return JKRArchive::getGlbResource(tag, name, arc);
}
diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper.h
index 8248d167a2..d0c9a7030a 100644
--- a/include/JSystem/JKernel/JKRDvdRipper.h
+++ b/include/JSystem/JKernel/JKRDvdRipper.h
@@ -43,11 +43,10 @@ inline void* JKRDvdToMainRam(s32 entryNum, u8* dst, JKRExpandSwitch expandSwitch
offset, compression, returnSize);
}
-inline void* JKRDvdToMainRam(char const* param_0, u8* dst, JKRExpandSwitch expandSwitch,
- u32 dstLength, JKRHeap* heap,
- JKRDvdRipper::EAllocDirection allocDirection, u32 offset,
- JKRCompression* compression, u32* returnSize) {
- return JKRDvdRipper::loadToMainRAM(param_0, dst, expandSwitch, dstLength, heap, allocDirection,
+inline void* JKRDvdToMainRam(const char* name, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength,
+ JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection,
+ u32 offset, JKRCompression* compression, u32* returnSize) {
+ return JKRDvdRipper::loadToMainRAM(name, dst, expandSwitch, dstLength, heap, allocDirection,
offset, compression, returnSize);
}
diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader.h
index 501fdda7d9..42752bc241 100644
--- a/include/JSystem/JKernel/JKRFileLoader.h
+++ b/include/JSystem/JKernel/JKRFileLoader.h
@@ -54,6 +54,10 @@ public:
static JSUList<JKRFileLoader> sVolumeList;
};
+inline bool JKRDetachResource(void* resource, JKRFileLoader* fileLoader) {
+ return JKRFileLoader::detachResource(resource,fileLoader);
+}
+
inline void* JKRGetNameResource(const char* name, JKRFileLoader* loader) {
return JKRFileLoader::getGlbResource(name, loader);
}
@@ -62,8 +66,4 @@ inline void* JKRGetResource(const char* name) {
return JKRFileLoader::getGlbResource(name);
}
-inline bool JKRDetachResource(void* resource, JKRFileLoader* loader) {
- return JKRFileLoader::detachResource(resource, loader);
-}
-
#endif /* JKRFILELOADER_H */