diff options
| author | 2020-08-02 01:13:13 -0700 | |
|---|---|---|
| committer | 2020-08-02 12:41:25 +0200 | |
| commit | f40b7e48f1335c704723438d5999b251b9bed4ea (patch) | |
| tree | 279b7d2ac44aee078816aa6139a7f149d21c42d1 | |
| parent | 8fff0b57ab9ea05c2ad303845bac957e3c7c473f (diff) | |
netlist: Macro-ized 74164 DIPs
| -rw-r--r-- | src/lib/netlist/devices/net_lib.cpp | 1 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_74164.cpp | 27 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_74164.h | 14 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_devinc.h | 8 | ||||
| -rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.cpp | 30 | ||||
| -rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.h | 3 |
6 files changed, 40 insertions, 43 deletions
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp index ced23e1c4cd..aa1f40de6b4 100644 --- a/src/lib/netlist/devices/net_lib.cpp +++ b/src/lib/netlist/devices/net_lib.cpp @@ -100,7 +100,6 @@ namespace devices LIB_ENTRY(74161_fixme) LIB_ENTRY(74163) LIB_ENTRY(74164) - LIB_ENTRY(74164_dip) LIB_ENTRY(74165) LIB_ENTRY(74165_dip) LIB_ENTRY(74166) diff --git a/src/lib/netlist/devices/nld_74164.cpp b/src/lib/netlist/devices/nld_74164.cpp index 8bbff391157..05aab8b5ccd 100644 --- a/src/lib/netlist/devices/nld_74164.cpp +++ b/src/lib/netlist/devices/nld_74164.cpp @@ -78,34 +78,7 @@ namespace netlist nld_power_pins m_power_pins; }; - NETLIB_OBJECT(74164_dip) - { - NETLIB_CONSTRUCTOR(74164_dip) - , A(*this, "A") - { - register_subalias("1", A.m_AB[0]); - register_subalias("2", A.m_AB[1]); - register_subalias("3", A.m_Q[0]); - register_subalias("4", A.m_Q[1]); - register_subalias("5", A.m_Q[2]); - register_subalias("6", A.m_Q[3]); - register_subalias("7", "A.GND"); - - register_subalias("8", A.m_CLK); - register_subalias("9", A.m_CLRQ); - register_subalias("10", A.m_Q[4]); - register_subalias("11", A.m_Q[5]); - register_subalias("12", A.m_Q[6]); - register_subalias("13", A.m_Q[7]); - register_subalias("14", "A.VCC"); - } - private: - NETLIB_SUB(74164) A; - }; - - NETLIB_DEVICE_IMPL(74164, "TTL_74164", "+A,+B,+CLRQ,+CLK,@VCC,@GND") - NETLIB_DEVICE_IMPL(74164_dip, "TTL_74164_DIP", "") } //namespace devices } // namespace netlist diff --git a/src/lib/netlist/devices/nld_74164.h b/src/lib/netlist/devices/nld_74164.h index 2efe339df2b..f4da1568a85 100644 --- a/src/lib/netlist/devices/nld_74164.h +++ b/src/lib/netlist/devices/nld_74164.h @@ -44,16 +44,8 @@ #include "netlist/nl_setup.h" -#define TTL_74164(name, cA, cB, cCLRQ, cCLK) \ - NET_REGISTER_DEV(TTL_74164, name) \ - NET_CONNECT(name, GND, GND) \ - NET_CONNECT(name, VCC, VCC) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, CLRQ, cCLRQ) \ - NET_CONNECT(name, CLK, cCLK) - -#define TTL_74164_DIP(name) \ - NET_REGISTER_DEV(TTL_74164_DIP, name) +// usage: TTL_74164(name, cA, cB, cCLRQ, cCLK) +#define TTL_74164(...) \ + NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__) #endif /* NLD_74164_H_ */ diff --git a/src/lib/netlist/devices/nld_devinc.h b/src/lib/netlist/devices/nld_devinc.h index ec006f08ce4..5d05a8ea021 100644 --- a/src/lib/netlist/devices/nld_devinc.h +++ b/src/lib/netlist/devices/nld_devinc.h @@ -421,10 +421,6 @@ #define TTL_74164(...) \ NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__) -// usage : TTL_74164_DIP(name) -#define TTL_74164_DIP(...) \ - NET_REGISTER_DEVEXT(TTL_74164_DIP, __VA_ARGS__) - // --------------------------------------------------------------------- // Source: src/lib/netlist/devices/nld_74165.cpp // --------------------------------------------------------------------- @@ -1035,6 +1031,10 @@ #define TTL_74163_DIP(...) \ NET_REGISTER_DEVEXT(TTL_74163_DIP, __VA_ARGS__) +// usage : TTL_74164_DIP(name) +#define TTL_74164_DIP(...) \ + NET_REGISTER_DEVEXT(TTL_74164_DIP, __VA_ARGS__) + // usage : TTL_74260_GATE(name) #define TTL_74260_GATE(...) \ NET_REGISTER_DEVEXT(TTL_74260_GATE, __VA_ARGS__) diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index b8b659862a8..763e6676c3f 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -1673,6 +1673,35 @@ static NETLIST_START(TTL_74163_DIP) NETLIST_END() /* + * DM74164: 8-bit parallel-out serial shift registers + * + * +------------+ + * A |1 ++ 14| VCC + * B |2 13| QH + * QA |3 12| QG + * QB |4 74164 11| QF + * QC |5 10| QE + * QD |6 9| CLRQ + * GND |7 8| CLK + * +------------+ + */ + +static NETLIST_START(TTL_74164_DIP) + TTL_74164(A) + + DIPPINS( /* +------------+ */ + A.A, /* A |1 ++ 14| VCC */ A.VCC, + A.B, /* B |2 13| QH */ A.QH, + A.QA, /* QA |3 12| QG */ A.QG, + A.QB, /* QB |4 74164 11| QF */ A.QF, + A.QC, /* QC |5 10| QE */ A.QE, + A.QD, /* QD |6 9| CLRQ */ A.CLRQ, + A.GND, /* GND |7 8| CLK */ A.CLK + /* +------------+ */ + ) +NETLIST_END() + +/* * DM74260: Dual 5-Input NOR Gates * _________ * Y = A+B+C+D+E @@ -2683,6 +2712,7 @@ NETLIST_START(TTL74XX_lib) LOCAL_LIB_ENTRY(TTL_74157_DIP) LOCAL_LIB_ENTRY(TTL_74161_DIP) LOCAL_LIB_ENTRY(TTL_74163_DIP) + LOCAL_LIB_ENTRY(TTL_74164_DIP) LOCAL_LIB_ENTRY(TTL_74260_DIP) LOCAL_LIB_ENTRY(TTL_74279_DIP) LOCAL_LIB_ENTRY(TTL_74377_DIP) diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h index 7cbba50938a..d9eed7435df 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.h +++ b/src/lib/netlist/macro/nlm_ttl74xx.h @@ -363,6 +363,9 @@ #define TTL_74163_DIP(name) \ NET_REGISTER_DEV(TTL_74163_DIP, name) +#define TTL_74164_DIP(name) \ + NET_REGISTER_DEV(TTL_74164_DIP, name) + #define TTL_74260_GATE(name) \ NET_REGISTER_DEV(TTL_74260_GATE, name) |
