Fix DMACallback bug, disable logging in release builds

2 files changed, 21 insertions, 7 deletions

diff --git a/libpsn00b/psxgpu/common.c b/libpsn00b/psxgpu/common.c
index cef1508..e06c63a 100644
--- a/libpsn00b/psxgpu/common.c
+++ b/libpsn00b/psxgpu/common.c
@@ -29,7 +29,13 @@ static volatile uint8_t  _queue_head, _queue_tail, _queue_length;
 static volatile uint32_t _vblank_counter;
 static volatile uint16_t _last_hblank;
 
-/* Interrupt handlers */
+/* Private utilities and interrupt handlers */
+
+#ifdef DEBUG
+#define _LOG(...) printf(__VA_ARGS__)
+#else
+#define _LOG(...)
+#endif
 
 static void _vblank_handler(void) {
 	_vblank_counter++;
@@ -69,7 +75,7 @@ void ResetGraph(int mode) {
 		_gpu_video_mode = (GPU_GP1 >> 20) & 1;
 		ExitCriticalSection();
 
-		printf("psxgpu: setup done, default mode is %s\n", _gpu_video_mode ? "PAL" : "NTSC");
+		_LOG("psxgpu: setup done, default mode is %s\n", _gpu_video_mode ? "PAL" : "NTSC");
 	}
 
 	if (mode == 3) {
@@ -108,7 +114,7 @@ static void _default_vsync_halt(void) {
 			return;
 	}
 
-	printf("psxgpu: VSync() timeout\n");
+	_LOG("psxgpu: VSync() timeout\n");
 	ChangeClearPAD(0);
 	ChangeClearRCnt(3, 0);
 }
@@ -230,7 +236,7 @@ void DrawOTag(const uint32_t *ot) {
 		}
 
 		IRQ_MASK = mask;
-		printf("psxgpu: DrawOTag() failed, draw queue full\n");
+		_LOG("psxgpu: DrawOTag() failed, draw queue full\n");
 		return;
 	}
 
diff --git a/libpsn00b/psxgpu/image.c b/libpsn00b/psxgpu/image.c
index da51e7d..6190c7a 100644
--- a/libpsn00b/psxgpu/image.c
+++ b/libpsn00b/psxgpu/image.c
@@ -10,7 +10,13 @@
 
 #define DMA_CHUNK_LENGTH 8
 
-/* VRAM transfer API */
+/* Private utilities */
+
+#ifdef DEBUG
+#define _LOG(...) printf(__VA_ARGS__)
+#else
+#define _LOG(...)
+#endif
 
 static void _load_store_image(
 	uint32_t	command,
@@ -20,11 +26,11 @@ static void _load_store_image(
 ) {
 	size_t length = rect->w * rect->h;
 	if (length % 2)
-		printf("psxgpu: can't transfer an odd number of pixels\n");
+		_LOG("psxgpu: can't transfer an odd number of pixels\n");
 
 	length /= 2;
 	if ((length >= DMA_CHUNK_LENGTH) && (length % DMA_CHUNK_LENGTH)) {
-		printf("psxgpu: transfer data length (%d) is not a multiple of %d, rounding\n", length, DMA_CHUNK_LENGTH);
+		_LOG("psxgpu: transfer data length (%d) is not a multiple of %d, rounding\n", length, DMA_CHUNK_LENGTH);
 		length += DMA_CHUNK_LENGTH - 1;
 	}
 
@@ -50,6 +56,8 @@ static void _load_store_image(
 	DMA_CHCR(2) = 0x01000200 | ((mode & 1) ^ 1);
 }
 
+/* VRAM transfer API */
+
 void LoadImage(const RECT *rect, const uint32_t *data) {
 	_load_store_image(0xa0000000, 2, rect, (uint32_t *) data);
 }