ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oops, the camera transfer buffer is 512 words long, not 1024

This commit is contained in:
Arisotura 2022-04-18 11:33:25 +02:00 committed by Nadia Holmquist Pedersen
parent ee61062aa1
commit a6e88bf6c0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/DSi_Camera.cpp
View File

@ -37,8 +37,8 @@ u32 CropStart, CropEnd;
u32 FrameLength; u32 FrameLength;
u32 TransferPos;*/ u32 TransferPos;*/
// pixel data buffer holds a maximum of 1024 words, regardless of how long scanlines are // pixel data buffer holds a maximum of 512 words, regardless of how long scanlines are
u32 DataBuffer[1024]; u32 DataBuffer[512];
u32 BufferReadPos, BufferWritePos; u32 BufferReadPos, BufferWritePos;
u32 BufferNumLines; u32 BufferNumLines;
Camera* CurCamera; Camera* CurCamera;
@ -80,7 +80,7 @@ void Reset()
/*memset(FrameBuffer, 0, 640*480*4); /*memset(FrameBuffer, 0, 640*480*4);
TransferPos = 0; TransferPos = 0;
FrameLength = 256*192*2;*/ // TODO: make it check frame size, data type, etc FrameLength = 256*192*2;*/ // TODO: make it check frame size, data type, etc
memset(DataBuffer, 0, 1024*sizeof(u32)); memset(DataBuffer, 0, 512*sizeof(u32));
BufferReadPos = 0; BufferReadPos = 0;
BufferWritePos = 0; BufferWritePos = 0;
BufferNumLines = 0; BufferNumLines = 0;
@ -138,10 +138,10 @@ void IRQ(u32 param)
void TransferScanline(u32 line) void TransferScanline(u32 line)
{ {
u32* dstbuf = &DataBuffer[BufferWritePos]; u32* dstbuf = &DataBuffer[BufferWritePos];
int maxlen = 1024 - BufferWritePos; int maxlen = 512 - BufferWritePos;
u32 tmpbuf[1024]; u32 tmpbuf[512];
int datalen = CurCamera->TransferScanline(tmpbuf, 1024); int datalen = CurCamera->TransferScanline(tmpbuf, 512);
// TODO: must be tweaked such that each block has enough time to transfer // TODO: must be tweaked such that each block has enough time to transfer
u32 delay = datalen*4 + 16; u32 delay = datalen*4 + 16;
@ -231,7 +231,7 @@ void TransferScanline(u32 line)
else else
{ {
BufferWritePos += copylen; BufferWritePos += copylen;
if (BufferWritePos > 1024) BufferWritePos = 1024; if (BufferWritePos > 512) BufferWritePos = 512;
BufferNumLines++; BufferNumLines++;
} }
@ -271,7 +271,7 @@ u32 Read32(u32 addr)
u32 ret = DataBuffer[BufferReadPos]; u32 ret = DataBuffer[BufferReadPos];
if (Cnt & (1<<15)) if (Cnt & (1<<15))
{ {
if (BufferReadPos < 1023) if (BufferReadPos < 511)
BufferReadPos++; BufferReadPos++;
// CHECKME!!!! // CHECKME!!!!
// also presumably we should set bit4 in Cnt if there's no new data to be read // also presumably we should set bit4 in Cnt if there's no new data to be read