summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/netlist/devices/nld_74107.cpp40
-rw-r--r--src/lib/netlist/devices/nld_74123.cpp142
-rw-r--r--src/lib/netlist/devices/nld_74153.cpp54
-rw-r--r--src/lib/netlist/devices/nld_7450.cpp36
-rw-r--r--src/lib/netlist/devices/nld_7473.cpp82
-rw-r--r--src/lib/netlist/devices/nld_7474.cpp44
-rw-r--r--src/lib/netlist/devices/nld_74ls629.cpp34
-rw-r--r--src/lib/netlist/devices/nld_9322.cpp24
-rw-r--r--src/lib/netlist/macro/nlm_other.cpp34
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp658
-rw-r--r--src/mame/machine/nl_rebound.cpp8
11 files changed, 581 insertions, 575 deletions
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index a164b9dddbf..a9c9b12c178 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -73,39 +73,39 @@ namespace netlist
NETLIB_OBJECT(74107_dip)
{
NETLIB_CONSTRUCTOR(74107_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", m_1.m_J);
- register_subalias("2", m_1.m_QQ);
- register_subalias("3", m_1.m_Q);
+ register_subalias("1", m_A.m_J);
+ register_subalias("2", m_A.m_QQ);
+ register_subalias("3", m_A.m_Q);
- register_subalias("4", m_1.m_K);
- register_subalias("5", m_2.m_Q);
- register_subalias("6", m_2.m_QQ);
+ register_subalias("4", m_A.m_K);
+ register_subalias("5", m_B.m_Q);
+ register_subalias("6", m_B.m_QQ);
- register_subalias("7", "1.GND");
+ register_subalias("7", "A.GND");
- register_subalias("8", m_2.m_J);
- register_subalias("9", m_2.m_clk);
- register_subalias("10", m_2.m_clrQ);
+ register_subalias("8", m_B.m_J);
+ register_subalias("9", m_B.m_clk);
+ register_subalias("10", m_B.m_clrQ);
- register_subalias("11", m_2.m_K);
- register_subalias("12", m_1.m_clk);
- register_subalias("13", m_1.m_clrQ);
+ register_subalias("11", m_B.m_K);
+ register_subalias("12", m_A.m_clk);
+ register_subalias("13", m_A.m_clrQ);
- register_subalias("14", "1.VCC" );
+ register_subalias("14", "A.VCC" );
- connect("1.GND", "2.GND");
- connect("1.VCC", "2.VCC");
+ connect("A.GND", "B.GND");
+ connect("A.VCC", "B.VCC");
}
//NETLIB_RESETI();
//NETLIB_UPDATEI();
private:
- NETLIB_SUB(74107) m_1;
- NETLIB_SUB(74107) m_2;
+ NETLIB_SUB(74107) m_A;
+ NETLIB_SUB(74107) m_B;
};
NETLIB_RESET(74107A)
diff --git a/src/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp
index 32e47a47ef2..889ba019f78 100644
--- a/src/lib/netlist/devices/nld_74123.cpp
+++ b/src/lib/netlist/devices/nld_74123.cpp
@@ -83,101 +83,101 @@ namespace netlist
NETLIB_OBJECT(74123_dip)
{
NETLIB_CONSTRUCTOR(74123_dip)
- , m_1(*this, "1", 74123)
- , m_2(*this, "2", 74123)
+ , m_A(*this, "A", 74123)
+ , m_B(*this, "B", 74123)
{
- register_subalias("1", m_1.m_A);
- register_subalias("2", m_1.m_B);
- register_subalias("3", m_1.m_CLRQ);
- register_subalias("4", m_1.m_QQ);
- register_subalias("5", m_2.m_Q);
- register_subalias("6", m_2.m_RN.m_R.m_N);
- register_subalias("7", m_2.m_RN.m_R.m_P);
- register_subalias("8", m_1.m_RN.m_R.m_N);
- connect(m_1.m_RN.m_R.m_N, m_2.m_RN.m_R.m_N);
-
- register_subalias("9", m_2.m_A);
- register_subalias("10", m_2.m_B);
- register_subalias("11", m_2.m_CLRQ);
- register_subalias("12", m_2.m_QQ);
- register_subalias("13", m_1.m_Q);
- register_subalias("14", m_1.m_RN.m_R.m_N);
- register_subalias("15", m_1.m_RN.m_R.m_P);
- register_subalias("16", m_1.m_RP.m_R.m_P);
- connect(m_1.m_RP.m_R.m_P, m_2.m_RP.m_R.m_P);
+ register_subalias("1", m_A.m_A);
+ register_subalias("2", m_A.m_B);
+ register_subalias("3", m_A.m_CLRQ);
+ register_subalias("4", m_A.m_QQ);
+ register_subalias("5", m_B.m_Q);
+ register_subalias("6", m_B.m_RN.m_R.m_N);
+ register_subalias("7", m_B.m_RN.m_R.m_P);
+ register_subalias("8", m_A.m_RN.m_R.m_N);
+ connect(m_A.m_RN.m_R.m_N, m_B.m_RN.m_R.m_N);
+
+ register_subalias("9", m_B.m_A);
+ register_subalias("10", m_B.m_B);
+ register_subalias("11", m_B.m_CLRQ);
+ register_subalias("12", m_B.m_QQ);
+ register_subalias("13", m_A.m_Q);
+ register_subalias("14", m_A.m_RN.m_R.m_N);
+ register_subalias("15", m_A.m_RN.m_R.m_P);
+ register_subalias("16", m_A.m_RP.m_R.m_P);
+ connect(m_A.m_RP.m_R.m_P, m_B.m_RP.m_R.m_P);
}
NETLIB_RESETI();
NETLIB_UPDATEI();
private:
- NETLIB_SUB(74123) m_1;
- NETLIB_SUB(74123) m_2;
+ NETLIB_SUB(74123) m_A;
+ NETLIB_SUB(74123) m_B;
};
NETLIB_OBJECT(9602_dip)
{
NETLIB_CONSTRUCTOR(9602_dip)
- , m_1(*this, "1", 9602)
- , m_2(*this, "2", 9602)
+ , m_A(*this, "A", 9602)
+ , m_B(*this, "B", 9602)
{
- register_subalias("1", m_1.m_RN.m_R.m_N); // C1
- register_subalias("2", m_1.m_RN.m_R.m_P); // RC1
- register_subalias("3", m_1.m_CLRQ);
- register_subalias("4", m_1.m_B);
- register_subalias("5", m_1.m_A);
- register_subalias("6", m_1.m_Q);
- register_subalias("7", m_1.m_QQ);
- register_subalias("8", m_1.m_RN.m_R.m_N);
- connect(m_1.m_RN.m_R.m_N, m_2.m_RN.m_R.m_N);
-
- register_subalias("9", m_2.m_QQ);
- register_subalias("10", m_2.m_Q);
- register_subalias("11", m_2.m_A);
- register_subalias("12", m_2.m_B);
- register_subalias("13", m_2.m_CLRQ);
- register_subalias("14", m_2.m_RN.m_R.m_P); // RC2
- register_subalias("15", m_2.m_RN.m_R.m_N); // C2
- register_subalias("16", m_1.m_RP.m_R.m_P);
- connect(m_1.m_RP.m_R.m_P, m_2.m_RP.m_R.m_P);
+ register_subalias("1", m_A.m_RN.m_R.m_N); // C1
+ register_subalias("2", m_A.m_RN.m_R.m_P); // RC1
+ register_subalias("3", m_A.m_CLRQ);
+ register_subalias("4", m_A.m_B);
+ register_subalias("5", m_A.m_A);
+ register_subalias("6", m_A.m_Q);
+ register_subalias("7", m_A.m_QQ);
+ register_subalias("8", m_A.m_RN.m_R.m_N);
+ connect(m_A.m_RN.m_R.m_N, m_B.m_RN.m_R.m_N);
+
+ register_subalias("9", m_B.m_QQ);
+ register_subalias("10", m_B.m_Q);
+ register_subalias("11", m_B.m_A);
+ register_subalias("12", m_B.m_B);
+ register_subalias("13", m_B.m_CLRQ);
+ register_subalias("14", m_B.m_RN.m_R.m_P); // RC2
+ register_subalias("15", m_B.m_RN.m_R.m_N); // C2
+ register_subalias("16", m_A.m_RP.m_R.m_P);
+ connect(m_A.m_RP.m_R.m_P, m_B.m_RP.m_R.m_P);
}
NETLIB_RESETI();
NETLIB_UPDATEI();
private:
- NETLIB_SUB(74123) m_1;
- NETLIB_SUB(74123) m_2;
+ NETLIB_SUB(74123) m_A;
+ NETLIB_SUB(74123) m_B;
};
NETLIB_OBJECT(4538_dip)
{
NETLIB_CONSTRUCTOR(4538_dip)
NETLIB_FAMILY("CD4XXX")
- , m_1(*this, "1", 4538)
- , m_2(*this, "2", 4538)
+ , m_A(*this, "A", 4538)
+ , m_B(*this, "B", 4538)
{
- register_subalias("1", m_1.m_RN.m_R.m_N); // C1
- register_subalias("2", m_1.m_RN.m_R.m_P); // RC1
- register_subalias("3", m_1.m_CLRQ);
- register_subalias("4", m_1.m_A);
- register_subalias("5", m_1.m_B);
- register_subalias("6", m_1.m_Q);
- register_subalias("7", m_1.m_QQ);
- register_subalias("8", m_1.m_RN.m_R.m_N);
- connect(m_1.m_RN.m_R.m_N, m_2.m_RN.m_R.m_N);
-
- register_subalias("9", m_2.m_QQ);
- register_subalias("10", m_2.m_Q);
- register_subalias("11", m_2.m_B);
- register_subalias("12", m_2.m_A);
- register_subalias("13", m_2.m_CLRQ);
- register_subalias("14", m_2.m_RN.m_R.m_P); // RC2
- register_subalias("15", m_2.m_RN.m_R.m_N); // C2
- register_subalias("16", m_1.m_RP.m_R.m_P);
- connect(m_1.m_RP.m_R.m_P, m_2.m_RP.m_R.m_P);
+ register_subalias("1", m_A.m_RN.m_R.m_N); // C1
+ register_subalias("2", m_A.m_RN.m_R.m_P); // RC1
+ register_subalias("3", m_A.m_CLRQ);
+ register_subalias("4", m_A.m_A);
+ register_subalias("5", m_A.m_B);
+ register_subalias("6", m_A.m_Q);
+ register_subalias("7", m_A.m_QQ);
+ register_subalias("8", m_A.m_RN.m_R.m_N);
+ connect(m_A.m_RN.m_R.m_N, m_B.m_RN.m_R.m_N);
+
+ register_subalias("9", m_B.m_QQ);
+ register_subalias("10", m_B.m_Q);
+ register_subalias("11", m_B.m_B);
+ register_subalias("12", m_B.m_A);
+ register_subalias("13", m_B.m_CLRQ);
+ register_subalias("14", m_B.m_RN.m_R.m_P); // RC2
+ register_subalias("15", m_B.m_RN.m_R.m_N); // C2
+ register_subalias("16", m_A.m_RP.m_R.m_P);
+ connect(m_A.m_RP.m_R.m_P, m_B.m_RP.m_R.m_P);
}
NETLIB_RESETI();
NETLIB_UPDATEI();
private:
- NETLIB_SUB(74123) m_1;
- NETLIB_SUB(74123) m_2;
+ NETLIB_SUB(74123) m_A;
+ NETLIB_SUB(74123) m_B;
};
NETLIB_UPDATE(74123)
@@ -302,8 +302,8 @@ namespace netlist
NETLIB_RESET(4538_dip)
{
- m_1.reset();
- m_2.reset();
+ m_A.reset();
+ m_B.reset();
}
NETLIB_DEVICE_IMPL(74123, "TTL_74123", "")
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index 7a7bf61b41c..ce2e25cb3f3 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -74,39 +74,39 @@ namespace devices
NETLIB_OBJECT(74153_dip)
{
NETLIB_CONSTRUCTOR(74153_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", m_1.m_G);
- register_subalias("2", m_1.m_B);
- register_subalias("3", m_1.m_C[3]);
- register_subalias("4", m_1.m_C[2]);
- register_subalias("5", m_1.m_C[1]);
- register_subalias("6", m_1.m_C[0]);
- register_subalias("7", m_1.m_Y);
- register_subalias("8", "1.GND");
-
- register_subalias("9", m_2.m_Y);
- register_subalias("10", m_2.m_C[0]);
- register_subalias("11", m_2.m_C[1]);
- register_subalias("12", m_2.m_C[2]);
- register_subalias("13", m_2.m_C[3]);
- register_subalias("14", m_1.m_A);
-
- register_subalias("15", m_2.m_G);
- register_subalias("16", "1.VCC");
-
- connect("1.GND", "2.GND");
- connect("1.VCC", "2.VCC");
- connect(m_1.m_A, m_2.m_A);
- connect(m_1.m_B, m_2.m_B);
+ register_subalias("1", m_A.m_G);
+ register_subalias("2", m_A.m_B);
+ register_subalias("3", m_A.m_C[3]);
+ register_subalias("4", m_A.m_C[2]);
+ register_subalias("5", m_A.m_C[1]);
+ register_subalias("6", m_A.m_C[0]);
+ register_subalias("7", m_A.m_Y);
+ register_subalias("8", "A.GND");
+
+ register_subalias("9", m_B.m_Y);
+ register_subalias("10", m_B.m_C[0]);
+ register_subalias("11", m_B.m_C[1]);
+ register_subalias("12", m_B.m_C[2]);
+ register_subalias("13", m_B.m_C[3]);
+ register_subalias("14", m_A.m_A);
+
+ register_subalias("15", m_B.m_G);
+ register_subalias("16", "A.VCC");
+
+ connect("A.GND", "B.GND");
+ connect("A.VCC", "B.VCC");
+ connect(m_A.m_A, m_B.m_A);
+ connect(m_A.m_B, m_B.m_B);
}
//NETLIB_RESETI();
//NETLIB_UPDATEI();
protected:
- NETLIB_SUB(74153) m_1;
- NETLIB_SUB(74153) m_2;
+ NETLIB_SUB(74153) m_A;
+ NETLIB_SUB(74153) m_B;
};
NETLIB_DEVICE_IMPL(74153, "TTL_74153", "+C0,+C1,+C2,+C3,+A,+B,+G,@VCC,@GND")
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
index 176d27966e9..818dad40853 100644
--- a/src/lib/netlist/devices/nld_7450.cpp
+++ b/src/lib/netlist/devices/nld_7450.cpp
@@ -39,34 +39,34 @@ namespace netlist
NETLIB_OBJECT(7450_dip)
{
NETLIB_CONSTRUCTOR(7450_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", m_1.m_A);
- register_subalias("2", m_2.m_A);
- register_subalias("3", m_2.m_B);
- register_subalias("4", m_2.m_C);
- register_subalias("5", m_2.m_D);
- register_subalias("6", m_2.m_Q);
- register_subalias("7", "1.GND");
+ register_subalias("1", m_A.m_A);
+ register_subalias("2", m_B.m_A);
+ register_subalias("3", m_B.m_B);
+ register_subalias("4", m_B.m_C);
+ register_subalias("5", m_B.m_D);
+ register_subalias("6", m_B.m_Q);
+ register_subalias("7", "A.GND");
- register_subalias("8", m_1.m_Q);
- register_subalias("9", m_1.m_C);
- register_subalias("10", m_1.m_D);
+ register_subalias("8", m_A.m_Q);
+ register_subalias("9", m_A.m_C);
+ register_subalias("10", m_A.m_D);
//register_subalias("11", m_1.m_X1);
//register_subalias("12", m_1.m_X1Q);
- register_subalias("13", m_1.m_B);
- register_subalias("14", "1.VCC");
+ register_subalias("13", m_A.m_B);
+ register_subalias("14", "A.VCC");
- connect("1.GND", "2.GND");
- connect("1.VCC", "2.VCC");
+ connect("A.GND", "B.GND");
+ connect("A.VCC", "B.VCC");
}
//NETLIB_RESETI();
//NETLIB_UPDATEI();
- NETLIB_SUB(7450) m_1;
- NETLIB_SUB(7450) m_2;
+ NETLIB_SUB(7450) m_A;
+ NETLIB_SUB(7450) m_B;
};
NETLIB_UPDATE(7450)
diff --git a/src/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp
index 905d154466b..5c75115c970 100644
--- a/src/lib/netlist/devices/nld_7473.cpp
+++ b/src/lib/netlist/devices/nld_7473.cpp
@@ -55,57 +55,63 @@ namespace netlist
NETLIB_OBJECT(7473_dip)
{
NETLIB_CONSTRUCTOR(7473_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", m_1.m_CLK);
- register_subalias("2", m_1.m_CLRQ);
- register_subalias("3", m_1.m_K);
- register_subalias("4", "VCC");
- register_subalias("5", m_2.m_CLK);
- register_subalias("6", m_2.m_CLRQ);
- register_subalias("7", m_2.m_J);
-
- register_subalias("8", m_2.m_QQ);
- register_subalias("9", m_2.m_Q);
- register_subalias("10", m_2.m_K);
- register_subalias("11", "GND");
- register_subalias("12", m_2.m_Q);
- register_subalias("13", m_1.m_QQ);
- register_subalias("14", m_1.m_J);
+ register_subalias("1", m_A.m_CLK);
+ register_subalias("2", m_A.m_CLRQ);
+ register_subalias("3", m_A.m_K);
+ register_subalias("4", "A.VCC");
+ register_subalias("5", m_B.m_CLK);
+ register_subalias("6", m_B.m_CLRQ);
+ register_subalias("7", m_B.m_J);
+
+ register_subalias("8", m_B.m_QQ);
+ register_subalias("9", m_B.m_Q);
+ register_subalias("10", m_B.m_K);
+ register_subalias("11", "A.GND");
+ register_subalias("12", m_B.m_Q);
+ register_subalias("13", m_A.m_QQ);
+ register_subalias("14", m_A.m_J);
+
+ connect("A.GND", "B.GND");
+ connect("A.VCC", "B.VCC");
}
private:
- NETLIB_SUB(7473) m_1;
- NETLIB_SUB(7473) m_2;
+ NETLIB_SUB(7473) m_A;
+ NETLIB_SUB(7473) m_B;
};
NETLIB_OBJECT(7473A_dip)
{
NETLIB_CONSTRUCTOR(7473A_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", m_1.m_CLK);
- register_subalias("2", m_1.m_CLRQ);
- register_subalias("3", m_1.m_K);
- //register_subalias("4", ); ==> VCC
- register_subalias("5", m_2.m_CLK);
- register_subalias("6", m_2.m_CLRQ);
- register_subalias("7", m_2.m_J);
-
- register_subalias("8", m_2.m_QQ);
- register_subalias("9", m_2.m_Q);
- register_subalias("10", m_2.m_K);
- //register_subalias("11", ); ==> VCC
- register_subalias("12", m_2.m_Q);
- register_subalias("13", m_1.m_QQ);
- register_subalias("14", m_1.m_J);
+ register_subalias("1", m_A.m_CLK);
+ register_subalias("2", m_A.m_CLRQ);
+ register_subalias("3", m_A.m_K);
+ register_subalias("4", "A.VCC");
+ register_subalias("5", m_B.m_CLK);
+ register_subalias("6", m_B.m_CLRQ);
+ register_subalias("7", m_B.m_J);
+
+ register_subalias("8", m_B.m_QQ);
+ register_subalias("9", m_B.m_Q);
+ register_subalias("10", m_B.m_K);
+ register_subalias("11", "A.GND");
+ register_subalias("12", m_B.m_Q);
+ register_subalias("13", m_A.m_QQ);
+ register_subalias("14", m_A.m_J);
+
+ connect("A.GND", "B.GND");
+ connect("A.VCC", "B.VCC");
}
private:
- NETLIB_SUB(7473A) m_1;
- NETLIB_SUB(7473A) m_2;
+ NETLIB_SUB(7473A) m_A;
+ NETLIB_SUB(7473A) m_B;
};
NETLIB_RESET(7473)
diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
index caf1aa93e13..495d8e0194a 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -57,34 +57,34 @@ namespace netlist
NETLIB_OBJECT(7474_dip)
{
NETLIB_CONSTRUCTOR(7474_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", "1.CLRQ");
- register_subalias("2", "1.D");
- register_subalias("3", "1.CLK");
- register_subalias("4", "1.PREQ");
- register_subalias("5", "1.Q");
- register_subalias("6", "1.QQ");
- register_subalias("7", "1.GND");
-
- register_subalias("8", "2.QQ");
- register_subalias("9", "2.Q");
- register_subalias("10", "2.PREQ");
- register_subalias("11", "2.CLK");
- register_subalias("12", "2.D");
- register_subalias("13", "2.CLRQ");
- register_subalias("14", "1.VCC");
-
- connect("1.GND", "2.GND");
- connect("1.VCC", "2.VCC");
+ register_subalias("1", "A.CLRQ");
+ register_subalias("2", "A.D");
+ register_subalias("3", "A.CLK");
+ register_subalias("4", "A.PREQ");
+ register_subalias("5", "A.Q");
+ register_subalias("6", "A.QQ");
+ register_subalias("7", "A.GND");
+
+ register_subalias("8", "B.QQ");
+ register_subalias("9", "B.Q");
+ register_subalias("10", "B.PREQ");
+ register_subalias("11", "B.CLK");
+ register_subalias("12", "B.D");
+ register_subalias("13", "B.CLRQ");
+ register_subalias("14", "A.VCC");
+
+ connect("A.GND", "B.GND");
+ connect("A.VCC", "B.VCC");
}
NETLIB_UPDATEI();
NETLIB_RESETI();
private:
- NETLIB_SUB(7474) m_1;
- NETLIB_SUB(7474) m_2;
+ NETLIB_SUB(7474) m_A;
+ NETLIB_SUB(7474) m_B;
};
NETLIB_HANDLER(7474, clk)
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index b7bb729b334..20798f7da69 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -124,37 +124,37 @@ namespace netlist
NETLIB_OBJECT(SN74LS629_dip)
{
NETLIB_CONSTRUCTOR(SN74LS629_dip)
- , m_1(*this, "1")
- , m_2(*this, "2")
+ , m_A(*this, "A")
+ , m_B(*this, "B")
{
- register_subalias("1", m_2.m_FC);
- register_subalias("2", m_1.m_FC);
- register_subalias("3", m_1.m_RNG);
+ register_subalias("1", m_B.m_FC);
+ register_subalias("2", m_A.m_FC);
+ register_subalias("3", m_A.m_RNG);
- register_subalias("6", m_1.m_ENQ);
- register_subalias("7", m_1.m_clock.m_Y);
+ register_subalias("6", m_A.m_ENQ);
+ register_subalias("7", m_A.m_clock.m_Y);
- register_subalias("8", m_1.m_R_FC.m_N);
- register_subalias("9", m_1.m_R_FC.m_N);
- connect(m_1.m_R_FC.m_N, m_2.m_R_FC.m_N);
+ register_subalias("8", m_A.m_R_FC.m_N);
+ register_subalias("9", m_A.m_R_FC.m_N);
+ connect(m_A.m_R_FC.m_N, m_B.m_R_FC.m_N);
- register_subalias("10", m_2.m_clock.m_Y);
+ register_subalias("10", m_B.m_clock.m_Y);
- register_subalias("11", m_2.m_ENQ);
- register_subalias("14", m_2.m_RNG);
+ register_subalias("11", m_B.m_ENQ);
+ register_subalias("14", m_B.m_RNG);
}
NETLIB_UPDATEI() { }
NETLIB_RESETI()
{
- m_1.reset();
- m_2.reset();
+ m_A.reset();
+ m_B.reset();
}
private:
- NETLIB_SUB(SN74LS629) m_1;
- NETLIB_SUB(SN74LS629) m_2;
+ NETLIB_SUB(SN74LS629) m_A;
+ NETLIB_SUB(SN74LS629) m_B;
};
diff --git a/src/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp
index 9247a8a9320..14b0a846053 100644
--- a/src/lib/netlist/devices/nld_9322.cpp
+++ b/src/lib/netlist/devices/nld_9322.cpp
@@ -41,10 +41,10 @@ namespace netlist
NETLIB_CONSTRUCTOR(9322)
, m_SELECT(*this, "SELECT")
, m_STROBE(*this, "STROBE")
- , m_1(*this, "1")
- , m_2(*this, "2")
- , m_3(*this, "3")
- , m_4(*this, "4")
+ , m_1(*this, "A")
+ , m_2(*this, "B")
+ , m_3(*this, "C")
+ , m_4(*this, "D")
{
register_subalias("A1", m_1.m_A);
register_subalias("B1", m_1.m_B);
@@ -59,15 +59,15 @@ namespace netlist
register_subalias("B4", m_4.m_B);
register_subalias("Y4", m_4.m_Y);
- connect("1.VCC", "2.VCC");
- connect("1.VCC", "3.VCC");
- connect("1.VCC", "4.VCC");
- connect("1.GND", "2.GND");
- connect("1.GND", "3.GND");
- connect("1.GND", "4.GND");
+ connect("A.VCC", "B.VCC");
+ connect("A.VCC", "C.VCC");
+ connect("A.VCC", "D.VCC");
+ connect("A.GND", "B.GND");
+ connect("A.GND", "C.GND");
+ connect("A.GND", "D.GND");
- register_subalias("GND", "1.GND");
- register_subalias("VCC", "1.VCC");
+ register_subalias("GND", "A.GND");
+ register_subalias("VCC", "B.VCC");
}
diff --git a/src/lib/netlist/macro/nlm_other.cpp b/src/lib/netlist/macro/nlm_other.cpp
index 5d3caa125d0..befbc99a364 100644
--- a/src/lib/netlist/macro/nlm_other.cpp
+++ b/src/lib/netlist/macro/nlm_other.cpp
@@ -21,24 +21,24 @@
*/
static NETLIST_START(MC14584B_DIP)
- MC14584B_GATE(s1)
- MC14584B_GATE(s2)
- MC14584B_GATE(s3)
- MC14584B_GATE(s4)
- MC14584B_GATE(s5)
- MC14584B_GATE(s6)
+ MC14584B_GATE(A)
+ MC14584B_GATE(B)
+ MC14584B_GATE(C)
+ MC14584B_GATE(D)
+ MC14584B_GATE(E)
+ MC14584B_GATE(F)
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC, s5.VCC, s6.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND, s5.GND, s6.GND)
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.Q, /* Y1 |2 13| A6 */ s6.A,
- s2.A, /* A2 |3 12| Y6 */ s6.Q,
- s2.Q, /* Y2 |4 MC14584B 11| A5 */ s5.A,
- s3.A, /* A3 |5 10| Y5 */ s5.Q,
- s3.Q, /* Y3 |6 9| A4 */ s4.A,
- s1.GND,/* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.Q, /* Y1 |2 13| A6 */ F.A,
+ B.A, /* A2 |3 12| Y6 */ F.Q,
+ B.Q, /* Y2 |4 MC14584B 11| A5 */ E.A,
+ C.A, /* A3 |5 10| Y5 */ E.Q,
+ C.Q, /* Y3 |6 9| A4 */ D.A,
+ A.GND,/* GND |7 8| Y4 */ D.Q
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index cff360af2b6..22c3ae976ab 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -25,23 +25,23 @@
*/
static NETLIST_START(TTL_7400_DIP)
- TTL_7400_GATE(s1)
- TTL_7400_GATE(s2)
- TTL_7400_GATE(s3)
- TTL_7400_GATE(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| B4 */ s4.B,
- s1.Q, /* Y1 |3 12| A4 */ s4.A,
- s2.A, /* A2 |4 7400 11| Y4 */ s4.Q,
- s2.B, /* B2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7400_GATE(A)
+ TTL_7400_GATE(B)
+ TTL_7400_GATE(C)
+ TTL_7400_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| B4 */ D.B,
+ A.Q, /* Y1 |3 12| A4 */ D.A,
+ B.A, /* A2 |4 7400 11| Y4 */ D.Q,
+ B.B, /* B2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -63,23 +63,23 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7402_DIP)
- TTL_7402_GATE(s1)
- TTL_7402_GATE(s2)
- TTL_7402_GATE(s3)
- TTL_7402_GATE(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.Q, /* Y1 |1 ++ 14| VCC */ s1.VCC,
- s1.A, /* A1 |2 13| Y4 */ s4.Q,
- s1.B, /* B1 |3 12| B4 */ s4.B,
- s2.Q, /* Y2 |4 7402 11| A4 */ s4.A,
- s2.A, /* A2 |5 10| Y3 */ s3.Q,
- s2.B, /* B2 |6 9| B3 */ s3.B,
- s1.GND,/* GND |7 8| A3 */ s3.A
- /* +--------------+ */
+ TTL_7402_GATE(A)
+ TTL_7402_GATE(B)
+ TTL_7402_GATE(C)
+ TTL_7402_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.Q, /* Y1 |1 ++ 14| VCC */ A.VCC,
+ A.A, /* A1 |2 13| Y4 */ D.Q,
+ A.B, /* B1 |3 12| B4 */ D.B,
+ B.Q, /* Y2 |4 7402 11| A4 */ D.A,
+ B.A, /* A2 |5 10| Y3 */ C.Q,
+ B.B, /* B2 |6 9| B3 */ C.B,
+ A.GND,/* GND |7 8| A3 */ C.A
+ /* +--------------+ */
)
NETLIST_END()
@@ -99,25 +99,25 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7404_DIP)
- TTL_7404_GATE(s1)
- TTL_7404_GATE(s2)
- TTL_7404_GATE(s3)
- TTL_7404_GATE(s4)
- TTL_7404_GATE(s5)
- TTL_7404_GATE(s6)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC, s5.VCC, s6.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND, s5.GND, s6.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.Q, /* Y1 |2 13| A6 */ s6.A,
- s2.A, /* A2 |3 12| Y6 */ s6.Q,
- s2.Q, /* Y2 |4 7404 11| A5 */ s5.A,
- s3.A, /* A3 |5 10| Y5 */ s5.Q,
- s3.Q, /* Y3 |6 9| A4 */ s4.A,
- s1.GND,/* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ TTL_7404_GATE(A)
+ TTL_7404_GATE(B)
+ TTL_7404_GATE(C)
+ TTL_7404_GATE(D)
+ TTL_7404_GATE(E)
+ TTL_7404_GATE(F)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.Q, /* Y1 |2 13| A6 */ F.A,
+ B.A, /* A2 |3 12| Y6 */ F.Q,
+ B.Q, /* Y2 |4 7404 11| A5 */ E.A,
+ C.A, /* A3 |5 10| Y5 */ E.Q,
+ C.Q, /* Y3 |6 9| A4 */ D.A,
+ A.GND,/* GND |7 8| Y4 */ D.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -140,23 +140,23 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7408_DIP)
- TTL_7408_GATE(s1)
- TTL_7408_GATE(s2)
- TTL_7408_GATE(s3)
- TTL_7408_GATE(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| B4 */ s4.B,
- s1.Q, /* Y1 |3 12| A4 */ s4.A,
- s2.A, /* A2 |4 7400 11| Y4 */ s4.Q,
- s2.B, /* B2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7408_GATE(A)
+ TTL_7408_GATE(B)
+ TTL_7408_GATE(C)
+ TTL_7408_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| B4 */ D.B,
+ A.Q, /* Y1 |3 12| A4 */ D.A,
+ B.A, /* A2 |4 7400 11| Y4 */ D.Q,
+ B.B, /* B2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -178,22 +178,22 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7410_DIP)
- TTL_7410_GATE(s1)
- TTL_7410_GATE(s2)
- TTL_7410_GATE(s3)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC)
- NET_C(s1.GND, s2.GND, s3.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| C1 */ s1.C,
- s2.A, /* A2 |3 12| Y1 */ s1.Q,
- s2.B, /* B2 |4 7410 11| C3 */ s3.C,
- s2.C, /* C2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7410_GATE(A)
+ TTL_7410_GATE(B)
+ TTL_7410_GATE(C)
+
+ NET_C(A.VCC, B.VCC, C.VCC)
+ NET_C(A.GND, B.GND, C.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| C1 */ A.C,
+ B.A, /* A2 |3 12| Y1 */ A.Q,
+ B.B, /* B2 |4 7410 11| C3 */ C.C,
+ B.C, /* C2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -215,22 +215,22 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7411_DIP)
- TTL_7411_GATE(s1)
- TTL_7411_GATE(s2)
- TTL_7411_GATE(s3)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC)
- NET_C(s1.GND, s2.GND, s3.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| C1 */ s1.C,
- s2.A, /* A2 |3 12| Y1 */ s1.Q,
- s2.B, /* B2 |4 7411 11| C3 */ s3.C,
- s2.C, /* C2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7411_GATE(A)
+ TTL_7411_GATE(B)
+ TTL_7411_GATE(C)
+
+ NET_C(A.VCC, B.VCC, C.VCC)
+ NET_C(A.GND, B.GND, C.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| C1 */ A.C,
+ B.A, /* A2 |3 12| Y1 */ A.Q,
+ B.B, /* B2 |4 7411 11| C3 */ C.C,
+ B.C, /* C2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -255,48 +255,48 @@ static NETLIST_START(TTL_74LS14_GATE)
NETLIST_END()
static NETLIST_START(TTL_7414_DIP)
- SCHMITT_TRIGGER(s1, "DM7414")
- SCHMITT_TRIGGER(s2, "DM7414")
- SCHMITT_TRIGGER(s3, "DM7414")
- SCHMITT_TRIGGER(s4, "DM7414")
- SCHMITT_TRIGGER(s5, "DM7414")
- SCHMITT_TRIGGER(s6, "DM7414")
-
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND, s5.GND, s6.GND)
+ SCHMITT_TRIGGER(A, "DM7414")
+ SCHMITT_TRIGGER(B, "DM7414")
+ SCHMITT_TRIGGER(C, "DM7414")
+ SCHMITT_TRIGGER(D, "DM7414")
+ SCHMITT_TRIGGER(E, "DM7414")
+ SCHMITT_TRIGGER(F, "DM7414")
+
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
DUMMY_INPUT(VCC)
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ VCC.I,
- s1.Q, /* Y1 |2 13| A6 */ s6.A,
- s2.A, /* A2 |3 12| Y6 */ s6.Q,
- s2.Q, /* Y2 |4 7414 11| A5 */ s5.A,
- s3.A, /* A3 |5 10| Y5 */ s5.Q,
- s3.Q, /* Y3 |6 9| A4 */ s4.A,
- s1.GND, /* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ VCC.I,
+ A.Q, /* Y1 |2 13| A6 */ F.A,
+ B.A, /* A2 |3 12| Y6 */ F.Q,
+ B.Q, /* Y2 |4 7414 11| A5 */ E.A,
+ C.A, /* A3 |5 10| Y5 */ E.Q,
+ C.Q, /* Y3 |6 9| A4 */ D.A,
+ A.GND, /* GND |7 8| Y4 */ D.Q
+ /* +--------------+ */
)
NETLIST_END()
static NETLIST_START(TTL_74LS14_DIP)
- SCHMITT_TRIGGER(s1, "DM74LS14")
- SCHMITT_TRIGGER(s2, "DM74LS14")
- SCHMITT_TRIGGER(s3, "DM74LS14")
- SCHMITT_TRIGGER(s4, "DM74LS14")
- SCHMITT_TRIGGER(s5, "DM74LS14")
- SCHMITT_TRIGGER(s6, "DM74LS14")
-
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND, s5.GND, s6.GND)
+ SCHMITT_TRIGGER(A, "DM74LS14")
+ SCHMITT_TRIGGER(B, "DM74LS14")
+ SCHMITT_TRIGGER(C, "DM74LS14")
+ SCHMITT_TRIGGER(D, "DM74LS14")
+ SCHMITT_TRIGGER(E, "DM74LS14")
+ SCHMITT_TRIGGER(F, "DM74LS14")
+
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
DUMMY_INPUT(VCC)
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ VCC.I,
- s1.Q, /* Y1 |2 13| A6 */ s6.A,
- s2.A, /* A2 |3 12| Y6 */ s6.Q,
- s2.Q, /* Y2 |4 74LS14 11| A5 */ s5.A,
- s3.A, /* A3 |5 10| Y5 */ s5.Q,
- s3.Q, /* Y3 |6 9| A4 */ s4.A,
- s1.GND, /* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ VCC.I,
+ A.Q, /* Y1 |2 13| A6 */ F.A,
+ B.A, /* A2 |3 12| Y6 */ F.Q,
+ B.Q, /* Y2 |4 74LS14 11| A5 */ E.A,
+ C.A, /* A3 |5 10| Y5 */ E.Q,
+ C.Q, /* Y3 |6 9| A4 */ D.A,
+ A.GND, /* GND |7 8| Y4 */ D.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -307,25 +307,25 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7416_DIP)
- TTL_7416_GATE(s1)
- TTL_7416_GATE(s2)
- TTL_7416_GATE(s3)
- TTL_7416_GATE(s4)
- TTL_7416_GATE(s5)
- TTL_7416_GATE(s6)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC, s5.VCC, s6.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND, s5.GND, s6.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.Q, /* Y1 |2 13| A6 */ s6.A,
- s2.A, /* A2 |3 12| Y6 */ s6.Q,
- s2.Q, /* Y2 |4 7416 11| A5 */ s5.A,
- s3.A, /* A3 |5 10| Y5 */ s5.Q,
- s3.Q, /* Y3 |6 9| A4 */ s4.A,
- s1.GND,/* GND |7 8| Y4 */ s4.Q
- /* +--------------+ */
+ TTL_7416_GATE(A)
+ TTL_7416_GATE(B)
+ TTL_7416_GATE(C)
+ TTL_7416_GATE(D)
+ TTL_7416_GATE(E)
+ TTL_7416_GATE(F)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.Q, /* Y1 |2 13| A6 */ F.A,
+ B.A, /* A2 |3 12| Y6 */ F.Q,
+ B.Q, /* Y2 |4 7416 11| A5 */ E.A,
+ C.A, /* A3 |5 10| Y5 */ E.Q,
+ C.Q, /* Y3 |6 9| A4 */ D.A,
+ A.GND,/* GND |7 8| Y4 */ D.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -348,22 +348,22 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7420_DIP)
- TTL_7420_GATE(s1)
- TTL_7420_GATE(s2)
+ TTL_7420_GATE(A)
+ TTL_7420_GATE(B)
- NET_C(s1.VCC, s2.VCC)
- NET_C(s1.GND, s2.GND)
+ NET_C(A.VCC, B.VCC)
+ NET_C(A.GND, B.GND)
DUMMY_INPUT(NC)
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| D2 */ s2.D,
- NC.I, /* NC |3 12| C2 */ s2.C,
- s1.C, /* C1 |4 7420 11| NC */ NC.I,
- s1.D, /* D1 |5 10| B2 */ s2.B,
- s1.Q, /* Y1 |6 9| A2 */ s2.A,
- s1.GND,/* GND |7 8| Y2 */ s2.Q
- /* +--------------+ */
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| D2 */ B.D,
+ NC.I, /* NC |3 12| C2 */ B.C,
+ A.C, /* C1 |4 7420 11| NC */ NC.I,
+ A.D, /* D1 |5 10| B2 */ B.B,
+ A.Q, /* Y1 |6 9| A2 */ B.A,
+ A.GND,/* GND |7 8| Y2 */ B.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -390,22 +390,22 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7425_DIP)
- TTL_7425_GATE(s1)
- TTL_7425_GATE(s2)
+ TTL_7425_GATE(A)
+ TTL_7425_GATE(B)
- NET_C(s1.VCC, s2.VCC)
- NET_C(s1.GND, s2.GND)
+ NET_C(A.VCC, B.VCC)
+ NET_C(A.GND, B.GND)
DUMMY_INPUT(X)
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| D2 */ s2.D,
- X.I, /* X1 |3 12| C2 */ s2.C,
- s1.C, /* C1 |4 7425 11| X2 */ X.I,
- s1.D, /* D1 |5 10| B2 */ s2.B,
- s1.Q, /* Y1 |6 9| A2 */ s2.A,
- s1.GND,/* GND |7 8| Y2 */ s2.Q
- /* +--------------+ */
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| D2 */ B.D,
+ X.I, /* X1 |3 12| C2 */ B.C,
+ A.C, /* C1 |4 7425 11| X2 */ X.I,
+ A.D, /* D1 |5 10| B2 */ B.B,
+ A.Q, /* Y1 |6 9| A2 */ B.A,
+ A.GND,/* GND |7 8| Y2 */ B.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -428,22 +428,22 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7427_DIP)
- TTL_7427_GATE(s1)
- TTL_7427_GATE(s2)
- TTL_7427_GATE(s3)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC)
- NET_C(s1.GND, s2.GND, s3.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| C1 */ s1.C,
- s2.A, /* A2 |3 12| Y1 */ s1.Q,
- s2.B, /* B2 |4 7427 11| C3 */ s3.C,
- s2.C, /* C2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7427_GATE(A)
+ TTL_7427_GATE(B)
+ TTL_7427_GATE(C)
+
+ NET_C(A.VCC, B.VCC, C.VCC)
+ NET_C(A.GND, B.GND, C.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| C1 */ A.C,
+ B.A, /* A2 |3 12| Y1 */ A.Q,
+ B.B, /* B2 |4 7427 11| C3 */ C.C,
+ B.C, /* C2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -469,19 +469,19 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7430_DIP)
- TTL_7430_GATE(s1)
+ TTL_7430_GATE(A)
DUMMY_INPUT(NC)
- DIPPINS( /* +--------------+ */
- s1.A, /* A |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B |2 13| NC */ NC.I,
- s1.C, /* C |3 12| H */ s1.H,
- s1.D, /* D |4 7430 11| G */ s1.G,
- s1.E, /* E |5 10| NC */ NC.I,
- s1.F, /* F |6 9| NC */ NC.I,
- s1.GND,/* GND |7 8| Y */ s1.Q
- /* +--------------+ */
+ DIPPINS( /* +--------------+ */
+ A.A, /* A |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B |2 13| NC */ NC.I,
+ A.C, /* C |3 12| H */ A.H,
+ A.D, /* D |4 7430 11| G */ A.G,
+ A.E, /* E |5 10| NC */ NC.I,
+ A.F, /* F |6 9| NC */ NC.I,
+ A.GND,/* GND |7 8| Y */ A.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -504,23 +504,23 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7432_DIP)
- TTL_7432_GATE(s1)
- TTL_7432_GATE(s2)
- TTL_7432_GATE(s3)
- TTL_7432_GATE(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| B4 */ s4.B,
- s1.Q, /* Y1 |3 12| A4 */ s4.A,
- s2.A, /* A2 |4 7400 11| Y4 */ s4.Q,
- s2.B, /* B2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7432_GATE(A)
+ TTL_7432_GATE(B)
+ TTL_7432_GATE(C)
+ TTL_7432_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| B4 */ D.B,
+ A.Q, /* Y1 |3 12| A4 */ D.A,
+ B.A, /* A2 |4 7400 11| Y4 */ D.Q,
+ B.B, /* B2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -546,23 +546,23 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7437_DIP)
- TTL_7437_GATE(s1)
- TTL_7437_GATE(s2)
- TTL_7437_GATE(s3)
- TTL_7437_GATE(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| B4 */ s4.B,
- s1.Q, /* Y1 |3 12| A4 */ s4.A,
- s2.A, /* A2 |4 7400 11| Y4 */ s4.Q,
- s2.B, /* B2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7437_GATE(A)
+ TTL_7437_GATE(B)
+ TTL_7437_GATE(C)
+ TTL_7437_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| B4 */ D.B,
+ A.Q, /* Y1 |3 12| A4 */ D.A,
+ B.A, /* A2 |4 7400 11| Y4 */ D.Q,
+ B.B, /* B2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -584,23 +584,23 @@ NETLIST_END()
*/
static NETLIST_START(TTL_7486_DIP)
- TTL_7486_GATE(s1)
- TTL_7486_GATE(s2)
- TTL_7486_GATE(s3)
- TTL_7486_GATE(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.A, /* A1 |1 ++ 14| VCC */ s1.VCC,
- s1.B, /* B1 |2 13| B4 */ s4.B,
- s1.Q, /* Y1 |3 12| A4 */ s4.A,
- s2.A, /* A2 |4 7486 11| Y4 */ s4.Q,
- s2.B, /* B2 |5 10| B3 */ s3.B,
- s2.Q, /* Y2 |6 9| A3 */ s3.A,
- s1.GND,/* GND |7 8| Y3 */ s3.Q
- /* +--------------+ */
+ TTL_7486_GATE(A)
+ TTL_7486_GATE(B)
+ TTL_7486_GATE(C)
+ TTL_7486_GATE(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.A, /* A1 |1 ++ 14| VCC */ A.VCC,
+ A.B, /* B1 |2 13| B4 */ D.B,
+ A.Q, /* Y1 |3 12| A4 */ D.A,
+ B.A, /* A2 |4 7486 11| Y4 */ D.Q,
+ B.B, /* B2 |5 10| B3 */ C.B,
+ B.Q, /* Y2 |6 9| A3 */ C.A,
+ A.GND,/* GND |7 8| Y3 */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
@@ -634,48 +634,48 @@ NETLIST_END()
*/
static NETLIST_START(TTL_74155_DIP)
- NET_REGISTER_DEV(TTL_74155A_GATE, s1)
- NET_REGISTER_DEV(TTL_74155B_GATE, s2)
-
- NET_C(s1.A, s2.A)
- NET_C(s1.B, s2.B)
-
- NET_C(s1.VCC, s2.VCC)
- NET_C(s1.GND, s2.GND)
-
- DIPPINS( /* +--------------+ */
- s1.C, /* C1 |1 ++ 16| VCC */ s1.VCC,
- s1.G, /* G1 |2 15| B4 */ s2.C,
- s1.B, /* B |3 14| B4 */ s2.G,
- s1.3, /* 1Y3 |4 74155 13| A4 */ s2.A,
- s2.2, /* 1Y2 |5 12| Y4 */ s2.3,
- s2.1, /* 1Y1 |6 11| B3 */ s2.2,
- s2.0, /* 1Y0 |7 10| A3 */ s2.1,
- s1.GND,/* GND |8 9| Y3 */ s2.0
- /* +--------------+ */
+ NET_REGISTER_DEV(TTL_74155A_GATE, A)
+ NET_REGISTER_DEV(TTL_74155B_GATE, B)
+
+ NET_C(A.A, B.A)
+ NET_C(A.B, B.B)
+
+ NET_C(A.VCC, B.VCC)
+ NET_C(A.GND, B.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.C, /* C1 |1 ++ 16| VCC */ A.VCC,
+ A.G, /* G1 |2 15| B4 */ B.C,
+ A.B, /* B |3 14| B4 */ B.G,
+ A.3, /* 1Y3 |4 74155 13| A4 */ B.A,
+ B.2, /* 1Y2 |5 12| Y4 */ B.3,
+ B.1, /* 1Y1 |6 11| B3 */ B.2,
+ B.0, /* 1Y0 |7 10| A3 */ B.1,
+ A.GND,/* GND |8 9| Y3 */ B.0
+ /* +--------------+ */
)
NETLIST_END()
static NETLIST_START(TTL_74156_DIP)
- NET_REGISTER_DEV(TTL_74156A_GATE, s1)
- NET_REGISTER_DEV(TTL_74156B_GATE, s2)
-
- NET_C(s1.A, s2.A)
- NET_C(s1.B, s2.B)
-
- NET_C(s1.VCC, s2.VCC)
- NET_C(s1.GND, s2.GND)
-
- DIPPINS( /* +--------------+ */
- s1.C, /* C1 |1 ++ 16| VCC */ s1.VCC,
- s1.G, /* G1 |2 15| B4 */ s2.C,
- s1.B, /* B |3 14| B4 */ s2.G,
- s1.3, /* 1Y3 |4 74156 13| A4 */ s2.A,
- s2.2, /* 1Y2 |5 12| Y4 */ s2.3,
- s2.1, /* 1Y1 |6 11| B3 */ s2.2,
- s2.0, /* 1Y0 |7 10| A3 */ s2.1,
- s1.GND,/* GND |8 9| Y3 */ s2.0
- /* +--------------+ */
+ NET_REGISTER_DEV(TTL_74156A_GATE, A)
+ NET_REGISTER_DEV(TTL_74156B_GATE, B)
+
+ NET_C(A.A, B.A)
+ NET_C(A.B, B.B)
+
+ NET_C(A.VCC, B.VCC)
+ NET_C(A.GND, B.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.C, /* C1 |1 ++ 16| VCC */ A.VCC,
+ A.G, /* G1 |2 15| B4 */ B.C,
+ A.B, /* B |3 14| B4 */ B.G,
+ A.3, /* 1Y3 |4 74156 13| A4 */ B.A,
+ B.2, /* 1Y2 |5 12| Y4 */ B.3,
+ B.1, /* 1Y1 |6 11| B3 */ B.2,
+ B.0, /* 1Y0 |7 10| A3 */ B.1,
+ A.GND,/* GND |8 9| Y3 */ B.0
+ /* +--------------+ */
)
NETLIST_END()
@@ -699,21 +699,21 @@ NETLIST_END()
*/
static NETLIST_START(TTL_74260_DIP)
- TTL_74260_GATE(s1)
- TTL_74260_GATE(s2)
-
- NET_C(s1.VCC, s2.VCC)
- NET_C(s1.GND, s2.GND)
-
- DIPPINS( /* +--------------+ */
- s1.C, /* C1 |1 ++ 14| VCC */ s1.VCC,
- s1.D, /* D1 |2 13| B1 */ s1.B,
- s1.E, /* E1 |3 12| A1 */ s1.A,
- s2.E, /* E2 |4 74260 11| D2 */ s2.D,
- s1.Q, /* Y1 |5 10| C2 */ s2.C,
- s2.Q, /* Y2 |6 9| B2 */ s2.B,
- s1.GND,/* GND |7 8| A2 */ s2.A
- /* +--------------+ */
+ TTL_74260_GATE(A)
+ TTL_74260_GATE(B)
+
+ NET_C(A.VCC, B.VCC)
+ NET_C(A.GND, B.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.C, /* C1 |1 ++ 14| VCC */ A.VCC,
+ A.D, /* D1 |2 13| B1 */ A.B,
+ A.E, /* E1 |3 12| A1 */ A.A,
+ B.E, /* E2 |4 74260 11| D2 */ B.D,
+ A.Q, /* Y1 |5 10| C2 */ B.C,
+ B.Q, /* Y2 |6 9| B2 */ B.B,
+ A.GND,/* GND |7 8| A2 */ B.A
+ /* +--------------+ */
)
NETLIST_END()
@@ -744,24 +744,24 @@ NETLIST_END()
#endif
static NETLIST_START(TTL_74279_DIP)
- TTL_74279B(s1)
- TTL_74279A(s2)
- TTL_74279B(s3)
- TTL_74279A(s4)
-
- NET_C(s1.VCC, s2.VCC, s3.VCC, s4.VCC)
- NET_C(s1.GND, s2.GND, s3.GND, s4.GND)
-
- DIPPINS( /* +--------------+ */
- s1.R, /* 1R |1 ++ 16| VCC */ s1.VCC,
- s1.S1, /* 1S1 |2 15| 4S */ s4.S,
- s1.S2, /* 1S2 |3 14| 4R */ s4.R,
- s1.Q, /* 1Q |4 74279 13| 4Q */ s4.Q,
- s2.R, /* 2R |5 12| 3S2 */ s3.S2,
- s2.S, /* 2S |6 11| 3S1 */ s3.S1,
- s2.Q, /* 2Q |7 10| 3R */ s3.R,
- s1.GND, /* GND |8 9| 3Q */ s3.Q
- /* +--------------+ */
+ TTL_74279B(A)
+ TTL_74279A(B)
+ TTL_74279B(C)
+ TTL_74279A(D)
+
+ NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+ NET_C(A.GND, B.GND, C.GND, D.GND)
+
+ DIPPINS( /* +--------------+ */
+ A.R, /* 1R |1 ++ 16| VCC */ A.VCC,
+ A.S1, /* 1S1 |2 15| 4S */ D.S,
+ A.S2, /* 1S2 |3 14| 4R */ D.R,
+ A.Q, /* 1Q |4 74279 13| 4Q */ D.Q,
+ B.R, /* 2R |5 12| 3S2 */ C.S2,
+ B.S, /* 2S |6 11| 3S1 */ C.S1,
+ B.Q, /* 2Q |7 10| 3R */ C.R,
+ A.GND, /* GND |8 9| 3Q */ C.Q
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/mame/machine/nl_rebound.cpp b/src/mame/machine/nl_rebound.cpp
index d298b88b622..207cab04c85 100644
--- a/src/mame/machine/nl_rebound.cpp
+++ b/src/mame/machine/nl_rebound.cpp
@@ -1265,10 +1265,10 @@ NETLIST_START(rebound_schematics)
* Inputs not used
* -----------------------------------------------------------------------*/
- NET_C(V5, A1.s3.A, A1.s3.B, B5.s6.A)
- NET_C(V5, B3.2.CLK, B3.2.CLRQ, B3.2.J, B3.2.K)
- NET_C(V5, F3.2.CLK, F3.2.CLRQ, F3.2.J, F3.2.K)
- NET_C(V5, F9.s1.A, F9.s5.A, F9.s6.A)
+ NET_C(V5, A1.C.A, A1.C.B, B5.F.A)
+ NET_C(V5, B3.B.CLK, B3.B.CLRQ, B3.B.J, B3.B.K)
+ NET_C(V5, F3.B.CLK, F3.B.CLRQ, F3.B.J, F3.B.K)
+ NET_C(V5, F9.A.A, F9.E.A, F9.F.A)
/* -----------------------------------------------------------------------
* Power terminals