diff options
Diffstat (limited to 'src/lib/netlist/nl_factory.cpp')
-rw-r--r-- | src/lib/netlist/nl_factory.cpp | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp index b32a51910dd..6ab9e84cafd 100644 --- a/src/lib/netlist/nl_factory.cpp +++ b/src/lib/netlist/nl_factory.cpp @@ -1,29 +1,34 @@ // license:BSD-3-Clause // copyright-holders:Couriersud -// -// nl_factory.cpp -// +/// +/// \file nl_factory.cpp +/// #include "nl_factory.h" -#include "nl_base.h" + #include "nl_errstr.h" #include "nl_setup.h" + +#include "core/core_device.h" + #include "plib/putil.h" -namespace netlist { -namespace factory { +namespace netlist::factory +{ // FIXME: this doesn't do anything, check how to remove - class NETLIB_NAME(wrapper) : public base_device_t + class NETLIB_NAME(wrapper) + : public base_device_t { public: - NETLIB_NAME(wrapper)(netlist_state_t &anetlist, const pstring &name) - : base_device_t(anetlist, name) + NETLIB_NAME(wrapper)(base_device_param_t data) + : base_device_t(data) { } + protected: - //NETLIB_RESETI() {} + // NETLIB_RESETI() {} }; element_t::element_t(const pstring &name, properties &&props) @@ -32,9 +37,9 @@ namespace factory { { } - // ---------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------- // net_device_t_base_factory - // ---------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------- list_t::list_t(log_type &alog) : m_log(alog) @@ -45,7 +50,7 @@ namespace factory { bool list_t::exists(const pstring &name) const noexcept { - for (const auto & e : *this) + for (const auto &e : *this) if (e->name() == name) return true; return false; @@ -61,9 +66,9 @@ namespace factory { push_back(std::move(factory)); } - factory::element_t * list_t::factory_by_name(const pstring &devname) + factory::element_t *list_t::factory_by_name(const pstring &devname) { - for (auto & e : *this) + for (auto &e : *this) { if (e->name() == devname) return e.get(); @@ -73,20 +78,22 @@ namespace factory { throw nl_exception(MF_CLASS_1_NOT_FOUND(devname)); } - // ----------------------------------------------------------------------------- + // ------------------------------------------------------------------------- // library_element_t: factory class to wrap macro based chips/elements - // ----------------------------------------------------------------------------- + // ------------------------------------------------------------------------- - library_element_t::library_element_t(const pstring &name, properties &&props) - : element_t(name, std::move(properties(props).set_type(element_type::MACRO))) + library_element_t::library_element_t(const pstring &name, + properties && props) + : element_t(name, + std::move(properties(props).set_type(element_type::MACRO))) { } - device_arena::unique_ptr<core_device_t> library_element_t::make_device(device_arena &pool, netlist_state_t &anetlist, const pstring &name) + device_arena::unique_ptr<core_device_t> library_element_t::make_device( + device_arena &pool, netlist_state_t &anetlist, const pstring &name) { - return plib::make_unique<NETLIB_NAME(wrapper)>(pool, anetlist, name); + return plib::make_unique<NETLIB_NAME(wrapper)>(pool, + base_device_data_t{anetlist, name}); } - -} // namespace factory - } // namespace netlist +} // namespace netlist::factory |