Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 07:58:56 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Scott Stone 2017-04-19 12:56:53 -04:00
commit 6a2ce9a7f3
11 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/drivers/cave.cpp
View File

@ -124,7 +124,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cave_state::cave_vblank_start)
update_irq_state();
cave_get_sprite_info(0);
m_agallet_vblank_irq = 1;
machine().scheduler().timer_set(attotime::from_usec(2000), timer_expired_delegate(FUNC(cave_state::cave_vblank_end),this));
m_vblank_end_timer->adjust(attotime::from_usec(2000));
}
TIMER_DEVICE_CALLBACK_MEMBER(cave_state::cave_vblank_start_left)
{
@ -1988,6 +1988,8 @@ GFXDECODE_END
MACHINE_START_MEMBER(cave_state,cave)
{
m_vblank_end_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cave_state::cave_vblank_end), this));
save_item(NAME(m_soundbuf_len));
save_item(NAME(m_soundbuf_data));

10
src/mame/drivers/galastrm.cpp
View File

@ -28,7 +28,7 @@ ENSONIQ 5701,5510,5505
OSC1:16MHz
OSC2:30.47618MHz
----------------------------------------------------------
based on driver from drivers/gunbustr.c by Bryan McPhail & David Graves
based on driver from drivers/gunbustr.cpp by Bryan McPhail & David Graves
Written by Hau
07/03/2008
@ -49,6 +49,12 @@ $305.b invincibility
/*********************************************************************/
void galastrm_state::machine_start()
{
m_interrupt6_timer = timer_alloc(TIMER_GALASTRM_INTERRUPT6);
}
INTERRUPT_GEN_MEMBER(galastrm_state::galastrm_interrupt)
{
m_frame_counter ^= 1;
@ -163,7 +169,7 @@ READ32_MEMBER(galastrm_state::galastrm_adstick_ctrl_r)
WRITE32_MEMBER(galastrm_state::galastrm_adstick_ctrl_w)
{
timer_set(downcast<cpu_device *>(&space.device())->cycles_to_attotime(1000), TIMER_GALASTRM_INTERRUPT6);
m_interrupt6_timer->adjust(m_maincpu->cycles_to_attotime(1000));
}
/***********************************************************

32
src/mame/drivers/gameplan.cpp
View File

@ -1060,6 +1060,21 @@ ROM_START( megatack )
ROM_LOAD( "megatsnd.e1", 0xe000, 0x0800, CRC(0c186bdb) SHA1(233af9481a3979971f2d5aa75ec8df4333aa5e0d) )
ROM_END
ROM_START( megatacka ) // original Centuri PCB
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "meg-e2.bin", 0xc000, 0x0800, CRC(9664c7b1) SHA1(356e7f5f3b2a9b829fac53e7bf9193278b4de2ed) )
ROM_LOAD( "meg-f2.bin", 0xc800, 0x0800, CRC(67c42523) SHA1(f9fc88cdea05a2d0e89e3ba9b545bf3476b37d2d) )
ROM_LOAD( "meg-g2.bin", 0xd000, 0x0800, CRC(71f36604) SHA1(043988126343b6224e8e1d6c0dbba6b6b08fe493) )
ROM_LOAD( "meg-j2.bin", 0xd800, 0x0800, CRC(4ddcc145) SHA1(3a6d42a58c388eaaf6561351fa98936d98975e0b) )
ROM_LOAD( "meg-j1.bin", 0xe000, 0x0800, CRC(911d5d9a) SHA1(92bfe0f69a6e563363df59ebee745d7b3cfc0141) )
ROM_LOAD( "meg-g1.bin", 0xe800, 0x0800, CRC(22a51c9b) SHA1(556e09216ed85eaf3870f85515c273c7eb1ab13a) )
ROM_LOAD( "meg-f1.bin", 0xf000, 0x0800, CRC(2ffa51ac) SHA1(7c5d8295c5e71a9918a02d203139b024bd3bf8f4) )
ROM_LOAD( "meg-e1.bin", 0xf800, 0x0800, CRC(01dbe4ad) SHA1(af72778ae112f24a92fb3007bb456331c3896b50) )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "megatsnd.e1", 0xe000, 0x0800, CRC(0c186bdb) SHA1(233af9481a3979971f2d5aa75ec8df4333aa5e0d) ) // missing for this board, using the one from the parent
ROM_END
ROM_START( challeng )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "chall.6", 0xa000, 0x1000, CRC(b30fe7f5) SHA1(ce93a57d626f90d31ddedbc35135f70758949dfa) )
@ -1160,11 +1175,12 @@ ROM_END
*
*************************************/
GAME( 1980, killcom, 0, gameplan, killcom, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Killer Comet", MACHINE_SUPPORTS_SAVE )
GAME( 1980, megatack, 0, gameplan, megatack, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Megatack", MACHINE_SUPPORTS_SAVE )
GAME( 1981, challeng, 0, gameplan, challeng, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Challenger", MACHINE_SUPPORTS_SAVE )
GAME( 1981, kaos, 0, gameplan, kaos, driver_device, 0, ROT270, "Game Plan", "Kaos", MACHINE_SUPPORTS_SAVE )
GAME( 1982, leprechn, 0, leprechn, leprechn, driver_device, 0, ROT0, "Tong Electronic", "Leprechaun", MACHINE_SUPPORTS_SAVE )
GAME( 1982, potogold, leprechn, leprechn, potogold, driver_device, 0, ROT0, "Tong Electronic (Game Plan license)", "Pot of Gold", MACHINE_SUPPORTS_SAVE )
GAME( 1982, leprechp, leprechn, leprechn, potogold, driver_device, 0, ROT0, "Tong Electronic (Pacific Polytechnical license)", "Leprechaun (Pacific)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, piratetr, 0, leprechn, piratetr, driver_device, 0, ROT0, "Tong Electronic", "Pirate Treasure", MACHINE_SUPPORTS_SAVE )
GAME( 1980, killcom, 0, gameplan, killcom, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Killer Comet", MACHINE_SUPPORTS_SAVE )
GAME( 1980, megatack, 0, gameplan, megatack, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Megatack (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1980, megatacka, megatack, gameplan, megatack, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Megatack (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, challeng, 0, gameplan, challeng, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Challenger", MACHINE_SUPPORTS_SAVE )
GAME( 1981, kaos, 0, gameplan, kaos, driver_device, 0, ROT270, "Game Plan", "Kaos", MACHINE_SUPPORTS_SAVE )
GAME( 1982, leprechn, 0, leprechn, leprechn, driver_device, 0, ROT0, "Tong Electronic", "Leprechaun", MACHINE_SUPPORTS_SAVE )
GAME( 1982, potogold, leprechn, leprechn, potogold, driver_device, 0, ROT0, "Tong Electronic (Game Plan license)", "Pot of Gold", MACHINE_SUPPORTS_SAVE )
GAME( 1982, leprechp, leprechn, leprechn, potogold, driver_device, 0, ROT0, "Tong Electronic (Pacific Polytechnical license)", "Leprechaun (Pacific)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, piratetr, 0, leprechn, piratetr, driver_device, 0, ROT0, "Tong Electronic", "Pirate Treasure", MACHINE_SUPPORTS_SAVE )

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

@ -469,7 +469,7 @@ INTERRUPT_GEN_MEMBER(gpworld_state::vblank_callback)
/* The time the IRQ line stays high is set just long enough to happen after the NMI - hacky? */
device.execute().set_input_line(0, ASSERT_LINE);
timer_set(attotime::from_usec(100), TIMER_IRQ_STOP);
m_irq_stop_timer->adjust(attotime::from_usec(100));
}
static const gfx_layout gpworld_tile_layout =

4
src/mame/drivers/overdriv.cpp
View File

@ -216,7 +216,7 @@ TIMER_CALLBACK_MEMBER(overdriv_state::objdma_end_cb )
WRITE16_MEMBER(overdriv_state::objdma_w)
{
if(data & 0x10)
machine().scheduler().timer_set(attotime::from_usec(100), timer_expired_delegate(FUNC(overdriv_state::objdma_end_cb), this));
m_objdma_end_timer->adjust(attotime::from_usec(100));
m_k053246->k053246_w(space,5,data,mem_mask);
}
@ -296,6 +296,8 @@ INPUT_PORTS_END
void overdriv_state::machine_start()
{
m_objdma_end_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(overdriv_state::objdma_end_cb), this));
save_item(NAME(m_cpuB_ctrl));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_zoom_colorbase));

11
src/mame/drivers/taito_f3.cpp
View File

@ -411,7 +411,7 @@ void taito_f3_state::device_timer(emu_timer &timer, device_timer_id id, int para
INTERRUPT_GEN_MEMBER(taito_f3_state::f3_interrupt2)
{
device.execute().set_input_line(2, HOLD_LINE); // vblank
timer_set(downcast<cpu_device *>(&device)->cycles_to_attotime(10000), TIMER_F3_INTERRUPT3);
m_interrupt3_timer->adjust(m_maincpu->cycles_to_attotime(10000));
}
static const uint16_t recalh_eeprom[64] = {
@ -425,8 +425,10 @@ static const uint16_t recalh_eeprom[64] = {
0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff
};
MACHINE_START_MEMBER(taito_f3_state,f3)
void taito_f3_state::machine_start()
{
m_interrupt3_timer = timer_alloc(TIMER_F3_INTERRUPT3);
save_item(NAME(m_coin_word));
}
@ -443,7 +445,6 @@ static MACHINE_CONFIG_START( f3, taito_f3_state )
MCFG_CPU_PROGRAM_MAP(f3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
MCFG_MACHINE_START_OVERRIDE(taito_f3_state,f3)
MCFG_MACHINE_RESET_OVERRIDE(taito_f3_state,f3)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@ -537,9 +538,7 @@ static MACHINE_CONFIG_START( bubsympb, taito_f3_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(f3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
MCFG_MACHINE_START_OVERRIDE(taito_f3_state,f3)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")

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

@ -100,6 +100,7 @@ public:
int m_spritetype[2];
int m_kludge;
emu_timer *m_vblank_end_timer;
/* misc */

2
src/mame/includes/galastrm.h
View File

@ -87,6 +87,7 @@ public:
struct gs_tempsprite *m_sprite_ptr_pre;
bitmap_ind16 m_tmpbitmaps;
std::unique_ptr<galastrm_renderer> m_poly;
emu_timer *m_interrupt6_timer;
int m_rsxb;
int m_rsyb;
@ -101,6 +102,7 @@ public:
DECLARE_WRITE32_MEMBER(galastrm_adstick_ctrl_w);
DECLARE_CUSTOM_INPUT_MEMBER(frame_counter_r);
DECLARE_CUSTOM_INPUT_MEMBER(coin_word_r);
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update_galastrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(galastrm_interrupt);

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

@ -32,6 +32,7 @@ public:
int m_zoom_colorbase[2];
int m_road_colorbase[2];
int m_sprite_colorbase;
emu_timer *m_objdma_end_timer;
/* misc */
uint16_t m_cpuB_ctrl;

3
src/mame/includes/taito_f3.h
View File

@ -93,6 +93,7 @@ public:
std::unique_ptr<uint16_t[]> m_f3_pf_data;
std::unique_ptr<uint16_t[]> m_f3_pivot_ram;
emu_timer *m_interrupt3_timer;
uint32_t m_coin_word[2];
int m_f3_game;
tilemap_t *m_pf1_tilemap;
@ -307,7 +308,7 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info8);
TILE_GET_INFO_MEMBER(get_tile_info_vram);
TILE_GET_INFO_MEMBER(get_tile_info_pixel);
DECLARE_MACHINE_START(f3);
virtual void machine_start() override;
DECLARE_MACHINE_RESET(f3);
DECLARE_VIDEO_START(f3);
uint32_t screen_update_f3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);

1
src/mame/mame.lst
View File

@ -13133,6 +13133,7 @@ killcom // (c) 1980 Centuri
leprechn // (c) 1982
leprechp // (c) 1982
megatack // (c) 1980 Centuri
megatacka // (c) 1980 Centuri
piratetr // (c) 1982
potogold // (c) 1982