summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2019-02-17 18:30:14 +0100
committer couriersud <couriersud@gmx.org>2019-02-17 18:30:34 +0100
commit1fe9f5e2e5cd05122a5600e43ccf7fed241df521 (patch)
tree70a7c9ca20de2fb25eb34877afa62f8904e2eab2 /src/devices
parent7d45dcec4efaf1ce3cb16afe7fa5cf885a67fcc4 (diff)
netlist: refactoring startup process and array usage. (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/machine/netlist.cpp10
-rw-r--r--src/devices/machine/netlist.h7
2 files changed, 9 insertions, 8 deletions
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index fcfa246910f..b05ae7b9625 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -213,7 +213,7 @@ private:
class netlist_source_memregion_t : public netlist::source_t
{
public:
- netlist_source_memregion_t(netlist::setup_t &setup, pstring name)
+ netlist_source_memregion_t(netlist::nlparse_t &setup, pstring name)
: netlist::source_t(setup), m_name(name)
{
}
@@ -238,7 +238,7 @@ public:
std::unique_ptr<plib::pistream> netlist_source_memregion_t::stream(const pstring &name)
{
- memory_region *mem = static_cast<netlist_mame_device::netlist_mame_t &>(setup().exec()).machine().root_device().memregion(m_name.c_str());
+ memory_region *mem = static_cast<netlist_mame_device::netlist_mame_t &>(setup().setup().exec()).machine().root_device().memregion(m_name.c_str());
return plib::make_unique<plib::pimemstream>(mem->base(), mem->bytes());
}
@@ -249,7 +249,7 @@ netlist_data_memregions_t::netlist_data_memregions_t(netlist::setup_t &setup)
std::unique_ptr<plib::pistream> netlist_data_memregions_t::stream(const pstring &name)
{
- memory_region *mem = static_cast<netlist_mame_device::netlist_mame_t &>(setup().exec()).parent().memregion(name.c_str());
+ memory_region *mem = static_cast<netlist_mame_device::netlist_mame_t &>(setup().setup().exec()).parent().memregion(name.c_str());
if (mem != nullptr)
{
return plib::make_unique<plib::pimemstream>(mem->base(), mem->bytes());
@@ -454,7 +454,7 @@ netlist::setup_t &netlist_mame_device::setup()
return m_netlist->nlstate().setup();
}
-void netlist_mame_device::register_memregion_source(netlist::setup_t &setup, const char *name)
+void netlist_mame_device::register_memregion_source(netlist::nlparse_t &setup, const char *name)
{
setup.register_source(plib::make_unique<netlist_source_memregion_t>(setup, pstring(name)));
}
@@ -826,7 +826,7 @@ netlist_mame_device::~netlist_mame_device()
LOGDEVCALLS("~netlist_mame_device\n");
}
-void netlist_mame_device::set_constructor(void (*setup_func)(netlist::setup_t &))
+void netlist_mame_device::set_constructor(void (*setup_func)(netlist::nlparse_t &))
{
if (LOG_DEV_CALLS) logerror("set_constructor\n");
m_setup_func = setup_func;
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 630bbabe42c..615f1fb1880 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -19,6 +19,7 @@ class nld_sound_in;
namespace netlist {
class setup_t;
+ class nlparse_t;
template <typename T>
class param_num_t;
class param_ptr_t;
@@ -105,7 +106,7 @@ public:
netlist_mame_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~netlist_mame_device();
- void set_constructor(void (*setup_func)(netlist::setup_t &));
+ void set_constructor(void (*setup_func)(netlist::nlparse_t &));
ATTR_HOT inline netlist::setup_t &setup();
ATTR_HOT inline netlist_mame_t &netlist() { return *m_netlist; }
@@ -113,7 +114,7 @@ public:
ATTR_HOT void update_icount(netlist::netlist_time time);
ATTR_HOT void check_mame_abort_slice();
- static void register_memregion_source(netlist::setup_t &setup, const char *name);
+ static void register_memregion_source(netlist::nlparse_t &setup, const char *name);
int m_icount;
@@ -144,7 +145,7 @@ private:
netlist::poolptr<netlist_mame_t> m_netlist;
- void (*m_setup_func)(netlist::setup_t &);
+ void (*m_setup_func)(netlist::nlparse_t &);
};
// ----------------------------------------------------------------------------------------