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

clean up some things

This commit is contained in:
Arisotura 2020-12-24 13:08:46 +01:00
parent d6b0ff1eda
commit 5025e9a989
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/DSi_Camera.cpp
View File

@ -303,7 +303,7 @@ u8 DSi_Camera::Read8(u32 addr)
} }
u16 DSi_Camera::Read16(u32 addr) u16 DSi_Camera::Read16(u32 addr)
{printf("CAM READ %08X %08X\n", addr, NDS::GetPC(0)); {
switch (addr) switch (addr)
{ {
case 0x04004200: return ModuleCnt; case 0x04004200: return ModuleCnt;
@ -313,15 +313,16 @@ u16 DSi_Camera::Read16(u32 addr)
printf("unknown DSi cam read16 %08X\n", addr); printf("unknown DSi cam read16 %08X\n", addr);
return 0; return 0;
} }
u32 dorp = 0;
u32 DSi_Camera::Read32(u32 addr) u32 DSi_Camera::Read32(u32 addr)
{ {
switch (addr) switch (addr)
{ {
case 0x04004204: case 0x04004204:
{ {
// TODO
return 0xFC00801F; return 0xFC00801F;
if (!(Cnt & (1<<15))) return 0; // CHECKME /*if (!(Cnt & (1<<15))) return 0; // CHECKME
u32 ret = *(u32*)&FrameBuffer[TransferPos]; u32 ret = *(u32*)&FrameBuffer[TransferPos];
TransferPos += 4; TransferPos += 4;
if (TransferPos >= FrameLength) TransferPos = 0; if (TransferPos >= FrameLength) TransferPos = 0;
@ -332,7 +333,7 @@ u32 DSi_Camera::Read32(u32 addr)
dorp = 0; dorp = 0;
Cnt &= ~(1<<4); Cnt &= ~(1<<4);
} }
return ret; return ret;*/
} }
} }
@ -348,7 +349,7 @@ void DSi_Camera::Write8(u32 addr, u8 val)
} }
void DSi_Camera::Write16(u32 addr, u16 val) void DSi_Camera::Write16(u32 addr, u16 val)
{printf("CAM WRITE %08X %04X %08X\n", addr, val, NDS::GetPC(0)); {
switch (addr) switch (addr)
{ {
case 0x04004200: case 0x04004200: