diff options
27 files changed, 68 insertions, 31 deletions
diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp index dc15ea3980f..59211d06f88 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -62,6 +62,10 @@ midiin_device::midiin_device(const machine_config &mconfig, const char *tag, dev { } +midiin_device::~midiin_device() +{ +} + ioport_constructor midiin_device::device_input_ports() const { return INPUT_PORTS_NAME(midiin); diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h index 3d39a88c845..aed7d3b15a9 100644 --- a/src/devices/imagedev/midiin.h +++ b/src/devices/imagedev/midiin.h @@ -27,6 +27,7 @@ class midiin_device : public device_t, public: // construction/destruction midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~midiin_device(); auto input_callback() { return m_input_cb.bind(); } diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp index e9551a50d17..026b6520143 100644 --- a/src/devices/imagedev/midiout.cpp +++ b/src/devices/imagedev/midiout.cpp @@ -9,8 +9,8 @@ *********************************************************************/ #include "emu.h" -#include "osdepend.h" #include "midiout.h" +#include "osdepend.h" /*************************************************************************** IMPLEMENTATION @@ -30,6 +30,10 @@ midiout_device::midiout_device(const machine_config &mconfig, const char *tag, d { } +midiout_device::~midiout_device() +{ +} + /*------------------------------------------------- device_start -------------------------------------------------*/ diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h index 0701c9b3d83..7b39e4fff5e 100644 --- a/src/devices/imagedev/midiout.h +++ b/src/devices/imagedev/midiout.h @@ -27,6 +27,7 @@ class midiout_device : public device_t, public: // construction/destruction midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~midiout_device(); // image-level overrides virtual image_init_result call_load() override; diff --git a/src/devices/machine/am79c90.h b/src/devices/machine/am79c90.h index 06ec00558b7..80c66ff58ce 100644 --- a/src/devices/machine/am79c90.h +++ b/src/devices/machine/am79c90.h @@ -6,7 +6,7 @@ #pragma once -#include "hashing.h" +#include "dinetwork.h" class am7990_device_base : public device_t, public device_network_interface { diff --git a/src/devices/machine/cs8900a.h b/src/devices/machine/cs8900a.h index 74e4c8b20b3..a0a6f88dbb4 100644 --- a/src/devices/machine/cs8900a.h +++ b/src/devices/machine/cs8900a.h @@ -16,6 +16,8 @@ #pragma once +#include "dinetwork.h" + #include <queue> /*************************************************************************** diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h index 1dfde1f01a5..7e87ffe44db 100644 --- a/src/devices/machine/dp8390.h +++ b/src/devices/machine/dp8390.h @@ -5,6 +5,8 @@ #pragma once +#include "dinetwork.h" + // device stuff diff --git a/src/devices/machine/dp83932c.h b/src/devices/machine/dp83932c.h index ef91d08313d..2a7d271eb11 100644 --- a/src/devices/machine/dp83932c.h +++ b/src/devices/machine/dp83932c.h @@ -6,6 +6,8 @@ #pragma once +#include "dinetwork.h" + class dp83932c_device : public device_t , public device_network_interface diff --git a/src/devices/machine/edlc.h b/src/devices/machine/edlc.h index 1a57841212a..bbcd91d2589 100644 --- a/src/devices/machine/edlc.h +++ b/src/devices/machine/edlc.h @@ -7,6 +7,7 @@ #pragma once #include "machine/bankdev.h" +#include "dinetwork.h" class seeq8003_device : public device_t, diff --git a/src/devices/machine/i82586.h b/src/devices/machine/i82586.h index 89d421a2cf9..82f48163620 100644 --- a/src/devices/machine/i82586.h +++ b/src/devices/machine/i82586.h @@ -6,6 +6,8 @@ #pragma once +#include "dinetwork.h" + class i82586_base_device : public device_t, public device_memory_interface, diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h index 7129f047ebe..57daf378f66 100644 --- a/src/devices/machine/mb8795.h +++ b/src/devices/machine/mb8795.h @@ -3,6 +3,8 @@ #ifndef MAME_MACHINE_MB8795_H #define MAME_MACHINE_MB8795_H +#include "dinetwork.h" + class mb8795_device : public device_t, public device_network_interface { diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h index 2942e77572a..e1c91a3e566 100644 --- a/src/devices/machine/smc91c9x.h +++ b/src/devices/machine/smc91c9x.h @@ -13,6 +13,8 @@ #pragma once +#include "dinetwork.h" + /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ diff --git a/src/emu/dinetwork.cpp b/src/emu/dinetwork.cpp index 3ad9f4c925b..2091ac6a2c3 100644 --- a/src/emu/dinetwork.cpp +++ b/src/emu/dinetwork.cpp @@ -1,6 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Carl, Miodrag Milanovic + #include "emu.h" +#include "dinetwork.h" #include "osdnet.h" device_network_interface::device_network_interface(const machine_config &mconfig, device_t &device, u32 bandwidth, u32 mtu) diff --git a/src/emu/emu.h b/src/emu/emu.h index f4fa0c21888..6f564f258ab 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -28,6 +28,7 @@ #include <map> #include <unordered_map> #include <unordered_set> +#include <cstdarg> // core emulator headers -- must be first (profiler needs attotime, attotime needs xtal) #include "emucore.h" @@ -72,7 +73,6 @@ #include "divideo.h" #include "dinvram.h" #include "schedule.h" -#include "dinetwork.h" // machine and driver configuration #include "mconfig.h" diff --git a/src/emu/emufwd.h b/src/emu/emufwd.h index 9dde867df54..48146615bce 100644 --- a/src/emu/emufwd.h +++ b/src/emu/emufwd.h @@ -36,6 +36,7 @@ class output_module; // declared in osdepend.h class osd_font; class osd_interface; +class osd_midi_device; @@ -129,6 +130,9 @@ class device_image_interface; // declared in dimemory.h class device_memory_interface; +// declared in dinetwork.h +class device_network_interface; + // declared in dipalette.h class device_palette_interface; diff --git a/src/emu/network.cpp b/src/emu/network.cpp index 68c9f93c196..0ffff1616cc 100644 --- a/src/emu/network.cpp +++ b/src/emu/network.cpp @@ -8,13 +8,16 @@ ***************************************************************************/ -#include <cctype> - #include "emu.h" #include "network.h" + #include "config.h" +#include "dinetwork.h" + #include "xmlfile.h" +#include <cctype> + //************************************************************************** // NETWORK MANAGER //************************************************************************** diff --git a/src/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp index aebe9a5886b..0ef893dfd1c 100644 --- a/src/frontend/mame/ui/mainmenu.cpp +++ b/src/frontend/mame/ui/mainmenu.cpp @@ -37,6 +37,7 @@ #include "machine/bcreader.h" #include "crsshair.h" +#include "dinetwork.h" #include "dipty.h" #include "emuopts.h" diff --git a/src/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp index b621581ee89..0733f554506 100644 --- a/src/frontend/mame/ui/miscmenu.cpp +++ b/src/frontend/mame/ui/miscmenu.cpp @@ -23,6 +23,7 @@ #include "osdnet.h" #include "mameopts.h" #include "pluginopts.h" +#include "dinetwork.h" #include "drivenum.h" #include "fileio.h" #include "romload.h" diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index 9adf9f2e604..1019bc4f766 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -17,6 +17,7 @@ #include "modules/netdev/netdev_module.h" #include "modules/midi/midi_module.h" #include "modules/monitor/monitor_module.h" +#include "osdnet.h" #include "watchdog.h" #include "emu.h" diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index 9cb5ddac39b..73d965d854a 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -2,7 +2,7 @@ // copyright-holders:R. Belmont /*************************************************************************** - portmap.c + portmidi.cpp Midi implementation based on portmidi library @@ -11,9 +11,10 @@ #ifndef NO_USE_MIDI #include <portmidi.h> -#include "osdcore.h" #include "modules/osdmodule.h" #include "midi_module.h" +#include <cstdio> +#include <cstring> class pm_module : public osd_module, public midi_module { diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp index 2ae32df0f3b..3ff82484b28 100644 --- a/src/osd/modules/netdev/pcap.cpp +++ b/src/osd/modules/netdev/pcap.cpp @@ -4,6 +4,7 @@ #if defined(OSD_NET_USE_PCAP) #include "emu.h" +#include "dinetwork.h" #include "osdnet.h" #include "netdev_module.h" #include "modules/osdmodule.h" diff --git a/src/osd/modules/netdev/taptun.cpp b/src/osd/modules/netdev/taptun.cpp index c0d99ec750c..10ca76fb2d0 100644 --- a/src/osd/modules/netdev/taptun.cpp +++ b/src/osd/modules/netdev/taptun.cpp @@ -14,6 +14,7 @@ #endif #include "emu.h" +#include "dinetwork.h" #include "osdnet.h" #include "modules/osdmodule.h" #include "netdev_module.h" diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp index acaeddd35b5..bd7923f1c5e 100644 --- a/src/osd/modules/render/bgfx/statereader.cpp +++ b/src/osd/modules/render/bgfx/statereader.cpp @@ -11,6 +11,7 @@ #include "osdcore.h" +#include <cstdarg> #include <cmath> bool state_reader::READER_CHECK(bool condition, const char* format, ...) diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index ff97f10c7d5..d9f61c22a5a 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -16,7 +16,6 @@ #include "strformat.h" -#include <cstdarg> #include <cstdint> #include <iosfwd> #include <string> @@ -360,28 +359,6 @@ std::string osd_get_clipboard_text(); /*************************************************************************** - MIDI I/O INTERFACES -***************************************************************************/ - -class osd_midi_device -{ -public: - virtual ~osd_midi_device() { } - // free result with osd_close_midi_channel() - virtual bool open_input(const char *devname) = 0; - // free result with osd_close_midi_channel() - virtual bool open_output(const char *devname) = 0; - virtual void close() = 0; - virtual bool poll() = 0; - virtual int read(uint8_t *pOut) = 0; - virtual void write(uint8_t data) = 0; -}; - -//FIXME: really needed here? -void osd_list_network_adapters(); - - -/*************************************************************************** UNCATEGORIZED INTERFACES ***************************************************************************/ diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h index 89665eb1a80..78f485d1759 100644 --- a/src/osd/osdepend.h +++ b/src/osd/osdepend.h @@ -24,7 +24,7 @@ // forward references -class input_type_entry; // FIXME: including emu.h does not work because emu.h includes osdepend.h +class input_type_entry; class osd_midi_device; namespace ui { class menu_item; } @@ -99,4 +99,21 @@ protected: virtual ~osd_interface() { } }; + +/*************************************************************************** + MIDI I/O INTERFACES +***************************************************************************/ + +class osd_midi_device +{ +public: + virtual ~osd_midi_device() { } + virtual bool open_input(const char *devname) = 0; + virtual bool open_output(const char *devname) = 0; + virtual void close() = 0; + virtual bool poll() = 0; + virtual int read(uint8_t *pOut) = 0; + virtual void write(uint8_t data) = 0; +}; + #endif // MAME_OSD_OSDEPEND_H diff --git a/src/osd/osdnet.cpp b/src/osd/osdnet.cpp index 39f0da3b343..0281bed9c1c 100644 --- a/src/osd/osdnet.cpp +++ b/src/osd/osdnet.cpp @@ -1,8 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Carl + #include "emu.h" #include "osdnet.h" +#include "dinetwork.h" + static class std::vector<std::unique_ptr<osd_netdev::entry_t>> netdev_list; void add_netdev(const char *name, const char *description, create_netdev func) diff --git a/src/osd/osdnet.h b/src/osd/osdnet.h index f18d7c5fea7..0c78f0a1fad 100644 --- a/src/osd/osdnet.h +++ b/src/osd/osdnet.h @@ -55,5 +55,6 @@ void add_netdev(const char *name, const char *description, create_netdev func); void clear_netdev(); const std::vector<std::unique_ptr<osd_netdev::entry_t>>& get_netdev_list(); int netdev_count(); +void osd_list_network_adapters(); #endif // MAME_OSD_OSDNET_H |