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: report read errors correctly
[pcsx_rearmed.git]
/
libpcsxcore
/
psxdma.c
diff --git
a/libpcsxcore/psxdma.c
b/libpcsxcore/psxdma.c
index
e6f68fc
..
d7c4cae
100644
(file)
--- a/
libpcsxcore/psxdma.c
+++ b/
libpcsxcore/psxdma.c
@@
-45,7
+45,7
@@
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
PSXDMA_LOG("*** DMA4 SPU - mem2spu *** %x addr = %x size = %x\n", chcr, madr, bcr);
#endif
ptr = (u16 *)PSXM(madr);
PSXDMA_LOG("*** DMA4 SPU - mem2spu *** %x addr = %x size = %x\n", chcr, madr, bcr);
#endif
ptr = (u16 *)PSXM(madr);
- if (ptr ==
NULL
) {
+ if (ptr ==
INVALID_PTR
) {
#ifdef CPU_LOG
CPU_LOG("*** DMA4 SPU - mem2spu *** NULL Pointer!!!\n");
#endif
#ifdef CPU_LOG
CPU_LOG("*** DMA4 SPU - mem2spu *** NULL Pointer!!!\n");
#endif
@@
-62,7
+62,7
@@
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
PSXDMA_LOG("*** DMA4 SPU - spu2mem *** %x addr = %x size = %x\n", chcr, madr, bcr);
#endif
ptr = (u16 *)PSXM(madr);
PSXDMA_LOG("*** DMA4 SPU - spu2mem *** %x addr = %x size = %x\n", chcr, madr, bcr);
#endif
ptr = (u16 *)PSXM(madr);
- if (ptr ==
NULL
) {
+ if (ptr ==
INVALID_PTR
) {
#ifdef CPU_LOG
CPU_LOG("*** DMA4 SPU - spu2mem *** NULL Pointer!!!\n");
#endif
#ifdef CPU_LOG
CPU_LOG("*** DMA4 SPU - spu2mem *** NULL Pointer!!!\n");
#endif
@@
-76,11
+76,9
@@
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
SPUDMA_INT(words * 4);
return;
SPUDMA_INT(words * 4);
return;
-#ifdef PSXDMA_LOG
default:
default:
-
PSXDMA_LOG
("*** DMA4 SPU - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
+
log_unhandled
("*** DMA4 SPU - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
break;
break;
-#endif
}
HW_DMA4_CHCR &= SWAP32(~0x01000000);
}
HW_DMA4_CHCR &= SWAP32(~0x01000000);
@@
-139,7
+137,7
@@
void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
#endif
ptr = (u32 *)PSXM(madr);
PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
#endif
ptr = (u32 *)PSXM(madr);
- if (ptr ==
NULL
) {
+ if (ptr ==
INVALID_PTR
) {
#ifdef CPU_LOG
CPU_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n");
#endif
#ifdef CPU_LOG
CPU_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n");
#endif
@@
-161,7
+159,7
@@
void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
#endif
ptr = (u32 *)PSXM(madr);
PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
#endif
ptr = (u32 *)PSXM(madr);
- if (ptr ==
NULL
) {
+ if (ptr ==
INVALID_PTR
) {
#ifdef CPU_LOG
CPU_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n");
#endif
#ifdef CPU_LOG
CPU_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n");
#endif
@@
-200,11
+198,9
@@
void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
GPUDMA_INT(size);
return;
GPUDMA_INT(size);
return;
-#ifdef PSXDMA_LOG
default:
default:
-
PSXDMA_LOG("*** DMA 2 - GPU unknown *** %lx addr = %lx size = %l
x\n", chcr, madr, bcr);
+
log_unhandled("*** DMA 2 - GPU unknown *** %x addr = %x size = %
x\n", chcr, madr, bcr);
break;
break;
-#endif
}
HW_DMA2_CHCR &= SWAP32(~0x01000000);
}
HW_DMA2_CHCR &= SWAP32(~0x01000000);
@@
-229,7
+225,7
@@
void psxDma6(u32 madr, u32 bcr, u32 chcr) {
#endif
if (chcr == 0x11000002) {
#endif
if (chcr == 0x11000002) {
- if (mem ==
NULL
) {
+ if (mem ==
INVALID_PTR
) {
#ifdef CPU_LOG
CPU_LOG("*** DMA6 OT *** NULL Pointer!!!\n");
#endif
#ifdef CPU_LOG
CPU_LOG("*** DMA6 OT *** NULL Pointer!!!\n");
#endif
@@
-253,12
+249,10
@@
void psxDma6(u32 madr, u32 bcr, u32 chcr) {
GPUOTCDMA_INT(16);
return;
}
GPUOTCDMA_INT(16);
return;
}
-#ifdef PSXDMA_LOG
else {
// Unknown option
else {
// Unknown option
-
PSXDMA_LOG
("*** DMA6 OT - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
+
log_unhandled
("*** DMA6 OT - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
}
}
-#endif
HW_DMA6_CHCR &= SWAP32(~0x01000000);
DMA_INTERRUPT(6);
HW_DMA6_CHCR &= SWAP32(~0x01000000);
DMA_INTERRUPT(6);