From 8d42b1c7d7466abf80a61ea51ee3006110c15b65 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Tue, 8 Sep 2020 20:19:37 +0200 Subject: messin' around --- src/DSi_Camera.cpp | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 211 insertions(+), 9 deletions(-) (limited to 'src/DSi_Camera.cpp') diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp index 56cba1c..dd8dea7 100644 --- a/src/DSi_Camera.cpp +++ b/src/DSi_Camera.cpp @@ -18,12 +18,22 @@ #include #include +#include "DSi.h" #include "DSi_Camera.h" DSi_Camera* DSi_Camera0; // 78 / facing outside DSi_Camera* DSi_Camera1; // 7A / selfie cam +u16 DSi_Camera::ModuleCnt; +u16 DSi_Camera::Cnt; + +u8 DSi_Camera::FrameBuffer[640*480*4]; +u32 DSi_Camera::FrameLength; +u32 DSi_Camera::TransferPos; + +const u32 kCameraInterval = 1024*16; // interval between camera data blocks + bool DSi_Camera::Init() { @@ -43,6 +53,63 @@ void DSi_Camera::Reset() { DSi_Camera0->ResetCam(); DSi_Camera1->ResetCam(); + + ModuleCnt = 0; // CHECKME + Cnt = 0; + + memset(FrameBuffer, 0, 640*480*4); + TransferPos = 0; + FrameLength = 256*192*2; // TODO: make it check frame size, data type, etc + + NDS::ScheduleEvent(NDS::Event_DSi_Camera, true, kCameraInterval, Process, 0); +} + + +void DSi_Camera::Process(u32 param) +{ + DSi_Camera* activecam = nullptr; + + // TODO: check which camera has priority if both are activated + if (DSi_Camera0->IsActivated()) activecam = DSi_Camera0; + else if (DSi_Camera1->IsActivated()) activecam = DSi_Camera1; + + if (activecam) + { + if (TransferPos == 0) + RequestFrame(activecam->Num); + + Cnt |= (1<<4); + if (Cnt & (1<<11)) NDS::SetIRQ(0, NDS::IRQ_DSi_Camera); + } + else + { + TransferPos = 0; + } + + // TODO: check the interval for this? + // on hardware the delay is likely determined by how long the camera takes to process raw data + NDS::ScheduleEvent(NDS::Event_DSi_Camera, true, kCameraInterval, Process, 0); +} + +void DSi_Camera::RequestFrame(u32 cam) +{ + if (!(Cnt & (1<<13))) printf("CAMERA: !! REQUESTING YUV FRAME\n"); + + // TODO: picture size, data type, cropping, etc + // generate test pattern + // TODO: get picture from platform (actual camera, video file, whatever source) + for (u32 y = 0; y < 192; y++) + { + for (u32 x = 0; x < 256; x++) + { + u16* px = (u16*)&FrameBuffer[((y*256) + x) * 2]; + + if ((x & 0x8) ^ (y & 0x8)) + *px = 0x8000; + else + *px = 0xFC00 | ((y >> 3) << 5); + } + } } @@ -63,15 +130,25 @@ void DSi_Camera::ResetCam() RegData = 0; PLLCnt = 0; + ClocksCnt = 0; StandbyCnt = 0x4029; // checkme + MiscCnt = 0; +} + +bool DSi_Camera::IsActivated() +{ + if (StandbyCnt & (1<<14)) return false; // standby + if (!(MiscCnt & (1<<9))) return false; // data transfer not enabled + + return true; } -void DSi_Camera::Start() +void DSi_Camera::I2C_Start() { } -u8 DSi_Camera::Read(bool last) +u8 DSi_Camera::I2C_Read(bool last) { u8 ret; @@ -89,7 +166,7 @@ u8 DSi_Camera::Read(bool last) } else { - RegData = ReadReg(RegAddr); + RegData = I2C_ReadReg(RegAddr); ret = RegData >> 8; } } @@ -100,7 +177,7 @@ u8 DSi_Camera::Read(bool last) return ret; } -void DSi_Camera::Write(u8 val, bool last) +void DSi_Camera::I2C_Write(u8 val, bool last) { if (DataPos < 2) { @@ -116,7 +193,7 @@ void DSi_Camera::Write(u8 val, bool last) if (DataPos & 0x1) { RegData |= val; - WriteReg(RegAddr, RegData); + I2C_WriteReg(RegAddr, RegData); RegAddr += 2; // checkme } else @@ -129,22 +206,24 @@ void DSi_Camera::Write(u8 val, bool last) else DataPos++; } -u16 DSi_Camera::ReadReg(u16 addr) +u16 DSi_Camera::I2C_ReadReg(u16 addr) { switch (addr) { case 0x0000: return 0x2280; // chip ID case 0x0014: return PLLCnt; + case 0x0016: return ClocksCnt; case 0x0018: return StandbyCnt; + case 0x001A: return MiscCnt; case 0x301A: return ((~StandbyCnt) & 0x4000) >> 12; } - //printf("DSi_Camera%d: unknown read %04X\n", Num, addr); + if(Num==1)printf("DSi_Camera%d: unknown read %04X\n", Num, addr); return 0; } -void DSi_Camera::WriteReg(u16 addr, u16 val) +void DSi_Camera::I2C_WriteReg(u16 addr, u16 val) { switch (addr) { @@ -154,13 +233,136 @@ void DSi_Camera::WriteReg(u16 addr, u16 val) val |= ((val & 0x0002) << 14); PLLCnt = val; return; + case 0x0016: + ClocksCnt = val; + printf("ClocksCnt=%04X\n", val); + return; case 0x0018: // TODO: this shouldn't be instant, but uh val &= 0x003F; val |= ((val & 0x0001) << 14); StandbyCnt = val; + printf("CAM%d STBCNT=%04X (%04X)\n", Num, StandbyCnt, val); + return; + case 0x001A: + MiscCnt = val & 0x0B7B; + printf("CAM%d MISCCNT=%04X (%04X)\n", Num, MiscCnt, val); + return; + } + + if(Num==1)printf("DSi_Camera%d: unknown write %04X %04X\n", Num, addr, val); +} + + +u8 DSi_Camera::Read8(u32 addr) +{ + // + + printf("unknown DSi cam read8 %08X\n", addr); + return 0; +} + +u16 DSi_Camera::Read16(u32 addr) +{printf("CAM READ %08X %08X\n", addr, NDS::GetPC(0)); + switch (addr) + { + case 0x04004200: return ModuleCnt; + case 0x04004202: return Cnt; + } + + printf("unknown DSi cam read16 %08X\n", addr); + return 0; +} +u32 dorp = 0; +u32 DSi_Camera::Read32(u32 addr) +{ + switch (addr) + { + case 0x04004204: + { + if (!(Cnt & (1<<15))) return 0; // CHECKME + u32 ret = *(u32*)&FrameBuffer[TransferPos]; + TransferPos += 4; + if (TransferPos >= FrameLength) TransferPos = 0; + dorp += 4; + //if (dorp >= (256*4*2)) + if (TransferPos == 0) + { + dorp = 0; + Cnt &= ~(1<<4); + } + return ret; + } + } + + printf("unknown DSi cam read32 %08X\n", addr); + return 0; +} + +void DSi_Camera::Write8(u32 addr, u8 val) +{ + // + + printf("unknown DSi cam write8 %08X %02X\n", addr, val); +} + +void DSi_Camera::Write16(u32 addr, u16 val) +{printf("CAM WRITE %08X %04X %08X\n", addr, val, NDS::GetPC(0)); + switch (addr) + { + case 0x04004200: + { + u16 oldcnt = ModuleCnt; + ModuleCnt = val; + + if ((ModuleCnt & (1<<1)) && !(oldcnt & (1<<1))) + { + // reset shit to zero + // CHECKME + + Cnt = 0; + } + + if ((ModuleCnt & (1<<5)) && !(oldcnt & (1<<5))) + { + // TODO: reset I2C?? + } + } + return; + + case 0x04004202: + { + // checkme + u16 oldmask; + if (Cnt & 0x8000) + { + val &= 0x8F00; + oldmask = 0x601F; + } + else + { + val &= 0xEF0F; + oldmask = 0x0010; + } + + Cnt = (Cnt & oldmask) | val; + if (val & (1<<5)) Cnt &= ~(1<<4); + + if ((val & (1<<15)) && !(Cnt & (1<<15))) + { + // start transfer + DSi::CheckNDMAs(0, 0x0B); + } + } return; } - //printf("DSi_Camera%d: unknown write %04X %04X\n", Num, addr, val); + printf("unknown DSi cam write16 %08X %04X\n", addr, val); +} + +void DSi_Camera::Write32(u32 addr, u32 val) +{ + // + + printf("unknown DSi cam write32 %08X %08X\n", addr, val); } -- cgit v1.2.3 From c0c1c2e1c262be9c7a5c5a4bdc7a5099896369d8 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Mon, 26 Oct 2020 21:16:20 +0100 Subject: camera: remember PLL config --- src/DSi_Camera.cpp | 12 +++++++++++- src/DSi_Camera.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/DSi_Camera.cpp') diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp index dd8dea7..5ac4dfd 100644 --- a/src/DSi_Camera.cpp +++ b/src/DSi_Camera.cpp @@ -129,7 +129,9 @@ void DSi_Camera::ResetCam() RegAddr = 0; RegData = 0; - PLLCnt = 0; + PLLDiv = 0x0366; + PLLPDiv = 0x00F5; + PLLCnt = 0x21F9; ClocksCnt = 0; StandbyCnt = 0x4029; // checkme MiscCnt = 0; @@ -211,6 +213,8 @@ u16 DSi_Camera::I2C_ReadReg(u16 addr) switch (addr) { case 0x0000: return 0x2280; // chip ID + case 0x0010: return PLLDiv; + case 0x0012: return PLLPDiv; case 0x0014: return PLLCnt; case 0x0016: return ClocksCnt; case 0x0018: return StandbyCnt; @@ -227,6 +231,12 @@ void DSi_Camera::I2C_WriteReg(u16 addr, u16 val) { switch (addr) { + case 0x0010: + PLLDiv = val & 0x3FFF; + return; + case 0x0012: + PLLPDiv = val & 0xBFFF; + return; case 0x0014: // shouldn't be instant either? val &= 0x7FFF; diff --git a/src/DSi_Camera.h b/src/DSi_Camera.h index 8e44db1..6022420 100644 --- a/src/DSi_Camera.h +++ b/src/DSi_Camera.h @@ -58,6 +58,8 @@ private: u16 I2C_ReadReg(u16 addr); void I2C_WriteReg(u16 addr, u16 val); + u16 PLLDiv; + u16 PLLPDiv; u16 PLLCnt; u16 ClocksCnt; u16 StandbyCnt; -- cgit v1.2.3 From 81964a0f89eb479bc1a4e60111f5120cd2b1b8f0 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Mon, 26 Oct 2020 21:54:08 +0100 Subject: make things function atleast somewhat no pciture is being actually sent yet --- src/ARM.cpp | 12 ---------- src/DSi_Camera.cpp | 67 +++++++++++++++++++++++++++++++++++++++--------------- src/DSi_Camera.h | 4 +++- src/NDS.h | 3 ++- 4 files changed, 54 insertions(+), 32 deletions(-) (limited to 'src/DSi_Camera.cpp') diff --git a/src/ARM.cpp b/src/ARM.cpp index 7fe3497..c6c51ed 100644 --- a/src/ARM.cpp +++ b/src/ARM.cpp @@ -256,18 +256,6 @@ void ARMv5::JumpTo(u32 addr, bool restorecpsr) // aging cart debug crap //if (addr == 0x0201764C) printf("capture test %d: R1=%08X\n", R[6], R[1]); //if (addr == 0x020175D8) printf("capture test %d: res=%08X\n", R[6], R[0]); - if(addr==0x0219BA2D) printf("CAM RESET FROM %08X\n", R[15]); - if(addr==0x0219BB69) printf("CAM SHITO FROM %08X\n", R[15]); - if(addr==0x0200BA45) printf("CAM SHITO2 FROM %08X\n", R[15]); - if(addr==0x0200B9ED) printf("CAM SHITO3 FROM %08X\n", R[15]); - if(addr==0x0200B9BD) printf("CAM SETUP START FROM %08X\n", R[15]); - if(R[15]==0x0200B9E6) printf("CAM SETUP END FROM %08X\n", addr); - if(addr==0x0219AA5B) printf("CAM LOOP BACK FROM %08X\n", R[15]); - if(addr==0x0200BD0D) printf("GUILLOTINE FIVE MILLION %08X\n", R[15]); - if(addr==0x0200512D) printf("GUILLOTINE SIX MILLION %08X\n", R[15]); - if(addr==0x0219A585) printf("GUILLOTINE SEVEN MILLION %08X\n", R[15]); - if(addr==0x0219BAF1) printf("CAM GET DRQ BIT %08X\n", R[15]); - if(addr==0x0219BA91) printf("CAM STOP TRANSFER %08X\n", R[15]); u32 oldregion = R[15] >> 24; u32 newregion = addr >> 24; diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp index 5ac4dfd..746dc64 100644 --- a/src/DSi_Camera.cpp +++ b/src/DSi_Camera.cpp @@ -32,7 +32,13 @@ u8 DSi_Camera::FrameBuffer[640*480*4]; u32 DSi_Camera::FrameLength; u32 DSi_Camera::TransferPos; -const u32 kCameraInterval = 1024*16; // interval between camera data blocks +// note on camera data/etc intervals +// on hardware those are likely affected by several factors +// namely, how long cameras take to process frames +// camera IRQ is fired at roughly 15FPS with default config + +const u32 kIRQInterval = 1120000; // ~30 FPS +const u32 kTransferStart = 60000; bool DSi_Camera::Init() @@ -61,34 +67,32 @@ void DSi_Camera::Reset() TransferPos = 0; FrameLength = 256*192*2; // TODO: make it check frame size, data type, etc - NDS::ScheduleEvent(NDS::Event_DSi_Camera, true, kCameraInterval, Process, 0); + NDS::ScheduleEvent(NDS::Event_DSi_CamIRQ, true, kIRQInterval, IRQ, 0); } -void DSi_Camera::Process(u32 param) +void DSi_Camera::IRQ(u32 param) { DSi_Camera* activecam = nullptr; // TODO: check which camera has priority if both are activated + // (or does it just jumble both data sources together, like it + // does for, say, overlapping VRAM?) if (DSi_Camera0->IsActivated()) activecam = DSi_Camera0; else if (DSi_Camera1->IsActivated()) activecam = DSi_Camera1; if (activecam) { - if (TransferPos == 0) - RequestFrame(activecam->Num); + RequestFrame(activecam->Num); - Cnt |= (1<<4); - if (Cnt & (1<<11)) NDS::SetIRQ(0, NDS::IRQ_DSi_Camera); - } - else - { - TransferPos = 0; + if (Cnt & (1<<11)) + NDS::SetIRQ(0, NDS::IRQ_DSi_Camera); + + if (Cnt & (1<<15)) + NDS::ScheduleEvent(NDS::Event_DSi_CamTransfer, false, kTransferStart, Transfer, 0); } - // TODO: check the interval for this? - // on hardware the delay is likely determined by how long the camera takes to process raw data - NDS::ScheduleEvent(NDS::Event_DSi_Camera, true, kCameraInterval, Process, 0); + NDS::ScheduleEvent(NDS::Event_DSi_CamIRQ, true, kIRQInterval, IRQ, 0); } void DSi_Camera::RequestFrame(u32 cam) @@ -112,6 +116,32 @@ void DSi_Camera::RequestFrame(u32 cam) } } +void DSi_Camera::Transfer(u32 pos) +{ + u32 numscan = (Cnt & 0x000F) + 1; + u32 numpix = numscan * 256; // CHECKME + + // TODO: present data + //printf("CAM TRANSFER POS=%d/%d\n", pos, 0x6000*2); + + DSi::CheckNDMAs(0, 0x0B); + + pos += numpix; + if (pos >= 0x6000*2) // HACK + { + // transfer done + } + else + { + // keep going + + // TODO: must be tweaked such that each block has enough time to transfer + u32 delay = numpix*2 + 16; + + NDS::ScheduleEvent(NDS::Event_DSi_CamTransfer, false, delay, Transfer, pos); + } +} + DSi_Camera::DSi_Camera(u32 num) { @@ -290,6 +320,7 @@ u32 DSi_Camera::Read32(u32 addr) { case 0x04004204: { + return 0; if (!(Cnt & (1<<15))) return 0; // CHECKME u32 ret = *(u32*)&FrameBuffer[TransferPos]; TransferPos += 4; @@ -346,22 +377,22 @@ void DSi_Camera::Write16(u32 addr, u16 val) u16 oldmask; if (Cnt & 0x8000) { - val &= 0x8F00; + val &= 0x8F20; oldmask = 0x601F; } else { - val &= 0xEF0F; + val &= 0xEF2F; oldmask = 0x0010; } - Cnt = (Cnt & oldmask) | val; + Cnt = (Cnt & oldmask) | (val & ~0x0020); if (val & (1<<5)) Cnt &= ~(1<<4); if ((val & (1<<15)) && !(Cnt & (1<<15))) { // start transfer - DSi::CheckNDMAs(0, 0x0B); + //DSi::CheckNDMAs(0, 0x0B); } } return; diff --git a/src/DSi_Camera.h b/src/DSi_Camera.h index 6022420..a8c0632 100644 --- a/src/DSi_Camera.h +++ b/src/DSi_Camera.h @@ -28,9 +28,11 @@ public: static void DeInit(); static void Reset(); - static void Process(u32 param); + static void IRQ(u32 param); static void RequestFrame(u32 cam); + static void Transfer(u32 pos); + DSi_Camera(u32 num); ~DSi_Camera(); diff --git a/src/NDS.h b/src/NDS.h index 89ef12f..98a0f7d 100644 --- a/src/NDS.h +++ b/src/NDS.h @@ -46,7 +46,8 @@ enum Event_DSi_SDMMCTransfer, Event_DSi_SDIOTransfer, Event_DSi_NWifi, - Event_DSi_Camera, + Event_DSi_CamIRQ, + Event_DSi_CamTransfer, Event_DSi_RAMSizeChange, -- cgit v1.2.3 From d2cd3eadbec9b9c7411f5653070bc6298e2023a2 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Tue, 27 Oct 2020 05:03:17 +0100 Subject: fix to timers (ZXDS no longer runs slow as shit) --- src/DSi_Camera.cpp | 2 +- src/NDS.cpp | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'src/DSi_Camera.cpp') diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp index 746dc64..79cfe3f 100644 --- a/src/DSi_Camera.cpp +++ b/src/DSi_Camera.cpp @@ -320,7 +320,7 @@ u32 DSi_Camera::Read32(u32 addr) { case 0x04004204: { - return 0; + return 0xFC00801F; if (!(Cnt & (1<<15))) return 0; // CHECKME u32 ret = *(u32*)&FrameBuffer[TransferPos]; TransferPos += 4; diff --git a/src/NDS.cpp b/src/NDS.cpp index 5c368e3..1781dd5 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -1470,7 +1470,7 @@ void HandleTimerOverflow(u32 tid) { Timer* timer = &Timers[tid]; - timer->Counter += timer->Reload << 16; + timer->Counter += (timer->Reload << 10); if (timer->Cnt & (1<<6)) SetIRQ(tid >> 2, IRQ_Timer0 + (tid & 0x3)); @@ -1486,11 +1486,11 @@ void HandleTimerOverflow(u32 tid) if ((timer->Cnt & 0x84) != 0x84) break; - timer->Counter += 0x10000; - if (timer->Counter >> 16) + timer->Counter += (1 << 10); + if (!(timer->Counter >> 26)) break; - timer->Counter = timer->Reload << 16; + timer->Counter = timer->Reload << 10; if (timer->Cnt & (1<<6)) SetIRQ(tid >> 2, IRQ_Timer0 + (tid & 0x3)); @@ -1505,8 +1505,13 @@ void RunTimer(u32 tid, s32 cycles) u32 oldcount = timer->Counter; timer->Counter += (cycles << timer->CycleShift); - if (timer->Counter < oldcount) + //if (timer->Counter < oldcount) + // HandleTimerOverflow(tid); + while (timer->Counter >> 26) + { + timer->Counter -= (1 << 26); HandleTimerOverflow(tid); + } } void RunTimers(u32 cpu) @@ -1623,7 +1628,7 @@ u16 TimerGetCounter(u32 timer) RunTimers(timer>>2); u32 ret = Timers[timer].Counter; - return ret >> 16; + return ret >> 10; } void TimerStart(u32 id, u16 cnt) @@ -1633,11 +1638,11 @@ void TimerStart(u32 id, u16 cnt) u16 newstart = cnt & (1<<7); timer->Cnt = cnt; - timer->CycleShift = 16 - TimerPrescaler[cnt & 0x03]; + timer->CycleShift = 10 - TimerPrescaler[cnt & 0x03]; if ((!curstart) && newstart) { - timer->Counter = timer->Reload << 16; + timer->Counter = timer->Reload << 10; /*if ((cnt & 0x84) == 0x80) { @@ -1799,6 +1804,15 @@ void StartSqrt() void debug(u32 param) { + if (param==1312) + { + u32 timer = 0x10000 - (Timers[3].Counter >> 16); + timer *= 16; + timer += (0x10000 - (Timers[2].Counter >> 16)); + printf("TIMER=%d (%04X/%04X)\n", timer, (Timers[2].Counter >> 16), (Timers[3].Counter >> 16)); + return; + } + printf("ARM9 PC=%08X LR=%08X %08X\n", ARM9->R[15], ARM9->R[14], ARM9->R_IRQ[1]); printf("ARM7 PC=%08X LR=%08X %08X\n", ARM7->R[15], ARM7->R[14], ARM7->R_IRQ[1]); -- cgit v1.2.3