Revert to new IRQ behavior after some unsuccessful experiments

[pistorm] / m68kconf.h

diff --git a/m68kconf.h b/m68kconf.h
index 71c42c296bc05eecb8536ad1ec860fbef08f7e80..c0f245bedefb971d48f7f64b1cc9c01d2112705a 100644 (file)
--- a/m68kconf.h
+++ b/m68kconf.h
@@ -90,7 +90,7 @@
  * auto-clear when the interrupt is serviced.
  */
 #define M68K_EMULATE_INT_ACK        OPT_OFF
-#define M68K_INT_ACK_CALLBACK(A)    cpu_irq_ack(A)
+#define M68K_INT_ACK_CALLBACK(...)    0xFFFFFFFF
 
 
 /* If ON, CPU will call the breakpoint acknowledge callback when it encounters
@@ -185,7 +185,7 @@
 #define M68K_LOG_FILEHANDLE         some_file_handle
 
 
-#define M68K_EMULATE_PMMU   OPT_ON
+#define M68K_EMULATE_PMMU   OPT_OFF
 
 
 /* ----------------------------- COMPATIBILITY ---------------------------- */
@@ -201,7 +201,7 @@
 #define M68K_USE_64_BIT  OPT_ON
 
 
-#include "main.h"
+#include "emulator.h"
 
 
 //#define m68k_read_memory_8(A)  read16(A)
@@ -220,6 +220,6 @@
 
 /* ======================================================================== */
 /* ============================== END OF FILE ============================= */
-/* =======================================x================================= */
+/* ======================================================================== */
 
 #endif /* M68KCONF__HEADER */