From ebbf2bf6031ec85bd80cf97bc15bd187cb7b9ce5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Nov 2012 00:42:19 +0100 Subject: [PATCH] (Mednafen PSX) Comment out some logs --- mednafen/psx/dma.cpp | 9 +++++++++ mednafen/psx/frontio.cpp | 12 ++++++++---- mednafen/psx/timer.cpp | 4 ++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/mednafen/psx/dma.cpp b/mednafen/psx/dma.cpp index 85dfca4..db5e7ea 100644 --- a/mednafen/psx/dma.cpp +++ b/mednafen/psx/dma.cpp @@ -175,10 +175,17 @@ static INLINE bool ChCan(void) return(GPU->DMACanWrite()); else return(true); // GPU + /* case 3: return(true); // CDC case 4: return(true); // SPU case 5: return(true); // ?? case 6: return(true); // OT + */ + case 3: + case 4: + case 5: + case 6: + return true; } abort(); } @@ -303,8 +310,10 @@ static INLINE void RunChannelT(pscpu_timestamp_t timestamp, int32 clocks) DMACH[ch].WordCounter = header >> 24; DMACH[ch].NextAddr = header & 0xFFFFFF; + /* if(DMACH[ch].WordCounter > 0x10) printf("What the lala? 0x%02x @ 0x%08x\n", DMACH[ch].WordCounter, DMACH[ch].CurAddr - 4); + */ if(DMACH[ch].WordCounter) DMACH[ch].ClockCounter -= 15; diff --git a/mednafen/psx/frontio.cpp b/mednafen/psx/frontio.cpp index e40fc9e..a28cd54 100644 --- a/mednafen/psx/frontio.cpp +++ b/mednafen/psx/frontio.cpp @@ -318,7 +318,7 @@ INLINE void FrontIO::DoDSRIRQ(void) { if(Control & 0x1000) { - PSX_FIODBGINFO("[DSR] IRQ"); + //PSX_FIODBGINFO("[DSR] IRQ"); istatus = true; IRQ_Assert(IRQ_SIO, true); } @@ -329,7 +329,7 @@ void FrontIO::Write(pscpu_timestamp_t timestamp, uint32 A, uint32 V) { assert(!(A & 0x1)); - PSX_FIODBGINFO("[FIO] Write: %08x %08x", A, V); + //PSX_FIODBGINFO("[FIO] Write: %08x %08x", A, V); Update(timestamp); @@ -346,8 +346,10 @@ void FrontIO::Write(pscpu_timestamp_t timestamp, uint32 A, uint32 V) break; case 0xa: +#if 0 if(ClockDivider > 0 && ((V & 0x2000) != (Control & 0x2000)) && ((Control & 0x2) == (V & 0x2)) ) fprintf(stderr, "FIO device selection changed during comm %04x->%04x", Control, V); +#endif //printf("Control: %d, %04x\n", timestamp, V); Control = V & 0x3F2F; @@ -472,8 +474,10 @@ uint32 FrontIO::Read(pscpu_timestamp_t timestamp, uint32 A) break; } +#if 0 if((A & 0xF) != 0x4) PSX_FIODBGINFO("[FIO] Read: %08x %08x", A, ret); +#endif return(ret); } @@ -523,7 +527,7 @@ pscpu_timestamp_t FrontIO::Update(pscpu_timestamp_t timestamp) if(!TransmitBitCounter) { need_start_stop_check = true; - PSX_FIODBGINFO("[FIO] Data transmitted: %08x", TransmitBuffer); + //PSX_FIODBGINFO("[FIO] Data transmitted: %08x", TransmitBuffer); TransmitInProgress = false; if(Control & 0x400) @@ -547,7 +551,7 @@ pscpu_timestamp_t FrontIO::Update(pscpu_timestamp_t timestamp) if(!ReceiveBitCounter) { need_start_stop_check = true; - PSX_FIODBGINFO("[FIO] Data received: %08x", ReceiveBuffer); + //PSX_FIODBGINFO("[FIO] Data received: %08x", ReceiveBuffer); ReceiveInProgress = false; ReceiveBufferAvail = true; diff --git a/mednafen/psx/timer.cpp b/mednafen/psx/timer.cpp index 1e348e7..0c0b4aa 100644 --- a/mednafen/psx/timer.cpp +++ b/mednafen/psx/timer.cpp @@ -187,7 +187,7 @@ static void ClockTimer(int i, uint32 clocks) if((before < target && Timers[i].Counter >= target) || zero_tm || Timers[i].Counter > 0xFFFF) { -#if 1 +#if 0 if(Timers[i].Mode & 0x10) { if((Timers[i].Counter - target) > 3) @@ -400,7 +400,7 @@ uint16 TIMER_Read(const pscpu_timestamp_t timestamp, uint32 A) if(which >= 3) { - PSX_WARNING("[TIMER] Open Bus Read: 0x%08x", A); + //PSX_WARNING("[TIMER] Open Bus Read: 0x%08x", A); return(ret >> ((A & 3) * 8)); }