summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/netlist/devices/nld_7493.cpp14
-rw-r--r--src/lib/netlist/devices/nld_9316.cpp5
2 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index 78b75e9e326..f3c68f7a5c2 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -22,15 +22,15 @@ namespace netlist
NETLIB_CONSTRUCTOR(7493)
, m_R1(*this, "R1")
, m_R2(*this, "R2")
+ , m_reset(*this, "_m_reset", 0)
+ , m_a(*this, "_m_a", 0)
+ , m_bcd(*this, "_m_b", 0)
, m_CLKA(*this, "CLKA", NETLIB_DELEGATE(7493, updA))
, m_CLKB(*this, "CLKB", NETLIB_DELEGATE(7493, updB))
, m_QA(*this, "QA")
, m_QB(*this, "QB")
, m_QC(*this, "QC")
, m_QD(*this, "QD")
- , m_reset(*this, "_m_reset", 0)
- , m_a(*this, "_m_a", 0)
- , m_bcd(*this, "_m_b", 0)
{
}
@@ -61,6 +61,10 @@ namespace netlist
logic_input_t m_R1;
logic_input_t m_R2;
+ state_var_sig m_reset;
+ state_var_sig m_a;
+ state_var_sig m_bcd;
+
logic_input_t m_CLKA;
logic_input_t m_CLKB;
@@ -68,10 +72,6 @@ namespace netlist
logic_output_t m_QB;
logic_output_t m_QC;
logic_output_t m_QD;
-
- state_var_sig m_reset;
- state_var_sig m_a;
- state_var_sig m_bcd;
};
NETLIB_OBJECT_DERIVED(7493_dip, 7493)
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 943fc85aaee..7c478fd4b05 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -18,10 +18,10 @@ namespace netlist
NETLIB_OBJECT(9316)
{
NETLIB_CONSTRUCTOR(9316)
- , m_cnt(*this, "m_cnt", 0)
, m_CLK(*this, "CLK", NETLIB_DELEGATE(9316, clk))
, m_ENT(*this, "ENT")
, m_LOADQ(*this, "LOADQ")
+ , m_cnt(*this, "m_cnt", 0)
, m_ENP(*this, "ENP")
, m_CLRQ(*this, "CLRQ")
, m_A(*this, "A", NETLIB_DELEGATE(9316, noop))
@@ -39,12 +39,13 @@ namespace netlist
NETLIB_HANDLERI(clk);
NETLIB_HANDLERI(noop) { }
- state_var<unsigned> m_cnt;
logic_input_t m_CLK;
logic_input_t m_ENT;
logic_input_t m_LOADQ;
+ state_var<unsigned> m_cnt;
+
logic_input_t m_ENP;
logic_input_t m_CLRQ;