summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-07-19 23:15:56 +0200
committer couriersud <couriersud@arcor.de>2015-07-20 22:21:30 +0200
commitfd0850e016d7f234772bb5f5e46fb5b678b90b6b (patch)
treec0b4af711eb0cd5d8ef1fa451bd963a79c299241
parentc30ac5a27b11813b8612730e94757452fa7fa698 (diff)
Changed case for parameter "model" to uppercase to align with rest of
code. (nw)
-rw-r--r--nl_examples/congo_bongo.c4
-rw-r--r--src/emu/netlist/analog/nld_bjt.c2
-rw-r--r--src/emu/netlist/analog/nld_bjt.h28
-rw-r--r--src/emu/netlist/analog/nld_opamps.c2
-rw-r--r--src/emu/netlist/analog/nld_opamps.h2
-rw-r--r--src/emu/netlist/analog/nld_twoterm.c2
-rw-r--r--src/emu/netlist/analog/nld_twoterm.h58
-rw-r--r--src/emu/netlist/devices/net_lib.c8
8 files changed, 53 insertions, 53 deletions
diff --git a/nl_examples/congo_bongo.c b/nl_examples/congo_bongo.c
index d9f40c9859a..bb7520b65db 100644
--- a/nl_examples/congo_bongo.c
+++ b/nl_examples/congo_bongo.c
@@ -78,8 +78,8 @@ NETLIST_START(dummy)
/* 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.
*/
- PARAM(XU16.B.model, "MB3614_SLOW")
- PARAM(XU17.C.model, "MB3614_SLOW")
+ PARAM(XU16.B.MODEL, "MB3614_SLOW")
+ PARAM(XU17.C.MODEL, "MB3614_SLOW")
OPTIMIZE_FRONTIER(C51.1, RES_K(20), 50)
OPTIMIZE_FRONTIER(R77.2, RES_K(20), 50)
diff --git a/src/emu/netlist/analog/nld_bjt.c b/src/emu/netlist/analog/nld_bjt.c
index 0e793c7d909..14b832ba9b9 100644
--- a/src/emu/netlist/analog/nld_bjt.c
+++ b/src/emu/netlist/analog/nld_bjt.c
@@ -55,7 +55,7 @@ NETLIB_NAME(Q)::~NETLIB_NAME(Q)()
NETLIB_START(Q)
{
- register_param("model", m_model, "");
+ register_param("MODEL", m_model, "");
}
NETLIB_RESET(Q)
diff --git a/src/emu/netlist/analog/nld_bjt.h b/src/emu/netlist/analog/nld_bjt.h
index df0a68f5cf8..eab013b99c6 100644
--- a/src/emu/netlist/analog/nld_bjt.h
+++ b/src/emu/netlist/analog/nld_bjt.h
@@ -11,24 +11,24 @@
#include "../nl_base.h"
#include "nld_twoterm.h"
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// Macros
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
-#define QBJT_SW(_name, _model) \
- NET_REGISTER_DEV(QBJT_SW, _name) \
- NETDEV_PARAMI(_name, model, _model)
+#define QBJT_SW(_name, _model) \
+ NET_REGISTER_DEV(QBJT_SW, _name) \
+ NETDEV_PARAMI(_name, MODEL, _model)
-#define QBJT_EB(_name, _model) \
- NET_REGISTER_DEV(QBJT_EB, _name) \
- NETDEV_PARAMI(_name, model, _model)
+#define QBJT_EB(_name, _model) \
+ NET_REGISTER_DEV(QBJT_EB, _name) \
+ NETDEV_PARAMI(_name, MODEL, _model)
NETLIB_NAMESPACE_DEVICES_START()
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_Q - Base classes
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// Have a common start for transistors
@@ -73,9 +73,9 @@ private:
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_QBJT_switch
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
/*
@@ -126,9 +126,9 @@ protected:
private:
};
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_QBJT_EB
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
class NETLIB_NAME(QBJT_EB) : public NETLIB_NAME(QBJT)
diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c
index b20989f9645..084e1970987 100644
--- a/src/emu/netlist/analog/nld_opamps.c
+++ b/src/emu/netlist/analog/nld_opamps.c
@@ -64,7 +64,7 @@ NETLIB_START(OPAMP)
register_output("VH", m_VH);
register_output("VREF", m_VREF);
- register_param("model", m_model, "");
+ register_param("MODEL", m_model, "");
m_type = m_model.model_value("TYPE");
diff --git a/src/emu/netlist/analog/nld_opamps.h b/src/emu/netlist/analog/nld_opamps.h
index f870c58b465..5dc0730357a 100644
--- a/src/emu/netlist/analog/nld_opamps.h
+++ b/src/emu/netlist/analog/nld_opamps.h
@@ -21,7 +21,7 @@
#define OPAMP(_name, _model) \
NET_REGISTER_DEV(OPAMP, _name) \
- NETDEV_PARAMI(_name, model, _model)
+ NETDEV_PARAMI(_name, MODEL, _model)
#define LM3900(_name) \
SUBMODEL(opamp_lm3900, _name)
diff --git a/src/emu/netlist/analog/nld_twoterm.c b/src/emu/netlist/analog/nld_twoterm.c
index 1a99dcaf90a..be0925fc826 100644
--- a/src/emu/netlist/analog/nld_twoterm.c
+++ b/src/emu/netlist/analog/nld_twoterm.c
@@ -264,7 +264,7 @@ NETLIB_START(D)
{
register_terminal("A", m_P);
register_terminal("K", m_N);
- register_param("model", m_model, "");
+ register_param("MODEL", m_model, "");
m_D.save("m_D", *this);
diff --git a/src/emu/netlist/analog/nld_twoterm.h b/src/emu/netlist/analog/nld_twoterm.h
index c6714d62d45..d29b11f0db7 100644
--- a/src/emu/netlist/analog/nld_twoterm.h
+++ b/src/emu/netlist/analog/nld_twoterm.h
@@ -24,9 +24,9 @@
* +-----T-----+
* (l)
*
- * This is a resistance in series to a voltage source and paralleled by a current source.
- * This is suitable to model voltage sources, current sources, resistors, capacitors,
- * inductances and diodes.
+ * This is a resistance in series to a voltage source and paralleled by a
+ * current source. This is suitable to model voltage sources, current sources,
+ * resistors, capacitors, inductances and diodes.
*
*/
@@ -35,12 +35,12 @@
#include "../nl_base.h"
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// Macros
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
#define RES(_name, _R) \
- NET_REGISTER_DEV(RES, _name) \
+ NET_REGISTER_DEV(RES, _name) \
NETDEV_PARAMI(_name, R, _R)
#define POT(_name, _R) \
@@ -54,13 +54,13 @@
#define CAP(_name, _C) \
- NET_REGISTER_DEV(CAP, _name) \
+ NET_REGISTER_DEV(CAP, _name) \
NETDEV_PARAMI(_name, C, _C)
/* Generic Diode */
#define DIODE(_name, _model) \
- NET_REGISTER_DEV(DIODE, _name) \
- NETDEV_PARAMI(_name, model, _model)
+ NET_REGISTER_DEV(DIODE, _name) \
+ NETDEV_PARAMI(_name, MODEL, _model)
#define VS(_name, _V) \
NET_REGISTER_DEV(VS, _name) \
@@ -70,9 +70,9 @@
NET_REGISTER_DEV(CS, _name) \
NETDEV_PARAMI(_name, I, _I)
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// Generic macros
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
#ifdef RES_R
@@ -90,15 +90,15 @@
#define IND_N(ind) ((double)(ind) * 1e-9)
#define IND_P(ind) ((double)(ind) * 1e-12)
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// Implementation
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
NETLIB_NAMESPACE_DEVICES_START()
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_twoterm
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
class NETLIB_NAME(twoterm) : public device_t
{
@@ -140,9 +140,9 @@ protected:
private:
};
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_R
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
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;
);
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_POT
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
NETLIB_DEVICE_WITH_PARAMS(POT,
NETLIB_NAME(R_base) m_R1;
@@ -187,9 +187,9 @@ NETLIB_DEVICE_WITH_PARAMS(POT2,
);
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_C
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
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 ...)
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
class generic_diode
{
@@ -285,9 +285,9 @@ private:
nl_double m_Vcrit;
};
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_D
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
class NETLIB_NAME(D) : public NETLIB_NAME(twoterm)
{
@@ -306,11 +306,11 @@ protected:
generic_diode m_D;
};
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_VS - Voltage source
//
// netlist voltage source must have inner resistance
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
class NETLIB_NAME(VS) : public NETLIB_NAME(twoterm)
{
@@ -326,9 +326,9 @@ protected:
param_double_t m_V;
};
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
// nld_CS - Current source
-// ----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
class NETLIB_NAME(CS) : public NETLIB_NAME(twoterm)
{
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index 02a004453da..3d88895e279 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -59,19 +59,19 @@ void initialize_factory(factory_list_t &factory)
ENTRY(POT, POT, "R")
ENTRY(POT2, POT2, "R")
ENTRY(C, CAP, "C")
- ENTRY(D, DIODE, "model")
+ ENTRY(D, DIODE, "MODEL")
ENTRY(VCVS, VCVS, "-")
ENTRY(VCCS, VCCS, "-")
ENTRY(CCCS, CCCS, "-")
ENTRY(LVCCS, LVCCS, "-")
ENTRY(VS, VS, "V")
ENTRY(CS, CS, "I")
- ENTRY(OPAMP, OPAMP, "model")
+ 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(QBJT_EB, QBJT_EB, "model")
- ENTRY(QBJT_switch, QBJT_SW, "model")
+ ENTRY(QBJT_EB, QBJT_EB, "MODEL")
+ ENTRY(QBJT_switch, QBJT_SW, "MODEL")
ENTRY(logic_input, TTL_INPUT, "IN")
ENTRY(logic_input, LOGIC_INPUT, "IN,FAMILY")
ENTRY(analog_input, ANALOG_INPUT, "IN")