diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-09-04 07:56:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-04 17:56:59 +0300 |
| commit | b45a089e15d79821b07be020db628e01a49b1fd2 (patch) | |
| tree | 948057548cc19b19d644bd4f300ca6434e6bff11 /src/JSystem/JKernel/JKRAramStream.cpp | |
| parent | ee8b843996f4d888903f8c125b95ec1af376877e (diff) | |
some J3D/misc cleanup (#2628)
* some j3d cleanup
* begin using uintptr_t
* j3dgraphbase cleanup
* j3dgraphanimator cleanup
Diffstat (limited to 'src/JSystem/JKernel/JKRAramStream.cpp')
| -rw-r--r-- | src/JSystem/JKernel/JKRAramStream.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp index 9a42aa7e3a..d5ad390f48 100644 --- a/src/JSystem/JKernel/JKRAramStream.cpp +++ b/src/JSystem/JKernel/JKRAramStream.cpp @@ -2,6 +2,7 @@ #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JSupport/JSUFileStream.h" #include "JSystem/JUtility/JUTException.h" +#include <stdint.h> /* ############################################################################################## */ /* 80451408-8045140C 000908 0004+00 1/1 0/0 0/0 .sbss sAramStreamObject__13JKRAramStream @@ -40,7 +41,7 @@ JKRAramStream::~JKRAramStream() {} /* 802D3C68-802D3CD8 2CE5A8 0070+00 1/0 0/0 0/0 .text run__13JKRAramStreamFv */ void* JKRAramStream::run() { - OSInitMessageQueue(&sMessageQueue, sMessageBuffer, ARRAY_SIZE(sMessageBuffer)); + OSInitMessageQueue(&sMessageQueue, sMessageBuffer, ARRAY_SIZEU(sMessageBuffer)); for (;;) { OSMessage message; @@ -115,7 +116,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { break; } - JKRAramPcs(0, (u32)buffer, destination, length, NULL); + JKRAramPcs(0, (uintptr_t)buffer, destination, length, NULL); dstSize -= length; writtenLength += length; destination += length; @@ -205,7 +206,7 @@ void JKRAramStream::setTransBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) { transHeap = NULL; if (buffer) { - transBuffer = (u8*)ALIGN_NEXT((u32)buffer, 0x20); + transBuffer = (u8*)ALIGN_NEXT((uintptr_t)buffer, 0x20); } if (bufferSize) { @@ -227,4 +228,4 @@ JKRAramStreamCommand::JKRAramStreamCommand() { // should be an inline function extern "C" s32 getAvailable__20JSURandomInputStreamCFv(JSURandomInputStream* self) { return self->getLength() - self->getPosition(); -}
\ No newline at end of file +} |