--- hatari/src/debug/68kDisass.h	2019/04/09 08:49:28	1.1.1.1
+++ hatari/src/debug/68kDisass.h	2019/04/09 08:53:07	1.1.1.2
@@ -1,18 +1,32 @@
 /*
   Hatari - 68kDisass.h
 
-  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.
 */
 #ifndef HATARI_68KDISASS_H
 #define HATARI_68KDISASS_H
 
+extern Uint32 Disasm_GetNextPC(Uint32 pc);
+extern void Disasm (FILE *f, uaecptr addr, uaecptr *nextpc, int cnt);
 
-#define	DISASM_ENGINE_UAE	0		/* Use UAE's internal disassembler */
-#define	DISASM_ENGINE_EXT	1		/* Use external disassembler from 68kdisass.c */
-
-
-void Disasm (FILE *f, uaecptr addr, uaecptr *nextpc, int cnt , int DisasmEngine);
+enum {
+	DISASM_COLUMN_ADDRESS = 0,
+	DISASM_COLUMN_HEXDUMP,
+	DISASM_COLUMN_LABEL,
+	DISASM_COLUMN_OPCODE,
+	DISASM_COLUMN_OPERAND,
+	DISASM_COLUMN_COMMENT,
+	DISASM_COLUMNS			/* number of columns in disassembly output */
+};
+
+#define DISASM_COLUMN_DISABLE -1
+
+extern void Disasm_GetColumns(int *columns);
+extern void Disasm_SetColumns(int *columns);
+extern void Disasm_DisableColumn(int column, int *oldcols, int *newcols);
 
+extern const char* Disasm_ParseOption(const char *arg);
+extern int Disasm_GetOptions(void);
 
 #endif		/* HATARI_68KDISASS_H */