Skip to content

Commit 7625ec4

Browse files
committed
Merge branch 'master' into libretro
2 parents c387c01 + 5082c6c commit 7625ec4

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

libpcsxcore/cdrom.c

+2-10
Original file line numberDiff line numberDiff line change
@@ -1304,16 +1304,6 @@ void cdrInterrupt(void) {
13041304
setIrq(IrqStat, Cmd);
13051305
}
13061306

1307-
#ifdef HAVE_ARMV7
1308-
#define ssat32_to_16(v) \
1309-
asm("ssat %0,#16,%1" : "=r" (v) : "r" (v))
1310-
#else
1311-
#define ssat32_to_16(v) do { \
1312-
if (v < -32768) v = -32768; \
1313-
else if (v > 32767) v = 32767; \
1314-
} while (0)
1315-
#endif
1316-
13171307
static void cdrPrepCdda(s16 *buf, int samples)
13181308
{
13191309
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -1332,6 +1322,8 @@ static void cdrReadInterruptSetResult(unsigned char result)
13321322
cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2],
13331323
cdr.CmdInProgress, cdr.IrqStat);
13341324
cdr.Irq1Pending = result;
1325+
// F1 2000 timing hack :(
1326+
psxRegs.intCycle[PSXINT_CDREAD].sCycle += cdReadTime / 10;
13351327
return;
13361328
}
13371329
SetResultSize(1);

0 commit comments

Comments
 (0)