diff options
Diffstat (limited to 'src/emu/netlist')
| -rw-r--r-- | src/emu/netlist/analog/nld_opamps.c | 27 | ||||
| -rw-r--r-- | src/emu/netlist/devices/net_lib.c | 4 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_log.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_system.h | 6 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_cd4xxx.c | 14 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_opamp.c | 4 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_opamp.h | 6 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_other.c | 4 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_other.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_ttl74xx.c | 4 | ||||
| -rw-r--r-- | src/emu/netlist/macro/nlm_ttl74xx.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.h | 6 | ||||
| -rw-r--r-- | src/emu/netlist/nl_factory.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/nl_setup.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/plib/palloc.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pconfig.h | 3 | ||||
| -rw-r--r-- | src/emu/netlist/plib/plists.h | 24 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pstate.c | 1 | ||||
| -rw-r--r-- | src/emu/netlist/solver/mat_cr.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/solver/vector_base.h | 1 | ||||
| -rw-r--r-- | src/emu/netlist/tools/nl_convert.c | 2 |
22 files changed, 62 insertions, 66 deletions
diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c index e54883151db..00eb9984cc5 100644 --- a/src/emu/netlist/analog/nld_opamps.c +++ b/src/emu/netlist/analog/nld_opamps.c @@ -42,10 +42,10 @@ NETLIB_NAMESPACE_DEVICES_START() /* * Type = 0: Impedance changer - * 1; Ideal opamp - * 2; opamp with first pole - * 3: opamp with first pole + output limit - * 4: opamp with input stage, first pole + output limit + * 1; Ideal opamp + * 2; opamp with first pole + * 3: opamp with first pole + output limit + * 4: opamp with input stage, first pole + output limit */ NETLIB_START(OPAMP) @@ -141,17 +141,16 @@ NETLIB_UPDATE_PARAM(OPAMP) /* NETLIB_DEVICE_WITH_PARAMS(OPAMPx, - NETLIB_NAME(R) m_RP; - NETLIB_NAME(C) m_CP; - NETLIB_NAME(VCCS) m_G1; - NETLIB_NAME(VCVS) m_EBUF; - - param_model_t m_model; - analog_input_t m_VH; - analog_input_t m_VL; - analog_input_t m_VREF; + NETLIB_NAME(R) m_RP; + NETLIB_NAME(C) m_CP; + NETLIB_NAME(VCCS) m_G1; + NETLIB_NAME(VCVS) m_EBUF; + + param_model_t m_model; + analog_input_t m_VH; + analog_input_t m_VL; + analog_input_t m_VREF; ); */ NETLIB_NAMESPACE_DEVICES_END() - diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c index 89829620448..b33a069a832 100644 --- a/src/emu/netlist/devices/net_lib.c +++ b/src/emu/netlist/devices/net_lib.c @@ -72,12 +72,12 @@ void initialize_factory(factory_list_t &factory) ENTRY(VCCS, VCCS, "-") ENTRY(CCCS, CCCS, "-") ENTRY(LVCCS, LVCCS, "-") - ENTRY(VS, VS, "V") + ENTRY(VS, VS, "V") ENTRY(CS, CS, "I") ENTRY(OPAMP, OPAMP, "MODEL") ENTRY(dummy_input, DUMMY_INPUT, "-") ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly - ENTRY(function, AFUNC, "N,FUNC") // only for macro devices - NO FEEDBACK loops + ENTRY(function, AFUNC, "N,FUNC") // only for macro devices - NO FEEDBACK loops ENTRY(QBJT_EB, QBJT_EB, "MODEL") ENTRY(QBJT_switch, QBJT_SW, "MODEL") ENTRY(logic_input, TTL_INPUT, "IN") diff --git a/src/emu/netlist/devices/nld_log.h b/src/emu/netlist/devices/nld_log.h index 4b768b66b82..9f7431ed1ee 100644 --- a/src/emu/netlist/devices/nld_log.h +++ b/src/emu/netlist/devices/nld_log.h @@ -21,7 +21,7 @@ #include "../nl_base.h" #define LOG(_name, _I) \ - NET_REGISTER_DEV(ÖPG, _name) \ + NET_REGISTER_DEV(??PG, _name) \ NET_CONNECT(_name, I, _I) NETLIB_NAMESPACE_DEVICES_START() diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h index 3f8de7bc2fc..27ed157b3f2 100644 --- a/src/emu/netlist/devices/nld_system.h +++ b/src/emu/netlist/devices/nld_system.h @@ -24,7 +24,7 @@ #define LOGIC_INPUT(_name, _v, _family) \ NET_REGISTER_DEV(LOGIC_INPUT, _name) \ - PARAM(_name.IN, _v) \ + PARAM(_name.IN, _v) \ PARAM(_name.FAMILY, _family) #define ANALOG_INPUT(_name, _v) \ @@ -70,9 +70,9 @@ #define PARAMETERS(_name) \ NET_REGISTER_DEV(PARAMETERS, _name) -#define AFUNC(_name, _N, _F) \ +#define AFUNC(_name, _N, _F) \ NET_REGISTER_DEV(AFUNC, _name) \ - PARAM(_name.N, _N) \ + PARAM(_name.N, _N) \ PARAM(_name.FUNC, _F) NETLIB_NAMESPACE_DEVICES_START() diff --git a/src/emu/netlist/macro/nlm_cd4xxx.c b/src/emu/netlist/macro/nlm_cd4xxx.c index 97777b193aa..e8ffede2aa8 100644 --- a/src/emu/netlist/macro/nlm_cd4xxx.c +++ b/src/emu/netlist/macro/nlm_cd4xxx.c @@ -38,7 +38,7 @@ NETLIST_START(CD4001_DIP) s2.A, /* A3 |5 10| Y5 */ s3.Q, s2.B, /* Y3 |6 9| A4 */ s3.B, VDD.I, /* GND |7 8| Y4 */ s3.A - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -74,10 +74,10 @@ NETLIST_START(CD4020_DIP) s1.Q7, /* Q7 |6 11| RESET */ s1.RESET, s1.Q4, /* Q4 |7 10| IP */ s1.IP, s1.VSS, /* VSS |8 9| Q1 */ s1.Q1 - /* +--------------+ */ + /* +--------------+ */ ) /* - * IP = (Input pulses) + * IP = (Input pulses) */ NETLIST_END() @@ -117,12 +117,12 @@ NETLIST_START(CD4066_DIP) DIPPINS( /* +--------------+ */ A.R.1, /* INOUTA |1 ++ 14| VDD */ A.PS.VDD, A.R.2, /* OUTINA |2 13| CONTROLA */ A.CTL, - B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL, + B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL, B.R.2, /* INOUTB |4 4066 11| INOUTD */ D.R.1, B.CTL, /* CONTROLB |5 10| OUTIND */ D.R.2, C.CTL, /* CONTROLC |6 9| OUTINC */ C.R.1, A.PS.VSS, /* VSS |7 8| INOUTC */ C.R.2 - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -143,12 +143,12 @@ NETLIST_START(CD4016_DIP) DIPPINS( /* +--------------+ */ A.R.1, /* INOUTA |1 ++ 14| VDD */ A.PS.VDD, A.R.2, /* OUTINA |2 13| CONTROLA */ A.CTL, - B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL, + B.R.1, /* OUTINB |3 12| CONTROLD */ D.CTL, B.R.2, /* INOUTB |4 4016 11| INOUTD */ D.R.1, B.CTL, /* CONTROLB |5 10| OUTIND */ D.R.2, C.CTL, /* CONTROLC |6 9| OUTINC */ C.R.1, A.PS.VSS, /* VSS |7 8| INOUTC */ C.R.2 - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() diff --git a/src/emu/netlist/macro/nlm_opamp.c b/src/emu/netlist/macro/nlm_opamp.c index c2038d19a28..bb160848b38 100644 --- a/src/emu/netlist/macro/nlm_opamp.c +++ b/src/emu/netlist/macro/nlm_opamp.c @@ -17,7 +17,7 @@ NETLIST_START(opamp_layout_4_4_11) B.PLUS, /* |5 10| */ C.PLUS, B.MINUS, /* |6 9| */ C.MINUS, B.OUT, /* |7 8| */ C.OUT - /* +--------------+ */ + /* +--------------+ */ ) NET_C(A.GND, B.GND, C.GND, D.GND) NET_C(A.VCC, B.VCC, C.VCC, D.VCC) @@ -33,7 +33,7 @@ NETLIST_START(opamp_layout_2_8_4) A.MINUS, /* |2 7| */ B.OUT, A.PLUS, /* |3 6| */ B.MINUS, A.GND, /* |4 5| */ B.PLUS - /* +--------------+ */ + /* +--------------+ */ ) NET_C(A.GND, B.GND) NET_C(A.VCC, B.VCC) diff --git a/src/emu/netlist/macro/nlm_opamp.h b/src/emu/netlist/macro/nlm_opamp.h index f9ed62d71b3..5b24ffc4842 100644 --- a/src/emu/netlist/macro/nlm_opamp.h +++ b/src/emu/netlist/macro/nlm_opamp.h @@ -9,13 +9,13 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ -#define MB3614_DIP(_name) \ +#define MB3614_DIP(_name) \ NET_REGISTER_DEV(MB3614_DIP, _name) -#define LM324_DIP(_name) \ +#define LM324_DIP(_name) \ NET_REGISTER_DEV(LM324_DIP, _name) -#define LM358_DIP(_name) \ +#define LM358_DIP(_name) \ NET_REGISTER_DEV(LM358_DIP, _name) /* ---------------------------------------------------------------------------- diff --git a/src/emu/netlist/macro/nlm_other.c b/src/emu/netlist/macro/nlm_other.c index 33747ed6780..e3d53def922 100644 --- a/src/emu/netlist/macro/nlm_other.c +++ b/src/emu/netlist/macro/nlm_other.c @@ -6,7 +6,7 @@ /* * MC14584B: Hex Schmitt Trigger - * ON Semiconductor + * ON Semiconductor * * +--------------+ * A1 |1 ++ 14| VCC @@ -39,7 +39,7 @@ NETLIST_START(MC14584B_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() diff --git a/src/emu/netlist/macro/nlm_other.h b/src/emu/netlist/macro/nlm_other.h index c658b0dfbb3..3bf574d6973 100644 --- a/src/emu/netlist/macro/nlm_other.h +++ b/src/emu/netlist/macro/nlm_other.h @@ -9,10 +9,10 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ -#define MC14584B_GATE(_name) \ +#define MC14584B_GATE(_name) \ NET_REGISTER_DEV(MC14584B_GATE, _name) -#define MC14584B_DIP(_name) \ +#define MC14584B_DIP(_name) \ NET_REGISTER_DEV(MC14584B_DIP, _name) diff --git a/src/emu/netlist/macro/nlm_ttl74xx.c b/src/emu/netlist/macro/nlm_ttl74xx.c index 75e865b1fe1..c9c33aceaeb 100644 --- a/src/emu/netlist/macro/nlm_ttl74xx.c +++ b/src/emu/netlist/macro/nlm_ttl74xx.c @@ -6,7 +6,7 @@ /* * DM7416: Hex Inverting Buffers with - * High Voltage Open-Collector Outputs + * High Voltage Open-Collector Outputs * * +--------------+ * A1 |1 ++ 14| VCC @@ -39,7 +39,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() diff --git a/src/emu/netlist/macro/nlm_ttl74xx.h b/src/emu/netlist/macro/nlm_ttl74xx.h index 91f757dbf7d..d322588eb52 100644 --- a/src/emu/netlist/macro/nlm_ttl74xx.h +++ b/src/emu/netlist/macro/nlm_ttl74xx.h @@ -9,10 +9,10 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ -#define TTL_7416_GATE(_name) \ +#define TTL_7416_GATE(_name) \ NET_REGISTER_DEV(TTL_7416_GATE, _name) -#define TTL_7416_DIP(_name) \ +#define TTL_7416_DIP(_name) \ NET_REGISTER_DEV(TTL7416_DIP, _name) /* ---------------------------------------------------------------------------- diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index 129bdd2db44..0c0b8e4d0fd 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -535,7 +535,7 @@ ATTR_COLD void device_t::register_subalias(const pstring &name, const pstring &a // FIXME: make this working again //if (term.isType(terminal_t::INPUT) || term.isType(terminal_t::TERMINAL)) - // m_terminals.add(name); + // m_terminals.add(name); } ATTR_COLD void device_t::register_terminal(const pstring &name, terminal_t &port) diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index d1329a5e5d6..940c5f54052 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -241,7 +241,7 @@ typedef UINT8 netlist_sig_t; , _priv) #define NETLIB_LOGIC_FAMILY(_fam) \ -virtual logic_family_desc_t *default_logic_family() \ +virtual logic_family_desc_t *default_logic_family() \ { \ return netlist_family_ ## _fam; \ } @@ -394,8 +394,8 @@ namespace netlist VCCS, // Voltage controlled current source LVCCS, // Voltage controlled current source (Current limited) CCCS, // Current controlled current source - VS, // Voltage Source - CS, // Current Source + VS, // Voltage Source + CS, // Current Source GND // GND device }; diff --git a/src/emu/netlist/nl_factory.c b/src/emu/netlist/nl_factory.c index f4e75b0ab41..edc55af9732 100644 --- a/src/emu/netlist/nl_factory.c +++ b/src/emu/netlist/nl_factory.c @@ -34,7 +34,7 @@ ATTR_COLD const pstring_list_t base_factory_t::def_params() } -factory_list_t::factory_list_t( setup_t &setup) +factory_list_t::factory_list_t( setup_t &setup) : m_setup(setup) { } diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h index a38aa7229ef..900fb810878 100644 --- a/src/emu/netlist/nl_setup.h +++ b/src/emu/netlist/nl_setup.h @@ -58,7 +58,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) \ setup.register_source(palloc(netlist::source_proc_t(# _name, &NETLIST_NAME(_name)))); #define LOCAL_LIB_ENTRY(_name) \ - LOCAL_SOURCE(_name) \ + LOCAL_SOURCE(_name) \ setup.register_lib_entry(# _name); #define INCLUDE(_name) \ diff --git a/src/emu/netlist/plib/palloc.h b/src/emu/netlist/plib/palloc.h index c80265c8105..badbc681486 100644 --- a/src/emu/netlist/plib/palloc.h +++ b/src/emu/netlist/plib/palloc.h @@ -79,7 +79,7 @@ inline void pfree_array_t(T *p) pfree_raw(s); } -#define palloc(T) new(ppool) T +#define palloc(T) new(ppool) T #define pfree(_ptr) pfree_t(_ptr) #if 1 @@ -94,7 +94,7 @@ inline void pfree_array_t(T *p) #define ATTR_ALIGN -#define palloc(T) global_alloc(T) +#define palloc(T) global_alloc(T) #define pfree(_ptr) global_free(_ptr) #define palloc_array(T, N) global_alloc_array(T, N) diff --git a/src/emu/netlist/plib/pconfig.h b/src/emu/netlist/plib/pconfig.h index 45958b85468..c06fe3e3d2f 100644 --- a/src/emu/netlist/plib/pconfig.h +++ b/src/emu/netlist/plib/pconfig.h @@ -40,7 +40,7 @@ //============================================================ // prevent implicit copying -#define P_PREVENT_COPYING(_name) \ +#define P_PREVENT_COPYING(_name) \ private: \ _name(const _name &); \ _name &operator=(const _name &); @@ -234,4 +234,3 @@ private: #if (defined(__MINGW32__) && (__GNUC__ >= 5)) #pragma GCC diagnostic pop #endif - diff --git a/src/emu/netlist/plib/plists.h b/src/emu/netlist/plib/plists.h index 8f4914145b5..bbb553eb12a 100644 --- a/src/emu/netlist/plib/plists.h +++ b/src/emu/netlist/plib/plists.h @@ -657,7 +657,7 @@ private: #if 0 unsigned hash(const pstring &v) const { - /* Fowler–Noll–Vo hash - FNV-1 */ + /* Fowler???Noll???Vo hash - FNV-1 */ const char *string = v.cstr(); unsigned result = 2166136261; for (UINT8 c = *string++; c != 0; c = *string++) @@ -671,17 +671,17 @@ private: /* jenkins one at a time algo */ unsigned result = 0; const char *string = v.cstr(); - while (*string) - { - result += *string; - string++; - result += (result << 10); - result ^= (result >> 6); - } - result += (result << 3); - result ^= (result >> 11); - result += (result << 15); - return result; + while (*string) + { + result += *string; + string++; + result += (result << 10); + result ^= (result >> 6); + } + result += (result << 3); + result ^= (result >> 11); + result += (result << 15); + return result; } #endif #endif diff --git a/src/emu/netlist/plib/pstate.c b/src/emu/netlist/plib/pstate.c index 909bfcb2e58..326eb13fe49 100644 --- a/src/emu/netlist/plib/pstate.c +++ b/src/emu/netlist/plib/pstate.c @@ -75,4 +75,3 @@ template<> ATTR_COLD void pstate_manager_t::save_item(pstate_callback_t &state, m_save.add(p); state.register_state(*this, stname); } - diff --git a/src/emu/netlist/solver/mat_cr.h b/src/emu/netlist/solver/mat_cr.h index 708833f2625..195e856784b 100644 --- a/src/emu/netlist/solver/mat_cr.h +++ b/src/emu/netlist/solver/mat_cr.h @@ -92,7 +92,7 @@ struct mat_cr_t * * ==> LUx = r * - * ==> Ux = L⁻¹r = w + * ==> Ux = L?????r = w * * ==> r = Lw * diff --git a/src/emu/netlist/solver/vector_base.h b/src/emu/netlist/solver/vector_base.h index c180b080338..c5b86cdb5e8 100644 --- a/src/emu/netlist/solver/vector_base.h +++ b/src/emu/netlist/solver/vector_base.h @@ -42,7 +42,6 @@ inline void vec_set (const std::size_t n, const double &scalar, double * RESTRIC } inline double vecmult (const std::size_t n, const double * RESTRICT a1, const double * RESTRICT a2 ) { - double value = 0.0; for ( std::size_t i = 0; i < n; i++ ) value = value + a1[i] * a2[i]; diff --git a/src/emu/netlist/tools/nl_convert.c b/src/emu/netlist/tools/nl_convert.c index bee0c2e8c36..59871b96bdf 100644 --- a/src/emu/netlist/tools/nl_convert.c +++ b/src/emu/netlist/tools/nl_convert.c @@ -188,7 +188,7 @@ nl_convert_base_t::unit_t nl_convert_base_t::m_units[] = { {"M", "CAP_M(%g)", 1.0e-3 }, {"u", "CAP_U(%g)", 1.0e-6 }, /* eagle */ {"U", "CAP_U(%g)", 1.0e-6 }, - {"μ", "CAP_U(%g)", 1.0e-6 }, + {"??", "CAP_U(%g)", 1.0e-6 }, {"N", "CAP_N(%g)", 1.0e-9 }, {"P", "CAP_P(%g)", 1.0e-12}, {"F", "%ge-15", 1.0e-15}, |
