Added newer version of the Z80 core

1 files changed, 12 insertions, 2 deletions

diff --git a/src/z80.h b/src/z80.h
index 0b7424b..f6bc041 100644
--- a/src/z80.h
+++ b/src/z80.h
@@ -27,6 +27,11 @@
 #ifndef Z80_H
 #define Z80_H "$Id$"
 
+/* Configuration
+*/
+#include "z80_config.h"
+
+
 /* ---------------------------------------- TYPES
 */
 
@@ -157,11 +162,16 @@ typedef struct
 
 /* Initialises the processor.  
 */
+#ifdef ENABLE_ARRAY_MEMORY
+Z80	*Z80Init(Z80ReadPort read_port,
+		 Z80WritePort write_port);
+#else
 Z80	*Z80Init(Z80ReadMemory read_memory,
 		 Z80WriteMemory write_memory,
 		 Z80ReadPort read_port,
 		 Z80WritePort write_port,
 		 Z80ReadMemory read_for_disassem);
+#endif
 
 
 /* Resets the processor.
@@ -235,8 +245,8 @@ void	Z80SetState(Z80 *cpu, const Z80State *state);
 void	Z80SetLabels(Z80Label labels[]);
 
 
-/* Simple disassembly of memory accessed through read_for_disassem.
-   addr is updated on exit.
+/* Simple disassembly of memory accessed through read_for_disassem, or 
+   Z80_MEMORY as appropriate.  addr is updated on exit.
 */
 const char *Z80Disassemble(Z80 *cpu, Z80Word *addr);