--- hatari/src/includes/log.h	2019/04/01 07:14:45	1.1.1.2
+++ hatari/src/includes/log.h	2019/04/01 07:15:28	1.1.1.3
@@ -77,8 +77,8 @@ extern bool Log_SetTraceOptions(const ch
 #define	HATARI_TRACE_MFP_READ		(1<<11)
 #define	HATARI_TRACE_MFP_WRITE		(1<<12)
 
-#define	HATARI_TRACE_PSG_WRITE_REG	(1<<13)
-#define	HATARI_TRACE_PSG_WRITE_DATA	(1<<14)
+#define	HATARI_TRACE_PSG_READ		(1<<13)
+#define	HATARI_TRACE_PSG_WRITE		(1<<14)
 
 #define	HATARI_TRACE_CPU_PAIRING	(1<<15)
 #define	HATARI_TRACE_CPU_DISASM		(1<<16)
@@ -99,6 +99,9 @@ extern bool Log_SetTraceOptions(const ch
 #define HATARI_TRACE_OS_GEMDOS		(1<<26)
 #define HATARI_TRACE_OS_VDI		(1<<27)
 
+#define HATARI_TRACE_IOMEM_RD		(1<<28)
+#define HATARI_TRACE_IOMEM_WR		(1<<29)
+
 #define	HATARI_TRACE_NONE		(0)
 #define	HATARI_TRACE_ALL		(~0)
 
@@ -109,7 +112,7 @@ extern bool Log_SetTraceOptions(const ch
 
 #define HATARI_TRACE_MFP_ALL		( HATARI_TRACE_MFP_EXCEPTION | HATARI_TRACE_MFP_START | HATARI_TRACE_MFP_READ | HATARI_TRACE_MFP_WRITE )
 
-#define	HATARI_TRACE_PSG_ALL		( HATARI_TRACE_PSG_WRITE_REG | HATARI_TRACE_PSG_WRITE_DATA )
+#define	HATARI_TRACE_PSG_ALL		( HATARI_TRACE_PSG_READ | HATARI_TRACE_PSG_WRITE )
 
 #define	HATARI_TRACE_CPU_ALL		( HATARI_TRACE_CPU_PAIRING | HATARI_TRACE_CPU_DISASM | HATARI_TRACE_CPU_EXCEPTION )