X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.c;h=df02b00f775e70a192bd21ebedad6a086911e1a3;hb=7b68d92c6224ba23a3250688afbf55c35ab106e4;hp=0480ce60703e6b65724b808b01294077e7b860c7;hpb=aa314e8ebc2281c4b2d3db3378f143de5d68f335;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c index 0480ce60..df02b00f 100644 --- a/libpcsxcore/psxdma.c +++ b/libpcsxcore/psxdma.c @@ -54,7 +54,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU words = (bcr >> 16) * (bcr & 0xffff); SPU_writeDMAMem(ptr, words * 2, psxRegs.cycle); HW_DMA4_MADR = SWAPu32(madr + words * 4); - SPUDMA_INT(words / 2); + SPUDMA_INT(words * 4); return; case 0x01000200: //spu to cpu transfer @@ -73,7 +73,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU psxCpu->Clear(madr, words); HW_DMA4_MADR = SWAPu32(madr + words * 4); - SPUDMA_INT(words / 2); + SPUDMA_INT(words * 4); return; #ifdef PSXDMA_LOG @@ -184,7 +184,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff); if ((int)size <= 0) size = gpuDmaChainSize(madr); - HW_GPU_STATUS &= ~PSXGPU_nBUSY; + HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY); // we don't emulate progress, just busy flag and end irq, // so pretend we're already at the last block @@ -216,7 +216,7 @@ void gpuInterrupt() { HW_DMA2_CHCR &= SWAP32(~0x01000000); DMA_INTERRUPT(2); } - HW_GPU_STATUS |= PSXGPU_nBUSY; // GPU no longer busy + HW_GPU_STATUS |= SWAP32(PSXGPU_nBUSY); // GPU no longer busy } void psxDma6(u32 madr, u32 bcr, u32 chcr) { @@ -244,7 +244,7 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) { *mem-- = SWAP32((madr - 4) & 0xffffff); madr -= 4; } - mem++; *mem = 0xffffff; + *++mem = SWAP32(0xffffff); //GPUOTCDMA_INT(size); // halted