Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 09:28:51 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

amiga.cpp: killed anonymous timer, hooked amigaaga_flop software list to the a1200 driver (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2017-04-11 18:13:36 +02:00
parent 82a03a03e6
commit 5f1c96bcb2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/amiga.cpp
View File

@ -1711,6 +1711,8 @@ static MACHINE_CONFIG_DERIVED_CLASS( a1200, amiga_base, a1200_state )
#endif #endif
// todo: pcmcia // todo: pcmcia
MCFG_SOFTWARE_LIST_ADD("aga_floppy_list", "amigaaga_flop")
MACHINE_CONFIG_END MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( a1200n, a1200, a1200_state ) static MACHINE_CONFIG_DERIVED_CLASS( a1200n, a1200, a1200_state )

1
src/mame/includes/amiga.h
View File

@ -651,6 +651,7 @@ private:
emu_timer *m_irq_timer; emu_timer *m_irq_timer;
emu_timer *m_serial_timer; emu_timer *m_serial_timer;
emu_timer *m_scanline_timer;
bool m_gayle_reset; bool m_gayle_reset;

5
src/mame/machine/amiga.cpp
View File

@ -156,9 +156,10 @@ void amiga_state::machine_start()
m_irq_timer = timer_alloc(TIMER_AMIGA_IRQ); m_irq_timer = timer_alloc(TIMER_AMIGA_IRQ);
m_blitter_timer = timer_alloc(TIMER_AMIGA_BLITTER); m_blitter_timer = timer_alloc(TIMER_AMIGA_BLITTER);
m_serial_timer = timer_alloc(TIMER_SERIAL); m_serial_timer = timer_alloc(TIMER_SERIAL);
m_scanline_timer = timer_alloc(TIMER_SCANLINE);
// start the scanline timer // 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 ) WRITE_LINE_MEMBER( amiga_state::m68k_reset )
@ -297,7 +298,7 @@ TIMER_CALLBACK_MEMBER( amiga_state::scanline_callback )
// set timer for next line // set timer for next line
scanline = (scanline + 1) % m_screen->height(); 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);
} }