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

Merge pull request #141 from lioncash/cdvdghz 

cdvdGigaherz: Fix a few things
This commit is contained in:
David Quintana 2014-07-16 20:50:40 +02:00
parent 320d22f2a7 54c21b30c9
commit cea03d91e4
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/cdvdGigaherz/src/CDVD.cpp
View File

@ -132,15 +132,13 @@ void __inline lba_to_msf(s32 lba, u8* m, u8* s, u8* f) {
char csrc[20]; char csrc[20];
BOOL cdvd_is_open=FALSE; bool cdvd_is_open = false;
BOOL cdvdKeepAlive_is_open = false; bool cdvdKeepAlive_is_open = false;
bool disc_has_changed = false;
bool weAreInNewDiskCB = false;
Source *src; Source *src;
s32 disc_has_changed=0;
int weAreInNewDiskCB=0;
char bfr[2352]; char bfr[2352];
char throwaway[2352]; char throwaway[2352];
extern s32 prefetch_last_lba; extern s32 prefetch_last_lba;

9
plugins/cdvdGigaherz/src/CDVD.h
View File

@ -160,14 +160,13 @@ void WriteSettings();
void CfgSetSettingsDir( const char* dir ); void CfgSetSettingsDir( const char* dir );
extern char csrc[]; extern char csrc[];
extern BOOL cdvd_is_open; extern bool cdvd_is_open;
extern BOOL cdvdKeepAlive_is_open; extern bool cdvdKeepAlive_is_open;
extern int weAreInNewDiskCB; extern bool disc_has_changed;
extern bool weAreInNewDiskCB;
extern void (*newDiscCB)(); extern void (*newDiscCB)();
extern s32 disc_has_changed;
s32 cdvdStartThread(); s32 cdvdStartThread();
void cdvdStopThread(); void cdvdStopThread();
s32 cdvdRequestSector(u32 sector, s32 mode); s32 cdvdRequestSector(u32 sector, s32 mode);

2
plugins/cdvdGigaherz/src/FileStream.cpp
View File

@ -35,7 +35,7 @@ void FileStream::seek(s64 offset)
void FileStream::seek(s64 offset, int ref_position) void FileStream::seek(s64 offset, int ref_position)
{ {
int ret = _fseeki64(handle, offset, SEEK_SET); int ret = _fseeki64(handle, offset, ref_position);
#ifdef __LINUX__ #ifdef __LINUX__
if (ret) throw "Seek offset out of bounds."; if (ret) throw "Seek offset out of bounds.";
#else #else

16
plugins/cdvdGigaherz/src/ReadThread.cpp
View File

@ -110,9 +110,9 @@ void cdvdCacheReset()
void cdvdCallNewDiscCB() void cdvdCallNewDiscCB()
{ {
weAreInNewDiskCB=1; weAreInNewDiskCB = true;
newDiscCB(); newDiscCB();
weAreInNewDiskCB=0; weAreInNewDiskCB = false;
} }
bool cdvdUpdateDiscStatus() bool cdvdUpdateDiscStatus()
@ -140,9 +140,9 @@ bool cdvdUpdateDiscStatus()
{ {
if(!disc_has_changed) if(!disc_has_changed)
{ {
disc_has_changed=1; disc_has_changed = true;
curDiskType=CDVD_TYPE_NODISC; curDiskType = CDVD_TYPE_NODISC;
curTrayStatus=CDVD_TRAY_OPEN; curTrayStatus = CDVD_TRAY_OPEN;
cdvdCallNewDiscCB(); cdvdCallNewDiscCB();
} }
} }
@ -150,13 +150,13 @@ bool cdvdUpdateDiscStatus()
{ {
if(disc_has_changed) if(disc_has_changed)
{ {
curDiskType=CDVD_TYPE_NODISC; curDiskType = CDVD_TYPE_NODISC;
curTrayStatus=CDVD_TRAY_CLOSE; curTrayStatus = CDVD_TRAY_CLOSE;
// just a test // just a test
src->Reopen(); src->Reopen();
disc_has_changed=0; disc_has_changed = false;
cdvdRefreshData(); cdvdRefreshData();
cdvdCallNewDiscCB(); cdvdCallNewDiscCB();
} }