diff options
Diffstat (limited to 'src/mame/drivers/nycaptor.cpp')
-rw-r--r-- | src/mame/drivers/nycaptor.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index 873ba5cbfdc..722a9e3853a 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -761,16 +761,14 @@ void nycaptor_state::nycaptor(machine_config &config) screen.set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_nycaptor); - PALETTE(config, m_palette, 512); - m_palette->set_format(PALETTE_FORMAT_xxxxBBBBGGGGRRRR); + PALETTE(config, m_palette).set_format(palette_device::xBGR_444, 512); /* sound hardware */ SPEAKER(config, "speaker").front_center(); - GENERIC_LATCH_8(config, m_soundlatch); - m_soundlatch->data_pending_callback().set("soundnmi", FUNC(input_merger_device::in_w<0>)); + GENERIC_LATCH_8(config, m_soundlatch).data_pending_callback().set(m_soundnmi, FUNC(input_merger_device::in_w<0>)); - INPUT_MERGER_ALL_HIGH(config, "soundnmi").output_handler().set_inputline("audiocpu", INPUT_LINE_NMI); + INPUT_MERGER_ALL_HIGH(config, m_soundnmi).output_handler().set_inputline(m_audiocpu, INPUT_LINE_NMI); GENERIC_LATCH_8(config, m_soundlatch2); @@ -834,15 +832,13 @@ void nycaptor_state::cyclshtg(machine_config &config) screen.set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_nycaptor); - PALETTE(config, m_palette, 512); - m_palette->set_format(PALETTE_FORMAT_xxxxBBBBGGGGRRRR); + PALETTE(config, m_palette).set_format(palette_device::xBGR_444, 512); SPEAKER(config, "speaker").front_center(); - GENERIC_LATCH_8(config, m_soundlatch); - m_soundlatch->data_pending_callback().set("soundnmi", FUNC(input_merger_device::in_w<0>)); + GENERIC_LATCH_8(config, m_soundlatch).data_pending_callback().set(m_soundnmi, FUNC(input_merger_device::in_w<0>)); - INPUT_MERGER_ALL_HIGH(config, "soundnmi").output_handler().set_inputline("audiocpu", INPUT_LINE_NMI); + INPUT_MERGER_ALL_HIGH(config, m_soundnmi).output_handler().set_inputline(m_audiocpu, INPUT_LINE_NMI); GENERIC_LATCH_8(config, m_soundlatch2); @@ -904,15 +900,13 @@ void nycaptor_state::bronx(machine_config &config) screen.set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_nycaptor); - PALETTE(config, m_palette, 512); - m_palette->set_format(PALETTE_FORMAT_xxxxBBBBGGGGRRRR); + PALETTE(config, m_palette).set_format(palette_device::xBGR_444, 512); SPEAKER(config, "speaker").front_center(); - GENERIC_LATCH_8(config, m_soundlatch); - m_soundlatch->data_pending_callback().set("soundnmi", FUNC(input_merger_device::in_w<0>)); + GENERIC_LATCH_8(config, m_soundlatch).data_pending_callback().set(m_soundnmi, FUNC(input_merger_device::in_w<0>)); - INPUT_MERGER_ALL_HIGH(config, "soundnmi").output_handler().set_inputline("audiocpu", INPUT_LINE_NMI); + INPUT_MERGER_ALL_HIGH(config, m_soundnmi).output_handler().set_inputline(m_audiocpu, INPUT_LINE_NMI); GENERIC_LATCH_8(config, m_soundlatch2); |