Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Changed case for parameter "model" to uppercase to align with rest of

Browse Source 
code. (nw)
This commit is contained in:
couriersud 2015-07-19 23:15:56 +02:00
parent c30ac5a27b
commit fd0850e016
8 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nl_examples/congo_bongo.c
View File

@ -78,8 +78,8 @@ NETLIST_START(dummy)
/* The opamp actually has an FPF of about 500k. This doesn't work here and causes oscillations. /* The opamp actually has an FPF of about 500k. This doesn't work here and causes oscillations.
* FPF here therefore about half the Solver clock. * FPF here therefore about half the Solver clock.
*/ */
PARAM(XU16.B.model, "MB3614_SLOW") PARAM(XU16.B.MODEL, "MB3614_SLOW")
PARAM(XU17.C.model, "MB3614_SLOW") PARAM(XU17.C.MODEL, "MB3614_SLOW")
OPTIMIZE_FRONTIER(C51.1, RES_K(20), 50) OPTIMIZE_FRONTIER(C51.1, RES_K(20), 50)
OPTIMIZE_FRONTIER(R77.2, RES_K(20), 50) OPTIMIZE_FRONTIER(R77.2, RES_K(20), 50)

2
src/emu/netlist/analog/nld_bjt.c
View File

@ -55,7 +55,7 @@ NETLIB_NAME(Q)::~NETLIB_NAME(Q)()
NETLIB_START(Q) NETLIB_START(Q)
{ {
register_param("model", m_model, ""); register_param("MODEL", m_model, "");
} }
NETLIB_RESET(Q) NETLIB_RESET(Q)

28
src/emu/netlist/analog/nld_bjt.h
View File

@ -11,24 +11,24 @@
#include "../nl_base.h" #include "../nl_base.h"
#include "nld_twoterm.h" #include "nld_twoterm.h"
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Macros // Macros
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#define QBJT_SW(_name, _model) \ #define QBJT_SW(_name, _model) \
NET_REGISTER_DEV(QBJT_SW, _name) \ NET_REGISTER_DEV(QBJT_SW, _name) \
NETDEV_PARAMI(_name, model, _model) NETDEV_PARAMI(_name, MODEL, _model)
#define QBJT_EB(_name, _model) \ #define QBJT_EB(_name, _model) \
NET_REGISTER_DEV(QBJT_EB, _name) \ NET_REGISTER_DEV(QBJT_EB, _name) \
NETDEV_PARAMI(_name, model, _model) NETDEV_PARAMI(_name, MODEL, _model)
NETLIB_NAMESPACE_DEVICES_START() NETLIB_NAMESPACE_DEVICES_START()
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_Q - Base classes // nld_Q - Base classes
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Have a common start for transistors // Have a common start for transistors
@ -73,9 +73,9 @@ private:
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_QBJT_switch // nld_QBJT_switch
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/* /*
@ -126,9 +126,9 @@ protected:
private: private:
}; };
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_QBJT_EB // nld_QBJT_EB
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(QBJT_EB) : public NETLIB_NAME(QBJT) class NETLIB_NAME(QBJT_EB) : public NETLIB_NAME(QBJT)

2
src/emu/netlist/analog/nld_opamps.c
View File

@ -64,7 +64,7 @@ NETLIB_START(OPAMP)
register_output("VH", m_VH); register_output("VH", m_VH);
register_output("VREF", m_VREF); register_output("VREF", m_VREF);
register_param("model", m_model, ""); register_param("MODEL", m_model, "");
m_type = m_model.model_value("TYPE"); m_type = m_model.model_value("TYPE");

2
src/emu/netlist/analog/nld_opamps.h
View File

@ -21,7 +21,7 @@
#define OPAMP(_name, _model) \ #define OPAMP(_name, _model) \
NET_REGISTER_DEV(OPAMP, _name) \ NET_REGISTER_DEV(OPAMP, _name) \
NETDEV_PARAMI(_name, model, _model) NETDEV_PARAMI(_name, MODEL, _model)
#define LM3900(_name) \ #define LM3900(_name) \
SUBMODEL(opamp_lm3900, _name) SUBMODEL(opamp_lm3900, _name)

2
src/emu/netlist/analog/nld_twoterm.c
View File

@ -264,7 +264,7 @@ NETLIB_START(D)
{ {
register_terminal("A", m_P); register_terminal("A", m_P);
register_terminal("K", m_N); register_terminal("K", m_N);
register_param("model", m_model, ""); register_param("MODEL", m_model, "");
m_D.save("m_D", *this); m_D.save("m_D", *this);

58
src/emu/netlist/analog/nld_twoterm.h
View File

@ -24,9 +24,9 @@
* +-----T-----+ * +-----T-----+
* (l) * (l)
* *
* This is a resistance in series to a voltage source and paralleled by a current source. * This is a resistance in series to a voltage source and paralleled by a
* This is suitable to model voltage sources, current sources, resistors, capacitors, * current source. This is suitable to model voltage sources, current sources,
* inductances and diodes. * resistors, capacitors, inductances and diodes.
* *
*/ */
@ -35,12 +35,12 @@
#include "../nl_base.h" #include "../nl_base.h"
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Macros // Macros
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#define RES(_name, _R) \ #define RES(_name, _R) \
NET_REGISTER_DEV(RES, _name) \ NET_REGISTER_DEV(RES, _name) \
NETDEV_PARAMI(_name, R, _R) NETDEV_PARAMI(_name, R, _R)
#define POT(_name, _R) \ #define POT(_name, _R) \
@ -54,13 +54,13 @@
#define CAP(_name, _C) \ #define CAP(_name, _C) \
NET_REGISTER_DEV(CAP, _name) \ NET_REGISTER_DEV(CAP, _name) \
NETDEV_PARAMI(_name, C, _C) NETDEV_PARAMI(_name, C, _C)
/* Generic Diode */ /* Generic Diode */
#define DIODE(_name, _model) \ #define DIODE(_name, _model) \
NET_REGISTER_DEV(DIODE, _name) \ NET_REGISTER_DEV(DIODE, _name) \
NETDEV_PARAMI(_name, model, _model) NETDEV_PARAMI(_name, MODEL, _model)
#define VS(_name, _V) \ #define VS(_name, _V) \
NET_REGISTER_DEV(VS, _name) \ NET_REGISTER_DEV(VS, _name) \
@ -70,9 +70,9 @@
NET_REGISTER_DEV(CS, _name) \ NET_REGISTER_DEV(CS, _name) \
NETDEV_PARAMI(_name, I, _I) NETDEV_PARAMI(_name, I, _I)
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Generic macros // Generic macros
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#ifdef RES_R #ifdef RES_R
@ -90,15 +90,15 @@
#define IND_N(ind) ((double)(ind) * 1e-9) #define IND_N(ind) ((double)(ind) * 1e-9)
#define IND_P(ind) ((double)(ind) * 1e-12) #define IND_P(ind) ((double)(ind) * 1e-12)
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Implementation // Implementation
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
NETLIB_NAMESPACE_DEVICES_START() NETLIB_NAMESPACE_DEVICES_START()
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_twoterm // nld_twoterm
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(twoterm) : public device_t class NETLIB_NAME(twoterm) : public device_t
{ {
@ -140,9 +140,9 @@ protected:
private: private:
}; };
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_R // nld_R
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(R_base) : public NETLIB_NAME(twoterm) class NETLIB_NAME(R_base) : public NETLIB_NAME(twoterm)
{ {
@ -164,9 +164,9 @@ NETLIB_DEVICE_WITH_PARAMS_DERIVED(R, R_base,
param_double_t m_R; param_double_t m_R;
); );
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_POT // nld_POT
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
NETLIB_DEVICE_WITH_PARAMS(POT, NETLIB_DEVICE_WITH_PARAMS(POT,
NETLIB_NAME(R_base) m_R1; NETLIB_NAME(R_base) m_R1;
@ -187,9 +187,9 @@ NETLIB_DEVICE_WITH_PARAMS(POT2,
); );
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_C // nld_C
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(C) : public NETLIB_NAME(twoterm) class NETLIB_NAME(C) : public NETLIB_NAME(twoterm)
{ {
@ -212,9 +212,9 @@ private:
}; };
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// A generic diode model to be used in other devices (Diode, BJT ...) // A generic diode model to be used in other devices (Diode, BJT ...)
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class generic_diode class generic_diode
{ {
@ -285,9 +285,9 @@ private:
nl_double m_Vcrit; nl_double m_Vcrit;
}; };
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_D // nld_D
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(D) : public NETLIB_NAME(twoterm) class NETLIB_NAME(D) : public NETLIB_NAME(twoterm)
{ {
@ -306,11 +306,11 @@ protected:
generic_diode m_D; generic_diode m_D;
}; };
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_VS - Voltage source // nld_VS - Voltage source
// //
// netlist voltage source must have inner resistance // netlist voltage source must have inner resistance
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(VS) : public NETLIB_NAME(twoterm) class NETLIB_NAME(VS) : public NETLIB_NAME(twoterm)
{ {
@ -326,9 +326,9 @@ protected:
param_double_t m_V; param_double_t m_V;
}; };
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// nld_CS - Current source // nld_CS - Current source
// ---------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class NETLIB_NAME(CS) : public NETLIB_NAME(twoterm) class NETLIB_NAME(CS) : public NETLIB_NAME(twoterm)
{ {

8
src/emu/netlist/devices/net_lib.c
View File

@ -59,19 +59,19 @@ void initialize_factory(factory_list_t &factory)
ENTRY(POT, POT, "R") ENTRY(POT, POT, "R")
ENTRY(POT2, POT2, "R") ENTRY(POT2, POT2, "R")
ENTRY(C, CAP, "C") ENTRY(C, CAP, "C")
ENTRY(D, DIODE, "model") ENTRY(D, DIODE, "MODEL")
ENTRY(VCVS, VCVS, "-") ENTRY(VCVS, VCVS, "-")
ENTRY(VCCS, VCCS, "-") ENTRY(VCCS, VCCS, "-")
ENTRY(CCCS, CCCS, "-") ENTRY(CCCS, CCCS, "-")
ENTRY(LVCCS, LVCCS, "-") ENTRY(LVCCS, LVCCS, "-")
ENTRY(VS, VS, "V") ENTRY(VS, VS, "V")
ENTRY(CS, CS, "I") ENTRY(CS, CS, "I")
ENTRY(OPAMP, OPAMP, "model") ENTRY(OPAMP, OPAMP, "MODEL")
ENTRY(dummy_input, DUMMY_INPUT, "-") ENTRY(dummy_input, DUMMY_INPUT, "-")
ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly 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_EB, QBJT_EB, "MODEL")
ENTRY(QBJT_switch, QBJT_SW, "model") ENTRY(QBJT_switch, QBJT_SW, "MODEL")
ENTRY(logic_input, TTL_INPUT, "IN") ENTRY(logic_input, TTL_INPUT, "IN")
ENTRY(logic_input, LOGIC_INPUT, "IN,FAMILY") ENTRY(logic_input, LOGIC_INPUT, "IN,FAMILY")
ENTRY(analog_input, ANALOG_INPUT, "IN") ENTRY(analog_input, ANALOG_INPUT, "IN")