diff options
Diffstat (limited to 'docs/release/src/mame/drivers/jrpacman.cpp')
-rw-r--r-- | docs/release/src/mame/drivers/jrpacman.cpp | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/docs/release/src/mame/drivers/jrpacman.cpp b/docs/release/src/mame/drivers/jrpacman.cpp index decb750ab14..3dcec79644e 100644 --- a/docs/release/src/mame/drivers/jrpacman.cpp +++ b/docs/release/src/mame/drivers/jrpacman.cpp @@ -116,7 +116,7 @@ public: : pacman_state(mconfig, type, tag) { } DECLARE_WRITE8_MEMBER(jrpacman_interrupt_vector_w); DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_DRIVER_INIT(jrpacman); + void init_jrpacman(); DECLARE_WRITE_LINE_MEMBER(vblank_irq); void jrpacman(machine_config &config); void main_map(address_map &map); @@ -278,7 +278,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( jrpacman ) +static GFXDECODE_START( gfx_jrpacman ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x2000, spritelayout, 0, 128 ) GFXDECODE_END @@ -300,24 +300,24 @@ WRITE_LINE_MEMBER(jrpacman_state::vblank_irq) MACHINE_CONFIG_START(jrpacman_state::jrpacman) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ - MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_IO_MAP(port_map) -// MCFG_CPU_VBLANK_INT_DRIVER("screen", jrpacman_state, vblank_irq) - MCFG_CPU_VBLANK_INT_DRIVER("screen", pacman_state, pacman_interrupt) // HBMAME + MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ + MCFG_DEVICE_PROGRAM_MAP(main_map) + MCFG_DEVICE_IO_MAP(port_map) +// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jrpacman_state, vblank_irq) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pacman_state, pacman_interrupt) // HBMAME MCFG_DEVICE_ADD("latch1", LS259, 0) // 5P - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(jrpacman_state, irq_mask_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("namco", namco_device, pacman_sound_enable_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(jrpacman_state, flipscreen_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(jrpacman_state, coin_counter_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, jrpacman_state, irq_mask_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, jrpacman_state, flipscreen_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, jrpacman_state, coin_counter_w)) MCFG_DEVICE_ADD("latch2", LS259, 0) // 1H - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(jrpacman_state, pengo_palettebank_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jrpacman_state, pengo_colortablebank_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(jrpacman_state, jrpacman_bgpriority_w)) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(jrpacman_state, jrpacman_charbank_w)) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(jrpacman_state, jrpacman_spritebank_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, jrpacman_state, pengo_palettebank_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jrpacman_state, pengo_colortablebank_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, jrpacman_state, jrpacman_bgpriority_w)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, jrpacman_state, jrpacman_charbank_w)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, jrpacman_state, jrpacman_spritebank_w)) MCFG_WATCHDOG_ADD("watchdog") @@ -329,18 +329,18 @@ MACHINE_CONFIG_START(jrpacman_state::jrpacman) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(jrpacman_state, screen_update_pacman) MCFG_SCREEN_PALETTE("palette") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(jrpacman_state, vblank_irq)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jrpacman_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jrpacman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jrpacman) MCFG_PALETTE_ADD("palette", 128*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(jrpacman_state,pacman) MCFG_VIDEO_START_OVERRIDE(jrpacman_state,jrpacman) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); - MCFG_SOUND_ADD("namco", NAMCO, 3072000/32) + MCFG_DEVICE_ADD("namco", NAMCO, 3072000/32) MCFG_NAMCO_AUDIO_VOICES(3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -405,7 +405,7 @@ ROM_END * *************************************/ -DRIVER_INIT_MEMBER(jrpacman_state,jrpacman) +void jrpacman_state::init_jrpacman() { /* The encryption PALs garble bits 0, 2 and 7 of the ROMs. The encryption */ /* scheme is complex (basically it's a state machine) and can only be */ @@ -443,10 +443,8 @@ DRIVER_INIT_MEMBER(jrpacman_state,jrpacman) }; uint8_t *RAM = memregion("maincpu")->base(); - int i, j, A; - - for (i = A = 0; table[i].count; i++) - for (j = 0; j < table[i].count; j++) + for (int i = 0, A = 0; table[i].count; i++) + for (int j = 0; j < table[i].count; j++) RAM[A++] ^= table[i].value; } @@ -458,5 +456,5 @@ DRIVER_INIT_MEMBER(jrpacman_state,jrpacman) * *************************************/ -GAME( 1983, jrpacman, 0, jrpacman, jrpacman, jrpacman_state, jrpacman, ROT90, "Bally Midway", "Jr. Pac-Man (11/9/83)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, jrpacmanf, jrpacman, jrpacman, jrpacman, jrpacman_state, jrpacman, ROT90, "hack", "Jr. Pac-Man (speedup hack)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, jrpacman, 0, jrpacman, jrpacman, jrpacman_state, init_jrpacman, ROT90, "Bally Midway", "Jr. Pac-Man (11/9/83)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, jrpacmanf, jrpacman, jrpacman, jrpacman, jrpacman_state, init_jrpacman, ROT90, "hack", "Jr. Pac-Man (speedup hack)", MACHINE_SUPPORTS_SAVE ) |