--- previous/src/debug/log.c	2018/04/24 19:25:10	1.1
+++ previous/src/debug/log.c	2018/04/24 19:33:57	1.1.1.5
@@ -30,29 +30,12 @@ const char Log_fileid[] = "Hatari log.c
 
 
 static struct {
-	Uint32 Level;
+	Uint64 Level;
 	const char *Name;
 }
 TraceOptions[] = {
 	{ TRACE_NONE		 , "none" },
 
-	{ TRACE_VIDEO_SYNC	 , "video_sync" } ,
-	{ TRACE_VIDEO_RES	 , "video_res" } ,
-	{ TRACE_VIDEO_COLOR	 , "video_color" } ,
-	{ TRACE_VIDEO_BORDER_V   , "video_border_v" } ,
-	{ TRACE_VIDEO_BORDER_H   , "video_border_h" } ,
-	{ TRACE_VIDEO_ADDR	 , "video_addr" } ,
-	{ TRACE_VIDEO_HBL	 , "video_hbl" } ,
-	{ TRACE_VIDEO_VBL	 , "video_vbl" } ,
-	{ TRACE_VIDEO_STE	 , "video_ste" } ,
-	{ TRACE_VIDEO_ALL	 , "video_all" } ,
-
-	{ TRACE_MFP_EXCEPTION	 , "mfp_exception" } ,
-	{ TRACE_MFP_START	 , "mfp_start" } ,
-	{ TRACE_MFP_READ	 , "mfp_read" } ,
-	{ TRACE_MFP_WRITE	 , "mfp_write" } ,
-	{ TRACE_MFP_ALL 	 , "mfp_all" } ,
-
 	{ TRACE_PSG_READ	 , "psg_read" } ,
 	{ TRACE_PSG_WRITE	 , "psg_write" } ,
 	{ TRACE_PSG_ALL 	 , "psg_all" } ,
@@ -69,29 +52,26 @@ TraceOptions[] = {
 	{ TRACE_IKBD_CMDS	 , "ikbd_cmds" } ,
 	{ TRACE_IKBD_ACIA	 , "ikbd_acia" } ,
 	{ TRACE_IKBD_EXEC	 , "ikbd_exec" } ,
-	{ TRACE_IKBD_ALL	 , "ikbd_all" } ,
-
-	{ TRACE_BLITTER 	 , "blitter" } ,
-
-	{ TRACE_OS_BIOS 	 , "bios" },
-	{ TRACE_OS_XBIOS	 , "xbios" },
-	{ TRACE_OS_GEMDOS	 , "gemdos" },
-	{ TRACE_OS_VDI  	 , "vdi" },
-	{ TRACE_OS_ALL  	 , "os_all" } ,
 
 	{ TRACE_IOMEM_RD	 , "io_read" } ,
 	{ TRACE_IOMEM_WR	 , "io_write" } ,
 	{ TRACE_IOMEM_ALL	 , "io_all" } ,
 
-	{ TRACE_DMASND  	 , "dmasound" } ,
-
-	{ TRACE_CROSSBAR  	 , "crossbar" } ,
+    { 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_ALL		 , "all" }
 };
 
 
-Uint32	LogTraceFlags = TRACE_NONE;
+Uint64	LogTraceFlags = TRACE_NONE;
 FILE *TraceFile = NULL;
 
 static FILE *hLogFile = NULL;
@@ -143,11 +123,11 @@ void Log_UnInit(void)
 /**
  * Output string to log file
  */
-void Log_Printf(LOGTYPE nType, const char *psFormat, ...)
+void _Log_Printf(LOGTYPE nType, const char *psFormat, ...)
 {
 	va_list argptr;
 
-	if (hLogFile && nType <= TextLogLevel)
+	if (hLogFile && nType && nType <= TextLogLevel)
 	{
 		va_start(argptr, psFormat);
 		vfprintf(hLogFile, psFormat, argptr);
@@ -168,7 +148,7 @@ void Log_AlertDlg(LOGTYPE nType, const c
 	va_list argptr;
 
 	/* Output to log file: */
-	if (hLogFile && nType <= TextLogLevel)
+	if (hLogFile && nType && nType <= TextLogLevel)
 	{
 		va_start(argptr, psFormat);
 		vfprintf(hLogFile, psFormat, argptr);
@@ -179,7 +159,7 @@ void Log_AlertDlg(LOGTYPE nType, const c
 	}
 
 	/* Show alert dialog box: */
-	if (sdlscrn && nType <= AlertDlgLogLevel)
+	if (sdlscrn && nType && nType <= AlertDlgLogLevel)
 	{
 		char *psTmpBuf;
 		psTmpBuf = malloc(2048);