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: forget old sector on cd change
[pcsx_rearmed.git]
/
libpcsxcore
/
psxhw.c
diff --git
a/libpcsxcore/psxhw.c
b/libpcsxcore/psxhw.c
index
b7540df
..
27ddfea
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
@@
-443,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;
@@
-524,6
+519,8
@@
void psxHwWrite16(u32 add, u16 value) {
}
#define DmaExec(n) { \
}
#define DmaExec(n) { \
+ if (value & SWAPu32(HW_DMA##n##_CHCR) & 0x01000000) \
+ log_unhandled("dma" #n " %08x -> %08x\n", HW_DMA##n##_CHCR, value); \
HW_DMA##n##_CHCR = SWAPu32(value); \
\
if (SWAPu32(HW_DMA##n##_CHCR) & 0x01000000 && SWAPu32(HW_DMA_PCR) & (8 << (n * 4))) { \
HW_DMA##n##_CHCR = SWAPu32(value); \
\
if (SWAPu32(HW_DMA##n##_CHCR) & 0x01000000 && SWAPu32(HW_DMA_PCR) & (8 << (n * 4))) { \
@@
-558,8
+555,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: