summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2018-09-19 15:19:47 +0200
committer hap <happppp@users.noreply.github.com>2018-09-19 15:20:01 +0200
commitf65d6a204efbbe8e42ddd112f9f59d8ff3ff4756 (patch)
tree1d910a627e4110f95b6876b4b47693cc0e6c69e2
parent7d58fbe09f8024f2f7e5377bec4baed050a05d54 (diff)
neogeo: move out-of-place section to where it was before (nw)
-rw-r--r--src/mame/drivers/neogeo.cpp34
1 files changed, 16 insertions, 18 deletions
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index d8afdcc4310..19b5f0e00ef 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -568,24 +568,6 @@
#define LOG_AUDIO_CPU_BANKING (0)
-/*************************************
- *
- * Main CPU interrupt generation
- *
- *************************************/
-
-
-
-// The display counter is automatically reloaded with the load register contents on scanline 224,
-// 1146 mclks from the rising edge of /HSYNC.
-#define NEOGEO_VBLANK_RELOAD_HTIM (attotime::from_ticks(1146, NEOGEO_MASTER_CLOCK))
-
-#define IRQ2CTRL_ENABLE (0x10)
-#define IRQ2CTRL_LOAD_RELATIVE (0x20)
-#define IRQ2CTRL_AUTOLOAD_VBLANK (0x40)
-#define IRQ2CTRL_AUTOLOAD_REPEAT (0x80)
-
-
class mvs_state : public ngarcade_base_state
{
public:
@@ -757,6 +739,22 @@ protected:
};
+
+/*************************************
+ *
+ * Main CPU interrupt generation
+ *
+ *************************************/
+
+// The display counter is automatically reloaded with the load register contents on scanline 224,
+// 1146 mclks from the rising edge of /HSYNC.
+#define NEOGEO_VBLANK_RELOAD_HTIM (attotime::from_ticks(1146, NEOGEO_MASTER_CLOCK))
+
+#define IRQ2CTRL_ENABLE (0x10)
+#define IRQ2CTRL_LOAD_RELATIVE (0x20)
+#define IRQ2CTRL_AUTOLOAD_VBLANK (0x40)
+#define IRQ2CTRL_AUTOLOAD_REPEAT (0x80)
+
void neogeo_base_state::adjust_display_position_interrupt_timer()
{
attotime period = attotime::from_ticks((uint64_t)m_display_counter + 1, NEOGEO_PIXEL_CLOCK);