dma: add optional slow linked list walking

[pcsx_rearmed.git] / libpcsxcore / psxhw.c

diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index c90f8c7..27ddfea 100644 (file)
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -30,21 +30,18 @@
 //#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
        cdrReset();
        psxRcntInit();
-       HW_GPU_STATUS = 0x14802000;
+       HW_GPU_STATUS = SWAP32(0x14802000);
 }
 
 u8 psxHwRead8(u32 add) {
        unsigned char hard;
 
-       switch (add) {
+       switch (add & 0x1fffffff) {
                case 0x1f801040: hard = sioRead8();break; \r
 #ifdef ENABLE_SIO1API
                case 0x1f801050: hard = SIO1_readData8(); break;\r
@@ -70,7 +67,7 @@ u8 psxHwRead8(u32 add) {
 u16 psxHwRead16(u32 add) {
        unsigned short hard;
 
-       switch (add) {
+       switch (add & 0x1fffffff) {
 #ifdef PSXHW_LOG
                case 0x1f801070: PSXHW_LOG("IREG 16bit read %x\n", psxHu16(0x1070));
                        return psxHu16(0x1070);
@@ -123,7 +120,14 @@ u16 psxHwRead16(u32 add) {
                        return hard;
                case 0x1f80105e:
                        hard = SIO1_readBaud16();
-                       return hard;\r
+                       return hard;
+#else
+               /* Fixes Armored Core misdetecting the Link cable being detected.
+                * We want to turn that thing off and force it to do local multiplayer instead.
+                * Thanks Sony for the fix, they fixed it in their PS Classic fork.
+                */
+               case 0x1f801054:
+                       return 0x80;\r
 #endif
                case 0x1f801100:
                        hard = psxRcntRcount(0);
@@ -183,6 +187,10 @@ u16 psxHwRead16(u32 add) {
                //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);
@@ -204,7 +212,7 @@ u16 psxHwRead16(u32 add) {
 u32 psxHwRead32(u32 add) {
        u32 hard;
 
-       switch (add) {
+       switch (add & 0x1fffffff) {
                case 0x1f801040:
                        hard = sioRead8();
                        hard |= sioRead8() << 8;
@@ -241,8 +249,8 @@ u32 psxHwRead32(u32 add) {
                        return hard;
                case 0x1f801814:
                        gpuSyncPluginSR();
-                       hard = HW_GPU_STATUS;
-                       if (hSyncCount < 240 && (HW_GPU_STATUS & PSXGPU_ILACE_BITS) != PSXGPU_ILACE_BITS)
+                       hard = SWAP32(HW_GPU_STATUS);
+                       if (hSyncCount < 240 && (hard & PSXGPU_ILACE_BITS) != PSXGPU_ILACE_BITS)
                                hard |= PSXGPU_LCF & (psxRegs.cycle << 20);
 #ifdef PSXHW_LOG
                        PSXHW_LOG("GPU STATUS 32bit read %x\n", hard);
@@ -341,6 +349,9 @@ u32 psxHwRead32(u32 add) {
 #endif
                        return hard;
 
+               case 0x1f801800:
+                       log_unhandled("cdrom r32 %x\n", add);
+                       // falthrough
                default:
                        hard = psxHu32(add); 
 #ifdef PSXHW_LOG
@@ -355,7 +366,7 @@ u32 psxHwRead32(u32 add) {
 }
 
 void psxHwWrite8(u32 add, u8 value) {
-       switch (add) {
+       switch (add & 0x1fffffff) {
                case 0x1f801040: sioWrite8(value); break;\r
 #ifdef ENABLE_SIO1API
                case 0x1f801050: SIO1_writeData8(value); break;\r
@@ -379,7 +390,7 @@ void psxHwWrite8(u32 add, u8 value) {
 }
 
 void psxHwWrite16(u32 add, u16 value) {
-       switch (add) {
+       switch (add & 0x1fffffff) {
                case 0x1f801040:
                        sioWrite8((unsigned char)value);
                        sioWrite8((unsigned char)(value>>8));
@@ -429,8 +440,6 @@ void psxHwWrite16(u32 add, u16 value) {
 #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;
 
@@ -439,7 +448,7 @@ void psxHwWrite16(u32 add, u16 value) {
                        PSXHW_LOG("IMASK 16bit write %x\n", value);
 #endif
                        psxHu16ref(0x1074) = SWAPu16(value);
-                       if (psxHu16ref(0x1070) & value)
+                       if (psxHu16ref(0x1070) & SWAPu16(value))
                                new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
                        return;
 
@@ -510,6 +519,8 @@ void psxHwWrite16(u32 add, u16 value) {
 }
 
 #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))) { \
@@ -518,7 +529,7 @@ void psxHwWrite16(u32 add, u16 value) {
 }
 
 void psxHwWrite32(u32 add, u32 value) {
-       switch (add) {
+       switch (add & 0x1fffffff) {
            case 0x1f801040:
                        sioWrite8((unsigned char)value);
                        sioWrite8((unsigned char)((value&0xff) >>  8));
@@ -544,8 +555,6 @@ void psxHwWrite32(u32 add, u32 value) {
 #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:
@@ -553,7 +562,7 @@ void psxHwWrite32(u32 add, u32 value) {
                        PSXHW_LOG("IMASK 32bit write %x\n", value);
 #endif
                        psxHu32ref(0x1074) = SWAPu32(value);
-                       if (psxHu32ref(0x1070) & value)
+                       if (psxHu32ref(0x1070) & SWAPu32(value))
                                new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
                        return;