From 4ac111da3cabcf4fa02370dd85293ea0bfc8bc4e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 5 Nov 2019 01:04:31 +1100 Subject: [PATCH] misc cleanup (nw) --- hash/32x.xml | 10 +++++----- src/lib/netlist/devices/nld_9310.cpp | 2 +- src/mame/drivers/gradius3.cpp | 5 ++--- src/mame/drivers/segapico.cpp | 28 ++++++++++++++++------------ 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/hash/32x.xml b/hash/32x.xml index a021dc6f3c5..e027eb673d7 100644 --- a/hash/32x.xml +++ b/hash/32x.xml @@ -28,7 +28,7 @@ - + @@ -72,8 +72,8 @@ - - + + @@ -89,7 +89,7 @@ - + @@ -106,7 +106,7 @@ - + diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp index bb1e9cc46e3..81c26928be3 100644 --- a/src/lib/netlist/devices/nld_9310.cpp +++ b/src/lib/netlist/devices/nld_9310.cpp @@ -1,5 +1,5 @@ // license:GPL-2.0+ -//+opyright-holders:Couriersud +// copyright-holders:Couriersud /* * nld_9310.c * diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index cb92013b72e..06aacaae97e 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -72,7 +72,7 @@ WRITE16_MEMBER(gradius3_state::cpuA_ctrl_w) m_irqAen = data & 0x20; /* other bits unknown */ - //logerror("%s: write %04x to c0000\n",machine().describe_context(),data); + //logerror("%s: write %04x to c0000\n",machine().describe_context(),data); } } @@ -266,8 +266,7 @@ void gradius3_state::gradius3(machine_config &config) M68000(config, m_subcpu, XTAL(10'000'000)); m_subcpu->set_addrmap(AS_PROGRAM, &gradius3_state::gradius3_map2); TIMER(config, "scantimer").configure_scanline(FUNC(gradius3_state::gradius3_sub_scanline), "screen", 0, 1); - /* 4 is triggered by cpu A, the others are unknown but */ - /* required for the game to run. */ + /* 4 is triggered by cpu A, the others are unknown but required for the game to run. */ Z80(config, m_audiocpu, 3579545); m_audiocpu->set_addrmap(AS_PROGRAM, &gradius3_state::gradius3_s_map); diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp index fa5e38fc88b..4e5a351d2d8 100644 --- a/src/mame/drivers/segapico.cpp +++ b/src/mame/drivers/segapico.cpp @@ -130,8 +130,8 @@ C = MB3514 / 9325 M36 class pico_base_state : public md_cons_state { public: - pico_base_state(const machine_config &mconfig, device_type type, const char *tag) - : md_cons_state(mconfig, type, tag), + pico_base_state(const machine_config &mconfig, device_type type, const char *tag) : + md_cons_state(mconfig, type, tag), m_sega_315_5641_pcm(*this, "315_5641"), m_io_page(*this, "PAGE"), m_io_pad(*this, "PAD"), @@ -164,9 +164,10 @@ protected: class pico_state : public pico_base_state { public: - pico_state(const machine_config &mconfig, device_type type, const char *tag) - : pico_base_state(mconfig, type, tag), - m_picocart(*this, "picoslot") { } + pico_state(const machine_config &mconfig, device_type type, const char *tag) : + pico_base_state(mconfig, type, tag), + m_picocart(*this, "picoslot") + { } void pico(machine_config &config); void picopal(machine_config &config); @@ -562,14 +563,17 @@ S-AUDIO <-| | +-----------+ +-------+ class copera_state : public pico_base_state { public: - copera_state(const machine_config &mconfig, device_type type, const char *tag) - : pico_base_state(mconfig, type, tag), - m_picocart(*this, "coperaslot") { } + copera_state(const machine_config &mconfig, device_type type, const char *tag) : + pico_base_state(mconfig, type, tag), + m_picocart(*this, "coperaslot") + { } - required_device m_picocart; - DECLARE_MACHINE_START(copera); void copera(machine_config &config); void copera_mem(address_map &map); + +private: + required_device m_picocart; + DECLARE_MACHINE_START(copera); }; @@ -618,13 +622,13 @@ void copera_state::copera(machine_config &config) config.device_remove("ymsnd"); MCFG_MACHINE_START_OVERRIDE( copera_state, copera ) - MCFG_MACHINE_RESET_OVERRIDE( pico_base_state, ms_megadriv ) + MCFG_MACHINE_RESET_OVERRIDE( copera_state, ms_megadriv ) COPERA_CART_SLOT(config, m_picocart, copera_cart, nullptr); SOFTWARE_LIST(config, "cart_list").set_original("copera"); SEGA_315_5641_PCM(config, m_sega_315_5641_pcm, upd7759_device::STANDARD_CLOCK); - //m_sega_315_5641_pcm->drq().set(FUNC(pico_state::sound_cause_irq)); FIXME: this never worked - the MAME 315_5641 doesn't support slave mode + //m_sega_315_5641_pcm->drq().set(FUNC(copera_state::sound_cause_irq)); FIXME: this never worked - the MAME 315_5641 doesn't support slave mode m_sega_315_5641_pcm->add_route(ALL_OUTPUTS, "lspeaker", 0.16); m_sega_315_5641_pcm->add_route(ALL_OUTPUTS, "rspeaker", 0.16); }