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

gaplus.c: added save state support (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2015-06-20 19:24:16 +02:00
parent 449a851e34
commit 65217eacbf
4 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/mame/drivers/gaplus.c
View File

@ -144,7 +144,7 @@ TODO:
- schematics show 4 lines going from the 58XX I/O chip to the 26XX (starfield generator). - schematics show 4 lines going from the 58XX I/O chip to the 26XX (starfield generator).
Function and operation unknown. Function and operation unknown.
- Add 62XX custom to machine/namcoio.c (though it's quite different from 56XX and 58XX). - Complete 62XX custom emulation (machine/namco62.c) (though it's quite different from 56XX and 58XX).
- Is the sprite generator the same as Phozon? This isn't clear yet. They are - Is the sprite generator the same as Phozon? This isn't clear yet. They are
very similar, especially in the way the size flags are layed out. very similar, especially in the way the size flags are layed out.
@ -158,17 +158,7 @@ TODO:
#include "includes/gaplus.h" #include "includes/gaplus.h"
READ8_MEMBER(gaplus_state::gaplus_spriteram_r) WRITE8_MEMBER(gaplus_state::irq_1_ctrl_w)
{
return m_spriteram[offset];
}
WRITE8_MEMBER(gaplus_state::gaplus_spriteram_w)
{
m_spriteram[offset] = data;
}
WRITE8_MEMBER(gaplus_state::gaplus_irq_1_ctrl_w)
{ {
int bit = !BIT(offset, 11); int bit = !BIT(offset, 11);
m_main_irq_mask = bit & 1; m_main_irq_mask = bit & 1;
@ -176,7 +166,7 @@ WRITE8_MEMBER(gaplus_state::gaplus_irq_1_ctrl_w)
m_maincpu->set_input_line(0, CLEAR_LINE); m_maincpu->set_input_line(0, CLEAR_LINE);
} }
WRITE8_MEMBER(gaplus_state::gaplus_irq_2_ctrl_w) WRITE8_MEMBER(gaplus_state::irq_2_ctrl_w)
{ {
int bit = offset & 1; int bit = offset & 1;
m_sub_irq_mask = bit & 1; m_sub_irq_mask = bit & 1;
@ -184,7 +174,7 @@ WRITE8_MEMBER(gaplus_state::gaplus_irq_2_ctrl_w)
m_subcpu->set_input_line(0, CLEAR_LINE); m_subcpu->set_input_line(0, CLEAR_LINE);
} }
WRITE8_MEMBER(gaplus_state::gaplus_irq_3_ctrl_w) WRITE8_MEMBER(gaplus_state::irq_3_ctrl_w)
{ {
int bit = !BIT(offset, 13); int bit = !BIT(offset, 13);
m_sub2_irq_mask = bit & 1; m_sub2_irq_mask = bit & 1;
@ -192,7 +182,7 @@ WRITE8_MEMBER(gaplus_state::gaplus_irq_3_ctrl_w)
m_subcpu2->set_input_line(0, CLEAR_LINE); m_subcpu2->set_input_line(0, CLEAR_LINE);
} }
WRITE8_MEMBER(gaplus_state::gaplus_sreset_w) WRITE8_MEMBER(gaplus_state::sreset_w)
{ {
int bit = !BIT(offset, 11); int bit = !BIT(offset, 11);
m_subcpu->set_input_line(INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); m_subcpu->set_input_line(INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
@ -200,7 +190,7 @@ WRITE8_MEMBER(gaplus_state::gaplus_sreset_w)
m_namco_15xx->mappy_sound_enable(bit); m_namco_15xx->mappy_sound_enable(bit);
} }
WRITE8_MEMBER(gaplus_state::gaplus_freset_w) WRITE8_MEMBER(gaplus_state::freset_w)
{ {
int bit = !BIT(offset, 11); int bit = !BIT(offset, 11);
@ -242,7 +232,7 @@ TIMER_CALLBACK_MEMBER(gaplus_state::namcoio_run)
} }
} }
INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_main_irq) INTERRUPT_GEN_MEMBER(gaplus_state::vblank_main_irq)
{ {
if(m_main_irq_mask) if(m_main_irq_mask)
m_maincpu->set_input_line(0, ASSERT_LINE); m_maincpu->set_input_line(0, ASSERT_LINE);
@ -266,13 +256,13 @@ INTERRUPT_GEN_MEMBER(gaplus_state::gapluso_vblank_main_irq)
timer_set(attotime::from_usec(50), TIMER_NAMCOIO_RUN, 0); timer_set(attotime::from_usec(50), TIMER_NAMCOIO_RUN, 0);
} }
INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_sub_irq) INTERRUPT_GEN_MEMBER(gaplus_state::vblank_sub_irq)
{ {
if(m_sub_irq_mask) if(m_sub_irq_mask)
m_subcpu->set_input_line(0, ASSERT_LINE); m_subcpu->set_input_line(0, ASSERT_LINE);
} }
INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_sub2_irq) INTERRUPT_GEN_MEMBER(gaplus_state::vblank_sub2_irq)
{ {
if(m_sub2_irq_mask) if(m_sub2_irq_mask)
m_subcpu2->set_input_line(0, ASSERT_LINE); m_subcpu2->set_input_line(0, ASSERT_LINE);
@ -280,32 +270,32 @@ INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_sub2_irq)
static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, gaplus_state ) static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, gaplus_state )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) AM_SHARE("videoram") /* tilemap RAM (shared with CPU #2) */ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram") /* tilemap RAM (shared with CPU #2) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) AM_SHARE("spriteram") /* shared RAM with CPU #2 (includes sprite RAM) */ AM_RANGE(0x0800, 0x1fff) AM_RAM AM_SHARE("spriteram") /* shared RAM with CPU #2 (includes sprite RAM) */
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("namco", namco_15xx_device, sharedram_r, sharedram_w) /* shared RAM with CPU #3 */ AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("namco", namco_15xx_device, sharedram_r, sharedram_w) /* shared RAM with CPU #3 */
AM_RANGE(0x6800, 0x680f) AM_DEVREADWRITE("namcoio_1", namcoio_device, read, write) /* custom I/O chips interface */ AM_RANGE(0x6800, 0x680f) AM_DEVREADWRITE("namcoio_1", namcoio_device, read, write) /* custom I/O chips interface */
AM_RANGE(0x6810, 0x681f) AM_DEVREADWRITE("namcoio_2", namcoio_device, read, write) /* custom I/O chips interface */ AM_RANGE(0x6810, 0x681f) AM_DEVREADWRITE("namcoio_2", namcoio_device, read, write) /* custom I/O chips interface */
AM_RANGE(0x6820, 0x682f) AM_READWRITE(gaplus_customio_3_r, gaplus_customio_3_w) AM_SHARE("customio_3") /* custom I/O chip #3 interface */ AM_RANGE(0x6820, 0x682f) AM_READWRITE(customio_3_r, customio_3_w) AM_SHARE("customio_3") /* custom I/O chip #3 interface */
AM_RANGE(0x7000, 0x7fff) AM_WRITE(gaplus_irq_1_ctrl_w) /* main CPU irq control */ AM_RANGE(0x7000, 0x7fff) AM_WRITE(irq_1_ctrl_w) /* main CPU irq control */
AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog */ AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog */
AM_RANGE(0x8000, 0x8fff) AM_WRITE(gaplus_sreset_w) /* reset CPU #2 & #3, enable sound */ AM_RANGE(0x8000, 0x8fff) AM_WRITE(sreset_w) /* reset CPU #2 & #3, enable sound */
AM_RANGE(0x9000, 0x9fff) AM_WRITE(gaplus_freset_w) /* reset I/O chips */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(freset_w) /* reset I/O chips */
AM_RANGE(0xa000, 0xa7ff) AM_WRITE(gaplus_starfield_control_w) /* starfield control */ AM_RANGE(0xa000, 0xa7ff) AM_WRITE(starfield_control_w) /* starfield control */
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, gaplus_state ) static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, gaplus_state )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) /* tilemap RAM (shared with CPU #1) */ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram") /* tilemap RAM (shared with CPU #1) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) /* shared RAM with CPU #1 */ AM_RANGE(0x0800, 0x1fff) AM_RAM AM_SHARE("spriteram") /* shared RAM with CPU #1 */
// AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */ // AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */
AM_RANGE(0x6000, 0x6fff) AM_WRITE(gaplus_irq_2_ctrl_w) /* IRQ 2 control */ AM_RANGE(0x6000, 0x6fff) AM_WRITE(irq_2_ctrl_w) /* IRQ 2 control */
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu3_map, AS_PROGRAM, 8, gaplus_state ) static ADDRESS_MAP_START( cpu3_map, AS_PROGRAM, 8, gaplus_state )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_15xx_device, sharedram_r, sharedram_w) /* shared RAM with the main CPU + sound registers */ AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_15xx_device, sharedram_r, sharedram_w) /* shared RAM with the main CPU + sound registers */
AM_RANGE(0x2000, 0x3fff) AM_READWRITE(watchdog_reset_r, watchdog_reset_w) /* watchdog? */ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(watchdog_reset_r, watchdog_reset_w) /* watchdog? */
AM_RANGE(0x4000, 0x7fff) AM_WRITE(gaplus_irq_3_ctrl_w) /* interrupt enable/disable */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(irq_3_ctrl_w) /* interrupt enable/disable */
AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM */ AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END ADDRESS_MAP_END
@ -495,7 +485,7 @@ WRITE8_MEMBER(gaplus_state::out_lamps1)
coin_counter_w(machine(), 1, ~data & 1); coin_counter_w(machine(), 1, ~data & 1);
} }
MACHINE_START_MEMBER(gaplus_state,gaplus) void gaplus_state::machine_start()
{ {
switch (m_type) switch (m_type)
{ {
@ -509,6 +499,10 @@ MACHINE_START_MEMBER(gaplus_state,gaplus)
m_namco56xx = machine().device<namco56xx_device>("namcoio_2"); m_namco56xx = machine().device<namco56xx_device>("namcoio_2");
break; break;
} }
save_item(NAME(m_main_irq_mask));
save_item(NAME(m_sub_irq_mask));
save_item(NAME(m_sub2_irq_mask));
} }
@ -517,17 +511,16 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state )
/* basic machine hardware */ /* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */ MCFG_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(cpu1_map) MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, gaplus_vblank_main_irq) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_main_irq)
MCFG_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */ MCFG_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, gaplus_vblank_sub_irq) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_sub_irq)
MCFG_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */ MCFG_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(cpu3_map) MCFG_CPU_PROGRAM_MAP(cpu3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, gaplus_vblank_sub2_irq) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_sub2_irq)
MCFG_MACHINE_START_OVERRIDE(gaplus_state, gaplus)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* a high value to ensure proper synchronization of the CPUs */ MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* a high value to ensure proper synchronization of the CPUs */
MCFG_DEVICE_ADD("namcoio_1", NAMCO56XX, 0) MCFG_DEVICE_ADD("namcoio_1", NAMCO56XX, 0)
@ -558,8 +551,8 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_SIZE(36*8, 28*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(gaplus_state, screen_update_gaplus) MCFG_SCREEN_UPDATE_DRIVER(gaplus_state, screen_update)
MCFG_SCREEN_VBLANK_DRIVER(gaplus_state, screen_eof_gaplus) MCFG_SCREEN_VBLANK_DRIVER(gaplus_state, screen_eof)
MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gaplus) MCFG_GFXDECODE_ADD("gfxdecode", "palette", gaplus)
@ -1011,16 +1004,16 @@ DRIVER_INIT_MEMBER(gaplus_state,galaga3)
/* These sets are on revision 2 or 3 PCBs AKA "Namco" PCBs */ /* These sets are on revision 2 or 3 PCBs AKA "Namco" PCBs */
GAME( 1984, gaplus, 0, gapluso, gapluso, gaplus_state, gaplus, ROT90, "Namco", "Gaplus (GP2 rev. B)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, gaplus, 0, gapluso, gapluso, gaplus_state, gaplus, ROT90, "Namco", "Gaplus (GP2 rev. B)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1984, gaplusa, gaplus, gapluso, gapluso, gaplus_state, gaplus, ROT90, "Namco", "Gaplus (GP2)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, gaplusa, gaplus, gapluso, gapluso, gaplus_state, gaplus, ROT90, "Namco", "Gaplus (GP2)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1984, gaplusd, gaplus, gaplusd, gapluso, gaplus_state, gaplusd, ROT90, "Namco", "Gaplus (GP2 rev D, alternate hardware)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, gaplusd, gaplus, gaplusd, gapluso, gaplus_state, gaplusd, ROT90, "Namco", "Gaplus (GP2 rev D, alternate hardware)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1984, galaga3, gaplus, gaplus, gaplus, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (GP3 rev. D)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, galaga3, gaplus, gaplus, gaplus, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (GP3 rev. D)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1984, galaga3a, gaplus, gaplus, gaplus, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (GP3 rev. C)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, galaga3a, gaplus, gaplus, gaplus, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (GP3 rev. C)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1984, galaga3b, gaplus, gaplus, gaplus, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (GP3)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, galaga3b, gaplus, gaplus, gaplus, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (GP3)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
/* These sets are on older revision (AKA Midway) 1 PCBs */ /* These sets are on older revision (AKA Midway) 1 PCBs */
GAME( 1984, galaga3c, gaplus, gaplus, galaga3a, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (set 4)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, galaga3c, gaplus, gaplus, galaga3a, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (set 4)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1984, galaga3m, gaplus, gaplus, galaga3m, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (set 5)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1984, galaga3m, gaplus, gaplus, galaga3m, gaplus_state, galaga3, ROT90, "Namco", "Galaga 3 (set 5)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
/* This is an odd mix of Galaga3 and Gaplus, main code seems closest to galaga3m but still has significant changes, copyright is modified to 1992, has Galaga 3 style high scores, PARSEF spelling error on high score table */ /* This is an odd mix of Galaga3 and Gaplus, main code seems closest to galaga3m but still has significant changes, copyright is modified to 1992, has Galaga 3 style high scores, PARSEF spelling error on high score table */
GAME( 1992, gaplust, gaplus, gaplus, galaga3m, gaplus_state, galaga3, ROT90, "bootleg (Tecfri)", "Gaplus (Tecfri PCB)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1992, gaplust, gaplus, gaplus, galaga3m, gaplus_state, galaga3, ROT90, "bootleg (Tecfri)", "Gaplus (Tecfri PCB)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )

57
src/mame/includes/gaplus.h
View File

@ -34,26 +34,27 @@ public:
m_subcpu2(*this, "sub2"), m_subcpu2(*this, "sub2"),
m_namco_15xx(*this, "namco"), m_namco_15xx(*this, "namco"),
m_samples(*this, "samples") , m_samples(*this, "samples") ,
m_customio_3(*this,"customio_3"),
m_videoram(*this,"videoram"),
m_spriteram(*this,"spriteram"),
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"), m_screen(*this, "screen"),
m_palette(*this, "palette") { } m_palette(*this, "palette"),
m_customio_3(*this,"customio_3"),
m_videoram(*this,"videoram"),
m_spriteram(*this,"spriteram") { }
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu; required_device<cpu_device> m_subcpu;
required_device<cpu_device> m_subcpu2; required_device<cpu_device> m_subcpu2;
required_device<namco_15xx_device> m_namco_15xx; required_device<namco_15xx_device> m_namco_15xx;
required_device<samples_device> m_samples; required_device<samples_device> m_samples;
required_shared_ptr<UINT8> m_customio_3;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen; required_device<screen_device> m_screen;
required_device<palette_device> m_palette; required_device<palette_device> m_palette;
namco58xx_device *m_namco58xx; namco58xx_device *m_namco58xx;
namco56xx_device *m_namco56xx; namco56xx_device *m_namco56xx;
required_shared_ptr<UINT8> m_customio_3;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
int m_type; int m_type;
@ -64,36 +65,38 @@ public:
UINT8 m_main_irq_mask; UINT8 m_main_irq_mask;
UINT8 m_sub_irq_mask; UINT8 m_sub_irq_mask;
UINT8 m_sub2_irq_mask; UINT8 m_sub2_irq_mask;
DECLARE_READ8_MEMBER(gaplus_spriteram_r);
DECLARE_WRITE8_MEMBER(gaplus_spriteram_w); DECLARE_WRITE8_MEMBER(irq_1_ctrl_w);
DECLARE_WRITE8_MEMBER(gaplus_irq_1_ctrl_w); DECLARE_WRITE8_MEMBER(irq_2_ctrl_w);
DECLARE_WRITE8_MEMBER(gaplus_irq_2_ctrl_w); DECLARE_WRITE8_MEMBER(irq_3_ctrl_w);
DECLARE_WRITE8_MEMBER(gaplus_irq_3_ctrl_w); DECLARE_WRITE8_MEMBER(sreset_w);
DECLARE_WRITE8_MEMBER(gaplus_sreset_w); DECLARE_WRITE8_MEMBER(freset_w);
DECLARE_WRITE8_MEMBER(gaplus_freset_w); DECLARE_WRITE8_MEMBER(customio_3_w);
DECLARE_WRITE8_MEMBER(gaplus_customio_3_w); DECLARE_READ8_MEMBER(customio_3_r);
DECLARE_READ8_MEMBER(gaplus_customio_3_r); DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_READ8_MEMBER(gaplus_videoram_r); DECLARE_WRITE8_MEMBER(starfield_control_w);
DECLARE_WRITE8_MEMBER(gaplus_videoram_w);
DECLARE_WRITE8_MEMBER(gaplus_starfield_control_w);
DECLARE_WRITE8_MEMBER(out_lamps0); DECLARE_WRITE8_MEMBER(out_lamps0);
DECLARE_WRITE8_MEMBER(out_lamps1); DECLARE_WRITE8_MEMBER(out_lamps1);
DECLARE_MACHINE_START(gaplus);
DECLARE_DRIVER_INIT(gaplus); DECLARE_DRIVER_INIT(gaplus);
DECLARE_DRIVER_INIT(gaplusd); DECLARE_DRIVER_INIT(gaplusd);
DECLARE_DRIVER_INIT(galaga3); DECLARE_DRIVER_INIT(galaga3);
TILEMAP_MAPPER_MEMBER(tilemap_scan); virtual void machine_start();
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_reset(); virtual void machine_reset();
virtual void video_start(); virtual void video_start();
DECLARE_PALETTE_INIT(gaplus); DECLARE_PALETTE_INIT(gaplus);
UINT32 screen_update_gaplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_gaplus(screen_device &screen, bool state); TILEMAP_MAPPER_MEMBER(tilemap_scan);
INTERRUPT_GEN_MEMBER(gaplus_vblank_main_irq); TILE_GET_INFO_MEMBER(get_tile_info);
INTERRUPT_GEN_MEMBER(vblank_main_irq);
INTERRUPT_GEN_MEMBER(gapluso_vblank_main_irq); INTERRUPT_GEN_MEMBER(gapluso_vblank_main_irq);
INTERRUPT_GEN_MEMBER(gaplus_vblank_sub_irq); INTERRUPT_GEN_MEMBER(vblank_sub_irq);
INTERRUPT_GEN_MEMBER(gaplus_vblank_sub2_irq); INTERRUPT_GEN_MEMBER(vblank_sub2_irq);
TIMER_CALLBACK_MEMBER(namcoio_run); TIMER_CALLBACK_MEMBER(namcoio_run);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof(screen_device &screen, bool state);
void starfield_init(); void starfield_init();
void starfield_render(bitmap_ind16 &bitmap); void starfield_render(bitmap_ind16 &bitmap);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );

6
src/mame/machine/gaplus.c
View File

@ -2,7 +2,7 @@
// copyright-holders:Manuel Abadia, Ernesto Corvi, Nicola Salmoria // copyright-holders:Manuel Abadia, Ernesto Corvi, Nicola Salmoria
/*************************************************************************** /***************************************************************************
machine.c gaplus.c
Functions to emulate general aspects of the machine (RAM, ROM, interrupts, Functions to emulate general aspects of the machine (RAM, ROM, interrupts,
I/O ports) I/O ports)
@ -20,7 +20,7 @@
* * * *
************************************************************************************/ ************************************************************************************/
WRITE8_MEMBER(gaplus_state::gaplus_customio_3_w) WRITE8_MEMBER(gaplus_state::customio_3_w)
{ {
if ((offset == 0x09) && (data >= 0x0f)) if ((offset == 0x09) && (data >= 0x0f))
m_samples->start(0,0); m_samples->start(0,0);
@ -29,7 +29,7 @@ WRITE8_MEMBER(gaplus_state::gaplus_customio_3_w)
} }
READ8_MEMBER(gaplus_state::gaplus_customio_3_r) READ8_MEMBER(gaplus_state::customio_3_r)
{ {
int mode = m_customio_3[8]; int mode = m_customio_3[8];

24
src/mame/video/gaplus.c
View File

@ -2,7 +2,7 @@
// copyright-holders:Manuel Abadia, Ernesto Corvi, Nicola Salmoria // copyright-holders:Manuel Abadia, Ernesto Corvi, Nicola Salmoria
/*************************************************************************** /***************************************************************************
video.c gaplus.c
Functions to emulate the video hardware of the machine. Functions to emulate the video hardware of the machine.
@ -183,6 +183,15 @@ void gaplus_state::video_start()
m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0xff); m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0xff);
starfield_init(); starfield_init();
save_item(NAME(m_starfield_control));
for (int i = 0; i < MAX_STARS; i++)
{
save_item(NAME(m_stars[i].x), i);
save_item(NAME(m_stars[i].y), i);
// col and set aren't changed after init
}
} }
@ -193,18 +202,13 @@ void gaplus_state::video_start()
***************************************************************************/ ***************************************************************************/
READ8_MEMBER(gaplus_state::gaplus_videoram_r) WRITE8_MEMBER(gaplus_state::videoram_w)
{
return m_videoram[offset];
}
WRITE8_MEMBER(gaplus_state::gaplus_videoram_w)
{ {
m_videoram[offset] = data; m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
} }
WRITE8_MEMBER(gaplus_state::gaplus_starfield_control_w) WRITE8_MEMBER(gaplus_state::starfield_control_w)
{ {
offset &= 3; offset &= 3;
m_starfield_control[offset] = data; m_starfield_control[offset] = data;
@ -298,7 +302,7 @@ void gaplus_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect
} }
} }
UINT32 gaplus_state::screen_update_gaplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) UINT32 gaplus_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
/* flip screen control is embedded in RAM */ /* flip screen control is embedded in RAM */
flip_screen_set(m_spriteram[0x1f7f-0x800] & 1); flip_screen_set(m_spriteram[0x1f7f-0x800] & 1);
@ -319,7 +323,7 @@ UINT32 gaplus_state::screen_update_gaplus(screen_device &screen, bitmap_ind16 &b
} }
void gaplus_state::screen_eof_gaplus(screen_device &screen, bool state)/* update starfields */ void gaplus_state::screen_eof(screen_device &screen, bool state)/* update starfields */
{ {
// falling edge // falling edge
if (!state) if (!state)