diff options
Diffstat (limited to 'src/mame/drivers/aquarium.cpp')
-rw-r--r-- | src/mame/drivers/aquarium.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp index d4379d9181f..0f3dd904512 100644 --- a/src/mame/drivers/aquarium.cpp +++ b/src/mame/drivers/aquarium.cpp @@ -87,13 +87,13 @@ uint8_t aquarium_state::aquarium_snd_bitswap( uint8_t scrambled_data ) READ8_MEMBER(aquarium_state::aquarium_oki_r) { - return aquarium_snd_bitswap(m_oki->read()); + return aquarium_snd_bitswap(m_oki->read(space, offset)); } WRITE8_MEMBER(aquarium_state::aquarium_oki_w) { logerror("%s:Writing %04x to the OKI M6295\n", machine().describe_context(), aquarium_snd_bitswap(data)); - m_oki->write(aquarium_snd_bitswap(data)); + m_oki->write(space, offset, (aquarium_snd_bitswap(data))); } @@ -287,33 +287,33 @@ static GFXDECODE_START( gfx_aquarium ) GFXDECODE_ENTRY( "gfx4", 0, char5bpplayout, 0x400, 32 ) GFXDECODE_END -void aquarium_state::aquarium(machine_config &config) -{ +MACHINE_CONFIG_START(aquarium_state::aquarium) + /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(32'000'000)/2); // clock not verified on pcb - m_maincpu->set_addrmap(AS_PROGRAM, &aquarium_state::main_map); - m_maincpu->set_vblank_int("screen", FUNC(aquarium_state::irq1_line_hold)); + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) // clock not verified on pcb + MCFG_DEVICE_PROGRAM_MAP(main_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aquarium_state, irq1_line_hold) - Z80(config, m_audiocpu, XTAL(32'000'000)/6); // clock not verified on pcb - m_audiocpu->set_addrmap(AS_PROGRAM, &aquarium_state::snd_map); - m_audiocpu->set_addrmap(AS_IO, &aquarium_state::snd_portmap); + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/6) // clock not verified on pcb + MCFG_DEVICE_PROGRAM_MAP(snd_map) + MCFG_DEVICE_IO_MAP(snd_portmap) // Is this the actual IC type? Some other Excellent games from this period use a MAX693. - MB3773(config, m_watchdog, 0); + MCFG_DEVICE_ADD("watchdog", MB3773, 0) /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(64*8, 64*8); - m_screen->set_visarea(2*8, 42*8-1, 2*8, 34*8-1); - m_screen->set_screen_update(FUNC(aquarium_state::screen_update_aquarium)); - m_screen->set_palette(m_palette); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_aquarium); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(64*8, 64*8) + MCFG_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 34*8-1) + MCFG_SCREEN_UPDATE_DRIVER(aquarium_state, screen_update_aquarium) + MCFG_SCREEN_PALETTE(m_palette) + + MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_palette, gfx_aquarium) PALETTE(config, m_palette).set_format(palette_device::RRRRGGGGBBBBRGBx, 0x1000/2); - EXCELLENT_SPRITE(config, m_sprgen, 0); + MCFG_DEVICE_ADD("spritegen", EXCELLENT_SPRITE, 0) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -328,10 +328,10 @@ void aquarium_state::aquarium(machine_config &config) ymsnd.add_route(0, "lspeaker", 0.45); ymsnd.add_route(1, "rspeaker", 0.45); - OKIM6295(config, m_oki, XTAL(1'056'000), okim6295_device::PIN7_HIGH); // pin 7 not verified - m_oki->add_route(ALL_OUTPUTS, "lspeaker", 0.47); - m_oki->add_route(ALL_OUTPUTS, "rspeaker", 0.47); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(1'056'000), okim6295_device::PIN7_HIGH) // pin 7 not verified + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) +MACHINE_CONFIG_END ROM_START( aquarium ) ROM_REGION( 0x080000, "maincpu", 0 ) /* 68000 code */ |