summaryrefslogtreecommitdiff
path: root/libpcsxcore/cdrom.c
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-07 04:31:29 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-07 04:31:29 +0000
commit2d5a9a02425951f4efed764d135be96867eb532f (patch)
treed94be7649ef8ccb627df551ac69f5d4a6a941cb6 /libpcsxcore/cdrom.c
parent6a4fd490f8c754883bee9468be8d35dc7a651cee (diff)
downloadpcsxr-2d5a9a02425951f4efed764d135be96867eb532f.tar.gz
preparing for refactor/cleanup, moved all definations into .c files, other minor cleanups. (Breaks Mac OS X and maybe windows as well for now, will fix later.)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47542 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/cdrom.c')
-rw-r--r--libpcsxcore/cdrom.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index dfd9a2e4..66edcab4 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -24,6 +24,8 @@
#include "cdrom.h"
#include "ppf.h"
+cdrStruct cdr;
+
/* CD-ROM magic numbers */
#define CdlSync 0
#define CdlNop 1
@@ -630,14 +632,14 @@ void cdrReadInterrupt() {
#ifdef CDR_LOG
fprintf(emuLog, "cdrReadInterrupt() Log: err\n");
#endif
- memset(cdr.Transfer, 0, 2340);
+ memset(cdr.Transfer, 0, DATA_SIZE);
cdr.Stat = DiskError;
cdr.Result[0] |= 0x01;
CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
return;
}
- memcpy(cdr.Transfer, buf, 2340);
+ memcpy(cdr.Transfer, buf, DATA_SIZE);
CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
cdr.Stat = DataReady;