diff options
| author | 2025-10-23 10:09:00 +0300 | |
|---|---|---|
| committer | 2025-10-23 09:09:00 +0200 | |
| commit | 8506c90258358f4d373e630f1d7970474bcc9cff (patch) | |
| tree | a3373d47d9f1aa6bbbedcd0a8a4ad93b39ad21e7 | |
| parent | e5ec14a53bc7328d16263c4d37ff961c3681cf05 (diff) | |
Follow-up to PR#14263 -- move implementation details out of headers etc. (#14384)
| -rw-r--r-- | scripts/src/bus.lua | 4 | ||||
| -rw-r--r-- | src/devices/bus/bk/ay.cpp | 38 | ||||
| -rw-r--r-- | src/devices/bus/bk/ay.h | 35 | ||||
| -rw-r--r-- | src/devices/bus/bk/carts.h | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/covox.cpp | 43 | ||||
| -rw-r--r-- | src/devices/bus/bk/covox.h | 36 | ||||
| -rw-r--r-- | src/devices/bus/bk/joystick.cpp | 31 | ||||
| -rw-r--r-- | src/devices/bus/bk/joystick.h | 28 | ||||
| -rw-r--r-- | src/devices/bus/bk/loopback.cpp | 32 | ||||
| -rw-r--r-- | src/devices/bus/bk/loopback.h | 28 | ||||
| -rw-r--r-- | src/devices/bus/bk/parallel.h | 2 | ||||
| -rw-r--r-- | src/devices/bus/bk/printer.cpp | 40 | ||||
| -rw-r--r-- | src/devices/bus/bk/printer.h | 36 | ||||
| -rw-r--r-- | src/devices/bus/rc2014/modules.cpp | 2 | ||||
| -rw-r--r-- | src/devices/bus/rc2014/sound_ym_ay.cpp (renamed from src/devices/bus/rc2014/sound.cpp) | 2 | ||||
| -rw-r--r-- | src/devices/bus/rc2014/sound_ym_ay.h (renamed from src/devices/bus/rc2014/sound.h) | 6 |
16 files changed, 171 insertions, 194 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 3a74d616595..c675adc356d 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2607,8 +2607,8 @@ if (BUSES["RC2014"]~=null) then MAME_DIR .. "src/devices/bus/rc2014/rtc.h", MAME_DIR .. "src/devices/bus/rc2014/serial.cpp", MAME_DIR .. "src/devices/bus/rc2014/serial.h", - MAME_DIR .. "src/devices/bus/rc2014/sound.cpp", - MAME_DIR .. "src/devices/bus/rc2014/sound.h", + MAME_DIR .. "src/devices/bus/rc2014/sound_ym_ay.cpp", + MAME_DIR .. "src/devices/bus/rc2014/sound_ym_ay.h", MAME_DIR .. "src/devices/bus/rc2014/z180cpu.cpp", MAME_DIR .. "src/devices/bus/rc2014/z180cpu.h", MAME_DIR .. "src/devices/bus/rc2014/z80cpu.cpp", diff --git a/src/devices/bus/bk/ay.cpp b/src/devices/bus/bk/ay.cpp index 634fd700a34..993ecf5dbf5 100644 --- a/src/devices/bus/bk/ay.cpp +++ b/src/devices/bus/bk/ay.cpp @@ -14,19 +14,36 @@ #include "emu.h" #include "ay.h" +#include "sound/ay8910.h" +#include "speaker.h" + + +namespace { //************************************************************************** -// CONSTANTS/MACROS +// TYPE DEFINITIONS //************************************************************************** -#define VERBOSE 0 +// ======================> bk_ay_device +class bk_ay_device : public device_t, public device_bk_parallel_interface +{ +public: + // construction/destruction + bk_ay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -//************************************************************************** -// DEVICE DEFINITIONS -//************************************************************************** +protected: + virtual void device_start() override ATTR_COLD {}; + + virtual uint16_t io_r() override; + virtual void io_w(uint16_t data, bool word) override; + +private: + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; -DEFINE_DEVICE_TYPE(BK_AY, bk_ay_device, "bk_ay", "Single AY Interface") + required_device<ym2149_device> m_ay; + required_device<bk_parallel_slot_device> m_up; +}; //************************************************************************** @@ -77,3 +94,12 @@ void bk_ay_device::io_w(uint16_t data, bool word) m_ay->data_w(data); m_up->write(0, data ^ 0xffff, word); } + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(BK_AY, device_qbus_card_interface, bk_ay_device, "bk_ay", "BK Single AY Interface") diff --git a/src/devices/bus/bk/ay.h b/src/devices/bus/bk/ay.h index 9e350dccb4f..50aca4f1562 100644 --- a/src/devices/bus/bk/ay.h +++ b/src/devices/bus/bk/ay.h @@ -13,38 +13,7 @@ #include "parallel.h" -#include "sound.h" -#include "sound/ay8910.h" -#include "speaker.h" +DECLARE_DEVICE_TYPE(BK_AY, device_qbus_card_interface) -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> bk_ay_device - -class bk_ay_device : public device_t, public device_bk_parallel_interface -{ -public: - // construction/destruction - bk_ay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - virtual void device_start() override {}; - virtual void device_reset() override {}; - - virtual uint16_t io_r() override; - virtual void io_w(uint16_t data, bool word) override; - -private: - virtual void device_add_mconfig(machine_config &config) override; - - required_device<ym2149_device> m_ay; - required_device<bk_parallel_slot_device> m_up; -}; - -// device type definition -DECLARE_DEVICE_TYPE(BK_AY, bk_ay_device) - -#endif // MAME_BUS_BK_AY_H +#endif diff --git a/src/devices/bus/bk/carts.h b/src/devices/bus/bk/carts.h index 78e1d3fc916..e0d63af4afe 100644 --- a/src/devices/bus/bk/carts.h +++ b/src/devices/bus/bk/carts.h @@ -14,4 +14,4 @@ void bk_parallel_devices(device_slot_interface &device); -#endif // MAME_BUS_BK_CARTS_H +#endif diff --git a/src/devices/bus/bk/covox.cpp b/src/devices/bus/bk/covox.cpp index 5cc72a4e96f..142b1461673 100644 --- a/src/devices/bus/bk/covox.cpp +++ b/src/devices/bus/bk/covox.cpp @@ -10,20 +10,36 @@ #include "emu.h" #include "covox.h" +#include "sound/dac.h" +#include "speaker.h" + + +namespace { //************************************************************************** -// CONSTANTS/MACROS +// TYPE DEFINITIONS //************************************************************************** -#define VERBOSE 0 +// ======================> bk_covox_device +class bk_covox_device : public device_t, public device_bk_parallel_interface +{ +public: + // construction/destruction + bk_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -//************************************************************************** -// DEVICE DEFINITIONS -//************************************************************************** +protected: + virtual void device_start() override ATTR_COLD {}; + + virtual uint16_t io_r() override; + virtual void io_w(uint16_t data, bool word) override; -DEFINE_DEVICE_TYPE(BK_COVOX, bk_covox_device, "bk_covox", "Mono Covox Interface") +private: + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; + required_device<dac_byte_interface> m_dac; + required_device<bk_parallel_slot_device> m_up; +}; //************************************************************************** // LIVE DEVICE @@ -54,11 +70,6 @@ void bk_covox_device::device_add_mconfig(machine_config &config) BK_PARALLEL_SLOT(config, m_up, DERIVED_CLOCK(1, 1), bk_parallel_devices, nullptr); } -void bk_covox_device::device_start() -{ - save_item(NAME(m_data)); -} - uint16_t bk_covox_device::io_r() { return m_up->read() ^ 0xffff; @@ -66,7 +77,15 @@ uint16_t bk_covox_device::io_r() void bk_covox_device::io_w(uint16_t data, bool word) { - m_data = data; m_dac->write(data); m_up->write(0, data ^ 0xffff, word); } + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(BK_COVOX, device_qbus_card_interface, bk_covox_device, "bk_covox", "BK Mono Covox Interface") diff --git a/src/devices/bus/bk/covox.h b/src/devices/bus/bk/covox.h index 9f2a77b75ff..80d81503390 100644 --- a/src/devices/bus/bk/covox.h +++ b/src/devices/bus/bk/covox.h @@ -13,39 +13,7 @@ #include "parallel.h" -#include "sound/dac.h" -#include "speaker.h" +DECLARE_DEVICE_TYPE(BK_COVOX, device_qbus_card_interface) -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> bk_covox_device - -class bk_covox_device : public device_t, public device_bk_parallel_interface -{ -public: - // construction/destruction - bk_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - virtual void device_start() override; - virtual void device_reset() override { m_data = 0; }; - - virtual uint16_t io_r() override; - virtual void io_w(uint16_t data, bool word) override; - -private: - virtual void device_add_mconfig(machine_config &config) override; - - required_device<dac_byte_interface> m_dac; - required_device<bk_parallel_slot_device> m_up; - - uint16_t m_data; -}; - -// device type definition -DECLARE_DEVICE_TYPE(BK_COVOX, bk_covox_device) - -#endif // MAME_BUS_BK_COVOX_H +#endif diff --git a/src/devices/bus/bk/joystick.cpp b/src/devices/bus/bk/joystick.cpp index 30c5d84ab26..75268ee826e 100644 --- a/src/devices/bus/bk/joystick.cpp +++ b/src/devices/bus/bk/joystick.cpp @@ -10,11 +10,29 @@ #include "joystick.h" +namespace { + //************************************************************************** -// DEVICE DEFINITIONS +// TYPE DEFINITIONS //************************************************************************** -DEFINE_DEVICE_TYPE(BK_JOYSTICK, bk_joystick_device, "bk_joystick", "BK Joystick Interface") +// ======================> bk_joystick_device + +class bk_joystick_device : public device_t, public device_bk_parallel_interface +{ +public: + // construction/destruction + bk_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + virtual ioport_constructor device_input_ports() const override ATTR_COLD; + virtual void device_start() override ATTR_COLD {}; + + virtual uint16_t io_r() override; + +private: + required_ioport m_joy; +}; //------------------------------------------------- // input_ports - device-specific input ports @@ -70,3 +88,12 @@ uint16_t bk_joystick_device::io_r() { return m_joy->read(); } + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(BK_JOYSTICK, device_qbus_card_interface, bk_joystick_device, "bk_joystick", "BK Joystick Interface") diff --git a/src/devices/bus/bk/joystick.h b/src/devices/bus/bk/joystick.h index 90d50144f3e..71190540e81 100644 --- a/src/devices/bus/bk/joystick.h +++ b/src/devices/bus/bk/joystick.h @@ -14,30 +14,6 @@ #include "parallel.h" -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** +DECLARE_DEVICE_TYPE(BK_JOYSTICK, device_qbus_card_interface) -// ======================> bk_joystick_device - -class bk_joystick_device : public device_t, public device_bk_parallel_interface -{ -public: - // construction/destruction - bk_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - virtual ioport_constructor device_input_ports() const override; - virtual void device_start() override {}; - virtual void device_reset() override {}; - - virtual uint16_t io_r() override; - -private: - required_ioport m_joy; -}; - -// device type definition -DECLARE_DEVICE_TYPE(BK_JOYSTICK, bk_joystick_device) - -#endif // MAME_BUS_BK_JOYSTICK_H +#endif diff --git a/src/devices/bus/bk/loopback.cpp b/src/devices/bus/bk/loopback.cpp index 6a682b9151b..96885322f0c 100644 --- a/src/devices/bus/bk/loopback.cpp +++ b/src/devices/bus/bk/loopback.cpp @@ -10,19 +10,30 @@ #include "loopback.h" +namespace { + //************************************************************************** -// CONSTANTS/MACROS +// TYPE DEFINITIONS //************************************************************************** -#define VERBOSE 0 +// ======================> bk_loopback_device +class bk_loopback_device : public device_t, public device_bk_parallel_interface +{ +public: + // construction/destruction + bk_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -//************************************************************************** -// DEVICE DEFINITIONS -//************************************************************************** +protected: + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD { m_data = 0; }; -DEFINE_DEVICE_TYPE(BK_LOOPBACK, bk_loopback_device, "bk_loopback", "Loopback") + virtual uint16_t io_r() override; + virtual void io_w(uint16_t data, bool word) override; +private: + uint16_t m_data; +}; //************************************************************************** // LIVE DEVICE @@ -57,3 +68,12 @@ void bk_loopback_device::io_w(uint16_t data, bool word) { m_data = data; } + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(BK_LOOPBACK, device_qbus_card_interface, bk_loopback_device, "bk_loopback", "BK Loopback") diff --git a/src/devices/bus/bk/loopback.h b/src/devices/bus/bk/loopback.h index 8b6d4054269..33b0df32e68 100644 --- a/src/devices/bus/bk/loopback.h +++ b/src/devices/bus/bk/loopback.h @@ -14,30 +14,6 @@ #include "parallel.h" -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** +DECLARE_DEVICE_TYPE(BK_LOOPBACK, device_qbus_card_interface) -// ======================> bk_loopback_device - -class bk_loopback_device : public device_t, public device_bk_parallel_interface -{ -public: - // construction/destruction - bk_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - virtual void device_start() override; - virtual void device_reset() override { m_data = 0; }; - - virtual uint16_t io_r() override; - virtual void io_w(uint16_t data, bool word) override; - -private: - uint16_t m_data; -}; - -// device type definition -DECLARE_DEVICE_TYPE(BK_LOOPBACK, bk_loopback_device) - -#endif // MAME_BUS_BK_LOOPBACK_H +#endif diff --git a/src/devices/bus/bk/parallel.h b/src/devices/bus/bk/parallel.h index e3730678541..7546e9e43d7 100644 --- a/src/devices/bus/bk/parallel.h +++ b/src/devices/bus/bk/parallel.h @@ -115,4 +115,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(BK_PARALLEL_SLOT, bk_parallel_slot_device) -#endif // MAME_BUS_BK_PARALLEL_H +#endif diff --git a/src/devices/bus/bk/printer.cpp b/src/devices/bus/bk/printer.cpp index b0a00cd7571..9e38c900338 100644 --- a/src/devices/bus/bk/printer.cpp +++ b/src/devices/bus/bk/printer.cpp @@ -13,20 +13,39 @@ #include "emu.h" #include "printer.h" +#include "bus/centronics/ctronics.h" +#include "machine/output_latch.h" + + +namespace { //************************************************************************** -// CONSTANTS/MACROS +// TYPE DEFINITIONS //************************************************************************** -#define VERBOSE 0 +// ======================> bk_printer_device +class bk_printer_device : public device_t, public device_bk_parallel_interface +{ +public: + // construction/destruction + bk_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -//************************************************************************** -// DEVICE DEFINITIONS -//************************************************************************** +protected: + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD { m_data = 0; }; + + virtual uint16_t io_r() override; + virtual void io_w(uint16_t data, bool word) override; + +private: + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; -DEFINE_DEVICE_TYPE(BK_PRINTER, bk_printer_device, "bk_printer", "Printer Interface") + required_device<centronics_device> m_centronics; + required_device<output_latch_device> m_cent_data_out; + uint16_t m_data; +}; //************************************************************************** // LIVE DEVICE @@ -71,3 +90,12 @@ void bk_printer_device::io_w(uint16_t data, bool word) if (!BIT(data, 8)) m_cent_data_out->write(~data); m_centronics->write_strobe(BIT(data, 8)); } + +} // anonymous namespace + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE_PRIVATE(BK_PRINTER, device_qbus_card_interface, bk_printer_device, "bk_printer", "BK Printer Interface") diff --git a/src/devices/bus/bk/printer.h b/src/devices/bus/bk/printer.h index b01d144d283..6eead39cba8 100644 --- a/src/devices/bus/bk/printer.h +++ b/src/devices/bus/bk/printer.h @@ -13,39 +13,7 @@ #include "parallel.h" -#include "bus/centronics/ctronics.h" -#include "machine/output_latch.h" +DECLARE_DEVICE_TYPE(BK_PRINTER, device_qbus_card_interface) -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> bk_printer_device - -class bk_printer_device : public device_t, public device_bk_parallel_interface -{ -public: - // construction/destruction - bk_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - virtual void device_start() override; - virtual void device_reset() override { m_data = 0; }; - - virtual uint16_t io_r() override; - virtual void io_w(uint16_t data, bool word) override; - -private: - virtual void device_add_mconfig(machine_config &config) override; - - required_device<centronics_device> m_centronics; - required_device<output_latch_device> m_cent_data_out; - - uint16_t m_data; -}; - -// device type definition -DECLARE_DEVICE_TYPE(BK_PRINTER, bk_printer_device) - -#endif // MAME_BUS_BK_PRINTER_H +#endif diff --git a/src/devices/bus/rc2014/modules.cpp b/src/devices/bus/rc2014/modules.cpp index 8ce74ae2cc1..b359adfcd4f 100644 --- a/src/devices/bus/rc2014/modules.cpp +++ b/src/devices/bus/rc2014/modules.cpp @@ -20,7 +20,7 @@ #include "bus/rc2014/romram.h" #include "bus/rc2014/rtc.h" #include "bus/rc2014/serial.h" -#include "bus/rc2014/sound.h" +#include "bus/rc2014/sound_ym_ay.h" #include "bus/rc2014/z180cpu.h" #include "bus/rc2014/z80cpu.h" diff --git a/src/devices/bus/rc2014/sound.cpp b/src/devices/bus/rc2014/sound_ym_ay.cpp index 3dafc5a7fb8..1b16c8cd947 100644 --- a/src/devices/bus/rc2014/sound.cpp +++ b/src/devices/bus/rc2014/sound_ym_ay.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "sound.h" +#include "sound_ym_ay.h" #include "sound/ay8910.h" #include "speaker.h" diff --git a/src/devices/bus/rc2014/sound.h b/src/devices/bus/rc2014/sound_ym_ay.h index a00a0e01654..e3ff2c00e96 100644 --- a/src/devices/bus/rc2014/sound.h +++ b/src/devices/bus/rc2014/sound_ym_ay.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_BUS_RC2014_SOUND_H -#define MAME_BUS_RC2014_SOUND_H +#ifndef MAME_BUS_RC2014_SOUND_YM_AY_H +#define MAME_BUS_RC2014_SOUND_YM_AY_H #pragma once @@ -16,4 +16,4 @@ DECLARE_DEVICE_TYPE(RC2014_YM2149_SOUND, device_rc2014_card_interface) DECLARE_DEVICE_TYPE(RC2014_AY8190_SOUND, device_rc2014_card_interface) -#endif // MAME_BUS_RC2014_SOUND_H +#endif // MAME_BUS_RC2014_SOUND_YM_AY_H |
