psxbios: implement some cdrom related stuff

[pcsx_rearmed.git] / libpcsxcore / psxdma.c

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index fa8f339..3ec42ed 100644 (file)
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -67,7 +67,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        // This should be much slower, like 12+ cycles/byte, it's like
                        // that because the CPU runs too fast and fifo is not emulated.
                        // See also set_dma_end().
-                       set_event(PSXINT_SPUDMA, words * 4);
+                       set_event(PSXINT_SPUDMA, words * 4 * 4);
                        return;
 
                case 0x01000200: //spu to cpu transfer
@@ -78,7 +78,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        psxCpu->Clear(madr, words_copy);
 
                        HW_DMA4_MADR = SWAPu32(madr + words_copy * 4);
-                       set_event(PSXINT_SPUDMA, words * 4);
+                       set_event(PSXINT_SPUDMA, words * 4 * 4);
                        return;
 
                default:
@@ -191,7 +191,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        madr_next = 0xffffff;
 
                        do_walking = Config.GpuListWalking;
-                       if (do_walking < 0)
+                       if (do_walking < 0 || Config.hacks.gpu_timing1024)
                                do_walking = Config.hacks.gpu_slow_list_walking;
                        madr_next_p = do_walking ? &madr_next : NULL;
 
@@ -201,10 +201,10 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 
                        HW_DMA2_MADR = SWAPu32(madr_next);
 
-                       // Tekken 3 = use 1.0 only (not 1.5x)
+                       // a hack for Judge Dredd which is annoyingly sensitive to timing
+                       if (Config.hacks.gpu_timing1024)
+                               size = 1024;
 
-                       // Einhander = parse linked list in pieces (todo)
-                       // Rebel Assault 2 = parse linked list in pieces (todo)
                        psxRegs.gpuIdleAfter = psxRegs.cycle + size + 16;
                        set_event(PSXINT_GPUDMA, size);
                        return;
@@ -242,6 +242,7 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
        PSXDMA_LOG("*** DMA6 OT *** %x addr = %x size = %x\n", chcr, madr, bcr);
 
        if (chcr == 0x11000002) {
+               madr &= ~3;
                mem = getDmaRam(madr, &words_max);
                if (mem == INVALID_PTR) {
                        log_unhandled("bad6 dma madr %x\n", madr);