summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-10-12 16:26:04 +0000
committerSND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-10-12 16:26:04 +0000
commit9e49d5d705aa46b30419d73205ed96a82aa0879a (patch)
tree8284e591ee5ef33817fbae504f6179a3e753c36e
parent670355c885ba609d8598158be00c921709075d2b (diff)
downloadpcsxr-9e49d5d705aa46b30419d73205ed96a82aa0879a.tar.gz
Joypad: sio.c
- Remove RX,TX ready (unbreaks Twisted Metal 2 intro) - Need to examine this problem later git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@58346 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--libpcsxcore/sio.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 88e72797..d0d21df8 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -82,15 +82,26 @@ unsigned char DongleData[ DONGLE_SIZE ];
static int DongleInit;
+#if 0
+// Breaks Twisted Metal 2 intro
+#define SIO_INT(eCycle) { \
+ if (!Config.Sio) { \
+ psxRegs.interrupt |= (1 << PSXINT_SIO); \
+ psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
+ psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
+ } \
+ \
+ StatReg &= ~RX_RDY; \
+ StatReg &= ~TX_RDY; \
+}
+#endif
+
#define SIO_INT(eCycle) { \
if (!Config.Sio) { \
psxRegs.interrupt |= (1 << PSXINT_SIO); \
psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
} \
- \
- StatReg &= ~RX_RDY; \
- StatReg &= ~TX_RDY; \
}
@@ -793,9 +804,12 @@ void sioInterrupt() {
StatReg |= IRQ;
psxHu32ref(0x1070) |= SWAPu32(0x80);
+#if 0
// Rhapsody: fixes input problems
+ // Twisted Metal 2: breaks intro
StatReg |= TX_RDY;
StatReg |= RX_RDY;
+#endif
}
void LoadMcd(int mcd, char *str) {