Replace DEBUG macro with standard NDEBUG macro

10 files changed, 44 insertions, 47 deletions

diff --git a/libpsn00b/cmake/flags.cmake b/libpsn00b/cmake/flags.cmake
index e56d3fc..1ca25c2 100644
--- a/libpsn00b/cmake/flags.cmake
+++ b/libpsn00b/cmake/flags.cmake
@@ -86,5 +86,5 @@ target_link_options(
 target_compile_definitions(
 	psn00bsdk INTERFACE
 		PSN00BSDK=1
-		$<$<CONFIG:DEBUG>:DEBUG=1>
+		$<$<CONFIG:Release>:NDEBUG=1>
 )
diff --git a/libpsn00b/include/assert.h b/libpsn00b/include/assert.h
index e27f2ed..32301e2 100644
--- a/libpsn00b/include/assert.h
+++ b/libpsn00b/include/assert.h
@@ -8,13 +8,13 @@
 
 void _assert_abort(const char *file, int line, const char *expr);
 
-#ifdef DEBUG
+#ifdef NDEBUG
+#define assert(x)
+#else
 #define assert(expr) { \
 	if (!(expr)) \
 		_assert_abort(__FILE__, __LINE__, #expr); \
 }
-#else
-#define assert(x)
 #endif
 
 #endif
diff --git a/libpsn00b/libc/abort.c b/libpsn00b/libc/abort.c
index 562b619..1108160 100644
--- a/libpsn00b/libc/abort.c
+++ b/libpsn00b/libc/abort.c
@@ -1,10 +1,10 @@
 
 #include <stdio.h>
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 /* Standard abort */
diff --git a/libpsn00b/psxcd/isofs.c b/libpsn00b/psxcd/isofs.c
index 6755d3f..fb1f6c9 100644
--- a/libpsn00b/psxcd/isofs.c
+++ b/libpsn00b/psxcd/isofs.c
@@ -7,13 +7,10 @@
 #include "psxcd.h"
 #include "isofs.h"
 
-// Uncommend to enable debug output
-//#define DEBUG
-
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 #define DEFAULT_PATH_SEP	'\\'
@@ -215,7 +212,7 @@ static int _CdReadIsoDirectory(int lba)
 	return 0;
 }
 
-#ifdef DEBUG
+#ifndef NDEBUG
 
 static void dump_directory(void)
 {
@@ -479,7 +476,7 @@ CdlFILE *CdSearchFile(CdlFILE *fp, const char *filename)
 	// Get number of directories in path table
 	num_dirs = get_pathtable_entry(0, NULL, NULL);
 	
-#ifdef DEBUG
+#ifndef NDEBUG
 	_LOG("psxcd: Directories in path table: %d\n", num_dirs);
 	
 	rbuff = resolve_pathtable_path(num_dirs-1, tpath_rbuff+127);
@@ -536,7 +533,7 @@ CdlFILE *CdSearchFile(CdlFILE *fp, const char *filename)
 		strcat(fp->name, ";1");
 	}
 	
-#ifdef DEBUG
+#ifndef NDEBUG
 	dump_directory();
 #endif
 	
diff --git a/libpsn00b/psxcd/psxcd.c b/libpsn00b/psxcd/psxcd.c
index ac93376..65dea48 100644
--- a/libpsn00b/psxcd/psxcd.c
+++ b/libpsn00b/psxcd/psxcd.c
@@ -20,10 +20,10 @@ volatile int _cd_last_sector_count;
 
 int _cd_media_changed;
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 void _cd_init(void);
@@ -88,7 +88,7 @@ int CdControlB(unsigned char com, const void *param, unsigned char *result)
 int CdControlF(unsigned char com, const void *param)
 {
 	int param_len=0;
-	
+
 	// Command specific parameters
 	switch(com)
 	{
@@ -116,21 +116,21 @@ int CdControlF(unsigned char com, const void *param)
 			break;
 		case CdlGetTD:
 			param_len = 1;
+			break;
+		case CdlReadN:
+		case CdlReadS:
+		case CdlSeekL:
+		case CdlSeekP:
+			if( param )
+			{
+				_cd_control(CdlSetloc, param, 3);
+				_cd_last_setloc = *((CdlLOC*)param);
+			}
 	}
-	
-	// Issue Setloc if parameters are specified on CdlReadN and CdlReadS
-	if( ( com == CdlReadN ) || ( com == CdlReadS ) )
-	{
-		if( param )
-		{
-			_cd_control(CdlSetloc, param, 3);
-			_cd_last_setloc = *((CdlLOC*)param);
-		}
-	}
-	
+
 	// Issue CD command
 	_cd_control(com, param, param_len);
-	
+
 	return 1;
 }
 
diff --git a/libpsn00b/psxetc/dl.c b/libpsn00b/psxetc/dl.c
index 6d37605..3d8f3ab 100644
--- a/libpsn00b/psxetc/dl.c
+++ b/libpsn00b/psxetc/dl.c
@@ -69,10 +69,10 @@ void *(*_dl_resolve_callback)(DLL *, const char *) = 0;
 
 /* Private utilities */
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 #define _ERROR(code, ret) { \
diff --git a/libpsn00b/psxgpu/common.c b/libpsn00b/psxgpu/common.c
index e06c63a..1e3d9e5 100644
--- a/libpsn00b/psxgpu/common.c
+++ b/libpsn00b/psxgpu/common.c
@@ -31,10 +31,10 @@ static volatile uint16_t _last_hblank;
 
 /* Private utilities and interrupt handlers */
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 static void _vblank_handler(void) {
diff --git a/libpsn00b/psxgpu/image.c b/libpsn00b/psxgpu/image.c
index 6190c7a..a0d7065 100644
--- a/libpsn00b/psxgpu/image.c
+++ b/libpsn00b/psxgpu/image.c
@@ -12,10 +12,10 @@
 
 /* Private utilities */
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 static void _load_store_image(
diff --git a/libpsn00b/psxpress/mdec.c b/libpsn00b/psxpress/mdec.c
index 53c596e..d308994 100644
--- a/libpsn00b/psxpress/mdec.c
+++ b/libpsn00b/psxpress/mdec.c
@@ -83,10 +83,10 @@ static const DECDCTENV _default_mdec_env = {
 
 /* Private utilities */
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 /* Public API */
diff --git a/libpsn00b/psxspu/common.c b/libpsn00b/psxspu/common.c
index 4809684..d6508c7 100644
--- a/libpsn00b/psxspu/common.c
+++ b/libpsn00b/psxspu/common.c
@@ -19,10 +19,10 @@ static uint16_t			_transfer_addr = WRITABLE_AREA_ADDR;
 
 /* Private utilities */
 
-#ifdef DEBUG
-#define _LOG(...) printf(__VA_ARGS__)
-#else
+#ifdef NDEBUG
 #define _LOG(...)
+#else
+#define _LOG(...) printf(__VA_ARGS__)
 #endif
 
 static void _wait_status(uint16_t mask, uint16_t value) {