summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2017-04-11 18:13:36 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2017-04-11 18:13:36 +0200
commit5f1c96bcb27c60ea805948c8b6189d1953ff7096 (patch)
treef256676da13f2f11bfd78b1d017c41e6da10a2c6
parent82a03a03e68315c5e4fe42afe51ec8cae4503315 (diff)
amiga.cpp: killed anonymous timer, hooked amigaaga_flop software list to the a1200 driver (nw)
-rw-r--r--src/mame/drivers/amiga.cpp2
-rw-r--r--src/mame/includes/amiga.h1
-rw-r--r--src/mame/machine/amiga.cpp5
3 files changed, 6 insertions, 2 deletions
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 7942fe75515..9a0acd17052 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -1711,6 +1711,8 @@ static MACHINE_CONFIG_DERIVED_CLASS( a1200, amiga_base, a1200_state )
#endif
// todo: pcmcia
+
+ MCFG_SOFTWARE_LIST_ADD("aga_floppy_list", "amigaaga_flop")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( a1200n, a1200, a1200_state )
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index 30289f756d0..a5de8bf3224 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -651,6 +651,7 @@ private:
emu_timer *m_irq_timer;
emu_timer *m_serial_timer;
+ emu_timer *m_scanline_timer;
bool m_gayle_reset;
diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp
index 7eb00839867..dc279456348 100644
--- a/src/mame/machine/amiga.cpp
+++ b/src/mame/machine/amiga.cpp
@@ -156,9 +156,10 @@ void amiga_state::machine_start()
m_irq_timer = timer_alloc(TIMER_AMIGA_IRQ);
m_blitter_timer = timer_alloc(TIMER_AMIGA_BLITTER);
m_serial_timer = timer_alloc(TIMER_SERIAL);
+ m_scanline_timer = timer_alloc(TIMER_SCANLINE);
// start the scanline timer
- timer_set(m_screen->time_until_pos(0), TIMER_SCANLINE);
+ m_scanline_timer->adjust(m_screen->time_until_pos(0));
}
WRITE_LINE_MEMBER( amiga_state::m68k_reset )
@@ -297,7 +298,7 @@ TIMER_CALLBACK_MEMBER( amiga_state::scanline_callback )
// set timer for next line
scanline = (scanline + 1) % m_screen->height();
- timer_set(m_screen->time_until_pos(scanline), TIMER_SCANLINE, scanline);
+ m_scanline_timer->adjust(m_screen->time_until_pos(scanline), scanline);
}