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

camera: fix bugs that Epicpkmn11's camera demo revealed

This commit is contained in:
Arisotura 2022-04-19 12:54:37 +02:00 committed by Nadia Holmquist Pedersen
parent a6e88bf6c0
commit ac9a4cfd6d
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/DSi_Camera.cpp
View File

@ -217,7 +217,7 @@ void TransferScanline(u32 line)
{ {
// return raw data // return raw data
memcpy(dstbuf, &tmpbuf[copystart], copylen); memcpy(dstbuf, &tmpbuf[copystart], copylen*sizeof(u32));
} }
u32 numscan = Cnt & 0x000F; u32 numscan = Cnt & 0x000F;
@ -577,29 +577,22 @@ int Camera::TransferScanline(u32* buffer, int maxlen)
void Camera::I2C_Start() void Camera::I2C_Start()
{ {
DataPos = 0;
} }
u8 Camera::I2C_Read(bool last) u8 Camera::I2C_Read(bool last)
{ {
u8 ret; u8 ret;
if (DataPos < 2) if (DataPos & 0x1)
{ {
printf("DSi_Camera: WHAT??\n"); ret = RegData & 0xFF;
ret = 0; RegAddr += 2; // checkme
} }
else else
{ {
if (DataPos & 0x1) RegData = I2C_ReadReg(RegAddr);
{ ret = RegData >> 8;
ret = RegData & 0xFF;
RegAddr += 2; // checkme
}
else
{
RegData = I2C_ReadReg(RegAddr);
ret = RegData >> 8;
}
} }
if (last) DataPos = 0; if (last) DataPos = 0;

2
src/DSi_I2C.cpp
View File

@ -201,7 +201,7 @@ void DoSavestate(Savestate* file)
void WriteCnt(u8 val) void WriteCnt(u8 val)
{ {
//printf("I2C: write CNT %02X, %08X\n", val, NDS::GetPC(1)); //printf("I2C: write CNT %02X, %02X, %08X\n", val, Data, NDS::GetPC(1));
// TODO: check ACK flag // TODO: check ACK flag
// TODO: transfer delay // TODO: transfer delay