diff options
author | couriersud <couriersud@gmx.org> | 2019-10-31 18:39:09 +0100 |
---|---|---|
committer | couriersud <couriersud@gmx.org> | 2019-10-31 18:39:09 +0100 |
commit | 6c075e602cf83b379b8fa2c981694134b679a538 (patch) | |
tree | f483a7149300768974de6b33036abd22be86734b /src/devices/machine | |
parent | cae02668fa8ef2c31b1d66ac4b7784b84bb734ac (diff) |
netlist: maintenance and simplifcation. (nw)
- solver: align matrix population along the various solvers
- solver: delete dead code
- renamed nl_double to nl_fptype and use nl_fptype where previously
double has been used.
- renamed param_double_t to param_fp_t
Diffstat (limited to 'src/devices/machine')
-rw-r--r-- | src/devices/machine/netlist.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index c6c0083e162..dae61de8e19 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -189,7 +189,7 @@ public: NETLIB_UPDATEI() { - nl_double cur = m_in(); + nl_fptype cur = m_in(); // FIXME: make this a parameter // avoid calls due to noise @@ -206,7 +206,7 @@ private: netlist::analog_input_t m_in; std::unique_ptr<netlist_mame_analog_output_device::output_delegate> m_callback; // TODO: change to std::optional for C++17 netlist_mame_cpu_device *m_cpu_device; - netlist::state_var<nl_double> m_last; + netlist::state_var<nl_fptype> m_last; }; // ---------------------------------------------------------------------------------------- @@ -443,7 +443,7 @@ public: NETLIB_UPDATEI() { - nl_double val = m_in() * m_mult() + m_offset(); + nl_fptype val = m_in() * m_mult() + m_offset(); sound_update(exec().time()); /* ignore spikes */ if (std::abs(val) < 32767.0) @@ -463,8 +463,8 @@ public: } netlist::param_int_t m_channel; - netlist::param_double_t m_mult; - netlist::param_double_t m_offset; + netlist::param_fp_t m_mult; + netlist::param_fp_t m_offset; stream_sample_t *m_buffer; int m_bufsize; @@ -500,8 +500,8 @@ public: for (int i = 0; i < MAX_INPUT_CHANNELS; i++) { m_channels[i].m_param_name = netlist::pool().make_unique<netlist::param_str_t>(*this, plib::pfmt("CHAN{1}")(i), ""); - m_channels[i].m_param_mult = netlist::pool().make_unique<netlist::param_double_t>(*this, plib::pfmt("MULT{1}")(i), 1.0); - m_channels[i].m_param_offset = netlist::pool().make_unique<netlist::param_double_t>(*this, plib::pfmt("OFFSET{1}")(i), 0.0); + m_channels[i].m_param_mult = netlist::pool().make_unique<netlist::param_fp_t>(*this, plib::pfmt("MULT{1}")(i), 1.0); + m_channels[i].m_param_offset = netlist::pool().make_unique<netlist::param_fp_t>(*this, plib::pfmt("OFFSET{1}")(i), 0.0); } } @@ -522,7 +522,7 @@ public: if (i != m_num_channels) state().log().fatal("sound input numbering has to be sequential!"); m_num_channels++; - m_channels[i].m_param = dynamic_cast<netlist::param_double_t *>(state().setup().find_param((*m_channels[i].m_param_name)(), true)); + m_channels[i].m_param = dynamic_cast<netlist::param_fp_t *>(state().setup().find_param((*m_channels[i].m_param_name)(), true)); } } } @@ -533,7 +533,7 @@ public: { if (m_channels[i].m_buffer == nullptr) break; // stop, called outside of stream_update - const nl_double v = m_channels[i].m_buffer[m_pos]; + const nl_fptype v = m_channels[i].m_buffer[m_pos]; m_channels[i].m_param->setTo(v * (*m_channels[i].m_param_mult)() + (*m_channels[i].m_param_offset)()); } m_pos++; @@ -549,10 +549,10 @@ public: struct channel { netlist::unique_pool_ptr<netlist::param_str_t> m_param_name; - netlist::param_double_t *m_param; + netlist::param_fp_t *m_param; stream_sample_t *m_buffer; - netlist::unique_pool_ptr<netlist::param_double_t> m_param_mult; - netlist::unique_pool_ptr<netlist::param_double_t> m_param_offset; + netlist::unique_pool_ptr<netlist::param_fp_t> m_param_mult; + netlist::unique_pool_ptr<netlist::param_fp_t> m_param_offset; }; channel m_channels[MAX_INPUT_CHANNELS]; netlist::netlist_time m_inc; @@ -688,7 +688,7 @@ void netlist_mame_analog_input_device::device_start() { LOGDEVCALLS("start\n"); netlist::param_t *p = this->nl_owner().setup().find_param(pstring(m_param_name)); - m_param = dynamic_cast<netlist::param_double_t *>(p); + m_param = dynamic_cast<netlist::param_fp_t *>(p); if (m_param == nullptr) { fatalerror("device %s wrong parameter type for %s\n", basetag(), m_param_name); @@ -704,7 +704,7 @@ void netlist_mame_analog_input_device::validity_helper(validity_checker &valid, netlist::netlist_state_t &nlstate) const { netlist::param_t *p = nlstate.setup().find_param(pstring(m_param_name)); - auto *param = dynamic_cast<netlist::param_double_t *>(p); + auto *param = dynamic_cast<netlist::param_fp_t *>(p); if (param == nullptr) { osd_printf_warning("device %s wrong parameter type for %s\n", basetag(), m_param_name); |