summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/debugger
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-01-29 03:02:02 +1100
committer Vas Crabb <vas@vastheman.com>2023-01-29 03:16:14 +1100
commit68472d3d72ea4bbc545c0669348172b4e96c7b41 (patch)
treee34fca0f55c977624148d1c806ecc6c44a5edd11 /src/osd/modules/debugger
parent01fcb2e0decf670a4cdee3d37b6f7ebde9b8f02b (diff)
Various input and OSD refactoring:
osd: Supply OSD object to modules on initialisation. Encapsulated some event handling in the OSD objects rather than leaving it in free functions. Put various stuff in namespaces. osd/modules/input: Enabled dinput, xinput and winhybrid modules for Windows SDL builds, and enabled background input for dinput and xinput (and by extension winhybrid) modules. Also fixed some COM and X11 resource leaks. osd/modules/input/input_sdl.cpp: Flipped SDL mouse button order to match Windows, and exposed vertical and horizontal scroll as Z and rZ axes. Moved SDL UI event handling out of input devices into OSD object. osd/modules/input_rawinput.cpp: Changed lightgun Z axis token so it's correctly identified as a relative axis (it maps to the scroll wheel equivalent). osd: Added an option to choose the network provider module. Mostly useful if you build with both TUN/TAP and pcap support included, or if you want to disable emulated networking completely. emu/input.cpp: Use a better strategy for assembling input code names that uses fewer temporary strings and doesn't require use of the non-Unicode-aware space trimming function (fixes MT08552). osd/modules/input_dinput.cpp: Improved polling logic. osd: Made various parts of the input code less dependent on concrete emu objects, and reduced inappropriately passing around the machine object. Made input modules less dependent on OSD implementation. Encapsulated some stuff and got rid of some vestigial newui and SDL1 support code. Cleaned up some interfaces. Moved OSD options classes to their own files. Prepare to remove main.h from emu.h - it's mostly used to get the application name, which the vast majority of emulated devices don't need to do.
Diffstat (limited to 'src/osd/modules/debugger')
-rw-r--r--src/osd/modules/debugger/debug_module.h7
-rw-r--r--src/osd/modules/debugger/debuggdbstub.cpp10
-rw-r--r--src/osd/modules/debugger/debugimgui.cpp26
-rw-r--r--src/osd/modules/debugger/debugosx.mm17
-rw-r--r--src/osd/modules/debugger/debugqt.cpp48
-rw-r--r--src/osd/modules/debugger/debugwin.cpp98
-rw-r--r--src/osd/modules/debugger/none.cpp13
7 files changed, 123 insertions, 96 deletions
diff --git a/src/osd/modules/debugger/debug_module.h b/src/osd/modules/debugger/debug_module.h
index 9e3d85f9fe8..1c5b1973c8e 100644
--- a/src/osd/modules/debugger/debug_module.h
+++ b/src/osd/modules/debugger/debug_module.h
@@ -4,7 +4,6 @@
* debug_module.h
*
*/
-
#ifndef MAME_OSD_DEBUGGER_DEBUG_MODULE_H
#define MAME_OSD_DEBUGGER_DEBUG_MODULE_H
@@ -13,6 +12,7 @@
#include "osdepend.h"
#include "modules/osdmodule.h"
+
//============================================================
// CONSTANTS
//============================================================
@@ -22,14 +22,11 @@
class debug_module
{
public:
-
- virtual ~debug_module() { }
+ virtual ~debug_module() = default;
virtual void init_debugger(running_machine &machine) = 0;
virtual void wait_for_debugger(device_t &device, bool firststop) = 0;
virtual void debugger_update() = 0;
};
-
-
#endif // MAME_OSD_DEBUGGER_DEBUG_MODULE_H
diff --git a/src/osd/modules/debugger/debuggdbstub.cpp b/src/osd/modules/debugger/debuggdbstub.cpp
index a150d4e89f0..feb6d51ac5e 100644
--- a/src/osd/modules/debugger/debuggdbstub.cpp
+++ b/src/osd/modules/debugger/debuggdbstub.cpp
@@ -23,6 +23,8 @@
#include <cinttypes>
+namespace osd {
+
namespace {
//-------------------------------------------------------------------------
@@ -516,7 +518,7 @@ public:
virtual ~debug_gdbstub() { }
- virtual int init(const osd_options &options) override;
+ virtual int init(osd_interface &osd, const osd_options &options) override;
virtual void exit() override;
virtual void init_debugger(running_machine &machine) override;
@@ -630,7 +632,7 @@ private:
};
//-------------------------------------------------------------------------
-int debug_gdbstub::init(const osd_options &options)
+int debug_gdbstub::init(osd_interface &osd, const osd_options &options)
{
m_debugger_port = options.debugger_port();
return 0;
@@ -1495,5 +1497,7 @@ void debug_gdbstub::handle_character(char ch)
} // anonymous namespace
+} // namespace osd
+
//-------------------------------------------------------------------------
-MODULE_DEFINITION(DEBUG_GDBSTUB, debug_gdbstub)
+MODULE_DEFINITION(DEBUG_GDBSTUB, osd::debug_gdbstub)
diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
index 6221b435f2f..81570fd0bcf 100644
--- a/src/osd/modules/debugger/debugimgui.cpp
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -25,6 +25,8 @@
#include "modules/osdmodule.h"
#include "zippath.h"
+namespace osd {
+
namespace {
class debug_area
@@ -122,7 +124,7 @@ public:
virtual ~debug_imgui() { }
- virtual int init(const osd_options &options) override { return 0; }
+ virtual int init(osd_interface &osd, const osd_options &options) override { return 0; }
virtual void exit() override {};
virtual void init_debugger(running_machine &machine) override;
@@ -1031,16 +1033,16 @@ void debug_imgui::refresh_filelist()
m_filelist.emplace_back(std::move(temp));
}
first = m_filelist.size();
- const osd::directory::entry *dirent;
+ const directory::entry *dirent;
while((dirent = dir->readdir()) != nullptr)
{
file_entry temp;
switch(dirent->type)
{
- case osd::directory::entry::entry_type::FILE:
+ case directory::entry::entry_type::FILE:
temp.type = file_entry_type::FILE;
break;
- case osd::directory::entry::entry_type::DIR:
+ case directory::entry::entry_type::DIR:
temp.type = file_entry_type::DIRECTORY;
break;
default:
@@ -1196,10 +1198,10 @@ void debug_imgui::draw_create_dialog(const char* label)
if(ImGui::InputText("##createfilename",m_path,1024,ImGuiInputTextFlags_EnterReturnsTrue))
{
auto entry = osd_stat(m_path);
- auto file_type = (entry != nullptr) ? entry->type : osd::directory::entry::entry_type::NONE;
- if(file_type == osd::directory::entry::entry_type::NONE)
+ auto file_type = (entry != nullptr) ? entry->type : directory::entry::entry_type::NONE;
+ if(file_type == directory::entry::entry_type::NONE)
create_image();
- if(file_type == osd::directory::entry::entry_type::FILE)
+ if(file_type == directory::entry::entry_type::FILE)
m_create_confirm_wait = true;
// cannot overwrite a directory, so nothing will be none in that case.
}
@@ -1246,10 +1248,10 @@ void debug_imgui::draw_create_dialog(const char* label)
if(ImGui::Button("OK##mount"))
{
auto entry = osd_stat(m_path);
- auto file_type = (entry != nullptr) ? entry->type : osd::directory::entry::entry_type::NONE;
- if(file_type == osd::directory::entry::entry_type::NONE)
+ auto file_type = (entry != nullptr) ? entry->type : directory::entry::entry_type::NONE;
+ if(file_type == directory::entry::entry_type::NONE)
create_image();
- if(file_type == osd::directory::entry::entry_type::FILE)
+ if(file_type == directory::entry::entry_type::FILE)
m_create_confirm_wait = true;
// cannot overwrite a directory, so nothing will be none in that case.
m_create_open = false;
@@ -1586,4 +1588,6 @@ void debug_imgui::debugger_update()
} // anonymous namespace
-MODULE_DEFINITION(DEBUG_IMGUI, debug_imgui)
+} // namespace osd
+
+MODULE_DEFINITION(DEBUG_IMGUI, osd::debug_imgui)
diff --git a/src/osd/modules/debugger/debugosx.mm b/src/osd/modules/debugger/debugosx.mm
index 66797e38453..39689db432e 100644
--- a/src/osd/modules/debugger/debugosx.mm
+++ b/src/osd/modules/debugger/debugosx.mm
@@ -24,11 +24,6 @@
// MAMEOS headers
#include "modules/lib/osdobj_common.h"
#include "osx/debugosx.h"
-#ifdef OSD_MAC
-#include "osdmac.h"
-#else
-#include "osdsdl.h"
-#endif
#include "debug_module.h"
#import "osx/debugconsole.h"
@@ -61,12 +56,12 @@ public:
[m_console release];
}
- virtual int init(const osd_options &options);
- virtual void exit();
+ virtual int init(osd_interface &osd, const osd_options &options) override;
+ virtual void exit() override;
- virtual void init_debugger(running_machine &machine);
- virtual void wait_for_debugger(device_t &device, bool firststop);
- virtual void debugger_update();
+ virtual void init_debugger(running_machine &machine) override;
+ virtual void wait_for_debugger(device_t &device, bool firststop) override;
+ virtual void debugger_update() override;
private:
void create_console();
@@ -91,7 +86,7 @@ std::atomic_bool debugger_osx::s_added_menus(false);
// initialise debugger module
//============================================================
-int debugger_osx::init(const osd_options &options)
+int debugger_osx::init(osd_interface &osd, const osd_options &options)
{
return 0;
}
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp
index 1afe6ffff66..cdf3fb014bc 100644
--- a/src/osd/modules/debugger/debugqt.cpp
+++ b/src/osd/modules/debugger/debugqt.cpp
@@ -43,9 +43,11 @@ bool winwindow_qt_filter(void *message);
#endif
+namespace osd {
+
namespace {
-class debug_qt : public osd_module, public debug_module, protected osd::debugger::qt::DebuggerQt
+class debug_qt : public osd_module, public debug_module, protected debugger::qt::DebuggerQt
#if defined(_WIN32) && !defined(SDLMAME_WIN32)
, public QAbstractNativeEventFilter
#endif
@@ -61,7 +63,7 @@ public:
virtual ~debug_qt() { }
- virtual int init(const osd_options &options) override { return 0; }
+ virtual int init(osd_interface &osd, const osd_options &options) override { return 0; }
virtual void exit() override;
virtual void init_debugger(running_machine &machine) override;
@@ -83,7 +85,7 @@ private:
void load_window_configurations(util::xml::data_node const &parentnode);
running_machine *m_machine;
- osd::debugger::qt::MainWindow *m_mainwindow;
+ debugger::qt::MainWindow *m_mainwindow;
util::xml::file::ptr m_config;
};
@@ -142,7 +144,7 @@ void debug_qt::wait_for_debugger(device_t &device, bool firststop)
// Dialog initialization
if (!m_mainwindow)
{
- m_mainwindow = new osd::debugger::qt::MainWindow(*this);
+ m_mainwindow = new debugger::qt::MainWindow(*this);
if (m_config)
{
load_window_configurations(*m_config->get_first_child());
@@ -211,31 +213,31 @@ void debug_qt::configuration_save(config_type which_type, util::xml::data_node *
void debug_qt::load_window_configurations(util::xml::data_node const &parentnode)
{
- for (util::xml::data_node const *wnode = parentnode.get_child(osd::debugger::NODE_WINDOW); wnode; wnode = wnode->get_next_sibling(osd::debugger::NODE_WINDOW))
+ for (util::xml::data_node const *wnode = parentnode.get_child(debugger::NODE_WINDOW); wnode; wnode = wnode->get_next_sibling(debugger::NODE_WINDOW))
{
- osd::debugger::qt::WindowQt *win = nullptr;
- switch (wnode->get_attribute_int(osd::debugger::ATTR_WINDOW_TYPE, -1))
+ debugger::qt::WindowQt *win = nullptr;
+ switch (wnode->get_attribute_int(debugger::ATTR_WINDOW_TYPE, -1))
{
- case osd::debugger::WINDOW_TYPE_CONSOLE:
+ case debugger::WINDOW_TYPE_CONSOLE:
win = m_mainwindow;
break;
- case osd::debugger::WINDOW_TYPE_MEMORY_VIEWER:
- win = new osd::debugger::qt::MemoryWindow(*this);
+ case debugger::WINDOW_TYPE_MEMORY_VIEWER:
+ win = new debugger::qt::MemoryWindow(*this);
break;
- case osd::debugger::WINDOW_TYPE_DISASSEMBLY_VIEWER:
- win = new osd::debugger::qt::DasmWindow(*this);
+ case debugger::WINDOW_TYPE_DISASSEMBLY_VIEWER:
+ win = new debugger::qt::DasmWindow(*this);
break;
- case osd::debugger::WINDOW_TYPE_ERROR_LOG_VIEWER:
- win = new osd::debugger::qt::LogWindow(*this);
+ case debugger::WINDOW_TYPE_ERROR_LOG_VIEWER:
+ win = new debugger::qt::LogWindow(*this);
break;
- case osd::debugger::WINDOW_TYPE_POINTS_VIEWER:
- win = new osd::debugger::qt::BreakpointsWindow(*this);
+ case debugger::WINDOW_TYPE_POINTS_VIEWER:
+ win = new debugger::qt::BreakpointsWindow(*this);
break;
- case osd::debugger::WINDOW_TYPE_DEVICES_VIEWER:
- win = new osd::debugger::qt::DevicesWindow(*this);
+ case debugger::WINDOW_TYPE_DEVICES_VIEWER:
+ win = new debugger::qt::DevicesWindow(*this);
break;
- case osd::debugger::WINDOW_TYPE_DEVICE_INFO_VIEWER:
- win = new osd::debugger::qt::DeviceInformationWindow(*this);
+ case debugger::WINDOW_TYPE_DEVICE_INFO_VIEWER:
+ win = new debugger::qt::DeviceInformationWindow(*this);
break;
}
if (win)
@@ -245,10 +247,12 @@ void debug_qt::load_window_configurations(util::xml::data_node const &parentnode
} // anonymous namespace
+} // namespace osd
+
#else // USE_QTDEBUG
-MODULE_NOT_SUPPORTED(debug_qt, OSD_DEBUG_PROVIDER, "qt")
+namespace osd { namespace { MODULE_NOT_SUPPORTED(debug_qt, OSD_DEBUG_PROVIDER, "qt") } }
#endif
-MODULE_DEFINITION(DEBUG_QT, debug_qt)
+MODULE_DEFINITION(DEBUG_QT, osd::debug_qt)
diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp
index 2c4677f316d..756aa7a5dd8 100644
--- a/src/osd/modules/debugger/debugwin.cpp
+++ b/src/osd/modules/debugger/debugwin.cpp
@@ -8,7 +8,6 @@
#include "emu.h"
#include "debug_module.h"
-#include "modules/osdmodule.h"
#if defined(OSD_WINDOWS) /*|| defined(SDLMAME_WIN32)*/
@@ -22,28 +21,34 @@
#include "win/pointswininfo.h"
#include "win/uimetrics.h"
+// emu
#include "config.h"
#include "debugger.h"
#include "debug/debugcpu.h"
#include "util/xmlfile.h"
+// osd/windows
#include "window.h"
-#include "../input/input_common.h"
-#include "../input/input_windows.h"
+#include "winmain.h"
+#include "../input/input_windows.h" // for the keyboard translation table
+
+
+namespace osd {
namespace {
class debugger_windows :
public osd_module,
public debug_module,
- protected osd::debugger::win::debugger_windows_interface
+ protected debugger::win::debugger_windows_interface
{
public:
debugger_windows() :
osd_module(OSD_DEBUG_PROVIDER, "windows"),
debug_module(),
+ m_osd(nullptr),
m_machine(nullptr),
m_metrics(),
m_waiting_for_debugger(false),
@@ -57,7 +62,7 @@ public:
virtual ~debugger_windows() { }
- virtual int init(const osd_options &options) override { return 0; }
+ virtual int init(osd_interface &osd, osd_options const &options) override;
virtual void exit() override;
virtual void init_debugger(running_machine &machine) override;
@@ -67,7 +72,7 @@ public:
protected:
virtual running_machine &machine() const override { return *m_machine; }
- virtual osd::debugger::win::ui_metrics &metrics() const override { return *m_metrics; }
+ virtual debugger::win::ui_metrics &metrics() const override { return *m_metrics; }
virtual void set_color_theme(int index) override;
virtual bool get_save_window_arrangement() const override { return m_save_windows; }
virtual void set_save_window_arrangement(bool save) override { m_save_windows = save; }
@@ -75,11 +80,11 @@ protected:
virtual bool const &waiting_for_debugger() const override { return m_waiting_for_debugger; }
virtual bool seq_pressed() const override;
- virtual void create_memory_window() override { create_window<osd::debugger::win::memorywin_info>(); }
- virtual void create_disasm_window() override { create_window<osd::debugger::win::disasmwin_info>(); }
- virtual void create_log_window() override { create_window<osd::debugger::win::logwin_info>(); }
- virtual void create_points_window() override { create_window<osd::debugger::win::pointswin_info>(); }
- virtual void remove_window(osd::debugger::win::debugwin_info &info) override;
+ virtual void create_memory_window() override { create_window<debugger::win::memorywin_info>(); }
+ virtual void create_disasm_window() override { create_window<debugger::win::disasmwin_info>(); }
+ virtual void create_log_window() override { create_window<debugger::win::logwin_info>(); }
+ virtual void create_points_window() override { create_window<debugger::win::pointswin_info>(); }
+ virtual void remove_window(debugger::win::debugwin_info &info) override;
virtual void show_all() override;
virtual void hide_all() override;
@@ -94,11 +99,12 @@ private:
void load_configuration(util::xml::data_node const &parentnode);
+ windows_osd_interface *m_osd;
running_machine *m_machine;
- std::unique_ptr<osd::debugger::win::ui_metrics> m_metrics;
+ std::unique_ptr<debugger::win::ui_metrics> m_metrics;
bool m_waiting_for_debugger;
- std::vector<std::unique_ptr<osd::debugger::win::debugwin_info> > m_window_list;
- osd::debugger::win::consolewin_info *m_main_console;
+ std::vector<std::unique_ptr<debugger::win::debugwin_info> > m_window_list;
+ debugger::win::consolewin_info *m_main_console;
POINT m_next_window_pos;
LONG m_window_start_x;
@@ -108,6 +114,16 @@ private:
};
+int debugger_windows::init(osd_interface &osd, osd_options const &options)
+{
+ m_osd = dynamic_cast<windows_osd_interface *>(&osd);
+ if (!m_osd)
+ return -1;
+
+ return 0;
+}
+
+
void debugger_windows::exit()
{
// loop over windows and free them
@@ -123,7 +139,7 @@ void debugger_windows::exit()
void debugger_windows::init_debugger(running_machine &machine)
{
m_machine = &machine;
- m_metrics = std::make_unique<osd::debugger::win::ui_metrics>(downcast<osd_options &>(m_machine->options()));
+ m_metrics = std::make_unique<debugger::win::ui_metrics>(downcast<osd_options &>(m_machine->options()));
machine.configuration().config_register(
"debugger",
configuration_manager::load_delegate(&debugger_windows::config_load, this),
@@ -136,7 +152,7 @@ void debugger_windows::wait_for_debugger(device_t &device, bool firststop)
// create a console window
if (!m_main_console)
{
- m_main_console = create_window<osd::debugger::win::consolewin_info>();
+ m_main_console = create_window<debugger::win::consolewin_info>();
// set the starting position for new auxiliary windows
HMONITOR const nearest_monitor = MonitorFromWindow(
@@ -286,7 +302,7 @@ bool debugger_windows::seq_pressed() const
}
-void debugger_windows::remove_window(osd::debugger::win::debugwin_info &info)
+void debugger_windows::remove_window(debugger::win::debugwin_info &info)
{
for (auto it = m_window_list.begin(); it != m_window_list.end(); ++it)
if (it->get() == &info) {
@@ -378,10 +394,10 @@ void debugger_windows::config_load(config_type cfgtype, config_level cfglevel, u
{
if (config_type::DEFAULT == cfgtype)
{
- m_save_windows = 0 != parentnode->get_attribute_int(osd::debugger::ATTR_DEBUGGER_SAVE_WINDOWS, m_save_windows ? 1 : 0);
- util::xml::data_node const *const colors = parentnode->get_child(osd::debugger::NODE_COLORS);
+ m_save_windows = 0 != parentnode->get_attribute_int(debugger::ATTR_DEBUGGER_SAVE_WINDOWS, m_save_windows ? 1 : 0);
+ util::xml::data_node const *const colors = parentnode->get_child(debugger::NODE_COLORS);
if (colors)
- m_metrics->set_color_theme(colors->get_attribute_int(osd::debugger::ATTR_COLORS_THEME, m_metrics->get_color_theme()));
+ m_metrics->set_color_theme(colors->get_attribute_int(debugger::ATTR_COLORS_THEME, m_metrics->get_color_theme()));
}
else if (config_type::SYSTEM == cfgtype)
{
@@ -404,10 +420,10 @@ void debugger_windows::config_save(config_type cfgtype, util::xml::data_node *pa
{
if (config_type::DEFAULT == cfgtype)
{
- parentnode->set_attribute_int(osd::debugger::ATTR_DEBUGGER_SAVE_WINDOWS, m_save_windows ? 1 : 0);
- util::xml::data_node *const colors = parentnode->add_child(osd::debugger::NODE_COLORS, nullptr);
+ parentnode->set_attribute_int(debugger::ATTR_DEBUGGER_SAVE_WINDOWS, m_save_windows ? 1 : 0);
+ util::xml::data_node *const colors = parentnode->add_child(debugger::NODE_COLORS, nullptr);
if (colors)
- colors->set_attribute_int(osd::debugger::ATTR_COLORS_THEME, m_metrics->get_color_theme());
+ colors->set_attribute_int(debugger::ATTR_COLORS_THEME, m_metrics->get_color_theme());
}
else if (m_save_windows && (config_type::SYSTEM == cfgtype))
{
@@ -419,30 +435,30 @@ void debugger_windows::config_save(config_type cfgtype, util::xml::data_node *pa
void debugger_windows::load_configuration(util::xml::data_node const &parentnode)
{
- for (util::xml::data_node const *node = parentnode.get_child(osd::debugger::NODE_WINDOW); node; node = node->get_next_sibling(osd::debugger::NODE_WINDOW))
+ for (util::xml::data_node const *node = parentnode.get_child(debugger::NODE_WINDOW); node; node = node->get_next_sibling(debugger::NODE_WINDOW))
{
- osd::debugger::win::debugwin_info *win = nullptr;
- switch (node->get_attribute_int(osd::debugger::ATTR_WINDOW_TYPE, -1))
+ debugger::win::debugwin_info *win = nullptr;
+ switch (node->get_attribute_int(debugger::ATTR_WINDOW_TYPE, -1))
{
- case osd::debugger::WINDOW_TYPE_CONSOLE:
+ case debugger::WINDOW_TYPE_CONSOLE:
m_main_console->restore_configuration_from_node(*node);
break;
- case osd::debugger::WINDOW_TYPE_MEMORY_VIEWER:
- win = create_window<osd::debugger::win::memorywin_info>();
+ case debugger::WINDOW_TYPE_MEMORY_VIEWER:
+ win = create_window<debugger::win::memorywin_info>();
break;
- case osd::debugger::WINDOW_TYPE_DISASSEMBLY_VIEWER:
- win = create_window<osd::debugger::win::disasmwin_info>();
+ case debugger::WINDOW_TYPE_DISASSEMBLY_VIEWER:
+ win = create_window<debugger::win::disasmwin_info>();
break;
- case osd::debugger::WINDOW_TYPE_ERROR_LOG_VIEWER:
- win = create_window<osd::debugger::win::logwin_info>();
+ case debugger::WINDOW_TYPE_ERROR_LOG_VIEWER:
+ win = create_window<debugger::win::logwin_info>();
break;
- case osd::debugger::WINDOW_TYPE_POINTS_VIEWER:
- win = create_window<osd::debugger::win::pointswin_info>();
+ case debugger::WINDOW_TYPE_POINTS_VIEWER:
+ win = create_window<debugger::win::pointswin_info>();
break;
- case osd::debugger::WINDOW_TYPE_DEVICES_VIEWER:
+ case debugger::WINDOW_TYPE_DEVICES_VIEWER:
// not supported
break;
- case osd::debugger::WINDOW_TYPE_DEVICE_INFO_VIEWER:
+ case debugger::WINDOW_TYPE_DEVICE_INFO_VIEWER:
// not supported
break;
default:
@@ -455,8 +471,12 @@ void debugger_windows::load_configuration(util::xml::data_node const &parentnode
} // anonymous namespace
+} // namespace osd
+
#else // not Windows
-MODULE_NOT_SUPPORTED(debugger_windows, OSD_DEBUG_PROVIDER, "windows")
+
+namespace osd { namespace { MODULE_NOT_SUPPORTED(debugger_windows, OSD_DEBUG_PROVIDER, "windows") } }
+
#endif
-MODULE_DEFINITION(DEBUG_WINDOWS, debugger_windows)
+MODULE_DEFINITION(DEBUG_WINDOWS, osd::debugger_windows)
diff --git a/src/osd/modules/debugger/none.cpp b/src/osd/modules/debugger/none.cpp
index 29ccb7cfca1..61bd1bbbd3e 100644
--- a/src/osd/modules/debugger/none.cpp
+++ b/src/osd/modules/debugger/none.cpp
@@ -8,27 +8,28 @@
#include "emu.h"
#include "debug_module.h"
-#include "modules/osdmodule.h"
#include "debug/debugcon.h"
#include "debug/debugcpu.h"
#include "debugger.h"
+namespace osd {
+
namespace {
class debug_none : public osd_module, public debug_module
{
public:
- debug_none()
- : osd_module(OSD_DEBUG_PROVIDER, "none"), debug_module(),
+ debug_none() :
+ osd_module(OSD_DEBUG_PROVIDER, "none"), debug_module(),
m_machine(nullptr)
{
}
virtual ~debug_none() { }
- virtual int init(const osd_options &options) override { return 0; }
+ virtual int init(osd_interface &osd, const osd_options &options) override { return 0; }
virtual void exit() override { }
virtual void init_debugger(running_machine &machine) override;
@@ -55,4 +56,6 @@ void debug_none::debugger_update()
} // anonymous namespace
-MODULE_DEFINITION(DEBUG_NONE, debug_none)
+} // namespace osd
+
+MODULE_DEFINITION(DEBUG_NONE, osd::debug_none)