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

Undo some changes that shouldn't have been commited. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4217 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2011-01-15 23:55:38 +00:00
parent 8bb14a6c0a
commit c46f8ae224
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/PS2Edefs.h
View File

@ -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 */

4
pcsx2_suite_2010.sln
View File

@ -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

16
plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp
View File

@ -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;
}