xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed region autodetection for some rare discs; 

- fixed copy protection regression in r82129 by notaz from one year ago; I hope this won't break anything (issue #11594).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89219 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\dario86_cp 2014-02-26 19:59:12 +00:00
parent b2a6f1a700
commit fb2006a065
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpcsxcore/cdrom.c
View File

@ -445,9 +445,6 @@ static void ReadTrack(const u8 *time) {
cdr.RErr = CDR_readTrack(tmp);
memcpy(cdr.Prev, tmp, 3);
if (CheckSBI(time))
return;
subq = (struct SubQ *)CDR_getBufferSub();
if (subq != NULL && cdr.CurTrack == 1) {
crc = calcCrc((u8 *)subq + 12, 10);
@ -851,6 +848,8 @@ void cdrInterrupt() {
SetResultSize(8);
memcpy(&cdr.Result, &cdr.subq, 8);
if (!cdr.Play && CheckSBI(cdr.Result+5))
memset(cdr.Result+2, 0, 6);
if (!cdr.Play && !cdr.Reading)
cdr.Result[1] = 0; // HACK?
break;

8
libpcsxcore/misc.c
View File

@ -337,10 +337,10 @@ int CheckCdrom() {
if (Config.PsxAuto) { // autodetect system (pal or ntsc)
if((CdromId[2] == 'e') || (CdromId[2] == 'E') ||
!strncmp(CdromId, "\0DTLS3035", 10) ||
!strncmp(CdromId, "PBPX95001", 10) || // according to redump.org, these PAL
!strncmp(CdromId, "PBPX95007", 10) || // discs have a non-standard ID;
!strncmp(CdromId, "PBPX95008", 10)) // add more serials if they are discovered.
!strncmp(CdromId, "DTLS3035", 8) ||
!strncmp(CdromId, "PBPX95001", 9) || // according to redump.org, these PAL
!strncmp(CdromId, "PBPX95007", 9) || // discs have a non-standard ID;
!strncmp(CdromId, "PBPX95008", 9)) // add more serials if they are discovered.
Config.PsxType = PSX_TYPE_PAL; // pal
else Config.PsxType = PSX_TYPE_NTSC; // ntsc
}