summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-01-24 21:03:59 +0100
committer couriersud <couriersud@arcor.de>2015-01-24 21:03:59 +0100
commit2bd20baaba88d83551ccc63590760145c16310ef (patch)
tree3f6639199ecfdbb811f9489aa9b640a3b4ff6c32 /src
parent10b3dce34df5deda56d708363087359785878a3b (diff)
Renamed osd_debugger_interface to debug_module in a first step to move
to new module infrastructure. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/osd/modules/debugger/debug_module.h23
-rw-r--r--src/osd/modules/debugger/debugint.c4
-rw-r--r--src/osd/modules/debugger/debugint.h5
-rw-r--r--src/osd/modules/debugger/debugqt.c8
-rw-r--r--src/osd/modules/debugger/debugqt.h5
-rw-r--r--src/osd/modules/debugger/none.c4
-rw-r--r--src/osd/modules/debugger/none.h5
-rw-r--r--src/osd/modules/lib/osdobj_common.c18
-rw-r--r--src/osd/modules/lib/osdobj_common.h27
9 files changed, 46 insertions, 53 deletions
diff --git a/src/osd/modules/debugger/debug_module.h b/src/osd/modules/debugger/debug_module.h
new file mode 100644
index 00000000000..fccea46b8be
--- /dev/null
+++ b/src/osd/modules/debugger/debug_module.h
@@ -0,0 +1,23 @@
+/*
+ * debug_module.h
+ *
+ */
+
+#ifndef DEBUG_MODULE_H_
+#define DEBUG_MODULE_H_
+
+class debug_module
+{
+public:
+
+ virtual ~debug_module() { }
+
+ virtual void init_debugger(running_machine &machine) = 0;
+ virtual void wait_for_debugger(device_t &device, bool firststop) = 0;
+ virtual void debugger_update() = 0;
+ virtual void debugger_exit() = 0;
+};
+
+
+
+#endif /* DEBUG_MODULE_H_ */
diff --git a/src/osd/modules/debugger/debugint.c b/src/osd/modules/debugger/debugint.c
index 39728cf94f7..c5857e00e4f 100644
--- a/src/osd/modules/debugger/debugint.c
+++ b/src/osd/modules/debugger/debugint.c
@@ -1454,7 +1454,7 @@ void debugger_internal::debugger_update()
//-------------------------------------------------
// debugger_internal - constructor
//-------------------------------------------------
-debugger_internal::debugger_internal(const osd_interface &osd)
- : osd_debugger_interface(osd), m_machine(NULL)
+debugger_internal::debugger_internal()
+ : debug_module(), m_machine(NULL)
{
}
diff --git a/src/osd/modules/debugger/debugint.h b/src/osd/modules/debugger/debugint.h
index e3733b10dd4..c9a73bff14d 100644
--- a/src/osd/modules/debugger/debugint.h
+++ b/src/osd/modules/debugger/debugint.h
@@ -16,12 +16,13 @@
#include "osdepend.h"
#include "modules/lib/osdobj_common.h"
+#include "debug_module.h"
-class debugger_internal : public osd_debugger_interface
+class debugger_internal : public debug_module
{
public:
// construction/destruction
- debugger_internal(const osd_interface &osd);
+ debugger_internal();
virtual ~debugger_internal() { }
virtual void init_debugger(running_machine &machine);
diff --git a/src/osd/modules/debugger/debugqt.c b/src/osd/modules/debugger/debugqt.c
index a9779c7782a..aaa6eee7627 100644
--- a/src/osd/modules/debugger/debugqt.c
+++ b/src/osd/modules/debugger/debugqt.c
@@ -31,9 +31,9 @@
#include "debugqt.h"
-osd_debugger_interface *qt_osd_debugger_creator(const osd_interface &osd)
+debug_module *qt_osd_debugger_creator()
{
- return new debugger_qt(osd);
+ return new debugger_qt();
}
const osd_debugger_type OSD_DEBUGGER_QT = &qt_osd_debugger_creator;
@@ -50,8 +50,8 @@ static MainWindow* mainQtWindow = NULL;
//-------------------------------------------------
// debugger_qt - constructor
//-------------------------------------------------
-debugger_qt::debugger_qt(const osd_interface &osd)
- : osd_debugger_interface(osd), m_machine(NULL)
+debugger_qt::debugger_qt()
+ : debug_module(), m_machine(NULL)
{
}
diff --git a/src/osd/modules/debugger/debugqt.h b/src/osd/modules/debugger/debugqt.h
index 51bf3cf27b2..343f15ff98d 100644
--- a/src/osd/modules/debugger/debugqt.h
+++ b/src/osd/modules/debugger/debugqt.h
@@ -15,12 +15,13 @@
#define __DEBUGGER_QT_H__
#include "emu.h"
+#include "debug_module.h"
-class debugger_qt : public osd_debugger_interface
+class debugger_qt : public debug_module
{
public:
// construction/destruction
- debugger_qt(const osd_interface &osd);
+ debugger_qt();
virtual ~debugger_qt();
virtual void init_debugger(running_machine &machine);
diff --git a/src/osd/modules/debugger/none.c b/src/osd/modules/debugger/none.c
index a3a29b290d5..33545a07b6d 100644
--- a/src/osd/modules/debugger/none.c
+++ b/src/osd/modules/debugger/none.c
@@ -12,8 +12,8 @@ const osd_debugger_type OSD_DEBUGGER_NONE = &osd_debugger_creator<debugger_none>
//-------------------------------------------------
// debugger_none - constructor
//-------------------------------------------------
-debugger_none::debugger_none(const osd_interface &osd)
- : osd_debugger_interface(osd), m_machine(NULL)
+debugger_none::debugger_none()
+ : debug_module(), m_machine(NULL)
{
}
diff --git a/src/osd/modules/debugger/none.h b/src/osd/modules/debugger/none.h
index ee87e22548a..b6760204339 100644
--- a/src/osd/modules/debugger/none.h
+++ b/src/osd/modules/debugger/none.h
@@ -14,13 +14,14 @@
#define __DEBUGGER_NONE_H__
#include "osdepend.h"
+#include "debug_module.h"
#include "modules/lib/osdobj_common.h"
-class debugger_none : public osd_debugger_interface
+class debugger_none : public debug_module
{
public:
// construction/destruction
- debugger_none(const osd_interface &osd);
+ debugger_none();
virtual ~debugger_none() { }
virtual void init_debugger(running_machine &machine);
diff --git a/src/osd/modules/lib/osdobj_common.c b/src/osd/modules/lib/osdobj_common.c
index a6bc35873f2..4e9083e6044 100644
--- a/src/osd/modules/lib/osdobj_common.c
+++ b/src/osd/modules/lib/osdobj_common.c
@@ -270,7 +270,7 @@ void osd_common_t::init_debugger()
osd_printf_warning("debugger_init: option %s not found switching to auto\n",options().debugger());
debugger = m_debugger_options.find("auto");
}
- m_debugger = (*debugger)(*this);
+ m_debugger = (*debugger)();
m_debugger->init_debugger(machine());
}
@@ -569,20 +569,4 @@ void osd_common_t::midi_exit()
osd_midi_exit();
}
-//-------------------------------------------------
-// osd_debugger_interface - constructor
-//-------------------------------------------------
-
-osd_debugger_interface::osd_debugger_interface(const osd_interface &osd)
- : m_osd(osd)
-{
-}
-
-//-------------------------------------------------
-// osd_debugger_interface - destructor
-//-------------------------------------------------
-
-osd_debugger_interface::~osd_debugger_interface()
-{
-}
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index a9d0d10b718..8ceb5583284 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -17,6 +17,7 @@
#include "modules/osdmodule.h"
#include "modules/font/font_module.h"
#include "modules/sound/sound_module.h"
+#include "modules/debugger/debug_module.h"
#include "cliopts.h"
//============================================================
@@ -104,10 +105,8 @@ private:
static const options_entry s_option_entries[];
};
-class osd_debugger_interface;
-
// a osd_sound_type is simply a pointer to its alloc function
-typedef osd_debugger_interface *(*osd_debugger_type)(const osd_interface &osd);
+typedef debug_module *(*osd_debugger_type)();
// ======================> osd_interface
@@ -224,7 +223,7 @@ private:
protected:
sound_module* m_sound;
- osd_debugger_interface* m_debugger;
+ debug_module* m_debugger;
private:
//tagmap_t<osd_video_type> m_video_options;
dynamic_array<const char *> m_video_names;
@@ -233,27 +232,11 @@ private:
};
-class osd_debugger_interface
-{
-public:
- // construction/destruction
- osd_debugger_interface(const osd_interface &osd);
- virtual ~osd_debugger_interface();
-
- virtual void init_debugger(running_machine &machine) = 0;
- virtual void wait_for_debugger(device_t &device, bool firststop) = 0;
- virtual void debugger_update() = 0;
- virtual void debugger_exit() = 0;
-
-protected:
- const osd_interface& m_osd;
-};
-
// this template function creates a stub which constructs a debugger
template<class _DeviceClass>
-osd_debugger_interface *osd_debugger_creator(const osd_interface &osd)
+debug_module *osd_debugger_creator()
{
- return global_alloc(_DeviceClass(osd));
+ return global_alloc(_DeviceClass());
}
#endif /* __OSDOBJ_COMMON_H__ */