Merge pull request #417 from israpps/modname

Tweak IOP modules printf
ps2dev · Dec 11, 2023 · 97cf7cb · 97cf7cb
2 parents f23fb7d + 92a4a82
commit 97cf7cb
Show file tree

Hide file tree

Showing 48 changed files with 1,031 additions and 941 deletions.
diff --git a/iop/cdvd/cdfs/src/cdfs_iop.h b/iop/cdvd/cdfs/src/cdfs_iop.h
@@ -1,8 +1,9 @@
 #ifndef _CDFS_IOP_H
 #define _CDFS_IOP_H
 
+#define MODNAME "cdfs_driver"
 #ifdef DEBUG
-#define DPRINTF(args...)	printf(args)
+#define DPRINTF(args...)	printf(MODNAME ": "args)
 #else
 #define DPRINTF(args...)	do { } while(0)
 #endif

diff --git a/iop/cdvd/cdfs/src/main.c b/iop/cdvd/cdfs/src/main.c
@@ -16,7 +16,6 @@
 #define DRIVER_UNIT_VERSION 2
 #define VERSION_STRINGIFY(x) #x
 
-#define MODNAME "cdfs_driver"
 
 IRX_ID(MODNAME, 1, 1);
 

diff --git a/iop/debug/ioptrap/src/ioptrap.c b/iop/debug/ioptrap/src/ioptrap.c
@@ -25,8 +25,8 @@
 #include "stdio.h"
 #include "sysclib.h"
 #include "thbase.h"
-
-IRX_ID("ioptrap_driver", 1, 1);
+#define MODNAME "ioptrap_driver"
+IRX_ID(MODNAME, 1, 1);
 
 extern struct irx_export_table _exp_ioptrap;
 
@@ -140,7 +140,7 @@ char *ExceptionGetModuleName(u32 epc, u32 *r_epc)
 #define JUMP_BUF_GP 11
 
 // Define this to something else if you want... maybe some ee_sio stuff :P
-#define TRAP_PRINTF(args...) printf(args)
+#define TRAP_PRINTF(args...) printf(MODNAME ": " args)
 
 static trap_exception_handler_t handlers[16];