netlist: Macro-ized 7490 DIP

This commit is contained in:
Aaron Giles 2020-08-01 17:52:40 -07:00 committed by couriersud
parent 5649ce186f
commit ca10c41883
6 changed files with 41 additions and 46 deletions

View File

@ -82,7 +82,6 @@ namespace devices
LIB_ENTRY(7483)
LIB_ENTRY(7485)
LIB_ENTRY(7490)
LIB_ENTRY(7490_dip)
LIB_ENTRY(7492)
LIB_ENTRY(7492_dip)
LIB_ENTRY(7493)

View File

@ -95,35 +95,7 @@ namespace devices
nld_power_pins m_power_pins;
};
NETLIB_OBJECT(7490_dip)
{
NETLIB_CONSTRUCTOR(7490_dip)
, A(*this, "A")
{
register_subalias("1", "A.B");
register_subalias("2", "A.R1");
register_subalias("3", "A.R2");
// register_subalias("4", ); --> NC
register_subalias("5", "A.VCC");
register_subalias("6", "A.R91");
register_subalias("7", "A.R92");
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(7490) A;
};
NETLIB_DEVICE_IMPL(7490, "TTL_7490", "+A,+B,+R1,+R2,+R91,+R92,@VCC,@GND")
NETLIB_DEVICE_IMPL(7490_dip, "TTL_7490_DIP", "")
} // namespace devices
} // namespace netlist

View File

@ -57,18 +57,8 @@
#include "netlist/nl_setup.h"
#define TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92) \
NET_REGISTER_DEV(TTL_7490, 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) \
NET_CONNECT(name, R91, cR91) \
NET_CONNECT(name, R92, cR92)
#define TTL_7490_DIP(name) \
NET_REGISTER_DEV(TTL_7490_DIP, name)
// usage: TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)
#define TTL_7490(...) \
NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
#endif /* NLD_7490_H_ */

View File

@ -312,10 +312,6 @@
#define TTL_7490(...) \
NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
// usage : TTL_7490_DIP(name)
#define TTL_7490_DIP(...) \
NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: src/lib/netlist/devices/nld_7492.cpp
// ---------------------------------------------------------------------
@ -1031,6 +1027,10 @@
#define TTL_7486_GATE(...) \
NET_REGISTER_DEVEXT(TTL_7486_GATE, __VA_ARGS__)
// usage : TTL_7490_DIP(name)
#define TTL_7490_DIP(...) \
NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
// usage : TTL_7486_XOR(name, pA, pB)
// auto connect: VCC, GND
#define TTL_7486_XOR(...) \

View File

@ -972,6 +972,36 @@ static NETLIST_START(TTL_7486_DIP)
)
NETLIST_END()
/*
* DM7490: Decade Counters
*
* +--------------+
* B |1 ++ 14| A
* R01 |2 13| NC
* R02 |3 12| QA
* NC |4 7490 11| QD
* VCC |5 10| GND
* R91 |6 9| QB
* R92 |7 8| QC
* +--------------+
*/
static NETLIST_START(TTL_7490_DIP)
TTL_7490(A)
NC_PIN(NC)
DIPPINS( /* +--------------+ */
A.B, /* B |1 ++ 14| A */ A.A,
A.R1, /* R1 |2 13| NC */ NC.I,
A.R2, /* R2 |3 12| QA */ A.QA,
NC.I, /* NC |4 7490 11| QD */ A.QD,
A.VCC, /* VCC |5 10| GND */ A.GND,
A.R91, /* R91 |6 9| QB */ A.QB,
A.R92, /* R92 |7 8| QC */ A.QC
/* +--------------+ */
)
NETLIST_END()
#if (NL_USE_TRUTHTABLE_74107)
#ifndef __PLIB_PREPROCESSOR__
#define TTL_74107_TT(name) \
@ -2286,6 +2316,7 @@ NETLIST_START(TTL74XX_lib)
LOCAL_LIB_ENTRY(TTL_7483_DIP)
LOCAL_LIB_ENTRY(TTL_7485_DIP)
LOCAL_LIB_ENTRY(TTL_7486_DIP)
LOCAL_LIB_ENTRY(TTL_7490_DIP)
LOCAL_LIB_ENTRY(TTL_74121_DIP)
LOCAL_LIB_ENTRY(TTL_74123_DIP)
LOCAL_LIB_ENTRY(TTL_9602_DIP)

View File

@ -303,6 +303,9 @@
#define TTL_7486_DIP(name) \
NET_REGISTER_DEV(TTL_7486_DIP, name)
#define TTL_7490_DIP(name) \
NET_REGISTER_DEV(TTL_7490_DIP, name)
#if (NL_USE_TRUTHTABLE_74107)
#define TTL_74107(name, cCLK, cJ, cK, cCLRQ) \
NET_REGISTER_DEV(TTL_74107, name) \