From 9a731fd8afdfe11993e581eb72c92481a41e7a67 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 16 Aug 2020 00:28:23 +0200 Subject: [PATCH] netlist: Fix compile - sorry. --- src/devices/machine/netlist.cpp | 6 ------ src/devices/machine/netlist.h | 34 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index cd59afcc6eb..8dd06070960 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -1349,12 +1349,6 @@ void netlist_mame_sound_device::device_validity_check(validity_checker &valid) c } } - -void netlist_mame_sound_device::device_reset() -{ - netlist_mame_device::device_reset(); -} - void netlist_mame_sound_device::device_start() { LOGDEVCALLS("sound device_start\n"); diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index acca73431aa..b7bd668cc32 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -108,23 +108,6 @@ private: bool m_device_reset_called; }; -// ---------------------------------------------------------------------------------------- -// netlist_mame_cpu_device -// ---------------------------------------------------------------------------------------- - -class netlist_disassembler : public util::disasm_interface -{ -public: - netlist_disassembler(netlist_mame_cpu_device *dev); - virtual ~netlist_disassembler() = default; - - virtual u32 opcode_alignment() const override; - virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) override; - -private: - netlist_mame_cpu_device *m_dev; -}; - class netlist_mame_cpu_device : public netlist_mame_device, public device_execute_interface, public device_state_interface, @@ -203,6 +186,23 @@ private: offs_t m_genPC; }; +// ---------------------------------------------------------------------------------------- +// netlist_mame_cpu_device +// ---------------------------------------------------------------------------------------- + +class netlist_disassembler : public util::disasm_interface +{ +public: + netlist_disassembler(netlist_mame_cpu_device *dev); + virtual ~netlist_disassembler() = default; + + virtual u32 opcode_alignment() const override; + virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) override; + +private: + netlist_mame_cpu_device *m_dev; +}; + // ---------------------------------------------------------------------------------------- // netlist_mame_sound_device // ----------------------------------------------------------------------------------------