diff --git a/common/include/PS2Edefs.h b/common/include/PS2Edefs.h index c34b537d4..6d6119d4c 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 8b02d3fca..6690707b1 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 (NO ASIO)|Win32 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release (NO ASIO)|Win32 + {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|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 3834aa29f..0b686e21b 100644 --- a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp +++ b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp @@ -585,25 +585,11 @@ s32 IOCtlSrc::ReadSectors2048(u32 sector, u32 count, char *buffer) if(ReadFile(device,buffer,2048*count,&size,NULL)==0) { - 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; + return -1; } if(size!=(2048*count)) { - printf(" **** CDVD ERROR: ReadFile did not read all bytes! **** \n"); return -1; }