diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/nl_base.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/nl_util.h | 18 | ||||
-rw-r--r-- | src/lib/netlist/plib/pdynlib.cpp | 5 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_direct.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_sm.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_sor_mat.h | 1 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_w.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_solver.cpp | 2 | ||||
-rw-r--r-- | src/lib/util/flac.cpp | 24 | ||||
-rw-r--r-- | src/lib/util/options.cpp | 2 |
11 files changed, 33 insertions, 35 deletions
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index 96038049473..ed74a8e305c 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -30,7 +30,7 @@ NETLIST_START(TTL_7416_DIP) s3.A, /* A3 |5 10| Y5 */ s5.Q, s3.Q, /* Y3 |6 9| A4 */ s4.A, GND.I, /* GND |7 8| Y4 */ s4.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -69,7 +69,7 @@ NETLIST_START(TTL_7400_DIP) s2.B, /* B2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index b5c26a2262c..a0c66a258af 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -1301,7 +1301,7 @@ protected: pstring m_name; setup_t *m_setup; plog_base<NL_DEBUG> m_log; - pdynlib *m_lib; // external lib needs to be loaded as long as netlist exists + pdynlib *m_lib; // external lib needs to be loaded as long as netlist exists }; // ----------------------------------------------------------------------------- diff --git a/src/lib/netlist/nl_util.h b/src/lib/netlist/nl_util.h index 352b20d0003..7c1f3d61915 100644 --- a/src/lib/netlist/nl_util.h +++ b/src/lib/netlist/nl_util.h @@ -28,18 +28,18 @@ public: static const pstring buildpath(std::initializer_list<pstring> list ) { pstring ret = ""; - for( auto elem : list ) - { - if (ret == "") - ret = elem; - else + for( auto elem : list ) + { + if (ret == "") + ret = elem; + else #ifdef _WIN32 - ret = ret + '\\' + elem; + ret = ret + '\\' + elem; #else - ret = ret + '/' + elem; + ret = ret + '/' + elem; #endif - } - return ret; + } + return ret; } static const pstring environment(const pstring &var, const pstring &default_val = "") diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp index 71b0dc2bfcc..bbf741896bc 100644 --- a/src/lib/netlist/plib/pdynlib.cpp +++ b/src/lib/netlist/plib/pdynlib.cpp @@ -24,7 +24,7 @@ pdynlib::pdynlib(const pstring libname) if (m_lib != nullptr) m_isLoaded = true; //else - // fprintf(stderr, "win: library <%s> not found!\n", libname.cstr()); + // fprintf(stderr, "win: library <%s> not found!\n", libname.cstr()); #else //printf("loading <%s>\n", libname.cstr()); if (libname != "") @@ -34,7 +34,7 @@ pdynlib::pdynlib(const pstring libname) if (m_lib != nullptr) m_isLoaded = true; //else - // printf("library <%s> not found!\n", libname.cstr()); + // printf("library <%s> not found!\n", libname.cstr()); #endif } @@ -88,4 +88,3 @@ void *pdynlib::getsym_p(const pstring name) return dlsym(m_lib, name.cstr()); #endif } - diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 91cb7c9385f..d6896cbe97d 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -46,7 +46,7 @@ struct ti_t volatile std::atomic<int> lo; thr_intf *intf; void *params; -// int _block[29]; /* make it 256 bytes */ +// int _block[29]; /* make it 256 bytes */ }; static ti_t ti[MAXTHR]; @@ -287,7 +287,7 @@ void matrix_solver_direct_t<m_N, _storage_N>::LE_solve() #else vec_add_mult_scalar(kN-i-1,pj,f1,pi); //for (unsigned k = i+1; k < kN; k++) - // pj[k] = pj[k] + pi[k] * f1; + // pj[k] = pj[k] + pi[k] * f1; //for (unsigned k = i+1; k < kN; k++) //A(j,k) += A(i,k) * f1; RHS(j) += RHS(i) * f1; diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index f83240c789a..f38ee5a5783 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -13,9 +13,9 @@ * In this specific implementation, u is a unit vector specifying the row which * changed. Thus v contains the changed column. * - * Than z = A⁻¹ u , w = transpose(A⁻¹) v , lambda = v z + * Than z = A^-1 u , w = transpose(A^-1) v , lambda = v z * - * A⁻¹ <- 1.0 / (1.0 + lambda) * (z x w) + * A^-1 <- 1.0 / (1.0 + lambda) * (z x w) * * The approach is iterative and applied for each row changed. * diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h index b57ba3cded1..eb59a7a94ac 100644 --- a/src/lib/netlist/solver/nld_ms_sor_mat.h +++ b/src/lib/netlist/solver/nld_ms_sor_mat.h @@ -23,7 +23,6 @@ NETLIB_NAMESPACE_DEVICES_START() template <unsigned m_N, unsigned _storage_N> class matrix_solver_SOR_mat_t: public matrix_solver_direct_t<m_N, _storage_N> { - friend class matrix_solver_t; public: diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h index fe7a4389566..89f83dea6cc 100644 --- a/src/lib/netlist/solver/nld_ms_w.h +++ b/src/lib/netlist/solver/nld_ms_w.h @@ -15,7 +15,7 @@ * Whilst the book proposes to invert the matrix R=(I+transpose(V)*Z) we define * * w = transpose(V)*y - * a = R⁻¹ * w + * a = R^-1 * w * * and consequently * diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index 5341d1b70d1..9fa0ee16c60 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -180,7 +180,7 @@ ATTR_COLD void matrix_solver_t::setup_base(analog_net_t::list_t &nets) if (net_proxy_output == nullptr) { //net_proxy_output = palloc(analog_output_t(*this, - // this->name() + "." + pfmt("m{1}")(m_inps.size()))); + // this->name() + "." + pfmt("m{1}")(m_inps.size()))); net_proxy_output = palloc(analog_output_t); net_proxy_output->init_object(*this, this->name() + "." + pfmt("m{1}")(m_inps.size())); diff --git a/src/lib/util/flac.cpp b/src/lib/util/flac.cpp index fedcd6cd73e..ced56cd3115 100644 --- a/src/lib/util/flac.cpp +++ b/src/lib/util/flac.cpp @@ -277,18 +277,18 @@ FLAC__StreamEncoderWriteStatus flac_encoder::write_callback(const FLAC__byte buf flac_decoder::flac_decoder() : m_decoder(FLAC__stream_decoder_new()), - m_file(nullptr), - m_sample_rate(0), - m_channels(0), - m_bits_per_sample(0), - m_compressed_offset(0), - m_compressed_start(nullptr), - m_compressed_length(0), - m_compressed2_start(nullptr), - m_compressed2_length(0), - m_uncompressed_offset(0), - m_uncompressed_length(0), - m_uncompressed_swap(false) + m_file(nullptr), + m_sample_rate(0), + m_channels(0), + m_bits_per_sample(0), + m_compressed_offset(0), + m_compressed_start(nullptr), + m_compressed_length(0), + m_compressed2_start(nullptr), + m_compressed2_length(0), + m_uncompressed_offset(0), + m_uncompressed_length(0), + m_uncompressed_swap(false) { } diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp index cd1ce38fce1..096499fe88c 100644 --- a/src/lib/util/options.cpp +++ b/src/lib/util/options.cpp @@ -841,4 +841,4 @@ core_options::entry *core_options::get_entry(const char *name) const { auto curentry = m_entrymap.find(name); return (curentry != m_entrymap.end()) ? curentry->second : nullptr; -}
\ No newline at end of file +} |