diff --git a/common/include/PS2Edefs.h b/common/include/PS2Edefs.h index 6d6119d4c7..c34b537d4d 100644 --- a/common/include/PS2Edefs.h +++ b/common/include/PS2Edefs.h @@ -17,11 +17,11 @@ #define __PS2EDEFS_H__ // Global enable/disable flag, disables all the parts if off -//#define ENABLE_NEW_IOPDMA +#define ENABLE_NEW_IOPDMA // Parts of the dmac, each one can be turned on independently #ifdef ENABLE_NEW_IOPDMA -//#define ENABLE_NEW_IOPDMA_SPU2 /* working */ +#define ENABLE_NEW_IOPDMA_SPU2 /* working */ //#define ENABLE_NEW_IOPDMA_SIO /* working */ //#define ENABLE_NEW_IOPDMA_CDVD /* NOT IMPLEMENTED */ //#define ENABLE_NEW_IOPDMA_SIF /* NOT IMPLEMENTED */ diff --git a/pcsx2_suite_2010.sln b/pcsx2_suite_2010.sln index 6690707b1d..8b02d3fca5 100644 --- a/pcsx2_suite_2010.sln +++ b/pcsx2_suite_2010.sln @@ -961,8 +961,8 @@ Global {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release SSSE3|Win32.Build.0 = Release (NO ASIO)|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release SSSE3|x64.ActiveCfg = Release (NO ASIO)|x64 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release SSSE3|x64.Build.0 = Release (NO ASIO)|x64 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release (NO ASIO)|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release (NO ASIO)|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64 {2D4E85B2-F47F-4D65-B091-701E5C031DAC}.Debug SSE2|Win32.ActiveCfg = Debug|Win32 diff --git a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp index 0b686e21b1..3834aa29f1 100644 --- a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp +++ b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp @@ -585,11 +585,25 @@ s32 IOCtlSrc::ReadSectors2048(u32 sector, u32 count, char *buffer) if(ReadFile(device,buffer,2048*count,&size,NULL)==0) { - return -1; + if(count == 1) + return -1; + + int acount = count/2; + int bcount = count-acount; + + int errors = 0; + if(ReadSectors2048(sector,acount,buffer) < 0) + errors++; + + if(ReadSectors2048(sector+acount,bcount,buffer+2048*acount) < 0) + errors++; + + return (errors==2)?-1:0; } if(size!=(2048*count)) { + printf(" **** CDVD ERROR: ReadFile did not read all bytes! **** \n"); return -1; } diff --git a/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp b/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp index 74d3c517a8..c4c6de1d3d 100644 --- a/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp +++ b/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp @@ -155,13 +155,13 @@ void UpdateDebugDialog() static wchar_t t[1024]; swprintf_s(t,L"%06x",vc.StartA); - TextOut(hdc,IX+4,IY+3,t,6); + TextOut(hdc,IX+4,IY+4,t,6); swprintf_s(t,L"%06x",vc.NextA); - TextOut(hdc,IX+4,IY+16,t,6); + TextOut(hdc,IX+4,IY+18,t,6); swprintf_s(t,L"%06x",vc.LoopStartA); - TextOut(hdc,IX+4,IY+29,t,6); + TextOut(hdc,IX+4,IY+32,t,6); vcd.displayPeak = 0; @@ -175,7 +175,7 @@ void UpdateDebugDialog() // top now: 400 int JX = 8 + c * 256; - int JY = 578; + int JY = 584; SetDCBrushColor(hdc,RGB( 0, 0, 0)); SetDCPenColor(hdc,RGB( 255, 128, 32)); @@ -186,23 +186,23 @@ void UpdateDebugDialog() SetTextColor(hdc,RGB(255,255,255)); SetBkColor (hdc,RGB( 0, 0, 0)); - TextOut(hdc,JX+4,JY+ 3,L"REVB",4); - TextOut(hdc,JX+4,JY+16,L"IRQE",4); - TextOut(hdc,JX+4,JY+29,L"ADMA",4); + TextOut(hdc,JX+4,JY+ 4,L"REVB",4); + TextOut(hdc,JX+4,JY+18,L"IRQE",4); + TextOut(hdc,JX+4,JY+32,L"ADMA",4); SetDCBrushColor(hdc,RGB( 0,255, 0)); if(cx.FxEnable) { - FillRectangle(hdc,JX+40,JY+3,10,10); + FillRectangle(hdc,JX+40,JY+4,10,10); } if(cx.IRQEnable) { - FillRectangle(hdc,JX+40,JY+16,10,10); + FillRectangle(hdc,JX+40,JY+18,10,10); } if(cx.AutoDMACtrl != 0) { - FillRectangle(hdc,JX+40,JY+29,10,10); + FillRectangle(hdc,JX+40,JY+32,10,10); for(int j=0;j<64;j++) {