diff options
Diffstat (limited to 'src/mame/drivers/blackt96.cpp')
-rw-r--r-- | src/mame/drivers/blackt96.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp index 28bb8f2f685..690fab53182 100644 --- a/src/mame/drivers/blackt96.cpp +++ b/src/mame/drivers/blackt96.cpp @@ -447,14 +447,14 @@ WRITE8_MEMBER(blackt96_state::blackt96_soundio_port_c_w) if (((data & 0x02) == 0x00) && ((m_port_c_data & 0x02) == 0x02)) // high -> low on bit 0x02 writes to selected OKI { //logerror("%s: blackt96_soundio_port_c_w (write to OKI %02x) (oki selected is %02x)\n", machine().describe_context().c_str(), m_port_b_latch, m_oki_selected); - if (m_oki_selected == 0) m_oki[0]->write(space, 0, m_port_b_latch); - else if (m_oki_selected == 1) m_oki[1]->write(space, 0, m_port_b_latch); + if (m_oki_selected == 0) m_oki[0]->write(m_port_b_latch); + else if (m_oki_selected == 1) m_oki[1]->write(m_port_b_latch); } if (((data & 0x01) == 0x00) && ((m_port_c_data & 0x01) == 0x01)) // high -> low on bit 0x01 reads to selected OKI { - if (m_oki_selected == 0) m_port_b_latch = m_oki[0]->read(space, 0); - else if (m_oki_selected == 1) m_port_b_latch = m_oki[1]->read(space, 0); + if (m_oki_selected == 0) m_port_b_latch = m_oki[0]->read(); + else if (m_oki_selected == 1) m_port_b_latch = m_oki[1]->read(); } m_port_c_data = data; @@ -477,10 +477,11 @@ void blackt96_state::tile_callback(int &tile, int& fx, int& fy, int& region) } -MACHINE_CONFIG_START(blackt96_state::blackt96) - MCFG_DEVICE_ADD("maincpu", M68000, 18000000 /2) - MCFG_DEVICE_PROGRAM_MAP(blackt96_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blackt96_state, irq1_line_hold) +void blackt96_state::blackt96(machine_config &config) +{ + M68000(config, m_maincpu, 18000000 /2); + m_maincpu->set_addrmap(AS_PROGRAM, &blackt96_state::blackt96_map); + m_maincpu->set_vblank_int("screen", FUNC(blackt96_state::irq1_line_hold)); pic16c57_device &audiocpu(PIC16C57(config, "audiocpu", 8000000)); /* ? */ audiocpu.write_a().set(FUNC(blackt96_state::blackt96_soundio_port_a_w)); @@ -489,16 +490,16 @@ MACHINE_CONFIG_START(blackt96_state::blackt96) audiocpu.read_c().set(FUNC(blackt96_state::blackt96_soundio_port_c_r)); audiocpu.write_c().set(FUNC(blackt96_state::blackt96_soundio_port_c_w)); - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blackt96) + GFXDECODE(config, m_gfxdecode, m_palette, gfx_blackt96); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(256, 256) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 16*32-1, 0*8, 16*32-1) - MCFG_SCREEN_VISIBLE_AREA(0*8, 256-1, 2*8, 240-1) - MCFG_SCREEN_UPDATE_DRIVER(blackt96_state, screen_update_blackt96) - MCFG_SCREEN_PALETTE(m_palette) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(60); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); + screen.set_size(256, 256); +// screen.set_visarea(0*8, 16*32-1, 0*8, 16*32-1); + screen.set_visarea(0*8, 256-1, 2*8, 240-1); + screen.set_screen_update(FUNC(blackt96_state::screen_update_blackt96)); + screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xRGB_444, 0x800); @@ -510,15 +511,15 @@ MACHINE_CONFIG_START(blackt96_state::blackt96) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("oki1", OKIM6295, 8000000/8, okim6295_device::PIN7_HIGH) // music - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) - MCFG_DEVICE_ADDRESS_MAP(0, oki1_map) + OKIM6295(config, m_oki[0], 8000000/8, okim6295_device::PIN7_HIGH); // music + m_oki[0]->add_route(ALL_OUTPUTS, "lspeaker", 0.47); + m_oki[0]->add_route(ALL_OUTPUTS, "rspeaker", 0.47); + m_oki[0]->set_addrmap(0, &blackt96_state::oki1_map); - MCFG_DEVICE_ADD("oki2", OKIM6295, 8000000/8, okim6295_device::PIN7_HIGH) // sfx - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) -MACHINE_CONFIG_END + OKIM6295(config, m_oki[1], 8000000/8, okim6295_device::PIN7_HIGH); // sfx + m_oki[1]->add_route(ALL_OUTPUTS, "lspeaker", 0.47); + m_oki[1]->add_route(ALL_OUTPUTS, "rspeaker", 0.47); +} ROM_START( blackt96 ) |