summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2020-08-01 18:08:52 -0700
committer Aaron Giles <aaron@aarongiles.com>2020-08-01 18:08:52 -0700
commitc527198383fac975b824aacd9cd33964d3dc505b (patch)
treee916d898f0886059b60f87ceb966accaf7b2fc80
parent098327290c77794e92c88fab8e289ad31e18db2a (diff)
Macro-ized 7492 DIP
-rw-r--r--src/lib/netlist/devices/net_lib.cpp1
-rw-r--r--src/lib/netlist/devices/net_lib.h1
-rw-r--r--src/lib/netlist/devices/nld_7492.cpp28
-rw-r--r--src/lib/netlist/devices/nld_7492.h14
-rw-r--r--src/lib/netlist/devices/nld_devinc.h8
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp31
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.h3
7 files changed, 42 insertions, 44 deletions
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 24478d2ef08..d190b344747 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -83,7 +83,6 @@ namespace devices
LIB_ENTRY(7485)
LIB_ENTRY(7490)
LIB_ENTRY(7492)
- LIB_ENTRY(7492_dip)
LIB_ENTRY(7493)
LIB_ENTRY(7493_dip)
LIB_ENTRY(7497)
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index c3d818de17d..9511abf1eb5 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -77,6 +77,7 @@ NETLIST_EXTERNAL(ROMS_lib)
#include "nld_7483.h"
#include "nld_7485.h"
#include "nld_7490.h"
+#include "nld_7492.h"
#include "nld_7493.h"
#include "nld_7497.h"
#include "nld_74ls629.h"
diff --git a/src/lib/netlist/devices/nld_7492.cpp b/src/lib/netlist/devices/nld_7492.cpp
index d4130081cb6..2e15bdfb052 100644
--- a/src/lib/netlist/devices/nld_7492.cpp
+++ b/src/lib/netlist/devices/nld_7492.cpp
@@ -89,35 +89,7 @@ namespace devices
nld_power_pins m_power_pins;
};
- NETLIB_OBJECT(7492_dip)
- {
- NETLIB_CONSTRUCTOR(7492_dip)
- , A(*this, "A")
- {
- register_subalias("1", "A.B");
- // register_subalias("2", ); --> NC
- // register_subalias("3", ); --> NC
-
- // register_subalias("4", ); --> NC
- register_subalias("5", "A.VCC");
- register_subalias("6", "A.R1");
- register_subalias("7", "A.R2");
-
- register_subalias("8", "A.QC");
- register_subalias("9", "A.QB");
- register_subalias("10", "A.GND");
- register_subalias("11", "A.QD");
- register_subalias("12", "A.QA");
- // register_subalias("13", ); --> NC
- register_subalias("14", "A.A");
- }
- //NETLIB_RESETI() {}
- private:
- NETLIB_SUB(7492) A;
- };
-
NETLIB_DEVICE_IMPL(7492, "TTL_7492", "+A,+B,+R1,+R2,@VCC,@GND")
- NETLIB_DEVICE_IMPL(7492_dip, "TTL_7492_DIP", "")
} // namespace devices
} // namespace netlist
diff --git a/src/lib/netlist/devices/nld_7492.h b/src/lib/netlist/devices/nld_7492.h
index 9595a7d89b0..93b2b9b0329 100644
--- a/src/lib/netlist/devices/nld_7492.h
+++ b/src/lib/netlist/devices/nld_7492.h
@@ -55,16 +55,8 @@
#include "netlist/nl_setup.h"
-#define TTL_7492(name, cA, cB, cR1, cR2) \
- NET_REGISTER_DEV(TTL_7492, name) \
- NET_CONNECT(name, GND, GND) \
- NET_CONNECT(name, VCC, VCC) \
- NET_CONNECT(name, A, cA) \
- NET_CONNECT(name, B, cB) \
- NET_CONNECT(name, R1, cR1) \
- NET_CONNECT(name, R2, cR2)
-
-#define TTL_7492_DIP(name) \
- NET_REGISTER_DEV(TTL_7492_DIP, name)
+// usage: TTL_7492(name, cA, cB, cR1, cR2)
+#define TTL_7492(...) \
+ NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
#endif /* NLD_7492_H_ */
diff --git a/src/lib/netlist/devices/nld_devinc.h b/src/lib/netlist/devices/nld_devinc.h
index 051372ccae3..a400bcb7dd1 100644
--- a/src/lib/netlist/devices/nld_devinc.h
+++ b/src/lib/netlist/devices/nld_devinc.h
@@ -320,10 +320,6 @@
#define TTL_7492(...) \
NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
-// usage : TTL_7492_DIP(name)
-#define TTL_7492_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7492_DIP, __VA_ARGS__)
-
// ---------------------------------------------------------------------
// Source: src/lib/netlist/devices/nld_7493.cpp
// ---------------------------------------------------------------------
@@ -1031,6 +1027,10 @@
#define TTL_7490_DIP(...) \
NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
+// usage : TTL_7492_DIP(name)
+#define TTL_7492_DIP(...) \
+ NET_REGISTER_DEVEXT(TTL_7492_DIP, __VA_ARGS__)
+
// usage : TTL_7486_XOR(name, pA, pB)
// auto connect: VCC, GND
#define TTL_7486_XOR(...) \
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index feab75b29d1..73480533a0b 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -1002,6 +1002,36 @@ NETLIST_END()
)
NETLIST_END()
+/*
+ * SN7492: Divide-by-12 Counter
+ *
+ * +--------------+
+ * B |1 ++ 14| A
+ * NC |2 13| NC
+ * NC |3 12| QA
+ * NC |4 7492 11| QD
+ * VCC |5 10| GND
+ * R01 |6 9| QB
+ * R02 |7 8| QC
+ * +--------------+
+ */
+
+ static NETLIST_START(TTL_7492_DIP)
+ TTL_7492(A)
+ NC_PIN(NC)
+
+ DIPPINS( /* +--------------+ */
+ A.B, /* B |1 ++ 14| A */ A.A,
+ NC.I, /* NC |2 13| NC */ NC.I,
+ NC.I, /* NC |3 12| QA */ A.QA,
+ NC.I, /* NC |4 7492 11| QD */ A.QD,
+ A.VCC, /* VCC |5 10| GND */ A.GND,
+ A.R1, /* R01 |6 9| QB */ A.QB,
+ A.R2, /* R02 |7 8| QC */ A.QC
+ /* +--------------+ */
+ )
+NETLIST_END()
+
#if (NL_USE_TRUTHTABLE_74107)
#ifndef __PLIB_PREPROCESSOR__
#define TTL_74107_TT(name) \
@@ -2317,6 +2347,7 @@ NETLIST_START(TTL74XX_lib)
LOCAL_LIB_ENTRY(TTL_7485_DIP)
LOCAL_LIB_ENTRY(TTL_7486_DIP)
LOCAL_LIB_ENTRY(TTL_7490_DIP)
+ LOCAL_LIB_ENTRY(TTL_7492_DIP)
LOCAL_LIB_ENTRY(TTL_74121_DIP)
LOCAL_LIB_ENTRY(TTL_74123_DIP)
LOCAL_LIB_ENTRY(TTL_9602_DIP)
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h
index bd1dbfc628b..103932da7bd 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.h
+++ b/src/lib/netlist/macro/nlm_ttl74xx.h
@@ -306,6 +306,9 @@
#define TTL_7490_DIP(name) \
NET_REGISTER_DEV(TTL_7490_DIP, name)
+#define TTL_7492_DIP(name) \
+ NET_REGISTER_DEV(TTL_7492_DIP, name)
+
#if (NL_USE_TRUTHTABLE_74107)
#define TTL_74107(name, cCLK, cJ, cK, cCLRQ) \
NET_REGISTER_DEV(TTL_74107, name) \