diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-29 02:39:14 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-29 02:39:14 +0000 |
| commit | 0b3c069d3b5887a7b19d612d419b4397f53c40e4 (patch) | |
| tree | 0513e02879b017342aee44d38159c77f7128d5a8 /libpcsxcore | |
| parent | 402c449811cb93d73bcdd69c5923713f8635411d (diff) | |
| download | pcsxr-0b3c069d3b5887a7b19d612d419b4397f53c40e4.tar.gz | |
- dfsound (unix): Added mute option and freqresponse to the config utility.
- gxvideo: Fixed FTBFS.
- Fixed Run BIOS (Issue #7806).
- Updated gettext scripts.
- Credit where it's due.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61576 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore')
| -rw-r--r-- | libpcsxcore/cdrom.c | 2 | ||||
| -rw-r--r-- | libpcsxcore/ix86/iR3000A.c | 3 | ||||
| -rw-r--r-- | libpcsxcore/ppc/pasm.s | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index abc431dc..c68e8c64 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -1236,6 +1236,7 @@ void cdrInterrupt() { case CdlID + 0x20: SetResultSize(8); + if (CDR_getStatus(&stat) == -1) { cdr.Result[0] = 0x00; // 0x08 and cdr.Result[1]|0x10 : audio cd, enters cd player cdr.Result[1] = 0x00; // 0x80 leads to the menu in the bios, else loads CD @@ -1255,6 +1256,7 @@ void cdrInterrupt() { } } + if (CdromId[0] == '\0') cdr.Result[1] |= 0x80; cdr.Result[2] = 0x00; cdr.Result[3] = 0x00; strncpy((char *)&cdr.Result[4], "PCSX", 4); diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c index 25475552..39b434bf 100644 --- a/libpcsxcore/ix86/iR3000A.c +++ b/libpcsxcore/ix86/iR3000A.c @@ -164,8 +164,6 @@ static void SetBranch() { RET(); return; } - - switch( psxRegs.code >> 26 ) { // Lode Runner (jr - beq) @@ -182,7 +180,6 @@ static void SetBranch() { break; } - iFlushRegs(); MOV32MtoR(EAX, (u32)&target); MOV32RtoM((u32)&psxRegs.pc, EAX); diff --git a/libpcsxcore/ppc/pasm.s b/libpcsxcore/ppc/pasm.s index d2b06588..753af4b8 100644 --- a/libpcsxcore/ppc/pasm.s +++ b/libpcsxcore/ppc/pasm.s @@ -1,7 +1,7 @@ #if defined (__ppc__) || defined (__ppc64__) || defined (__powerpc__) || (__powerpc64__) -#ifdef ELF +#if defined (ELF) || defined (__linux__) #define C(label) label #else #define C(label) _##label |