X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=8e11f5a66aba0aa7e07be9348ee96dbcacc131ef;hb=43cb60ce6554566358bcea86f8df56c05316020b;hp=83677504f87766df5999989f4f38771e2026dba2;hpb=f02c57eacd43b7a27111181dabc97b2c5ead78c4;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 83677504..8e11f5a6 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -36,18 +36,16 @@ #include #include #define strcasecmp _stricmp -#else +#elif P_HAVE_PTHREAD #include #include #include #endif -#ifndef _WIN32 // to enable the USE_READ_THREAD code, fix: // - https://github.com/notaz/pcsx_rearmed/issues/257 // - ISOgetBufferSub to not race with async code -//#define USE_READ_THREAD -#endif +#define USE_READ_THREAD 0 //P_HAVE_PTHREAD #ifdef USE_LIBRETRO_VFS #include @@ -1079,7 +1077,7 @@ static int opensbifile(const char *isoname) { return LoadSBI(sbiname, s); } -#ifndef USE_READ_THREAD +#if !USE_READ_THREAD static void readThreadStop() {} static void readThreadStart() {} #else @@ -1497,7 +1495,7 @@ static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) return 12*2 + ret; } -#ifdef USE_READ_THREAD +#if USE_READ_THREAD static int cdread_async(FILE *f, unsigned int base, void *dest, int sector) { boolean found = FALSE; @@ -1555,7 +1553,7 @@ static unsigned char * CALLBACK ISOgetBuffer_chd(void) { } #endif -#ifdef USE_READ_THREAD +#if USE_READ_THREAD static unsigned char * CALLBACK ISOgetBuffer_async(void) { unsigned char *buffer; pthread_mutex_lock(§orbuffer_lock); @@ -1563,7 +1561,6 @@ static unsigned char * CALLBACK ISOgetBuffer_async(void) { pthread_mutex_unlock(§orbuffer_lock); return buffer + 12; } - #endif static unsigned char * CALLBACK ISOgetBuffer(void) {