--- hatari/src/debug/log.c	2019/04/09 08:48:37	1.1.1.1
+++ hatari/src/debug/log.c	2019/04/09 08:53:03	1.1.1.4
@@ -1,8 +1,8 @@
 /*
  * Hatari - log.c
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  *
  * Logger functions.
  *
@@ -27,10 +27,11 @@ const char Log_fileid[] = "Hatari log.c
 #include "log.h"
 #include "screen.h"
 #include "file.h"
+#include "vdi.h"
 
-
+#if ENABLE_TRACING
 static struct {
-	Uint32 Level;
+	Uint64 Level;
 	const char *Name;
 }
 TraceOptions[] = {
@@ -66,6 +67,8 @@ TraceOptions[] = {
 
 	{ TRACE_FDC		 , "fdc" } ,
 
+	{ TRACE_ACIA		 , "acia" } ,
+
 	{ TRACE_IKBD_CMDS	 , "ikbd_cmds" } ,
 	{ TRACE_IKBD_ACIA	 , "ikbd_acia" } ,
 	{ TRACE_IKBD_EXEC	 , "ikbd_exec" } ,
@@ -77,6 +80,7 @@ TraceOptions[] = {
 	{ TRACE_OS_XBIOS	 , "xbios" },
 	{ TRACE_OS_GEMDOS	 , "gemdos" },
 	{ TRACE_OS_VDI  	 , "vdi" },
+	{ TRACE_OS_AES  	 , "aes" },
 	{ TRACE_OS_ALL  	 , "os_all" } ,
 
 	{ TRACE_IOMEM_RD	 , "io_read" } ,
@@ -87,11 +91,29 @@ TraceOptions[] = {
 
 	{ TRACE_CROSSBAR  	 , "crossbar" } ,
 
+	{ TRACE_VIDEL  	         , "videl" } ,
+
+	{ TRACE_DSP_HOST_INTERFACE, "dsp_host_interface" },
+	{ TRACE_DSP_HOST_COMMAND , "dsp_host_command" },
+	{ TRACE_DSP_HOST_SSI	 , "dsp_host_ssi" },
+	{ TRACE_DSP_INTERRUPT	 , "dsp_interrupt" },
+	{ TRACE_DSP_DISASM	 , "dsp_disasm" },
+	{ TRACE_DSP_DISASM_REG	 , "dsp_disasm_reg" },
+	{ TRACE_DSP_DISASM_MEM	 , "dsp_disasm_mem" },
+	{ TRACE_DSP_STATE	 , "dsp_state" },
+	{ TRACE_DSP_ALL		 , "dsp_all" },
+
+	{ TRACE_DSP_SYMBOLS	 , "dsp_symbols" },
+	{ TRACE_CPU_SYMBOLS	 , "cpu_symbols" },
+
+	{ TRACE_NVRAM  	         , "nvram" } ,
+
 	{ TRACE_ALL		 , "all" }
 };
+#endif /* ENABLE_TRACING */
 
 
-Uint32	LogTraceFlags = TRACE_NONE;
+Uint64	LogTraceFlags = TRACE_NONE;
 FILE *TraceFile = NULL;
 
 static FILE *hLogFile = NULL;
@@ -312,7 +334,15 @@ const char* Log_SetTraceOptions (const c
 		
 		cur = sep;
 	}
-	
+
+	/* Enable Hatari flags needed for tracing selected items.
+	 * 
+	 * Doesn't enable bBiosInterception for X/Bios because
+	 * that implies other things in addition to tracing.
+	 */
+	if (LogTraceFlags & (TRACE_OS_AES|TRACE_OS_VDI))
+		bVdiAesIntercept = true;
+
 	//fprintf(stderr, "trace parse <%x>\n", LogTraceFlags);
 	
 	free (OptionsCopy);