notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cdrom: report read errors correctly
[pcsx_rearmed.git]
/
libpcsxcore
/
psxhw.c
diff --git
a/libpcsxcore/psxhw.c
b/libpcsxcore/psxhw.c
index
7b2401b
..
483f496
100644
(file)
--- a/
libpcsxcore/psxhw.c
+++ b/
libpcsxcore/psxhw.c
@@
-30,9
+30,6
@@
//#define PSXHW_LOG printf
void psxHwReset() {
//#define PSXHW_LOG printf
void psxHwReset() {
- if (Config.Sio) psxHu32ref(0x1070) |= SWAP32(0x80);
- if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAP32(0x200);
-
memset(psxH, 0, 0x10000);
mdecInit(); // initialize mdec decoder
memset(psxH, 0, 0x10000);
mdecInit(); // initialize mdec decoder
@@
-190,6
+187,10
@@
u16 psxHwRead16(u32 add) {
//case 0x1f802030: hard = //int_2000????
//case 0x1f802040: hard =//dip switches...??
//case 0x1f802030: hard = //int_2000????
//case 0x1f802040: hard =//dip switches...??
+ case 0x1f801800:
+ case 0x1f801802:
+ log_unhandled("cdrom r16 %x\n", add);
+ // falthrough
default:
if (add >= 0x1f801c00 && add < 0x1f801e00) {
hard = SPU_readRegister(add);
default:
if (add >= 0x1f801c00 && add < 0x1f801e00) {
hard = SPU_readRegister(add);
@@
-348,6
+349,9
@@
u32 psxHwRead32(u32 add) {
#endif
return hard;
#endif
return hard;
+ case 0x1f801800:
+ log_unhandled("cdrom r32 %x\n", add);
+ // falthrough
default:
hard = psxHu32(add);
#ifdef PSXHW_LOG
default:
hard = psxHu32(add);
#ifdef PSXHW_LOG
@@
-436,8
+440,6
@@
void psxHwWrite16(u32 add, u16 value) {
#ifdef PSXHW_LOG
PSXHW_LOG("IREG 16bit write %x\n", value);
#endif
#ifdef PSXHW_LOG
PSXHW_LOG("IREG 16bit write %x\n", value);
#endif
- if (Config.Sio) psxHu16ref(0x1070) |= SWAPu16(0x80);
- if (Config.SpuIrq) psxHu16ref(0x1070) |= SWAPu16(0x200);
psxHu16ref(0x1070) &= SWAPu16(value);
return;
psxHu16ref(0x1070) &= SWAPu16(value);
return;
@@
-551,8
+553,6
@@
void psxHwWrite32(u32 add, u32 value) {
#ifdef PSXHW_LOG
PSXHW_LOG("IREG 32bit write %x\n", value);
#endif
#ifdef PSXHW_LOG
PSXHW_LOG("IREG 32bit write %x\n", value);
#endif
- if (Config.Sio) psxHu32ref(0x1070) |= SWAPu32(0x80);
- if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAPu32(0x200);
psxHu32ref(0x1070) &= SWAPu32(value);
return;
case 0x1f801074:
psxHu32ref(0x1070) &= SWAPu32(value);
return;
case 0x1f801074: