diff --git a/src/frontend/mame/pluginopts.cpp b/src/frontend/mame/pluginopts.cpp index 88119e52491..cfb04af21a4 100644 --- a/src/frontend/mame/pluginopts.cpp +++ b/src/frontend/mame/pluginopts.cpp @@ -7,7 +7,6 @@ Plugin options manager. ***************************************************************************/ -#include #include "emu.h" #include "pluginopts.h" @@ -15,6 +14,9 @@ #include #include +#include + + //************************************************************************** // PLUGIN OPTIONS //************************************************************************** @@ -75,8 +77,8 @@ void plugin_options::parse_json(std::string path) if (type=="plugin") { - m_descriptions.push_back(std::move(description)); - add_entry({ std::move(plugin_name) }, m_descriptions.back().c_str(), option_type::BOOLEAN, start ? "1" : "0"); + auto const it = m_descriptions.emplace(m_descriptions.end(), std::move(description)); + add_entry({ std::move(plugin_name) }, it->c_str(), option_type::BOOLEAN, start ? "1" : "0"); } } diff --git a/src/frontend/mame/pluginopts.h b/src/frontend/mame/pluginopts.h index 4e78dfd0be6..f306c925ce2 100644 --- a/src/frontend/mame/pluginopts.h +++ b/src/frontend/mame/pluginopts.h @@ -7,24 +7,27 @@ Plugin options manager. ***************************************************************************/ +#ifndef MAME_FRONTEND_PLUGINOPTS_H +#define MAME_FRONTEND_PLUGINOPTS_H #pragma once -#ifndef __PLUGIN_OPTS_H__ -#define __PLUGIN_OPTS_H__ - #include "options.h" +#include +#include + + class plugin_options : public core_options { public: - // construction/destruction plugin_options(); void parse_json(std::string path); + private: static const options_entry s_option_entries[]; - std::vector m_descriptions; + std::list m_descriptions; }; -#endif /* __PLUGIN_OPTS_H__ */ +#endif // MAME_FRONTEND_PLUGINOPTS_H diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 6b3f7d34bba..826cb04ce6e 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -113,19 +113,19 @@ public: DECLARE_READ8_MEMBER(segapcm_rom_r); DECLARE_READ8_MEMBER(ymf271_rom_r); DECLARE_READ8_MEMBER(ymz280b_rom_r); - template DECLARE_READ8_MEMBER(multipcm_rom_r); + template DECLARE_READ8_MEMBER(multipcm_rom_r); DECLARE_READ8_MEMBER(k053260_rom_r); - template DECLARE_READ8_MEMBER(okim6295_rom_r); - template DECLARE_READ8_MEMBER(k054539_rom_r); + template DECLARE_READ8_MEMBER(okim6295_rom_r); + template DECLARE_READ8_MEMBER(k054539_rom_r); DECLARE_READ8_MEMBER(c352_rom_r); DECLARE_READ8_MEMBER(qsound_rom_r); - template DECLARE_WRITE8_MEMBER(multipcm_bank_hi_w); - template DECLARE_WRITE8_MEMBER(multipcm_bank_lo_w); + template DECLARE_WRITE8_MEMBER(multipcm_bank_hi_w); + template DECLARE_WRITE8_MEMBER(multipcm_bank_lo_w); - template DECLARE_WRITE8_MEMBER(okim6295_nmk112_enable_w); - template DECLARE_WRITE8_MEMBER(okim6295_bank_w); - template DECLARE_WRITE8_MEMBER(okim6295_nmk112_bank_w); + template DECLARE_WRITE8_MEMBER(okim6295_nmk112_enable_w); + template DECLARE_WRITE8_MEMBER(okim6295_bank_w); + template DECLARE_WRITE8_MEMBER(okim6295_nmk112_bank_w); private: struct rom_block { @@ -178,8 +178,8 @@ public: DECLARE_READ8_MEMBER(file_r); DECLARE_READ8_MEMBER(file_size_r); - template DECLARE_WRITE8_MEMBER(okim6295_clock_w); - template DECLARE_WRITE8_MEMBER(okim6295_pin7_w); + template DECLARE_WRITE8_MEMBER(okim6295_clock_w); + template DECLARE_WRITE8_MEMBER(okim6295_pin7_w); void vgmplay(machine_config &config); private: @@ -967,59 +967,59 @@ READ8_MEMBER(vgmplay_device::ymz280b_rom_r) return rom_r(0, 0x86, offset); } -template +template READ8_MEMBER(vgmplay_device::multipcm_rom_r) { - if (m_multipcm_banked[chip] == 1) + if (m_multipcm_banked[Chip] == 1) { offset &= 0x1fffff; if (offset & 0x100000) { - if (m_multipcm_bank_l[chip] == m_multipcm_bank_r[chip]) + if (m_multipcm_bank_l[Chip] == m_multipcm_bank_r[Chip]) { - offset = ((m_multipcm_bank_r[chip] & ~0xf) << 16) | (offset & 0xfffff); + offset = ((m_multipcm_bank_r[Chip] & ~0xf) << 16) | (offset & 0xfffff); } else { if (offset & 0x80000) { - offset = ((m_multipcm_bank_l[chip] & ~0x7) << 16) | (offset & 0x7ffff); + offset = ((m_multipcm_bank_l[Chip] & ~0x7) << 16) | (offset & 0x7ffff); } else { - offset = ((m_multipcm_bank_r[chip] & ~0x7) << 16) | (offset & 0x7ffff); + offset = ((m_multipcm_bank_r[Chip] & ~0x7) << 16) | (offset & 0x7ffff); } } } } - return rom_r(chip, 0x89, offset); + return rom_r(Chip, 0x89, offset); } -template +template READ8_MEMBER(vgmplay_device::okim6295_rom_r) { - if (m_okim6295_nmk112_enable[chip]) + if (m_okim6295_nmk112_enable[Chip]) { - if ((offset < 0x400) && (m_okim6295_nmk112_enable[chip] & 0x80)) + if ((offset < 0x400) && (m_okim6295_nmk112_enable[Chip] & 0x80)) { - offset = (m_okim6295_nmk112_bank[chip][(offset >> 8) & 0x3] << 16) | (offset & 0xff); + offset = (m_okim6295_nmk112_bank[Chip][(offset >> 8) & 0x3] << 16) | (offset & 0xff); } else { - offset = (m_okim6295_nmk112_bank[chip][(offset >> 16) & 0x3] << 16) | (offset & 0xffff); + offset = (m_okim6295_nmk112_bank[Chip][(offset >> 16) & 0x3] << 16) | (offset & 0xffff); } } else { - offset = (m_okim6295_bank[chip] * 0x40000) | offset; + offset = (m_okim6295_bank[Chip] * 0x40000) | offset; } - return rom_r(chip, 0x8b, offset); + return rom_r(Chip, 0x8b, offset); } -template +template READ8_MEMBER(vgmplay_device::k054539_rom_r) { - return rom_r(chip, 0x8c, offset); + return rom_r(Chip, 0x8c, offset); } READ8_MEMBER(vgmplay_device::k053260_rom_r) @@ -1334,69 +1334,69 @@ READ8_MEMBER(vgmplay_state::file_size_r) return size >> (8*offset); } -template +template WRITE8_MEMBER(vgmplay_device::multipcm_bank_hi_w) { if (offset & 1) - m_multipcm_bank_l[chip] = (m_multipcm_bank_l[chip] & 0xff) | (data << 16); + m_multipcm_bank_l[Chip] = (m_multipcm_bank_l[Chip] & 0xff) | (data << 16); if (offset & 2) - m_multipcm_bank_r[chip] = (m_multipcm_bank_r[chip] & 0xff) | (data << 16); + m_multipcm_bank_r[Chip] = (m_multipcm_bank_r[Chip] & 0xff) | (data << 16); } -template +template WRITE8_MEMBER(vgmplay_device::multipcm_bank_lo_w) { if (offset & 1) - m_multipcm_bank_l[chip] = (m_multipcm_bank_l[chip] & 0xff00) | data; + m_multipcm_bank_l[Chip] = (m_multipcm_bank_l[Chip] & 0xff00) | data; if (offset & 2) - m_multipcm_bank_r[chip] = (m_multipcm_bank_r[chip] & 0xff00) | data; + m_multipcm_bank_r[Chip] = (m_multipcm_bank_r[Chip] & 0xff00) | data; - m_multipcm_banked[chip] = 1; + m_multipcm_banked[Chip] = 1; } -template +template WRITE8_MEMBER(vgmplay_state::okim6295_clock_w) { - uint32_t old = m_okim6295_clock[chip]; + uint32_t old = m_okim6295_clock[Chip]; int shift = ((offset & 3) << 3); - m_okim6295_clock[chip] = (m_okim6295_clock[chip] & ~(mem_mask << shift)) | ((data & mem_mask) << shift); - if (old != m_okim6295_clock[chip]) - m_okim6295[chip]->set_unscaled_clock(m_okim6295_clock[chip]); + m_okim6295_clock[Chip] = (m_okim6295_clock[Chip] & ~(mem_mask << shift)) | ((data & mem_mask) << shift); + if (old != m_okim6295_clock[Chip]) + m_okim6295[Chip]->set_unscaled_clock(m_okim6295_clock[Chip]); } -template +template WRITE8_MEMBER(vgmplay_state::okim6295_pin7_w) { - if ((data & mem_mask) != (m_okim6295_pin7[chip] & mem_mask)) + if ((data & mem_mask) != (m_okim6295_pin7[Chip] & mem_mask)) { - COMBINE_DATA(&m_okim6295_pin7[chip]); - okim6295_device::static_set_pin7(*m_okim6295[chip], m_okim6295_pin7[chip]); + COMBINE_DATA(&m_okim6295_pin7[Chip]); + okim6295_device::static_set_pin7(*m_okim6295[Chip], m_okim6295_pin7[Chip]); } } -template +template WRITE8_MEMBER(vgmplay_device::okim6295_nmk112_enable_w) { - COMBINE_DATA(&m_okim6295_nmk112_enable[chip]); + COMBINE_DATA(&m_okim6295_nmk112_enable[Chip]); } -template +template WRITE8_MEMBER(vgmplay_device::okim6295_bank_w) { - if ((data & mem_mask) != (m_okim6295_bank[chip] & mem_mask)) + if ((data & mem_mask) != (m_okim6295_bank[Chip] & mem_mask)) { - COMBINE_DATA(&m_okim6295_bank[chip]); + COMBINE_DATA(&m_okim6295_bank[Chip]); } } -template +template WRITE8_MEMBER(vgmplay_device::okim6295_nmk112_bank_w) { offset &= 3; - if ((data & mem_mask) != (m_okim6295_nmk112_bank[chip][offset] & mem_mask)) + if ((data & mem_mask) != (m_okim6295_nmk112_bank[Chip][offset] & mem_mask)) { - COMBINE_DATA(&m_okim6295_nmk112_bank[chip][offset]); + COMBINE_DATA(&m_okim6295_nmk112_bank[Chip][offset]); } } diff --git a/src/mame/includes/a2600.h b/src/mame/includes/a2600.h index b3090220c49..55a39069d45 100644 --- a/src/mame/includes/a2600.h +++ b/src/mame/includes/a2600.h @@ -13,22 +13,18 @@ #pragma once -#define USE_NEW_RIOT 0 - - -#define CONTROL1_TAG "joyport1" -#define CONTROL2_TAG "joyport2" - +#include "bus/vcs/compumat.h" +#include "bus/vcs/dpc.h" +#include "bus/vcs/harmony_melody.h" +#include "bus/vcs/rom.h" +#include "bus/vcs/scharger.h" +#include "bus/vcs/vcs_slot.h" +#include "bus/vcs_ctrl/ctrl.h" #include "cpu/m6502/m6507.h" #include "sound/tiaintf.h" #include "video/tia.h" -#include "bus/vcs/vcs_slot.h" -#include "bus/vcs/rom.h" -#include "bus/vcs/dpc.h" -#include "bus/vcs/harmony_melody.h" -#include "bus/vcs/scharger.h" -#include "bus/vcs/compumat.h" -#include "bus/vcs_ctrl/ctrl.h" + +#define USE_NEW_RIOT 0 #if USE_NEW_RIOT #include "machine/mos6530n.h" @@ -36,6 +32,9 @@ #include "machine/6532riot.h" #endif +#define CONTROL1_TAG "joyport1" +#define CONTROL2_TAG "joyport2" + class a2600_state : public driver_device {