summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/netlist/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/netlist/devices')
-rw-r--r--src/emu/netlist/devices/net_lib.c86
-rw-r--r--src/emu/netlist/devices/nld_4066.c90
-rw-r--r--src/emu/netlist/devices/nld_4066.h18
-rw-r--r--src/emu/netlist/devices/nld_7400.c59
-rw-r--r--src/emu/netlist/devices/nld_7400.h2
-rw-r--r--src/emu/netlist/devices/nld_7402.c59
-rw-r--r--src/emu/netlist/devices/nld_7402.h10
-rw-r--r--src/emu/netlist/devices/nld_7404.c62
-rw-r--r--src/emu/netlist/devices/nld_7404.h14
-rw-r--r--src/emu/netlist/devices/nld_7410.c51
-rw-r--r--src/emu/netlist/devices/nld_7410.h8
-rw-r--r--src/emu/netlist/devices/nld_74107.c56
-rw-r--r--src/emu/netlist/devices/nld_74107.h6
-rw-r--r--src/emu/netlist/devices/nld_74153.c93
-rw-r--r--src/emu/netlist/devices/nld_74153.h20
-rw-r--r--src/emu/netlist/devices/nld_7420.c35
-rw-r--r--src/emu/netlist/devices/nld_7420.h6
-rw-r--r--src/emu/netlist/devices/nld_7425.c39
-rw-r--r--src/emu/netlist/devices/nld_7425.h6
-rw-r--r--src/emu/netlist/devices/nld_7427.c51
-rw-r--r--src/emu/netlist/devices/nld_7427.h8
-rw-r--r--src/emu/netlist/devices/nld_7430.c27
-rw-r--r--src/emu/netlist/devices/nld_7430.h4
-rw-r--r--src/emu/netlist/devices/nld_7448.c225
-rw-r--r--src/emu/netlist/devices/nld_7448.h54
-rw-r--r--src/emu/netlist/devices/nld_7450.c107
-rw-r--r--src/emu/netlist/devices/nld_7450.h22
-rw-r--r--src/emu/netlist/devices/nld_7474.c66
-rw-r--r--src/emu/netlist/devices/nld_7474.h6
-rw-r--r--src/emu/netlist/devices/nld_7483.c40
-rw-r--r--src/emu/netlist/devices/nld_7483.h2
-rw-r--r--src/emu/netlist/devices/nld_7486.c51
-rw-r--r--src/emu/netlist/devices/nld_7486.h10
-rw-r--r--src/emu/netlist/devices/nld_7490.c69
-rw-r--r--src/emu/netlist/devices/nld_7490.h6
-rw-r--r--src/emu/netlist/devices/nld_7493.c58
-rw-r--r--src/emu/netlist/devices/nld_7493.h2
-rw-r--r--src/emu/netlist/devices/nld_74ls629.c194
-rw-r--r--src/emu/netlist/devices/nld_74ls629.h26
-rw-r--r--src/emu/netlist/devices/nld_9316.c93
-rw-r--r--src/emu/netlist/devices/nld_9316.h14
-rw-r--r--src/emu/netlist/devices/nld_legacy.c4
-rw-r--r--src/emu/netlist/devices/nld_ne555.c40
-rw-r--r--src/emu/netlist/devices/nld_ne555.h2
-rw-r--r--src/emu/netlist/devices/nld_signal.h172
-rw-r--r--src/emu/netlist/devices/nld_system.c10
-rw-r--r--src/emu/netlist/devices/nld_system.h256
47 files changed, 1163 insertions, 1176 deletions
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index ecc27fc13ab..7834386df31 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -51,15 +51,15 @@
#include "nld_system.h"
NETLIST_START(diode_models)
- NET_MODEL(".model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
- NET_MODEL(".model 1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
+ NET_MODEL(".model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
+ NET_MODEL(".model 1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
NETLIST_END()
NETLIST_START(bjt_models)
- NET_MODEL(".MODEL BC237B NPN(IS=1.8E-14 ISE=5.0E-14 ISC=1.72E-13 XTI=3 BF=400 BR=35.5 IKF=0.14 IKR=0.03 XTB=1.5 VAF=80 VAR=12.5 VJE=0.58 VJC=0.54 RE=0.6 RC=0.25 RB=0.56 CJE=13E-12 CJC=4E-12 XCJC=0.75 FC=0.5 NF=0.9955 NR=1.005 NE=1.46 NC=1.27 MJE=0.33 MJC=0.33 TF=0.64E-9 TR=50.72E-9 EG=1.11 KF=0 AF=1 VCEO=45V ICRATING=100M MFG=ZETEX)")
- NET_MODEL(".model BC556B PNP(IS=3.83E-14 NF=1.008 ISE=1.22E-14 NE=1.528 BF=344.4 IKF=0.08039 VAF=21.11 NR=1.005 ISC=2.85E-13 NC=1.28 BR=14.84 IKR=0.047 VAR=32.02 RB=1 IRB=1.00E-06 RBM=1 RE=0.6202 RC=0.5713 XTB=0 EG=1.11 XTI=3 CJE=1.23E-11 VJE=0.6106 MJE=0.378 TF=5.60E-10 XTF=3.414 VTF=5.23 ITF=0.1483 PTF=0 CJC=1.08E-11 VJC=0.1022 MJC=0.3563 XCJC=0.6288 TR=1.00E-32 CJS=0 VJS=0.75 MJS=0.333 FC=0.8027 Vceo=65 Icrating=100m mfg=Philips)")
- NET_MODEL(".model 2SA1015 PNP(Is=295.1E-18 Xti=3 Eg=1.11 Vaf=100 Bf=110 Xtb=1.5 Br=10.45 Rc=15 Cjc=66.2p Mjc=1.054 Vjc=.75 Fc=.5 Cje=5p Mje=.3333 Vje=.75 Tr=10n Tf=1.661n VCEO=45V ICrating=150M MFG=Toshiba)")
- NET_MODEL(".model 2SC1815 NPN(Is=2.04f Xti=3 Eg=1.11 Vaf=6 Bf=400 Ikf=20m Xtb=1.5 Br=3.377 Rc=1 Cjc=1p Mjc=.3333 Vjc=.75 Fc=.5 Cje=25p Mje=.3333 Vje=.75 Tr=450n Tf=20n Itf=0 Vtf=0 Xtf=0 VCEO=45V ICrating=150M MFG=Toshiba)")
+ NET_MODEL(".MODEL BC237B NPN(IS=1.8E-14 ISE=5.0E-14 ISC=1.72E-13 XTI=3 BF=400 BR=35.5 IKF=0.14 IKR=0.03 XTB=1.5 VAF=80 VAR=12.5 VJE=0.58 VJC=0.54 RE=0.6 RC=0.25 RB=0.56 CJE=13E-12 CJC=4E-12 XCJC=0.75 FC=0.5 NF=0.9955 NR=1.005 NE=1.46 NC=1.27 MJE=0.33 MJC=0.33 TF=0.64E-9 TR=50.72E-9 EG=1.11 KF=0 AF=1 VCEO=45V ICRATING=100M MFG=ZETEX)")
+ NET_MODEL(".model BC556B PNP(IS=3.83E-14 NF=1.008 ISE=1.22E-14 NE=1.528 BF=344.4 IKF=0.08039 VAF=21.11 NR=1.005 ISC=2.85E-13 NC=1.28 BR=14.84 IKR=0.047 VAR=32.02 RB=1 IRB=1.00E-06 RBM=1 RE=0.6202 RC=0.5713 XTB=0 EG=1.11 XTI=3 CJE=1.23E-11 VJE=0.6106 MJE=0.378 TF=5.60E-10 XTF=3.414 VTF=5.23 ITF=0.1483 PTF=0 CJC=1.08E-11 VJC=0.1022 MJC=0.3563 XCJC=0.6288 TR=1.00E-32 CJS=0 VJS=0.75 MJS=0.333 FC=0.8027 Vceo=65 Icrating=100m mfg=Philips)")
+ NET_MODEL(".model 2SA1015 PNP(Is=295.1E-18 Xti=3 Eg=1.11 Vaf=100 Bf=110 Xtb=1.5 Br=10.45 Rc=15 Cjc=66.2p Mjc=1.054 Vjc=.75 Fc=.5 Cje=5p Mje=.3333 Vje=.75 Tr=10n Tf=1.661n VCEO=45V ICrating=150M MFG=Toshiba)")
+ NET_MODEL(".model 2SC1815 NPN(Is=2.04f Xti=3 Eg=1.11 Vaf=6 Bf=400 Ikf=20m Xtb=1.5 Br=3.377 Rc=1 Cjc=1p Mjc=.3333 Vjc=.75 Fc=.5 Cje=25p Mje=.3333 Vje=.75 Tr=450n Tf=20n Itf=0 Vtf=0 Xtf=0 VCEO=45V ICrating=150M MFG=Toshiba)")
NETLIST_END()
@@ -89,7 +89,7 @@ void netlist_factory_t::initialize()
ENTRY(D, DIODE, "model")
ENTRY(VCVS, VCVS, "-") // FIXME: STD parameters ?
ENTRY(VCCS, VCCS, "-")
- ENTRY(QBJT_EB, QBJT_EB, "model")
+ ENTRY(QBJT_EB, QBJT_EB, "model")
ENTRY(QBJT_switch, QBJT_SW, "model")
ENTRY(ttl_input, TTL_INPUT, "IN")
ENTRY(analog_input, ANALOG_INPUT, "IN")
@@ -98,7 +98,7 @@ void netlist_factory_t::initialize()
ENTRY(clock, CLOCK, "FREQ")
ENTRY(mainclock, MAINCLOCK, "FREQ")
ENTRY(solver, SOLVER, "FREQ")
- ENTRY(gnd, GND, "-")
+ ENTRY(gnd, GND, "-")
ENTRY(switch2, SWITCH2, "-")
ENTRY(nicRSFF, NETDEV_RSFF, "+S,R")
ENTRY(7400, TTL_7400_NAND, "+A,B")
@@ -119,30 +119,30 @@ void netlist_factory_t::initialize()
ENTRY(74107, TTL_74107, "+CLK,J,K,CLRQ")
ENTRY(74107A, TTL_74107A, "+CLK,J,K,CLRQ")
ENTRY(74153, TTL_74153, "+C0,C1,C2,C3,A,B,G")
- ENTRY(SN74LS629, SN74LS629, "CAP")
+ ENTRY(SN74LS629, SN74LS629, "CAP")
ENTRY(9316, TTL_9316, "+CLK,ENP,ENT,CLRQ,LOADQ,A,B,C,D")
ENTRY(NE555, NE555, "-")
- ENTRY(4066_dip, CD_4066_DIP, "-")
- ENTRY(7400_dip, TTL_7400_DIP, "-")
- ENTRY(7402_dip, TTL_7402_DIP, "-")
- ENTRY(7404_dip, TTL_7404_DIP, "-")
- ENTRY(7410_dip, TTL_7410_DIP, "-")
- ENTRY(7420_dip, TTL_7420_DIP, "-")
- ENTRY(7425_dip, TTL_7425_DIP, "-")
- ENTRY(7427_dip, TTL_7427_DIP, "-")
- ENTRY(7430_dip, TTL_7430_DIP, "-")
- ENTRY(7448_dip, TTL_7448_DIP, "-")
- ENTRY(7450_dip, TTL_7450_DIP, "-")
- ENTRY(7474_dip, TTL_7474_DIP, "-")
- ENTRY(7483_dip, TTL_7483_DIP, "-")
- ENTRY(7486_dip, TTL_7486_DIP, "-")
- ENTRY(7490_dip, TTL_7490_DIP, "-")
- ENTRY(7493_dip, TTL_7493_DIP, "-")
- ENTRY(74107_dip, TTL_74107_DIP, "-")
- ENTRY(74153_dip, TTL_74153_DIP, "-")
- ENTRY(9316_dip, TTL_9316_DIP, "-")
- ENTRY(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2")
- ENTRY(NE555_dip, NE555_DIP, "-")
+ ENTRY(4066_dip, CD_4066_DIP, "-")
+ ENTRY(7400_dip, TTL_7400_DIP, "-")
+ ENTRY(7402_dip, TTL_7402_DIP, "-")
+ ENTRY(7404_dip, TTL_7404_DIP, "-")
+ ENTRY(7410_dip, TTL_7410_DIP, "-")
+ ENTRY(7420_dip, TTL_7420_DIP, "-")
+ ENTRY(7425_dip, TTL_7425_DIP, "-")
+ ENTRY(7427_dip, TTL_7427_DIP, "-")
+ ENTRY(7430_dip, TTL_7430_DIP, "-")
+ ENTRY(7448_dip, TTL_7448_DIP, "-")
+ ENTRY(7450_dip, TTL_7450_DIP, "-")
+ ENTRY(7474_dip, TTL_7474_DIP, "-")
+ ENTRY(7483_dip, TTL_7483_DIP, "-")
+ ENTRY(7486_dip, TTL_7486_DIP, "-")
+ ENTRY(7490_dip, TTL_7490_DIP, "-")
+ ENTRY(7493_dip, TTL_7493_DIP, "-")
+ ENTRY(74107_dip, TTL_74107_DIP, "-")
+ ENTRY(74153_dip, TTL_74153_DIP, "-")
+ ENTRY(9316_dip, TTL_9316_DIP, "-")
+ ENTRY(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2")
+ ENTRY(NE555_dip, NE555_DIP, "-")
}
netlist_device_t *netlist_factory_t::new_device_by_classname(const pstring &classname, netlist_setup_t &setup) const
@@ -163,21 +163,21 @@ netlist_device_t *netlist_factory_t::new_device_by_classname(const pstring &clas
netlist_device_t *netlist_factory_t::new_device_by_name(const pstring &name, netlist_setup_t &setup) const
{
- net_device_t_base_factory *f = factory_by_name(name, setup);
- return f->Create();
+ net_device_t_base_factory *f = factory_by_name(name, setup);
+ return f->Create();
}
net_device_t_base_factory * netlist_factory_t::factory_by_name(const pstring &name, netlist_setup_t &setup) const
{
- for (net_device_t_base_factory * const *e = m_list.first(); e != NULL; e = m_list.next(e))
- {
- net_device_t_base_factory *p = *e;
- if (strcmp(p->name(), name) == 0)
- {
- return p;
- }
- p++;
- }
- setup.netlist().error("Class %s not found!\n", name.cstr());
- return NULL; // appease code analysis
+ for (net_device_t_base_factory * const *e = m_list.first(); e != NULL; e = m_list.next(e))
+ {
+ net_device_t_base_factory *p = *e;
+ if (strcmp(p->name(), name) == 0)
+ {
+ return p;
+ }
+ p++;
+ }
+ setup.netlist().error("Class %s not found!\n", name.cstr());
+ return NULL; // appease code analysis
}
diff --git a/src/emu/netlist/devices/nld_4066.c b/src/emu/netlist/devices/nld_4066.c
index 9a3b05f55cd..19f67543516 100644
--- a/src/emu/netlist/devices/nld_4066.c
+++ b/src/emu/netlist/devices/nld_4066.c
@@ -25,70 +25,70 @@ NETLIB_START(4066)
NETLIB_RESET(4066)
{
- m_R.do_reset();
+ m_R.do_reset();
}
NETLIB_UPDATE(4066)
{
- double sup = (m_supply->vdd() - m_supply->vss());
- double low = 0.45 * sup;
- double high = 0.55 * sup;
- double in = INPANALOG(m_control) - m_supply->vss();
- double rON = 270.0 * 5.0 / sup;
+ double sup = (m_supply->vdd() - m_supply->vss());
+ double low = 0.45 * sup;
+ double high = 0.55 * sup;
+ double in = INPANALOG(m_control) - m_supply->vss();
+ double rON = 270.0 * 5.0 / sup;
- if (in < low)
- {
- m_R.set_R(1.0 / netlist().gmin());
- m_R.update_dev();
- }
- else if (in > high)
- {
- m_R.set_R(rON);
- m_R.update_dev();
- }
+ if (in < low)
+ {
+ m_R.set_R(1.0 / netlist().gmin());
+ m_R.update_dev();
+ }
+ else if (in > high)
+ {
+ m_R.set_R(rON);
+ m_R.update_dev();
+ }
}
NETLIB_START(4066_dip)
{
- register_sub(m_supply, "supply");
- m_A.m_supply = m_B.m_supply = m_C.m_supply = m_D.m_supply = &m_supply;
- register_sub(m_A, "A");
- register_sub(m_B, "B");
- register_sub(m_C, "C");
- register_sub(m_D, "D");
+ register_sub(m_supply, "supply");
+ m_A.m_supply = m_B.m_supply = m_C.m_supply = m_D.m_supply = &m_supply;
+ register_sub(m_A, "A");
+ register_sub(m_B, "B");
+ register_sub(m_C, "C");
+ register_sub(m_D, "D");
- register_subalias("1", m_A.m_R.m_P);
- register_subalias("2", m_A.m_R.m_N);
- register_subalias("3", m_B.m_R.m_P);
- register_subalias("4", m_B.m_R.m_N);
- register_subalias("5", m_B.m_control);
- register_subalias("6", m_C.m_control);
- register_input("7", m_supply.m_vss);
+ register_subalias("1", m_A.m_R.m_P);
+ register_subalias("2", m_A.m_R.m_N);
+ register_subalias("3", m_B.m_R.m_P);
+ register_subalias("4", m_B.m_R.m_N);
+ register_subalias("5", m_B.m_control);
+ register_subalias("6", m_C.m_control);
+ register_input("7", m_supply.m_vss);
- register_subalias("8", m_C.m_R.m_P);
- register_subalias("9", m_C.m_R.m_N);
- register_subalias("10", m_D.m_R.m_P);
- register_subalias("11", m_D.m_R.m_N);
- register_subalias("12", m_D.m_control);
- register_subalias("13", m_A.m_control);
- register_input("14", m_supply.m_vdd);
+ register_subalias("8", m_C.m_R.m_P);
+ register_subalias("9", m_C.m_R.m_N);
+ register_subalias("10", m_D.m_R.m_P);
+ register_subalias("11", m_D.m_R.m_N);
+ register_subalias("12", m_D.m_control);
+ register_subalias("13", m_A.m_control);
+ register_input("14", m_supply.m_vdd);
}
NETLIB_RESET(4066_dip)
{
- m_A.do_reset();
- m_B.do_reset();
- m_C.do_reset();
- m_D.do_reset();
+ m_A.do_reset();
+ m_B.do_reset();
+ m_C.do_reset();
+ m_D.do_reset();
}
NETLIB_UPDATE(4066_dip)
{
- /* only called during startup */
- m_A.update_dev();
- m_B.update_dev();
- m_C.update_dev();
- m_D.update_dev();
+ /* only called during startup */
+ m_A.update_dev();
+ m_B.update_dev();
+ m_C.update_dev();
+ m_D.update_dev();
}
diff --git a/src/emu/netlist/devices/nld_4066.h b/src/emu/netlist/devices/nld_4066.h
index a2bfff2c3c6..ddd12ef0a50 100644
--- a/src/emu/netlist/devices/nld_4066.h
+++ b/src/emu/netlist/devices/nld_4066.h
@@ -28,15 +28,15 @@
#include "../analog/nld_twoterm.h"
#define CD_4066_DIP(_name) \
- NET_REGISTER_DEV(4066_dip, _name)
+ NET_REGISTER_DEV(4066_dip, _name)
NETLIB_SUBDEVICE(vdd_vss,
netlist_analog_input_t m_vdd;
- netlist_analog_input_t m_vss;
+ netlist_analog_input_t m_vss;
public:
- ATTR_HOT inline double vdd() { return INPANALOG(m_vdd); }
- ATTR_HOT inline double vss() { return INPANALOG(m_vss); }
+ ATTR_HOT inline double vdd() { return INPANALOG(m_vdd); }
+ ATTR_HOT inline double vss() { return INPANALOG(m_vss); }
);
NETLIB_SUBDEVICE(4066,
@@ -50,11 +50,11 @@ public:
NETLIB_DEVICE(4066_dip,
- NETLIB_NAME(4066) m_A;
- NETLIB_NAME(4066) m_B;
- NETLIB_NAME(4066) m_C;
- NETLIB_NAME(4066) m_D;
- NETLIB_NAME(vdd_vss) m_supply;
+ NETLIB_NAME(4066) m_A;
+ NETLIB_NAME(4066) m_B;
+ NETLIB_NAME(4066) m_C;
+ NETLIB_NAME(4066) m_D;
+ NETLIB_NAME(vdd_vss) m_supply;
);
#endif /* NLD_4066_H_ */
diff --git a/src/emu/netlist/devices/nld_7400.c b/src/emu/netlist/devices/nld_7400.c
index e4a3731cd49..e6025c3bdcb 100644
--- a/src/emu/netlist/devices/nld_7400.c
+++ b/src/emu/netlist/devices/nld_7400.c
@@ -7,42 +7,41 @@
NETLIB_START(7400_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
- register_sub(m_3, "3");
- register_sub(m_4, "4");
-
- register_subalias("1", m_1.m_i[0]);
- register_subalias("2", m_1.m_i[1]);
- register_subalias("3", m_1.m_Q);
-
- register_subalias("4", m_2.m_i[0]);
- register_subalias("5", m_2.m_i[1]);
- register_subalias("6", m_2.m_Q);
-
- register_subalias("9", m_3.m_i[0]);
- register_subalias("10", m_3.m_i[1]);
- register_subalias("8", m_3.m_Q);
-
- register_subalias("12", m_4.m_i[0]);
- register_subalias("13", m_4.m_i[1]);
- register_subalias("11", m_4.m_Q);
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+ register_sub(m_3, "3");
+ register_sub(m_4, "4");
+
+ register_subalias("1", m_1.m_i[0]);
+ register_subalias("2", m_1.m_i[1]);
+ register_subalias("3", m_1.m_Q);
+
+ register_subalias("4", m_2.m_i[0]);
+ register_subalias("5", m_2.m_i[1]);
+ register_subalias("6", m_2.m_Q);
+
+ register_subalias("9", m_3.m_i[0]);
+ register_subalias("10", m_3.m_i[1]);
+ register_subalias("8", m_3.m_Q);
+
+ register_subalias("12", m_4.m_i[0]);
+ register_subalias("13", m_4.m_i[1]);
+ register_subalias("11", m_4.m_Q);
}
NETLIB_UPDATE(7400_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
- m_3.update_dev();
- m_4.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
+ m_3.update_dev();
+ m_4.update_dev();
}
NETLIB_RESET(7400_dip)
{
- m_1.do_reset();
- m_2.do_reset();
- m_3.do_reset();
- m_4.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
+ m_3.do_reset();
+ m_4.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7400.h b/src/emu/netlist/devices/nld_7400.h
index e5b356eecb2..3e30bba7c58 100644
--- a/src/emu/netlist/devices/nld_7400.h
+++ b/src/emu/netlist/devices/nld_7400.h
@@ -42,7 +42,7 @@
NETLIB_SIGNAL(7400, 2, 0, 0);
#define TTL_7400_DIP(_name) \
- NET_REGISTER_DEV(7400_dip, _name)
+ NET_REGISTER_DEV(7400_dip, _name)
NETLIB_DEVICE(7400_dip,
diff --git a/src/emu/netlist/devices/nld_7402.c b/src/emu/netlist/devices/nld_7402.c
index cf744f70ba2..3a01e083336 100644
--- a/src/emu/netlist/devices/nld_7402.c
+++ b/src/emu/netlist/devices/nld_7402.c
@@ -7,42 +7,41 @@
NETLIB_START(7402_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
- register_sub(m_3, "3");
- register_sub(m_4, "4");
-
- register_subalias("1", m_1.m_Q);
- register_subalias("2", m_1.m_i[0]);
- register_subalias("3", m_1.m_i[1]);
-
- register_subalias("4", m_2.m_Q);
- register_subalias("5", m_2.m_i[0]);
- register_subalias("6", m_2.m_i[1]);
-
- register_subalias("8", m_3.m_i[0]);
- register_subalias("9", m_3.m_i[1]);
- register_subalias("10", m_3.m_Q);
-
- register_subalias("11", m_4.m_i[0]);
- register_subalias("12", m_4.m_i[1]);
- register_subalias("13", m_4.m_Q);
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+ register_sub(m_3, "3");
+ register_sub(m_4, "4");
+
+ register_subalias("1", m_1.m_Q);
+ register_subalias("2", m_1.m_i[0]);
+ register_subalias("3", m_1.m_i[1]);
+
+ register_subalias("4", m_2.m_Q);
+ register_subalias("5", m_2.m_i[0]);
+ register_subalias("6", m_2.m_i[1]);
+
+ register_subalias("8", m_3.m_i[0]);
+ register_subalias("9", m_3.m_i[1]);
+ register_subalias("10", m_3.m_Q);
+
+ register_subalias("11", m_4.m_i[0]);
+ register_subalias("12", m_4.m_i[1]);
+ register_subalias("13", m_4.m_Q);
}
NETLIB_UPDATE(7402_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
- m_3.update_dev();
- m_4.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
+ m_3.update_dev();
+ m_4.update_dev();
}
NETLIB_RESET(7402_dip)
{
- m_1.do_reset();
- m_2.do_reset();
- m_3.do_reset();
- m_4.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
+ m_3.do_reset();
+ m_4.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7402.h b/src/emu/netlist/devices/nld_7402.h
index 4f050514633..c8e45c7f59b 100644
--- a/src/emu/netlist/devices/nld_7402.h
+++ b/src/emu/netlist/devices/nld_7402.h
@@ -40,17 +40,17 @@
NET_CONNECT(_name, B, _I2)
#define TTL_7402_DIP(_name) \
- NET_REGISTER_DEV(7402_dip, _name)
+ NET_REGISTER_DEV(7402_dip, _name)
NETLIB_SIGNAL(7402, 2, 1, 0);
NETLIB_DEVICE(7402_dip,
- NETLIB_NAME(7402) m_1;
- NETLIB_NAME(7402) m_2;
- NETLIB_NAME(7402) m_3;
- NETLIB_NAME(7402) m_4;
+ NETLIB_NAME(7402) m_1;
+ NETLIB_NAME(7402) m_2;
+ NETLIB_NAME(7402) m_3;
+ NETLIB_NAME(7402) m_4;
);
#endif /* NLD_7402_H_ */
diff --git a/src/emu/netlist/devices/nld_7404.c b/src/emu/netlist/devices/nld_7404.c
index 99591d961f8..e0f1dd59e19 100644
--- a/src/emu/netlist/devices/nld_7404.c
+++ b/src/emu/netlist/devices/nld_7404.c
@@ -24,50 +24,50 @@ NETLIB_UPDATE(7404)
NETLIB_START(7404_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
- register_sub(m_3, "3");
- register_sub(m_4, "4");
- register_sub(m_5, "5");
- register_sub(m_6, "6");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+ register_sub(m_3, "3");
+ register_sub(m_4, "4");
+ register_sub(m_5, "5");
+ register_sub(m_6, "6");
- register_subalias("1", m_1.m_I);
- register_subalias("2", m_1.m_Q);
+ register_subalias("1", m_1.m_I);
+ register_subalias("2", m_1.m_Q);
- register_subalias("3", m_2.m_I);
- register_subalias("4", m_2.m_Q);
+ register_subalias("3", m_2.m_I);
+ register_subalias("4", m_2.m_Q);
- register_subalias("5", m_3.m_I);
- register_subalias("6", m_3.m_Q);
+ register_subalias("5", m_3.m_I);
+ register_subalias("6", m_3.m_Q);
- register_subalias("8", m_4.m_Q);
- register_subalias("9", m_4.m_I);
+ register_subalias("8", m_4.m_Q);
+ register_subalias("9", m_4.m_I);
- register_subalias("10", m_5.m_Q);
- register_subalias("11", m_5.m_I);
+ register_subalias("10", m_5.m_Q);
+ register_subalias("11", m_5.m_I);
- register_subalias("12", m_6.m_Q);
- register_subalias("13", m_6.m_I);
+ register_subalias("12", m_6.m_Q);
+ register_subalias("13", m_6.m_I);
}
NETLIB_UPDATE(7404_dip)
{
- /* only called during startup */
+ /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
- m_3.update_dev();
- m_4.update_dev();
- m_5.update_dev();
- m_6.update_dev();
+ m_1.update_dev();
+ m_2.update_dev();
+ m_3.update_dev();
+ m_4.update_dev();
+ m_5.update_dev();
+ m_6.update_dev();
}
NETLIB_RESET(7404_dip)
{
- m_1.do_reset();
- m_2.do_reset();
- m_3.do_reset();
- m_4.do_reset();
- m_5.do_reset();
- m_6.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
+ m_3.do_reset();
+ m_4.do_reset();
+ m_5.do_reset();
+ m_6.do_reset();
}
diff --git a/src/emu/netlist/devices/nld_7404.h b/src/emu/netlist/devices/nld_7404.h
index 88151503f8a..f96eb355251 100644
--- a/src/emu/netlist/devices/nld_7404.h
+++ b/src/emu/netlist/devices/nld_7404.h
@@ -43,15 +43,15 @@ public:
NET_CONNECT(_name, A, _A)
#define TTL_7404_DIP(_name) \
- NET_REGISTER_DEV(7402_dip, _name)
+ NET_REGISTER_DEV(7402_dip, _name)
NETLIB_DEVICE(7404_dip,
- NETLIB_NAME(7404) m_1;
- NETLIB_NAME(7404) m_2;
- NETLIB_NAME(7404) m_3;
- NETLIB_NAME(7404) m_4;
- NETLIB_NAME(7404) m_5;
- NETLIB_NAME(7404) m_6;
+ NETLIB_NAME(7404) m_1;
+ NETLIB_NAME(7404) m_2;
+ NETLIB_NAME(7404) m_3;
+ NETLIB_NAME(7404) m_4;
+ NETLIB_NAME(7404) m_5;
+ NETLIB_NAME(7404) m_6;
);
#endif /* NLD_7404_H_ */
diff --git a/src/emu/netlist/devices/nld_7410.c b/src/emu/netlist/devices/nld_7410.c
index 933a2b0fb07..95f477a2b4a 100644
--- a/src/emu/netlist/devices/nld_7410.c
+++ b/src/emu/netlist/devices/nld_7410.c
@@ -7,38 +7,37 @@
NETLIB_START(7410_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
- register_sub(m_3, "3");
-
- register_subalias("1", m_1.m_i[0]);
- register_subalias("2", m_1.m_i[1]);
- register_subalias("3", m_2.m_i[0]);
- register_subalias("4", m_2.m_i[1]);
- register_subalias("5", m_2.m_i[2]);
- register_subalias("6", m_2.m_Q);
-
- register_subalias("8", m_3.m_Q);
- register_subalias("9", m_3.m_i[0]);
- register_subalias("10", m_3.m_i[1]);
- register_subalias("11", m_3.m_i[2]);
-
- register_subalias("12", m_1.m_Q);
- register_subalias("13", m_1.m_i[2]);
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+ register_sub(m_3, "3");
+
+ register_subalias("1", m_1.m_i[0]);
+ register_subalias("2", m_1.m_i[1]);
+ register_subalias("3", m_2.m_i[0]);
+ register_subalias("4", m_2.m_i[1]);
+ register_subalias("5", m_2.m_i[2]);
+ register_subalias("6", m_2.m_Q);
+
+ register_subalias("8", m_3.m_Q);
+ register_subalias("9", m_3.m_i[0]);
+ register_subalias("10", m_3.m_i[1]);
+ register_subalias("11", m_3.m_i[2]);
+
+ register_subalias("12", m_1.m_Q);
+ register_subalias("13", m_1.m_i[2]);
}
NETLIB_UPDATE(7410_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
- m_3.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
+ m_3.update_dev();
}
NETLIB_RESET(7410_dip)
{
- m_1.do_reset();
- m_2.do_reset();
- m_3.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
+ m_3.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7410.h b/src/emu/netlist/devices/nld_7410.h
index 098ca903fff..82c6c194476 100644
--- a/src/emu/netlist/devices/nld_7410.h
+++ b/src/emu/netlist/devices/nld_7410.h
@@ -43,13 +43,13 @@
NETLIB_SIGNAL(7410, 3, 0, 0);
#define TTL_7410_DIP(_name) \
- NET_REGISTER_DEV(7410_dip, _name)
+ NET_REGISTER_DEV(7410_dip, _name)
NETLIB_DEVICE(7410_dip,
- NETLIB_NAME(7410) m_1;
- NETLIB_NAME(7410) m_2;
- NETLIB_NAME(7410) m_3;
+ NETLIB_NAME(7410) m_1;
+ NETLIB_NAME(7410) m_2;
+ NETLIB_NAME(7410) m_3;
);
#endif /* NLD_7410_H_ */
diff --git a/src/emu/netlist/devices/nld_74107.c b/src/emu/netlist/devices/nld_74107.c
index 7480b9fcd74..b679b2125d7 100644
--- a/src/emu/netlist/devices/nld_74107.c
+++ b/src/emu/netlist/devices/nld_74107.c
@@ -18,13 +18,13 @@ NETLIB_START(74107Asub)
NETLIB_RESET(74107Asub)
{
- m_clk.set_state(netlist_input_t::STATE_INP_HL);
- m_Q.initial(0);
- m_QQ.initial(1);
+ m_clk.set_state(netlist_input_t::STATE_INP_HL);
+ m_Q.initial(0);
+ m_QQ.initial(1);
- m_Q1 = 0;
- m_Q2 = 0;
- m_F = 0;
+ m_Q1 = 0;
+ m_Q2 = 0;
+ m_F = 0;
}
NETLIB_START(74107A)
@@ -42,7 +42,7 @@ NETLIB_START(74107A)
NETLIB_RESET(74107A)
{
- sub.reset();
+ sub.reset();
}
ATTR_HOT inline void NETLIB_NAME(74107Asub)::newstate(const netlist_sig_t state)
@@ -103,39 +103,39 @@ NETLIB_UPDATE(74107A)
NETLIB_START(74107_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
- register_subalias("1", m_1.m_J);
- register_subalias("2", m_1.sub.m_QQ);
- register_subalias("3", m_1.sub.m_Q);
+ register_subalias("1", m_1.m_J);
+ register_subalias("2", m_1.sub.m_QQ);
+ register_subalias("3", m_1.sub.m_Q);
- register_subalias("4", m_1.m_K);
- register_subalias("5", m_2.sub.m_Q);
- register_subalias("6", m_2.sub.m_QQ);
+ register_subalias("4", m_1.m_K);
+ register_subalias("5", m_2.sub.m_Q);
+ register_subalias("6", m_2.sub.m_QQ);
- // register_subalias("7", ); ==> GND
+ // register_subalias("7", ); ==> GND
- register_subalias("8", m_2.m_J);
- register_subalias("9", m_2.sub.m_clk);
- register_subalias("10", m_2.m_clrQ);
+ register_subalias("8", m_2.m_J);
+ register_subalias("9", m_2.sub.m_clk);
+ register_subalias("10", m_2.m_clrQ);
- register_subalias("11", m_2.m_K);
- register_subalias("12", m_1.sub.m_clk);
- register_subalias("13", m_1.m_clrQ);
+ register_subalias("11", m_2.m_K);
+ register_subalias("12", m_1.sub.m_clk);
+ register_subalias("13", m_1.m_clrQ);
- // register_subalias("14", ); ==> VCC
+ // register_subalias("14", ); ==> VCC
}
NETLIB_RESET(74107_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
NETLIB_UPDATE(74107_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
}
diff --git a/src/emu/netlist/devices/nld_74107.h b/src/emu/netlist/devices/nld_74107.h
index 44b0b766372..150516a00c3 100644
--- a/src/emu/netlist/devices/nld_74107.h
+++ b/src/emu/netlist/devices/nld_74107.h
@@ -72,7 +72,7 @@
TTL_74107A(_name, _CLK, _J, _K, _CLRQ)
#define TTL_74107_DIP(_name) \
- NET_REGISTER_DEV(74107_dip, _name)
+ NET_REGISTER_DEV(74107_dip, _name)
NETLIB_SUBDEVICE(74107Asub,
netlist_ttl_input_t m_clk;
@@ -108,8 +108,8 @@ public:
NETLIB_DEVICE(74107_dip,
- NETLIB_NAME(74107) m_1;
- NETLIB_NAME(74107) m_2;
+ NETLIB_NAME(74107) m_1;
+ NETLIB_NAME(74107) m_2;
);
#endif /* NLD_74107_H_ */
diff --git a/src/emu/netlist/devices/nld_74153.c b/src/emu/netlist/devices/nld_74153.c
index f8e16408009..94c51fa85a8 100644
--- a/src/emu/netlist/devices/nld_74153.c
+++ b/src/emu/netlist/devices/nld_74153.c
@@ -12,42 +12,42 @@
NETLIB_START(74153sub)
{
- register_input("C0", m_C[0]);
- register_input("C1", m_C[1]);
- register_input("C2", m_C[2]);
- register_input("C3", m_C[3]);
- register_input("G", m_G);
+ register_input("C0", m_C[0]);
+ register_input("C1", m_C[1]);
+ register_input("C2", m_C[2]);
+ register_input("C3", m_C[3]);
+ register_input("G", m_G);
- register_output("AY", m_Y); //FIXME: Change netlists
+ register_output("AY", m_Y); //FIXME: Change netlists
- m_chan = 0;
+ m_chan = 0;
- save(NAME(m_chan));
+ save(NAME(m_chan));
}
NETLIB_RESET(74153sub)
{
- m_chan = 0;
+ m_chan = 0;
}
NETLIB_UPDATE(74153sub)
{
- const netlist_time delay[2] = { NLTIME_FROM_NS(23), NLTIME_FROM_NS(18) };
- if (!INPLOGIC(m_G))
- {
- UINT8 t = INPLOGIC(m_C[m_chan]);
- OUTLOGIC(m_Y, t, delay[t] );
- }
- else
- {
- OUTLOGIC(m_Y, 0, delay[0]);
- }
+ const netlist_time delay[2] = { NLTIME_FROM_NS(23), NLTIME_FROM_NS(18) };
+ if (!INPLOGIC(m_G))
+ {
+ UINT8 t = INPLOGIC(m_C[m_chan]);
+ OUTLOGIC(m_Y, t, delay[t] );
+ }
+ else
+ {
+ OUTLOGIC(m_Y, 0, delay[0]);
+ }
}
NETLIB_START(74153)
{
- register_sub(m_sub, "SUB");
+ register_sub(m_sub, "SUB");
register_subalias("C0", m_sub.m_C[0]);
register_subalias("C1", m_sub.m_C[1]);
@@ -68,44 +68,43 @@ NETLIB_RESET(74153)
NETLIB_UPDATE(74153)
{
- m_sub.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
- m_sub.update();
+ m_sub.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
+ m_sub.update();
}
NETLIB_START(74153_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
-
- register_subalias("1", m_1.m_G);
- register_input("2", m_B); // m_2.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("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_input("14", m_A); // m_2.m_B
- register_subalias("15", m_2.m_G);
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+
+ register_subalias("1", m_1.m_G);
+ register_input("2", m_B); // m_2.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("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_input("14", m_A); // m_2.m_B
+ register_subalias("15", m_2.m_G);
}
NETLIB_UPDATE(74153_dip)
{
- m_2.m_chan = m_1.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
- m_1.update();
- m_2.update();
+ m_2.m_chan = m_1.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
+ m_1.update();
+ m_2.update();
}
NETLIB_RESET(74153_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_74153.h b/src/emu/netlist/devices/nld_74153.h
index 8252dcebabf..03c942f9a70 100644
--- a/src/emu/netlist/devices/nld_74153.h
+++ b/src/emu/netlist/devices/nld_74153.h
@@ -58,30 +58,30 @@
NET_CONNECT(_name, G, _G)
#define TTL_74153_DIP(_name) \
- NET_REGISTER_DEV(74153_dip, _name)
+ NET_REGISTER_DEV(74153_dip, _name)
NETLIB_SUBDEVICE(74153sub,
- netlist_ttl_input_t m_C[4];
- netlist_ttl_input_t m_G;
+ netlist_ttl_input_t m_C[4];
+ netlist_ttl_input_t m_G;
- netlist_ttl_output_t m_Y;
+ netlist_ttl_output_t m_Y;
- int m_chan;
+ int m_chan;
);
NETLIB_DEVICE(74153,
public:
- NETLIB_NAME(74153sub) m_sub;
+ NETLIB_NAME(74153sub) m_sub;
netlist_ttl_input_t m_A;
netlist_ttl_input_t m_B;
);
NETLIB_DEVICE(74153_dip,
- NETLIB_NAME(74153sub) m_1;
- NETLIB_NAME(74153sub) m_2;
- netlist_ttl_input_t m_A;
- netlist_ttl_input_t m_B;
+ NETLIB_NAME(74153sub) m_1;
+ NETLIB_NAME(74153sub) m_2;
+ netlist_ttl_input_t m_A;
+ netlist_ttl_input_t m_B;
);
#endif /* NLD_74153_H_ */
diff --git a/src/emu/netlist/devices/nld_7420.c b/src/emu/netlist/devices/nld_7420.c
index edfb536d3a8..b4bb3f77a1b 100644
--- a/src/emu/netlist/devices/nld_7420.c
+++ b/src/emu/netlist/devices/nld_7420.c
@@ -7,35 +7,34 @@
NETLIB_START(7420_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
- register_subalias("1", m_1.m_i[0]);
- register_subalias("2", m_1.m_i[1]);
+ register_subalias("1", m_1.m_i[0]);
+ register_subalias("2", m_1.m_i[1]);
- register_subalias("4", m_1.m_i[2]);
- register_subalias("5", m_1.m_i[3]);
- register_subalias("6", m_1.m_Q);
+ register_subalias("4", m_1.m_i[2]);
+ register_subalias("5", m_1.m_i[3]);
+ register_subalias("6", m_1.m_Q);
- register_subalias("8", m_2.m_Q);
- register_subalias("9", m_2.m_i[0]);
- register_subalias("10", m_2.m_i[1]);
+ register_subalias("8", m_2.m_Q);
+ register_subalias("9", m_2.m_i[0]);
+ register_subalias("10", m_2.m_i[1]);
- register_subalias("12", m_2.m_i[2]);
- register_subalias("13", m_2.m_i[3]);
+ register_subalias("12", m_2.m_i[2]);
+ register_subalias("13", m_2.m_i[3]);
}
NETLIB_UPDATE(7420_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
}
NETLIB_RESET(7420_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7420.h b/src/emu/netlist/devices/nld_7420.h
index 3b359fb91d1..04f74c1d91c 100644
--- a/src/emu/netlist/devices/nld_7420.h
+++ b/src/emu/netlist/devices/nld_7420.h
@@ -46,12 +46,12 @@
NETLIB_SIGNAL(7420, 4, 0, 0);
#define TTL_7420_DIP(_name) \
- NET_REGISTER_DEV(7420_dip, _name)
+ NET_REGISTER_DEV(7420_dip, _name)
NETLIB_DEVICE(7420_dip,
- NETLIB_NAME(7420) m_1;
- NETLIB_NAME(7420) m_2;
+ NETLIB_NAME(7420) m_1;
+ NETLIB_NAME(7420) m_2;
);
#endif /* NLD_7420_H_ */
diff --git a/src/emu/netlist/devices/nld_7425.c b/src/emu/netlist/devices/nld_7425.c
index bb903544485..30262a1f181 100644
--- a/src/emu/netlist/devices/nld_7425.c
+++ b/src/emu/netlist/devices/nld_7425.c
@@ -7,39 +7,38 @@
NETLIB_START(7425_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
- register_subalias("1", m_1.m_i[0]);
- register_subalias("2", m_1.m_i[1]);
+ register_subalias("1", m_1.m_i[0]);
+ register_subalias("2", m_1.m_i[1]);
- //register_subalias("3", ); X1 ==> NC
+ //register_subalias("3", ); X1 ==> NC
- register_subalias("4", m_1.m_i[2]);
- register_subalias("5", m_1.m_i[3]);
- register_subalias("6", m_1.m_Q);
+ register_subalias("4", m_1.m_i[2]);
+ register_subalias("5", m_1.m_i[3]);
+ register_subalias("6", m_1.m_Q);
- register_subalias("8", m_2.m_Q);
- register_subalias("9", m_2.m_i[0]);
- register_subalias("10", m_2.m_i[1]);
+ register_subalias("8", m_2.m_Q);
+ register_subalias("9", m_2.m_i[0]);
+ register_subalias("10", m_2.m_i[1]);
- //register_subalias("11", ); X2 ==> NC
+ //register_subalias("11", ); X2 ==> NC
- register_subalias("12", m_2.m_i[2]);
- register_subalias("13", m_2.m_i[3]);
+ register_subalias("12", m_2.m_i[2]);
+ register_subalias("13", m_2.m_i[3]);
}
NETLIB_UPDATE(7425_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
}
NETLIB_RESET(7425_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7425.h b/src/emu/netlist/devices/nld_7425.h
index 271e59ee49b..f7df8442851 100644
--- a/src/emu/netlist/devices/nld_7425.h
+++ b/src/emu/netlist/devices/nld_7425.h
@@ -49,11 +49,11 @@
NETLIB_SIGNAL(7425, 4, 1, 0);
#define TTL_7425_DIP(_name) \
- NET_REGISTER_DEV(7425_dip, _name)
+ NET_REGISTER_DEV(7425_dip, _name)
NETLIB_DEVICE(7425_dip,
- NETLIB_NAME(7425) m_1;
- NETLIB_NAME(7425) m_2;
+ NETLIB_NAME(7425) m_1;
+ NETLIB_NAME(7425) m_2;
);
#endif /* NLD_7425_H_ */
diff --git a/src/emu/netlist/devices/nld_7427.c b/src/emu/netlist/devices/nld_7427.c
index 7867aa5bad2..49904334d07 100644
--- a/src/emu/netlist/devices/nld_7427.c
+++ b/src/emu/netlist/devices/nld_7427.c
@@ -7,38 +7,37 @@
NETLIB_START(7427_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
- register_sub(m_3, "3");
-
- register_subalias("1", m_1.m_i[0]);
- register_subalias("2", m_1.m_i[1]);
- register_subalias("3", m_2.m_i[0]);
- register_subalias("4", m_2.m_i[1]);
- register_subalias("5", m_2.m_i[2]);
- register_subalias("6", m_2.m_Q);
-
- register_subalias("8", m_3.m_Q);
- register_subalias("9", m_3.m_i[0]);
- register_subalias("10", m_3.m_i[1]);
- register_subalias("11", m_3.m_i[2]);
-
- register_subalias("12", m_1.m_Q);
- register_subalias("13", m_1.m_i[2]);
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+ register_sub(m_3, "3");
+
+ register_subalias("1", m_1.m_i[0]);
+ register_subalias("2", m_1.m_i[1]);
+ register_subalias("3", m_2.m_i[0]);
+ register_subalias("4", m_2.m_i[1]);
+ register_subalias("5", m_2.m_i[2]);
+ register_subalias("6", m_2.m_Q);
+
+ register_subalias("8", m_3.m_Q);
+ register_subalias("9", m_3.m_i[0]);
+ register_subalias("10", m_3.m_i[1]);
+ register_subalias("11", m_3.m_i[2]);
+
+ register_subalias("12", m_1.m_Q);
+ register_subalias("13", m_1.m_i[2]);
}
NETLIB_UPDATE(7427_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
- m_3.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
+ m_3.update_dev();
}
NETLIB_RESET(7427_dip)
{
- m_1.do_reset();
- m_2.do_reset();
- m_3.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
+ m_3.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7427.h b/src/emu/netlist/devices/nld_7427.h
index ae5f7e65a75..88dc344ea16 100644
--- a/src/emu/netlist/devices/nld_7427.h
+++ b/src/emu/netlist/devices/nld_7427.h
@@ -43,12 +43,12 @@
NETLIB_SIGNAL(7427, 3, 1, 0);
#define TTL_7427_DIP(_name) \
- NET_REGISTER_DEV(7427_dip, _name)
+ NET_REGISTER_DEV(7427_dip, _name)
NETLIB_DEVICE(7427_dip,
- NETLIB_NAME(7427) m_1;
- NETLIB_NAME(7427) m_2;
- NETLIB_NAME(7427) m_3;
+ NETLIB_NAME(7427) m_1;
+ NETLIB_NAME(7427) m_2;
+ NETLIB_NAME(7427) m_3;
);
#endif /* NLD_7427_H_ */
diff --git a/src/emu/netlist/devices/nld_7430.c b/src/emu/netlist/devices/nld_7430.c
index e6ef3624b8b..b9079846325 100644
--- a/src/emu/netlist/devices/nld_7430.c
+++ b/src/emu/netlist/devices/nld_7430.c
@@ -7,29 +7,28 @@
NETLIB_START(7430_dip)
{
- register_sub(m_1, "1");
+ register_sub(m_1, "1");
- register_subalias("1", m_1.m_i[0]);
- register_subalias("2", m_1.m_i[1]);
- register_subalias("3", m_1.m_i[2]);
- register_subalias("4", m_1.m_i[3]);
- register_subalias("5", m_1.m_i[4]);
- register_subalias("6", m_1.m_i[5]);
+ register_subalias("1", m_1.m_i[0]);
+ register_subalias("2", m_1.m_i[1]);
+ register_subalias("3", m_1.m_i[2]);
+ register_subalias("4", m_1.m_i[3]);
+ register_subalias("5", m_1.m_i[4]);
+ register_subalias("6", m_1.m_i[5]);
- register_subalias("8", m_1.m_Q);
+ register_subalias("8", m_1.m_Q);
- register_subalias("11", m_1.m_i[6]);
- register_subalias("12", m_1.m_i[7]);
+ register_subalias("11", m_1.m_i[6]);
+ register_subalias("12", m_1.m_i[7]);
}
NETLIB_UPDATE(7430_dip)
{
- /* only called during startup */
- m_1.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
}
NETLIB_RESET(7430_dip)
{
- m_1.do_reset();
+ m_1.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7430.h b/src/emu/netlist/devices/nld_7430.h
index daba75e4d96..7530380d216 100644
--- a/src/emu/netlist/devices/nld_7430.h
+++ b/src/emu/netlist/devices/nld_7430.h
@@ -54,10 +54,10 @@
NETLIB_SIGNAL(7430, 8, 0, 0);
#define TTL_7430_DIP(_name) \
- NET_REGISTER_DEV(7430_dip, _name)
+ NET_REGISTER_DEV(7430_dip, _name)
NETLIB_DEVICE(7430_dip,
- NETLIB_NAME(7430) m_1;
+ NETLIB_NAME(7430) m_1;
);
#endif /* NLD_7430_H_ */
diff --git a/src/emu/netlist/devices/nld_7448.c b/src/emu/netlist/devices/nld_7448.c
index dfa2a226135..59b00935240 100644
--- a/src/emu/netlist/devices/nld_7448.c
+++ b/src/emu/netlist/devices/nld_7448.c
@@ -9,160 +9,159 @@
NETLIB_START(7448)
{
- register_sub(sub, "sub");
-
- register_subalias("A", sub.m_A);
- register_subalias("B", sub.m_B);
- register_subalias("C", sub.m_C);
- register_subalias("D", sub.m_D);
- register_input("LTQ", m_LTQ);
- register_input("BIQ", m_BIQ);
- register_subalias("RBIQ",sub.m_RBIQ);
-
- register_subalias("a", sub.m_a);
- register_subalias("b", sub.m_b);
- register_subalias("c", sub.m_c);
- register_subalias("d", sub.m_d);
- register_subalias("e", sub.m_e);
- register_subalias("f", sub.m_f);
- register_subalias("g", sub.m_g);
+ register_sub(sub, "sub");
+
+ register_subalias("A", sub.m_A);
+ register_subalias("B", sub.m_B);
+ register_subalias("C", sub.m_C);
+ register_subalias("D", sub.m_D);
+ register_input("LTQ", m_LTQ);
+ register_input("BIQ", m_BIQ);
+ register_subalias("RBIQ",sub.m_RBIQ);
+
+ register_subalias("a", sub.m_a);
+ register_subalias("b", sub.m_b);
+ register_subalias("c", sub.m_c);
+ register_subalias("d", sub.m_d);
+ register_subalias("e", sub.m_e);
+ register_subalias("f", sub.m_f);
+ register_subalias("g", sub.m_g);
}
NETLIB_RESET(7448)
{
- sub.do_reset();
+ sub.do_reset();
}
NETLIB_UPDATE(7448)
{
- if (INPLOGIC(m_BIQ) && !INPLOGIC(m_LTQ))
- {
- sub.update_outputs(8);
- }
- else if (!INPLOGIC(m_BIQ))
- {
- sub.update_outputs(15);
- }
-
- if (!INPLOGIC(m_BIQ) || (INPLOGIC(m_BIQ) && !INPLOGIC(m_LTQ)))
- {
- sub.m_A.inactivate();
- sub.m_B.inactivate();
- sub.m_C.inactivate();
- sub.m_D.inactivate();
- sub.m_RBIQ.inactivate();
- } else {
- sub.m_RBIQ.activate();
- sub.m_D.activate();
- sub.m_C.activate();
- sub.m_B.activate();
- sub.m_A.activate();
- sub.update();
- }
+ if (INPLOGIC(m_BIQ) && !INPLOGIC(m_LTQ))
+ {
+ sub.update_outputs(8);
+ }
+ else if (!INPLOGIC(m_BIQ))
+ {
+ sub.update_outputs(15);
+ }
+
+ if (!INPLOGIC(m_BIQ) || (INPLOGIC(m_BIQ) && !INPLOGIC(m_LTQ)))
+ {
+ sub.m_A.inactivate();
+ sub.m_B.inactivate();
+ sub.m_C.inactivate();
+ sub.m_D.inactivate();
+ sub.m_RBIQ.inactivate();
+ } else {
+ sub.m_RBIQ.activate();
+ sub.m_D.activate();
+ sub.m_C.activate();
+ sub.m_B.activate();
+ sub.m_A.activate();
+ sub.update();
+ }
}
NETLIB_START(7448_sub)
{
- register_input("A0", m_A);
- register_input("A1", m_B);
- register_input("A2", m_C);
- register_input("A3", m_D);
- register_input("RBIQ", m_RBIQ);
-
- register_output("a", m_a);
- register_output("b", m_b);
- register_output("c", m_c);
- register_output("d", m_d);
- register_output("e", m_e);
- register_output("f", m_f);
- register_output("g", m_g);
-
- save(NAME(m_state));
+ register_input("A0", m_A);
+ register_input("A1", m_B);
+ register_input("A2", m_C);
+ register_input("A3", m_D);
+ register_input("RBIQ", m_RBIQ);
+
+ register_output("a", m_a);
+ register_output("b", m_b);
+ register_output("c", m_c);
+ register_output("d", m_d);
+ register_output("e", m_e);
+ register_output("f", m_f);
+ register_output("g", m_g);
+
+ save(NAME(m_state));
}
NETLIB_RESET(7448_sub)
{
- m_state = 0;
+ m_state = 0;
}
NETLIB_UPDATE(7448_sub)
{
- UINT8 v;
+ UINT8 v;
- v = (INPLOGIC(m_A) << 0) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_D) << 3);
- if ((!INPLOGIC(m_RBIQ) && (v==0)))
- v = 15;
- update_outputs(v);
+ v = (INPLOGIC(m_A) << 0) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_D) << 3);
+ if ((!INPLOGIC(m_RBIQ) && (v==0)))
+ v = 15;
+ update_outputs(v);
}
NETLIB_FUNC_VOID(7448_sub, update_outputs, (UINT8 v))
{
- assert(v<16);
- if (v != m_state)
- {
- // max transfer time is 100 NS */
-
- OUTLOGIC(m_a, tab7448[v][0], NLTIME_FROM_NS(100));
- OUTLOGIC(m_b, tab7448[v][1], NLTIME_FROM_NS(100));
- OUTLOGIC(m_c, tab7448[v][2], NLTIME_FROM_NS(100));
- OUTLOGIC(m_d, tab7448[v][3], NLTIME_FROM_NS(100));
- OUTLOGIC(m_e, tab7448[v][4], NLTIME_FROM_NS(100));
- OUTLOGIC(m_f, tab7448[v][5], NLTIME_FROM_NS(100));
- OUTLOGIC(m_g, tab7448[v][6], NLTIME_FROM_NS(100));
- m_state = v;
- }
+ assert(v<16);
+ if (v != m_state)
+ {
+ // max transfer time is 100 NS */
+
+ OUTLOGIC(m_a, tab7448[v][0], NLTIME_FROM_NS(100));
+ OUTLOGIC(m_b, tab7448[v][1], NLTIME_FROM_NS(100));
+ OUTLOGIC(m_c, tab7448[v][2], NLTIME_FROM_NS(100));
+ OUTLOGIC(m_d, tab7448[v][3], NLTIME_FROM_NS(100));
+ OUTLOGIC(m_e, tab7448[v][4], NLTIME_FROM_NS(100));
+ OUTLOGIC(m_f, tab7448[v][5], NLTIME_FROM_NS(100));
+ OUTLOGIC(m_g, tab7448[v][6], NLTIME_FROM_NS(100));
+ m_state = v;
+ }
}
const UINT8 NETLIB_NAME(7448_sub)::tab7448[16][7] =
{
- { 1, 1, 1, 1, 1, 1, 0 }, /* 00 - not blanked ! */
- { 0, 1, 1, 0, 0, 0, 0 }, /* 01 */
- { 1, 1, 0, 1, 1, 0, 1 }, /* 02 */
- { 1, 1, 1, 1, 0, 0, 1 }, /* 03 */
- { 0, 1, 1, 0, 0, 1, 1 }, /* 04 */
- { 1, 0, 1, 1, 0, 1, 1 }, /* 05 */
- { 0, 0, 1, 1, 1, 1, 1 }, /* 06 */
- { 1, 1, 1, 0, 0, 0, 0 }, /* 07 */
- { 1, 1, 1, 1, 1, 1, 1 }, /* 08 */
- { 1, 1, 1, 0, 0, 1, 1 }, /* 09 */
- { 0, 0, 0, 1, 1, 0, 1 }, /* 10 */
- { 0, 0, 1, 1, 0, 0, 1 }, /* 11 */
- { 0, 1, 0, 0, 0, 1, 1 }, /* 12 */
- { 1, 0, 0, 1, 0, 1, 1 }, /* 13 */
- { 0, 0, 0, 1, 1, 1, 1 }, /* 14 */
- { 0, 0, 0, 0, 0, 0, 0 }, /* 15 */
+ { 1, 1, 1, 1, 1, 1, 0 }, /* 00 - not blanked ! */
+ { 0, 1, 1, 0, 0, 0, 0 }, /* 01 */
+ { 1, 1, 0, 1, 1, 0, 1 }, /* 02 */
+ { 1, 1, 1, 1, 0, 0, 1 }, /* 03 */
+ { 0, 1, 1, 0, 0, 1, 1 }, /* 04 */
+ { 1, 0, 1, 1, 0, 1, 1 }, /* 05 */
+ { 0, 0, 1, 1, 1, 1, 1 }, /* 06 */
+ { 1, 1, 1, 0, 0, 0, 0 }, /* 07 */
+ { 1, 1, 1, 1, 1, 1, 1 }, /* 08 */
+ { 1, 1, 1, 0, 0, 1, 1 }, /* 09 */
+ { 0, 0, 0, 1, 1, 0, 1 }, /* 10 */
+ { 0, 0, 1, 1, 0, 0, 1 }, /* 11 */
+ { 0, 1, 0, 0, 0, 1, 1 }, /* 12 */
+ { 1, 0, 0, 1, 0, 1, 1 }, /* 13 */
+ { 0, 0, 0, 1, 1, 1, 1 }, /* 14 */
+ { 0, 0, 0, 0, 0, 0, 0 }, /* 15 */
};
NETLIB_START(7448_dip)
{
- NETLIB_NAME(7448)::start();
-
- register_subalias("1", sub.m_B);
- register_subalias("2", sub.m_C);
- register_subalias("3", m_LTQ);
- register_subalias("4", m_BIQ);
- register_subalias("5",sub.m_RBIQ);
- register_subalias("6", sub.m_D);
- register_subalias("7", sub.m_A);
-
- register_subalias("9", sub.m_e);
- register_subalias("10", sub.m_d);
- register_subalias("11", sub.m_c);
- register_subalias("12", sub.m_b);
- register_subalias("13", sub.m_a);
- register_subalias("14", sub.m_g);
- register_subalias("15", sub.m_f);
+ NETLIB_NAME(7448)::start();
+
+ register_subalias("1", sub.m_B);
+ register_subalias("2", sub.m_C);
+ register_subalias("3", m_LTQ);
+ register_subalias("4", m_BIQ);
+ register_subalias("5",sub.m_RBIQ);
+ register_subalias("6", sub.m_D);
+ register_subalias("7", sub.m_A);
+
+ register_subalias("9", sub.m_e);
+ register_subalias("10", sub.m_d);
+ register_subalias("11", sub.m_c);
+ register_subalias("12", sub.m_b);
+ register_subalias("13", sub.m_a);
+ register_subalias("14", sub.m_g);
+ register_subalias("15", sub.m_f);
}
NETLIB_UPDATE(7448_dip)
{
- NETLIB_NAME(7448)::update();
+ NETLIB_NAME(7448)::update();
}
NETLIB_RESET(7448_dip)
{
- NETLIB_NAME(7448)::reset();
+ NETLIB_NAME(7448)::reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7448.h b/src/emu/netlist/devices/nld_7448.h
index a6e47418b62..2c06638f93a 100644
--- a/src/emu/netlist/devices/nld_7448.h
+++ b/src/emu/netlist/devices/nld_7448.h
@@ -27,45 +27,45 @@
#include "../nl_base.h"
#define TTL_7448(_name, _A0, _A1, _A2, _A3, _LTQ, _BIQ, _RBIQ) \
- NET_REGISTER_DEV(7448, _name) \
- NET_CONNECT(_name, A, _A0) \
- NET_CONNECT(_name, B, _A1) \
- NET_CONNECT(_name, C, _A2) \
- NET_CONNECT(_name, D, _A3) \
- NET_CONNECT(_name, LTQ, _LTQ) \
- NET_CONNECT(_name, BIQ, _BIQ) \
- NET_CONNECT(_name, RBIQ, _RBIQ)
+ NET_REGISTER_DEV(7448, _name) \
+ NET_CONNECT(_name, A, _A0) \
+ NET_CONNECT(_name, B, _A1) \
+ NET_CONNECT(_name, C, _A2) \
+ NET_CONNECT(_name, D, _A3) \
+ NET_CONNECT(_name, LTQ, _LTQ) \
+ NET_CONNECT(_name, BIQ, _BIQ) \
+ NET_CONNECT(_name, RBIQ, _RBIQ)
#define TTL_7448_DIP(_name) \
- NET_REGISTER_DEV(7448_dip, _name)
+ NET_REGISTER_DEV(7448_dip, _name)
NETLIB_SUBDEVICE(7448_sub,
- ATTR_HOT void update_outputs(UINT8 v);
- static const UINT8 tab7448[16][7];
+ ATTR_HOT void update_outputs(UINT8 v);
+ static const UINT8 tab7448[16][7];
- netlist_ttl_input_t m_A;
- netlist_ttl_input_t m_B;
- netlist_ttl_input_t m_C;
- netlist_ttl_input_t m_D;
- netlist_ttl_input_t m_RBIQ;
+ netlist_ttl_input_t m_A;
+ netlist_ttl_input_t m_B;
+ netlist_ttl_input_t m_C;
+ netlist_ttl_input_t m_D;
+ netlist_ttl_input_t m_RBIQ;
- UINT8 m_state;
+ UINT8 m_state;
- netlist_ttl_output_t m_a;
- netlist_ttl_output_t m_b;
- netlist_ttl_output_t m_c;
- netlist_ttl_output_t m_d;
- netlist_ttl_output_t m_e;
- netlist_ttl_output_t m_f;
- netlist_ttl_output_t m_g;
+ netlist_ttl_output_t m_a;
+ netlist_ttl_output_t m_b;
+ netlist_ttl_output_t m_c;
+ netlist_ttl_output_t m_d;
+ netlist_ttl_output_t m_e;
+ netlist_ttl_output_t m_f;
+ netlist_ttl_output_t m_g;
);
NETLIB_DEVICE(7448,
public:
- NETLIB_NAME(7448_sub) sub;
+ NETLIB_NAME(7448_sub) sub;
- netlist_ttl_input_t m_LTQ;
- netlist_ttl_input_t m_BIQ;
+ netlist_ttl_input_t m_LTQ;
+ netlist_ttl_input_t m_BIQ;
);
NETLIB_DEVICE_DERIVED(7448_dip, 7448,
diff --git a/src/emu/netlist/devices/nld_7450.c b/src/emu/netlist/devices/nld_7450.c
index bcd1000d43a..9c16cd0537a 100644
--- a/src/emu/netlist/devices/nld_7450.c
+++ b/src/emu/netlist/devices/nld_7450.c
@@ -7,11 +7,11 @@
NETLIB_START(7450)
{
- register_input("A", m_A);
- register_input("B", m_B);
- register_input("C", m_C);
- register_input("D", m_D);
- register_output("Q", m_Q);
+ register_input("A", m_A);
+ register_input("B", m_B);
+ register_input("C", m_C);
+ register_input("D", m_D);
+ register_output("Q", m_Q);
}
NETLIB_RESET(7450)
@@ -20,70 +20,69 @@ NETLIB_RESET(7450)
NETLIB_UPDATE(7450)
{
- m_A.activate();
- m_B.activate();
- m_C.activate();
- m_D.activate();
- UINT8 t1 = INPLOGIC(m_A) & INPLOGIC(m_B);
- UINT8 t2 = INPLOGIC(m_C) & INPLOGIC(m_D);
+ m_A.activate();
+ m_B.activate();
+ m_C.activate();
+ m_D.activate();
+ UINT8 t1 = INPLOGIC(m_A) & INPLOGIC(m_B);
+ UINT8 t2 = INPLOGIC(m_C) & INPLOGIC(m_D);
- const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
+ const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
- UINT8 res = 0;
- if (t1 ^ 1)
- {
- if (t2 ^ 1)
- {
- res = 1;
- }
- else
- {
- m_A.inactivate();
- m_B.inactivate();
- }
- } else {
- if (t2 ^ 1)
- {
- m_C.inactivate();
- m_D.inactivate();
- }
- }
- OUTLOGIC(m_Q, res, times[1 - res]);// ? 22000 : 15000);
+ UINT8 res = 0;
+ if (t1 ^ 1)
+ {
+ if (t2 ^ 1)
+ {
+ res = 1;
+ }
+ else
+ {
+ m_A.inactivate();
+ m_B.inactivate();
+ }
+ } else {
+ if (t2 ^ 1)
+ {
+ m_C.inactivate();
+ m_D.inactivate();
+ }
+ }
+ OUTLOGIC(m_Q, res, times[1 - res]);// ? 22000 : 15000);
}
NETLIB_START(7450_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
- 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",); GND
+ 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",); GND
- register_subalias("8", m_1.m_Q);
- register_subalias("9", m_1.m_C);
- register_subalias("10", m_1.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",); VCC
+ register_subalias("8", m_1.m_Q);
+ register_subalias("9", m_1.m_C);
+ register_subalias("10", m_1.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",); VCC
}
NETLIB_UPDATE(7450_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
}
NETLIB_RESET(7450_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7450.h b/src/emu/netlist/devices/nld_7450.h
index 72deaebb508..bb15005ad10 100644
--- a/src/emu/netlist/devices/nld_7450.h
+++ b/src/emu/netlist/devices/nld_7450.h
@@ -27,22 +27,22 @@
#include "nld_signal.h"
#define TTL_7450_ANDORINVERT(_name, _I1, _I2, _I3, _I4) \
- NET_REGISTER_DEV(7450, _name) \
- NET_CONNECT(_name, A, _I1) \
- NET_CONNECT(_name, B, _I2) \
- NET_CONNECT(_name, C, _I3) \
- NET_CONNECT(_name, D, _I4)
+ NET_REGISTER_DEV(7450, _name) \
+ NET_CONNECT(_name, A, _I1) \
+ NET_CONNECT(_name, B, _I2) \
+ NET_CONNECT(_name, C, _I3) \
+ NET_CONNECT(_name, D, _I4)
#define TTL_7450_DIP(_name) \
- NET_REGISTER_DEV(7450_dip, _name)
+ NET_REGISTER_DEV(7450_dip, _name)
NETLIB_DEVICE(7450,
public:
- netlist_ttl_input_t m_A;
- netlist_ttl_input_t m_B;
- netlist_ttl_input_t m_C;
- netlist_ttl_input_t m_D;
- netlist_ttl_output_t m_Q;
+ netlist_ttl_input_t m_A;
+ netlist_ttl_input_t m_B;
+ netlist_ttl_input_t m_C;
+ netlist_ttl_input_t m_D;
+ netlist_ttl_output_t m_Q;
);
NETLIB_DEVICE(7450_dip,
diff --git a/src/emu/netlist/devices/nld_7474.c b/src/emu/netlist/devices/nld_7474.c
index 7ac8aa60ff5..b6bb5f78b9c 100644
--- a/src/emu/netlist/devices/nld_7474.c
+++ b/src/emu/netlist/devices/nld_7474.c
@@ -23,11 +23,11 @@ NETLIB_UPDATE(7474sub)
NETLIB_UPDATE(7474)
{
- if (!INPLOGIC(m_PREQ) && !INPLOGIC(m_CLRQ))
- {
- sub.newstate(1, 1);
- sub.m_CLK.inactivate();
- }
+ if (!INPLOGIC(m_PREQ) && !INPLOGIC(m_CLRQ))
+ {
+ sub.newstate(1, 1);
+ sub.m_CLK.inactivate();
+ }
if (!INPLOGIC(m_PREQ))
{
sub.newstate(1, 0);
@@ -64,7 +64,7 @@ NETLIB_START(7474)
NETLIB_RESET(7474)
{
- sub.do_reset();
+ sub.do_reset();
}
NETLIB_START(7474sub)
@@ -79,44 +79,44 @@ NETLIB_START(7474sub)
NETLIB_RESET(7474sub)
{
- m_CLK.set_state(netlist_input_t::STATE_INP_LH);
+ m_CLK.set_state(netlist_input_t::STATE_INP_LH);
- m_nextD = 0;
- /* FIXME: required by pong doubles - need a mechanism to set this from netlist */
- m_Q.initial(1);
- m_QQ.initial(0);
+ m_nextD = 0;
+ /* FIXME: required by pong doubles - need a mechanism to set this from netlist */
+ m_Q.initial(1);
+ m_QQ.initial(0);
}
NETLIB_START(7474_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
-
- register_subalias("1", m_1.m_CLRQ);
- register_subalias("2", m_1.m_D);
- register_subalias("3", m_1.sub.m_CLK);
- register_subalias("4", m_1.m_PREQ);
- register_subalias("5", m_1.sub.m_Q);
- register_subalias("6", m_1.sub.m_QQ);
- // register_subalias("7", ); ==> GND
-
- register_subalias("8", m_2.sub.m_QQ);
- register_subalias("9", m_2.sub.m_Q);
- register_subalias("10", m_2.m_PREQ);
- register_subalias("11", m_2.sub.m_CLK);
- register_subalias("12", m_2.m_D);
- register_subalias("13", m_2.m_CLRQ);
- // register_subalias("14", ); ==> VCC
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+
+ register_subalias("1", m_1.m_CLRQ);
+ register_subalias("2", m_1.m_D);
+ register_subalias("3", m_1.sub.m_CLK);
+ register_subalias("4", m_1.m_PREQ);
+ register_subalias("5", m_1.sub.m_Q);
+ register_subalias("6", m_1.sub.m_QQ);
+ // register_subalias("7", ); ==> GND
+
+ register_subalias("8", m_2.sub.m_QQ);
+ register_subalias("9", m_2.sub.m_Q);
+ register_subalias("10", m_2.m_PREQ);
+ register_subalias("11", m_2.sub.m_CLK);
+ register_subalias("12", m_2.m_D);
+ register_subalias("13", m_2.m_CLRQ);
+ // register_subalias("14", ); ==> VCC
}
NETLIB_RESET(7474_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
NETLIB_UPDATE(7474_dip)
{
- m_1.update_dev();
- m_2.update_dev();
+ m_1.update_dev();
+ m_2.update_dev();
}
diff --git a/src/emu/netlist/devices/nld_7474.h b/src/emu/netlist/devices/nld_7474.h
index 7dab3f673e9..c72a1e91069 100644
--- a/src/emu/netlist/devices/nld_7474.h
+++ b/src/emu/netlist/devices/nld_7474.h
@@ -52,7 +52,7 @@
NET_CONNECT(_name, PREQ, _PREQ)
#define TTL_7474_DIP(_name) \
- NET_REGISTER_DEV(7474_dip, _name)
+ NET_REGISTER_DEV(7474_dip, _name)
NETLIB_SUBDEVICE(7474sub,
netlist_ttl_input_t m_CLK;
@@ -75,8 +75,8 @@ public:
NETLIB_DEVICE(7474_dip,
- NETLIB_NAME(7474) m_1;
- NETLIB_NAME(7474) m_2;
+ NETLIB_NAME(7474) m_1;
+ NETLIB_NAME(7474) m_2;
);
#endif /* NLD_7474_H_ */
diff --git a/src/emu/netlist/devices/nld_7483.c b/src/emu/netlist/devices/nld_7483.c
index baa01fe41ba..8aa36e80b17 100644
--- a/src/emu/netlist/devices/nld_7483.c
+++ b/src/emu/netlist/devices/nld_7483.c
@@ -28,7 +28,7 @@ NETLIB_START(7483)
NETLIB_RESET(7483)
{
- m_lastr = 0;
+ m_lastr = 0;
}
NETLIB_UPDATE(7483)
@@ -51,33 +51,33 @@ NETLIB_UPDATE(7483)
NETLIB_START(7483_dip)
{
- NETLIB_NAME(7483)::start();
- register_subalias("1", m_A4);
- register_subalias("2", m_S3);
- register_subalias("3", m_A3);
- register_subalias("4", m_B3);
- // register_subalias("5", ); --> VCC
- register_subalias("6", m_S2);
- register_subalias("7", m_B2);
- register_subalias("8", m_A2);
+ NETLIB_NAME(7483)::start();
+ register_subalias("1", m_A4);
+ register_subalias("2", m_S3);
+ register_subalias("3", m_A3);
+ register_subalias("4", m_B3);
+ // register_subalias("5", ); --> VCC
+ register_subalias("6", m_S2);
+ register_subalias("7", m_B2);
+ register_subalias("8", m_A2);
- register_subalias("9", m_S1);
- register_subalias("10", m_A1);
- register_subalias("11", m_B1);
- // register_subalias("12", ); --> GND
- register_subalias("13", m_C0);
- register_subalias("14", m_C4);
- register_subalias("15", m_S4);
- register_subalias("16", m_B4);
+ register_subalias("9", m_S1);
+ register_subalias("10", m_A1);
+ register_subalias("11", m_B1);
+ // register_subalias("12", ); --> GND
+ register_subalias("13", m_C0);
+ register_subalias("14", m_C4);
+ register_subalias("15", m_S4);
+ register_subalias("16", m_B4);
}
NETLIB_UPDATE(7483_dip)
{
- NETLIB_NAME(7483)::update();
+ NETLIB_NAME(7483)::update();
}
NETLIB_RESET(7483_dip)
{
- NETLIB_NAME(7483)::reset();
+ NETLIB_NAME(7483)::reset();
}
diff --git a/src/emu/netlist/devices/nld_7483.h b/src/emu/netlist/devices/nld_7483.h
index b76c68efbbc..d2da6ecc517 100644
--- a/src/emu/netlist/devices/nld_7483.h
+++ b/src/emu/netlist/devices/nld_7483.h
@@ -42,7 +42,7 @@
NET_CONNECT(_name, C0, _CI)
#define TTL_7483_DIP(_name) \
- NET_REGISTER_DEV(7483_dip, _name)
+ NET_REGISTER_DEV(7483_dip, _name)
NETLIB_DEVICE(7483,
netlist_ttl_input_t m_C0;
diff --git a/src/emu/netlist/devices/nld_7486.c b/src/emu/netlist/devices/nld_7486.c
index 4234e1e5400..4eddfb828ef 100644
--- a/src/emu/netlist/devices/nld_7486.c
+++ b/src/emu/netlist/devices/nld_7486.c
@@ -25,42 +25,41 @@ NETLIB_UPDATE(7486)
NETLIB_START(7486_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
- register_sub(m_3, "3");
- register_sub(m_4, "4");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
+ register_sub(m_3, "3");
+ register_sub(m_4, "4");
- register_subalias("1", m_1.m_A);
- register_subalias("2", m_1.m_B);
- register_subalias("3", m_1.m_Q);
+ register_subalias("1", m_1.m_A);
+ register_subalias("2", m_1.m_B);
+ register_subalias("3", m_1.m_Q);
- register_subalias("4", m_2.m_A);
- register_subalias("5", m_2.m_B);
- register_subalias("6", m_2.m_Q);
+ register_subalias("4", m_2.m_A);
+ register_subalias("5", m_2.m_B);
+ register_subalias("6", m_2.m_Q);
- register_subalias("9", m_3.m_A);
- register_subalias("10", m_3.m_B);
- register_subalias("8", m_3.m_Q);
+ register_subalias("9", m_3.m_A);
+ register_subalias("10", m_3.m_B);
+ register_subalias("8", m_3.m_Q);
- register_subalias("12", m_4.m_A);
- register_subalias("13", m_4.m_B);
- register_subalias("11", m_4.m_Q);
+ register_subalias("12", m_4.m_A);
+ register_subalias("13", m_4.m_B);
+ register_subalias("11", m_4.m_Q);
}
NETLIB_UPDATE(7486_dip)
{
- /* only called during startup */
- m_1.update_dev();
- m_2.update_dev();
- m_3.update_dev();
- m_4.update_dev();
+ /* only called during startup */
+ m_1.update_dev();
+ m_2.update_dev();
+ m_3.update_dev();
+ m_4.update_dev();
}
NETLIB_RESET(7486_dip)
{
- m_1.do_reset();
- m_2.do_reset();
- m_3.do_reset();
- m_4.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
+ m_3.do_reset();
+ m_4.do_reset();
}
-
diff --git a/src/emu/netlist/devices/nld_7486.h b/src/emu/netlist/devices/nld_7486.h
index ed8bdbf37b4..d9f8608be6f 100644
--- a/src/emu/netlist/devices/nld_7486.h
+++ b/src/emu/netlist/devices/nld_7486.h
@@ -47,14 +47,14 @@ public:
);
#define TTL_7486_DIP(_name) \
- NET_REGISTER_DEV(7486_dip, _name)
+ NET_REGISTER_DEV(7486_dip, _name)
NETLIB_DEVICE(7486_dip,
- NETLIB_NAME(7486) m_1;
- NETLIB_NAME(7486) m_2;
- NETLIB_NAME(7486) m_3;
- NETLIB_NAME(7486) m_4;
+ NETLIB_NAME(7486) m_1;
+ NETLIB_NAME(7486) m_2;
+ NETLIB_NAME(7486) m_3;
+ NETLIB_NAME(7486) m_4;
);
#endif /* NLD_7486_H_ */
diff --git a/src/emu/netlist/devices/nld_7490.c b/src/emu/netlist/devices/nld_7490.c
index 00a4b1e3c6a..623ee0bf982 100644
--- a/src/emu/netlist/devices/nld_7490.c
+++ b/src/emu/netlist/devices/nld_7490.c
@@ -7,8 +7,8 @@
NETLIB_START(7490)
{
- register_input("A", m_A);
- register_input("B", m_B);
+ register_input("A", m_A);
+ register_input("B", m_B);
register_input("R1", m_R1);
register_input("R2", m_R2);
register_input("R91", m_R91);
@@ -25,15 +25,15 @@ NETLIB_START(7490)
NETLIB_RESET(7490)
{
- m_cnt = 0;
+ m_cnt = 0;
}
static const netlist_time delay[4] =
{
- NLTIME_FROM_NS(18),
- NLTIME_FROM_NS(36) - NLTIME_FROM_NS(18),
- NLTIME_FROM_NS(54) - NLTIME_FROM_NS(18),
- NLTIME_FROM_NS(72) - NLTIME_FROM_NS(18)};
+ NLTIME_FROM_NS(18),
+ NLTIME_FROM_NS(36) - NLTIME_FROM_NS(18),
+ NLTIME_FROM_NS(54) - NLTIME_FROM_NS(18),
+ NLTIME_FROM_NS(72) - NLTIME_FROM_NS(18)};
NETLIB_UPDATE(7490)
{
@@ -50,52 +50,51 @@ NETLIB_UPDATE(7490)
else if (INP_HL(m_A))
{
m_cnt ^= 1;
- OUTLOGIC(m_Q[0], m_cnt & 1, delay[0]);
+ OUTLOGIC(m_Q[0], m_cnt & 1, delay[0]);
+ }
+ else if (INP_HL(m_B))
+ {
+ m_cnt += 2;
+ if (m_cnt >= 10)
+ m_cnt = 0;
+ update_outputs();
}
- else if (INP_HL(m_B))
- {
- m_cnt += 2;
- if (m_cnt >= 10)
- m_cnt = 0;
- update_outputs();
- }
}
NETLIB_FUNC_VOID(7490, update_outputs, (void))
{
-
for (int i=0; i<4; i++)
OUTLOGIC(m_Q[i], (m_cnt >> i) & 1, delay[i]);
}
NETLIB_START(7490_dip)
{
- NETLIB_NAME(7490)::start();
- register_subalias("1", m_B);
- register_subalias("2", m_R1);
- register_subalias("3", m_R2);
-
- // register_subalias("4", ); --> NC
- // register_subalias("5", ); --> VCC
- register_subalias("6", m_R91);
- register_subalias("7", m_R92);
-
- register_subalias("8", m_Q[2]);
- register_subalias("9", m_Q[1]);
- // register_subalias("10", ); --> GND
- register_subalias("11", m_Q[3]);
- register_subalias("12", m_Q[0]);
- // register_subalias("13", ); --> NC
- register_subalias("14", m_A);
+ NETLIB_NAME(7490)::start();
+ register_subalias("1", m_B);
+ register_subalias("2", m_R1);
+ register_subalias("3", m_R2);
+
+ // register_subalias("4", ); --> NC
+ // register_subalias("5", ); --> VCC
+ register_subalias("6", m_R91);
+ register_subalias("7", m_R92);
+
+ register_subalias("8", m_Q[2]);
+ register_subalias("9", m_Q[1]);
+ // register_subalias("10", ); --> GND
+ register_subalias("11", m_Q[3]);
+ register_subalias("12", m_Q[0]);
+ // register_subalias("13", ); --> NC
+ register_subalias("14", m_A);
}
NETLIB_UPDATE(7490_dip)
{
- NETLIB_NAME(7490)::update();
+ NETLIB_NAME(7490)::update();
}
NETLIB_RESET(7490_dip)
{
- NETLIB_NAME(7490)::reset();
+ NETLIB_NAME(7490)::reset();
}
diff --git a/src/emu/netlist/devices/nld_7490.h b/src/emu/netlist/devices/nld_7490.h
index 29ca2a19716..f54c299fe8b 100644
--- a/src/emu/netlist/devices/nld_7490.h
+++ b/src/emu/netlist/devices/nld_7490.h
@@ -60,14 +60,14 @@
#define TTL_7490(_name, _A, _B, _R1, _R2, _R91, _R92) \
NET_REGISTER_DEV(7490, _name) \
NET_CONNECT(_name, A, _A) \
- NET_CONNECT(_name, B, _B) \
+ NET_CONNECT(_name, B, _B) \
NET_CONNECT(_name, R1, _R1) \
NET_CONNECT(_name, R2, _R2) \
NET_CONNECT(_name, R91, _R91) \
NET_CONNECT(_name, R92, _R92)
#define TTL_7490_DIP(_name) \
- NET_REGISTER_DEV(7490_dip, _name)
+ NET_REGISTER_DEV(7490_dip, _name)
NETLIB_DEVICE(7490,
@@ -78,7 +78,7 @@ NETLIB_DEVICE(7490,
netlist_ttl_input_t m_R91;
netlist_ttl_input_t m_R92;
netlist_ttl_input_t m_A;
- netlist_ttl_input_t m_B;
+ netlist_ttl_input_t m_B;
UINT8 m_cnt;
diff --git a/src/emu/netlist/devices/nld_7493.c b/src/emu/netlist/devices/nld_7493.c
index dcc08776cff..c2b51558c4b 100644
--- a/src/emu/netlist/devices/nld_7493.c
+++ b/src/emu/netlist/devices/nld_7493.c
@@ -29,10 +29,10 @@ NETLIB_START(7493)
NETLIB_RESET(7493)
{
- A.do_reset();
- B.do_reset();
- C.do_reset();
- D.do_reset();
+ A.do_reset();
+ B.do_reset();
+ C.do_reset();
+ D.do_reset();
}
NETLIB_START(7493ff)
@@ -45,13 +45,13 @@ NETLIB_START(7493ff)
NETLIB_RESET(7493ff)
{
- m_reset = 1;
- m_I.set_state(netlist_input_t::STATE_INP_HL);
+ m_reset = 1;
+ m_I.set_state(netlist_input_t::STATE_INP_HL);
}
NETLIB_UPDATE(7493ff)
{
- const netlist_time out_delay = NLTIME_FROM_NS(18);
+ const netlist_time out_delay = NLTIME_FROM_NS(18);
//if (m_reset == 0)
OUTLOGIC(m_Q, (!m_Q.net().new_Q()) & m_reset, out_delay);
}
@@ -68,45 +68,45 @@ NETLIB_UPDATE(7493)
OUTLOGIC(B.m_Q, 0, NLTIME_FROM_NS(40));
OUTLOGIC(C.m_Q, 0, NLTIME_FROM_NS(40));
OUTLOGIC(D.m_Q, 0, NLTIME_FROM_NS(40));
- A.m_reset = B.m_reset = C.m_reset = D.m_reset = 0;
+ A.m_reset = B.m_reset = C.m_reset = D.m_reset = 0;
}
else
{
A.m_I.activate_hl();
B.m_I.activate_hl();
- A.m_reset = B.m_reset = C.m_reset = D.m_reset = 1;
+ A.m_reset = B.m_reset = C.m_reset = D.m_reset = 1;
}
}
NETLIB_START(7493_dip)
{
- NETLIB_NAME(7493)::start();
-
- register_subalias("1", B.m_I);
- register_subalias("2", m_R1);
- register_subalias("3", m_R2);
-
- // register_subalias("4", ); --> NC
- // register_subalias("5", ); --> VCC
- // register_subalias("6", ); --> NC
- // register_subalias("7", ); --> NC
-
- register_subalias("8", C.m_Q);
- register_subalias("9", B.m_Q);
- // register_subalias("10", ); --> GND
- register_subalias("11", D.m_Q);
- register_subalias("12", A.m_Q);
- // register_subalias("13", ); --> NC
- register_subalias("14", A.m_I);
+ NETLIB_NAME(7493)::start();
+
+ register_subalias("1", B.m_I);
+ register_subalias("2", m_R1);
+ register_subalias("3", m_R2);
+
+ // register_subalias("4", ); --> NC
+ // register_subalias("5", ); --> VCC
+ // register_subalias("6", ); --> NC
+ // register_subalias("7", ); --> NC
+
+ register_subalias("8", C.m_Q);
+ register_subalias("9", B.m_Q);
+ // register_subalias("10", ); --> GND
+ register_subalias("11", D.m_Q);
+ register_subalias("12", A.m_Q);
+ // register_subalias("13", ); --> NC
+ register_subalias("14", A.m_I);
}
NETLIB_UPDATE(7493_dip)
{
- NETLIB_NAME(7493)::update();
+ NETLIB_NAME(7493)::update();
}
NETLIB_RESET(7493_dip)
{
- NETLIB_NAME(7493)::reset();
+ NETLIB_NAME(7493)::reset();
}
diff --git a/src/emu/netlist/devices/nld_7493.h b/src/emu/netlist/devices/nld_7493.h
index 0bf182e27c0..8c856048a7c 100644
--- a/src/emu/netlist/devices/nld_7493.h
+++ b/src/emu/netlist/devices/nld_7493.h
@@ -67,7 +67,7 @@
NET_CONNECT(_name, R2, _R2)
#define TTL_7493_DIP(_name) \
- NET_REGISTER_DEV(7493_dip, _name)
+ NET_REGISTER_DEV(7493_dip, _name)
NETLIB_SUBDEVICE(7493ff,
netlist_ttl_input_t m_I;
diff --git a/src/emu/netlist/devices/nld_74ls629.c b/src/emu/netlist/devices/nld_74ls629.c
index 09c12d2d98c..42d10263858 100644
--- a/src/emu/netlist/devices/nld_74ls629.c
+++ b/src/emu/netlist/devices/nld_74ls629.c
@@ -50,139 +50,139 @@ NETLIB_START(SN74LS629clk)
reset();
save(NAME(m_enableq));
- save(NAME(m_inc));
+ save(NAME(m_inc));
}
NETLIB_RESET(SN74LS629clk)
{
- m_enableq = 1;
- m_inc = netlist_time::zero;
+ m_enableq = 1;
+ m_inc = netlist_time::zero;
}
NETLIB_UPDATE(SN74LS629clk)
{
- if (!m_enableq)
- {
- OUTLOGIC(m_Y, !m_Y.net().new_Q(), m_inc);
- }
- else
- {
- OUTLOGIC(m_Y, 1, m_inc);
- }
+ if (!m_enableq)
+ {
+ OUTLOGIC(m_Y, !m_Y.net().new_Q(), m_inc);
+ }
+ else
+ {
+ OUTLOGIC(m_Y, 1, m_inc);
+ }
}
NETLIB_START(SN74LS629)
{
- register_sub(m_clock, "OSC");
- register_sub(m_R_FC, "R_FC");
- register_sub(m_R_RNG, "R_RNG");
+ register_sub(m_clock, "OSC");
+ register_sub(m_R_FC, "R_FC");
+ register_sub(m_R_RNG, "R_RNG");
- register_input("ENQ", m_ENQ);
- register_input("RNG", m_RNG);
- register_input("FC", m_FC);
- register_subalias("GND", m_R_FC.m_N);
+ register_input("ENQ", m_ENQ);
+ register_input("RNG", m_RNG);
+ register_input("FC", m_FC);
+ register_subalias("GND", m_R_FC.m_N);
- connect(m_FC, m_R_FC.m_P);
- connect(m_RNG, m_R_RNG.m_P);
- connect(m_R_FC.m_N, m_R_RNG.m_N);
+ connect(m_FC, m_R_FC.m_P);
+ connect(m_RNG, m_R_RNG.m_P);
+ connect(m_R_FC.m_N, m_R_RNG.m_N);
- register_subalias("Y", m_clock.m_Y);
- register_param("CAP", m_CAP, 1e-6);
+ register_subalias("Y", m_clock.m_Y);
+ register_param("CAP", m_CAP, 1e-6);
}
NETLIB_RESET(SN74LS629)
{
- m_R_FC.set_R(90000.0);
- m_R_RNG.set_R(90000.0);
- m_clock.reset();
+ m_R_FC.set_R(90000.0);
+ m_R_RNG.set_R(90000.0);
+ m_clock.reset();
}
NETLIB_UPDATE(SN74LS629)
{
- {
- // recompute
- double freq;
- double v_freq_2, v_freq_3, v_freq_4;
- double v_freq = INPANALOG(m_FC);
- double v_rng = INPANALOG(m_RNG);
-
- /* coefficients */
- const double k1 = 1.9904769024796283E+03;
- const double k2 = 1.2070059213983407E+03;
- const double k3 = 1.3266985579561108E+03;
- const double k4 = -1.5500979825922698E+02;
- const double k5 = 2.8184536266938172E+00;
- const double k6 = -2.3503421582744556E+02;
- const double k7 = -3.3836786704527788E+02;
- const double k8 = -1.3569136703258670E+02;
- const double k9 = 2.9914575453819188E+00;
- const double k10 = 1.6855569086173170E+00;
-
- /* scale due to input resistance */
-
- /* Polyfunctional3D_model created by zunzun.com using sum of squared absolute error */
- v_freq_2 = v_freq * v_freq;
- v_freq_3 = v_freq_2 * v_freq;
- v_freq_4 = v_freq_3 * v_freq;
- freq = k1;
- freq += k2 * v_freq;
- freq += k3 * v_freq_2;
- freq += k4 * v_freq_3;
- freq += k5 * v_freq_4;
- freq += k6 * v_rng;
- freq += k7 * v_rng * v_freq;
- freq += k8 * v_rng * v_freq_2;
- freq += k9 * v_rng * v_freq_3;
- freq += k10 * v_rng * v_freq_4;
-
- freq *= 0.1e-6 / m_CAP.Value();
-
- // FIXME: we need a possibility to remove entries from queue ...
- // or an exact model ...
- m_clock.m_inc = netlist_time::from_double(0.5 / freq);
- //m_clock.update();
- }
-
- if (!m_clock.m_enableq && INPLOGIC(m_ENQ))
- {
- m_clock.m_enableq = 1;
- OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1));
- }
- else if (m_clock.m_enableq && !INPLOGIC(m_ENQ))
- {
- m_clock.m_enableq = 0;
- OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1));
- }
+ {
+ // recompute
+ double freq;
+ double v_freq_2, v_freq_3, v_freq_4;
+ double v_freq = INPANALOG(m_FC);
+ double v_rng = INPANALOG(m_RNG);
+
+ /* coefficients */
+ const double k1 = 1.9904769024796283E+03;
+ const double k2 = 1.2070059213983407E+03;
+ const double k3 = 1.3266985579561108E+03;
+ const double k4 = -1.5500979825922698E+02;
+ const double k5 = 2.8184536266938172E+00;
+ const double k6 = -2.3503421582744556E+02;
+ const double k7 = -3.3836786704527788E+02;
+ const double k8 = -1.3569136703258670E+02;
+ const double k9 = 2.9914575453819188E+00;
+ const double k10 = 1.6855569086173170E+00;
+
+ /* scale due to input resistance */
+
+ /* Polyfunctional3D_model created by zunzun.com using sum of squared absolute error */
+ v_freq_2 = v_freq * v_freq;
+ v_freq_3 = v_freq_2 * v_freq;
+ v_freq_4 = v_freq_3 * v_freq;
+ freq = k1;
+ freq += k2 * v_freq;
+ freq += k3 * v_freq_2;
+ freq += k4 * v_freq_3;
+ freq += k5 * v_freq_4;
+ freq += k6 * v_rng;
+ freq += k7 * v_rng * v_freq;
+ freq += k8 * v_rng * v_freq_2;
+ freq += k9 * v_rng * v_freq_3;
+ freq += k10 * v_rng * v_freq_4;
+
+ freq *= 0.1e-6 / m_CAP.Value();
+
+ // FIXME: we need a possibility to remove entries from queue ...
+ // or an exact model ...
+ m_clock.m_inc = netlist_time::from_double(0.5 / freq);
+ //m_clock.update();
+ }
+
+ if (!m_clock.m_enableq && INPLOGIC(m_ENQ))
+ {
+ m_clock.m_enableq = 1;
+ OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1));
+ }
+ else if (m_clock.m_enableq && !INPLOGIC(m_ENQ))
+ {
+ m_clock.m_enableq = 0;
+ OUTLOGIC(m_clock.m_Y, !m_clock.m_Y.net().last_Q(), netlist_time::from_nsec(1));
+ }
}
NETLIB_UPDATE_PARAM(SN74LS629)
{
- //printf("updating %s to %f\n", name().cstr(), m_R.Value());
- update_dev();
+ //printf("updating %s to %f\n", name().cstr(), m_R.Value());
+ update_dev();
}
NETLIB_START(SN74LS629_dip)
{
- register_sub(m_1, "1");
- register_sub(m_2, "2");
+ register_sub(m_1, "1");
+ register_sub(m_2, "2");
- 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_2.m_FC);
+ register_subalias("2", m_1.m_FC);
+ register_subalias("3", m_1.m_RNG);
- register_subalias("6", m_1.m_ENQ);
- register_subalias("7", m_1.m_clock.m_Y);
+ register_subalias("6", m_1.m_ENQ);
+ register_subalias("7", m_1.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_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("10", m_2.m_clock.m_Y);
+ register_subalias("10", m_2.m_clock.m_Y);
- register_subalias("11", m_2.m_ENQ);
- register_subalias("14", m_2.m_RNG);
+ register_subalias("11", m_2.m_ENQ);
+ register_subalias("14", m_2.m_RNG);
}
@@ -192,6 +192,6 @@ NETLIB_UPDATE(SN74LS629_dip)
NETLIB_RESET(SN74LS629_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1.do_reset();
+ m_2.do_reset();
}
diff --git a/src/emu/netlist/devices/nld_74ls629.h b/src/emu/netlist/devices/nld_74ls629.h
index 31ecf340902..b4f011cf337 100644
--- a/src/emu/netlist/devices/nld_74ls629.h
+++ b/src/emu/netlist/devices/nld_74ls629.h
@@ -33,23 +33,23 @@
#define SN74LS629(_name, _cap) \
NET_REGISTER_DEV(SN74LS629, _name) \
- NETDEV_PARAMI(_name, CAP, _cap)
+ NETDEV_PARAMI(_name, CAP, _cap)
NETLIB_SUBDEVICE(SN74LS629clk,
- netlist_logic_input_t m_FB;
- netlist_logic_output_t m_Y;
+ netlist_logic_input_t m_FB;
+ netlist_logic_output_t m_Y;
- netlist_time m_inc;
- netlist_sig_t m_enableq;
+ netlist_time m_inc;
+ netlist_sig_t m_enableq;
);
NETLIB_DEVICE_WITH_PARAMS(SN74LS629,
public:
NETLIB_NAME(SN74LS629clk) m_clock;
- NETLIB_NAME(R_base) m_R_FC;
- NETLIB_NAME(R_base) m_R_RNG;
+ NETLIB_NAME(R_base) m_R_FC;
+ NETLIB_NAME(R_base) m_R_RNG;
- netlist_logic_input_t m_ENQ;
+ netlist_logic_input_t m_ENQ;
netlist_analog_input_t m_RNG;
netlist_analog_input_t m_FC;
@@ -57,13 +57,13 @@ public:
);
#define SN74LS629_DIP(_name, _cap1, _cap2) \
- NET_REGISTER_DEV(SN74LS629_dip, _name) \
- NETDEV_PARAMI(_name, 1.CAP, _cap1) \
- NETDEV_PARAMI(_name, 2.CAP, _cap2)
+ NET_REGISTER_DEV(SN74LS629_dip, _name) \
+ NETDEV_PARAMI(_name, 1.CAP, _cap1) \
+ NETDEV_PARAMI(_name, 2.CAP, _cap2)
NETLIB_DEVICE(SN74LS629_dip,
- NETLIB_NAME(SN74LS629) m_1;
- NETLIB_NAME(SN74LS629) m_2;
+ NETLIB_NAME(SN74LS629) m_1;
+ NETLIB_NAME(SN74LS629) m_2;
);
diff --git a/src/emu/netlist/devices/nld_9316.c b/src/emu/netlist/devices/nld_9316.c
index 14a691c4481..6445611fd06 100644
--- a/src/emu/netlist/devices/nld_9316.c
+++ b/src/emu/netlist/devices/nld_9316.c
@@ -7,8 +7,8 @@
NETLIB_START(9316)
{
- register_sub(subABCD, "subABCD");
- sub.m_ABCD = &subABCD;
+ register_sub(subABCD, "subABCD");
+ sub.m_ABCD = &subABCD;
register_sub(sub, "sub");
register_subalias("CLK", sub.m_CLK);
@@ -33,36 +33,36 @@ NETLIB_START(9316)
NETLIB_RESET(9316)
{
- sub.do_reset();
- subABCD.do_reset();
+ sub.do_reset();
+ subABCD.do_reset();
}
NETLIB_START(9316_subABCD)
{
- register_input("A", m_A);
- register_input("B", m_B);
- register_input("C", m_C);
- register_input("D", m_D);
+ register_input("A", m_A);
+ register_input("B", m_B);
+ register_input("C", m_C);
+ register_input("D", m_D);
}
NETLIB_RESET(9316_subABCD)
{
- if (1 || !USE_ADD_REMOVE_LIST)
- {
- m_A.inactivate();
- m_B.inactivate();
- m_C.inactivate();
- m_D.inactivate();
- }
+ if (1 || !USE_ADD_REMOVE_LIST)
+ {
+ m_A.inactivate();
+ m_B.inactivate();
+ m_C.inactivate();
+ m_D.inactivate();
+ }
}
ATTR_HOT inline UINT8 NETLIB_NAME(9316_subABCD::read_ABCD)()
{
- if (1 || !USE_ADD_REMOVE_LIST)
- return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
- else
- return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0);
+ if (1 || !USE_ADD_REMOVE_LIST)
+ return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
+ else
+ return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0);
}
NETLIB_UPDATE(9316_subABCD)
@@ -86,10 +86,10 @@ NETLIB_START(9316_sub)
NETLIB_RESET(9316_sub)
{
- m_CLK.set_state(netlist_input_t::STATE_INP_LH);
- m_cnt = 0;
- m_loadq = 1;
- m_ent = 1;
+ m_CLK.set_state(netlist_input_t::STATE_INP_LH);
+ m_cnt = 0;
+ m_loadq = 1;
+ m_ent = 1;
}
NETLIB_UPDATE(9316_sub)
@@ -99,7 +99,7 @@ NETLIB_UPDATE(9316_sub)
{
cnt = ( cnt + 1) & 0x0f;
update_outputs(cnt);
- OUTLOGIC(m_RC, m_ent & (cnt == 0x0f), NLTIME_FROM_NS(20));
+ OUTLOGIC(m_RC, m_ent & (cnt == 0x0f), NLTIME_FROM_NS(20));
#if 0
if (cnt == 0x0f)
OUTLOGIC(m_RC, m_ent, NLTIME_FROM_NS(20));
@@ -128,7 +128,7 @@ NETLIB_UPDATE(9316)
}
else
{
- UINT8 cnt = sub.m_cnt;
+ UINT8 cnt = sub.m_cnt;
sub.m_CLK.inactivate();
if (!clrq & (cnt>0))
{
@@ -198,34 +198,33 @@ inline NETLIB_FUNC_VOID(9316_sub, update_outputs, (const UINT8 cnt))
NETLIB_START(9316_dip)
{
- NETLIB_NAME(9316)::start();
-
- register_subalias("1", m_CLRQ);
- register_subalias("2", sub.m_CLK);
- register_subalias("3", subABCD.m_A);
- register_subalias("4", subABCD.m_B);
- register_subalias("5", subABCD.m_C);
- register_subalias("6", subABCD.m_D);
- register_subalias("7", m_ENP);
- // register_subalias("8", ); --> GND
-
- register_subalias("9", m_LOADQ);
- register_subalias("10", m_ENT);
- register_subalias("11", sub.m_QD);
- register_subalias("12", sub.m_QC);
- register_subalias("13", sub.m_QB);
- register_subalias("14", sub.m_QA);
- register_subalias("15", sub.m_RC);
- // register_subalias("16", ); --> VCC
+ NETLIB_NAME(9316)::start();
+
+ register_subalias("1", m_CLRQ);
+ register_subalias("2", sub.m_CLK);
+ register_subalias("3", subABCD.m_A);
+ register_subalias("4", subABCD.m_B);
+ register_subalias("5", subABCD.m_C);
+ register_subalias("6", subABCD.m_D);
+ register_subalias("7", m_ENP);
+ // register_subalias("8", ); --> GND
+
+ register_subalias("9", m_LOADQ);
+ register_subalias("10", m_ENT);
+ register_subalias("11", sub.m_QD);
+ register_subalias("12", sub.m_QC);
+ register_subalias("13", sub.m_QB);
+ register_subalias("14", sub.m_QA);
+ register_subalias("15", sub.m_RC);
+ // register_subalias("16", ); --> VCC
}
NETLIB_UPDATE(9316_dip)
{
- NETLIB_NAME(9316)::update();
+ NETLIB_NAME(9316)::update();
}
NETLIB_RESET(9316_dip)
{
- NETLIB_NAME(9316)::reset();
+ NETLIB_NAME(9316)::reset();
}
-
diff --git a/src/emu/netlist/devices/nld_9316.h b/src/emu/netlist/devices/nld_9316.h
index a9e7a37df5f..524871d8ea5 100644
--- a/src/emu/netlist/devices/nld_9316.h
+++ b/src/emu/netlist/devices/nld_9316.h
@@ -64,15 +64,15 @@
NET_CONNECT(_name, D, _D)
#define TTL_9316_DIP(_name) \
- NET_REGISTER_DEV(9316_dip, _name)
+ NET_REGISTER_DEV(9316_dip, _name)
NETLIB_SUBDEVICE(9316_subABCD,
- netlist_ttl_input_t m_A;
- netlist_ttl_input_t m_B;
- netlist_ttl_input_t m_C;
- netlist_ttl_input_t m_D;
+ netlist_ttl_input_t m_A;
+ netlist_ttl_input_t m_B;
+ netlist_ttl_input_t m_C;
+ netlist_ttl_input_t m_D;
- ATTR_HOT inline UINT8 read_ABCD();
+ ATTR_HOT inline UINT8 read_ABCD();
);
NETLIB_SUBDEVICE(9316_sub,
@@ -95,7 +95,7 @@ NETLIB_SUBDEVICE(9316_sub,
NETLIB_DEVICE(9316,
NETLIB_NAME(9316_sub) sub;
- NETLIB_NAME(9316_subABCD) subABCD;
+ NETLIB_NAME(9316_subABCD) subABCD;
netlist_ttl_input_t m_ENP;
netlist_ttl_input_t m_ENT;
netlist_ttl_input_t m_CLRQ;
diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c
index 529d5325651..7c3faa58117 100644
--- a/src/emu/netlist/devices/nld_legacy.c
+++ b/src/emu/netlist/devices/nld_legacy.c
@@ -16,8 +16,8 @@ NETLIB_START(nicRSFF)
NETLIB_RESET(nicRSFF)
{
- m_Q.initial(0);
- m_QQ.initial(1);
+ m_Q.initial(0);
+ m_QQ.initial(1);
}
NETLIB_UPDATE(nicRSFF)
diff --git a/src/emu/netlist/devices/nld_ne555.c b/src/emu/netlist/devices/nld_ne555.c
index 580c76d3787..b8f4e4b5fc7 100644
--- a/src/emu/netlist/devices/nld_ne555.c
+++ b/src/emu/netlist/devices/nld_ne555.c
@@ -46,17 +46,17 @@ NETLIB_START(NE555)
NETLIB_RESET(NE555)
{
- m_R1.do_reset();
- m_R2.do_reset();
- m_R3.do_reset();
- m_RDIS.do_reset();
+ m_R1.do_reset();
+ m_R2.do_reset();
+ m_R3.do_reset();
+ m_RDIS.do_reset();
- m_R1.set_R(5000);
- m_R2.set_R(5000);
- m_R3.set_R(5000);
- m_RDIS.set_R(R_OFF);
+ m_R1.set_R(5000);
+ m_R2.set_R(5000);
+ m_R3.set_R(5000);
+ m_RDIS.set_R(R_OFF);
- m_last_out = false;
+ m_last_out = false;
}
NETLIB_UPDATE(NE555)
@@ -93,25 +93,25 @@ NETLIB_UPDATE(NE555)
NETLIB_START(NE555_dip)
{
- NETLIB_NAME(NE555)::start();
+ NETLIB_NAME(NE555)::start();
- register_subalias("1", m_R3.m_N); // Pin 1
- register_subalias("2", m_TRIG); // Pin 2
- register_subalias("3", m_OUT); // Pin 3
- register_subalias("4", m_RESET); // Pin 4
- register_subalias("5", m_R1.m_N); // Pin 5
- register_subalias("6", m_THRES); // Pin 6
- register_subalias("7", m_RDIS.m_P); // Pin 7
- register_subalias("8", m_R1.m_P); // Pin 8
+ register_subalias("1", m_R3.m_N); // Pin 1
+ register_subalias("2", m_TRIG); // Pin 2
+ register_subalias("3", m_OUT); // Pin 3
+ register_subalias("4", m_RESET); // Pin 4
+ register_subalias("5", m_R1.m_N); // Pin 5
+ register_subalias("6", m_THRES); // Pin 6
+ register_subalias("7", m_RDIS.m_P); // Pin 7
+ register_subalias("8", m_R1.m_P); // Pin 8
}
NETLIB_UPDATE(NE555_dip)
{
- NETLIB_NAME(NE555)::update();
+ NETLIB_NAME(NE555)::update();
}
NETLIB_RESET(NE555_dip)
{
- NETLIB_NAME(NE555)::reset();
+ NETLIB_NAME(NE555)::reset();
}
diff --git a/src/emu/netlist/devices/nld_ne555.h b/src/emu/netlist/devices/nld_ne555.h
index 50fccf8486a..8c9c1baa420 100644
--- a/src/emu/netlist/devices/nld_ne555.h
+++ b/src/emu/netlist/devices/nld_ne555.h
@@ -44,7 +44,7 @@ NETLIB_DEVICE(NE555,
);
#define NE555_DIP(_name) \
- NET_REGISTER_DEV(NE555_dip, _name)
+ NET_REGISTER_DEV(NE555_dip, _name)
NETLIB_DEVICE_DERIVED(NE555_dip, NE555,
);
diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h
index 24c3854a07d..6580ec0818c 100644
--- a/src/emu/netlist/devices/nld_signal.h
+++ b/src/emu/netlist/devices/nld_signal.h
@@ -47,8 +47,8 @@ public:
ATTR_COLD void reset()
{
- m_Q.initial(1);
- m_active = 1;
+ m_Q.initial(1);
+ m_active = 1;
}
#if (USE_DEACTIVE_DEVICE)
@@ -98,55 +98,55 @@ public:
save(NAME(m_active));
}
- ATTR_COLD void reset()
- {
- m_Q.initial(1);
- m_active = 1;
- }
+ ATTR_COLD void reset()
+ {
+ m_Q.initial(1);
+ m_active = 1;
+ }
#if (USE_DEACTIVE_DEVICE)
- ATTR_HOT void inc_active()
- {
- if (++m_active == 1)
- {
- update();
- }
- }
-
- ATTR_HOT void dec_active()
- {
- if (--m_active == 0)
- {
- for (int i = 0; i< _numdev; i++)
- m_i[i].inactivate();
- }
- }
+ ATTR_HOT void inc_active()
+ {
+ if (++m_active == 1)
+ {
+ update();
+ }
+ }
+
+ ATTR_HOT void dec_active()
+ {
+ if (--m_active == 0)
+ {
+ for (int i = 0; i< _numdev; i++)
+ m_i[i].inactivate();
+ }
+ }
#endif
- virtual void update()
- {
- const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
-
- // FIXME: this check is needed because update is called during startup as well
- if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0))
- return;
-
- for (int i = 0; i< _numdev; i++)
- {
- this->m_i[i].activate();
- if (INPLOGIC(this->m_i[i]) == _check)
- {
- for (int j = 0; j < i; j++)
- this->m_i[j].inactivate();
- for (int j = i + 1; j < _numdev; j++)
- this->m_i[j].inactivate();
-
- OUTLOGIC(this->m_Q, _check ^ (1 ^ _invert), times[_check]);// ? 15000 : 22000);
- return;
- }
- }
- OUTLOGIC(this->m_Q,_check ^ (_invert), times[1-_check]);// ? 22000 : 15000);
- }
+ virtual void update()
+ {
+ const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
+
+ // FIXME: this check is needed because update is called during startup as well
+ if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0))
+ return;
+
+ for (int i = 0; i< _numdev; i++)
+ {
+ this->m_i[i].activate();
+ if (INPLOGIC(this->m_i[i]) == _check)
+ {
+ for (int j = 0; j < i; j++)
+ this->m_i[j].inactivate();
+ for (int j = i + 1; j < _numdev; j++)
+ this->m_i[j].inactivate();
+
+ OUTLOGIC(this->m_Q, _check ^ (1 ^ _invert), times[_check]);// ? 15000 : 22000);
+ return;
+ }
+ }
+ OUTLOGIC(this->m_Q,_check ^ (_invert), times[1-_check]);// ? 22000 : 15000);
+ }
public:
netlist_ttl_input_t m_i[_numdev];
@@ -166,35 +166,35 @@ public:
ATTR_COLD void start()
{
register_output("Q", m_Q);
- register_input("A", m_i[0]);
- register_input("B", m_i[1]);
+ register_input("A", m_i[0]);
+ register_input("B", m_i[1]);
- save(NAME(m_active));
+ save(NAME(m_active));
}
- ATTR_COLD void reset()
- {
- m_Q.initial(1);
- m_active = 1;
- }
+ ATTR_COLD void reset()
+ {
+ m_Q.initial(1);
+ m_active = 1;
+ }
#if (USE_DEACTIVE_DEVICE)
- ATTR_HOT virtual void inc_active()
- {
- if (++m_active == 1)
- {
- update();
- }
- }
-
- ATTR_HOT virtual void dec_active()
- {
- if (--m_active == 0)
- {
- m_i[0].inactivate();
- m_i[1].inactivate();
- }
- }
+ ATTR_HOT virtual void inc_active()
+ {
+ if (++m_active == 1)
+ {
+ update();
+ }
+ }
+
+ ATTR_HOT virtual void dec_active()
+ {
+ if (--m_active == 0)
+ {
+ m_i[0].inactivate();
+ m_i[1].inactivate();
+ }
+ }
#endif
ATTR_HOT ATTR_ALIGN void update()
@@ -202,13 +202,13 @@ public:
const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)};
// FIXME: this check is needed because update is called during startup as well
- if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0))
- return;
+ if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0))
+ return;
m_i[0].activate();
m_i[1].activate();
#if 0
- UINT8 res = _invert ^ 1 ^_check;
+ UINT8 res = _invert ^ 1 ^_check;
if (INPLOGIC(m_i[0]) ^ _check)
{
if (INPLOGIC(m_i[1]) ^ _check)
@@ -221,23 +221,23 @@ public:
if (INPLOGIC(m_i[1]) ^ _check)
m_i[1].inactivate();
}
- OUTLOGIC(m_Q, res, times[res & 1]);// ? 22000 : 15000);
+ OUTLOGIC(m_Q, res, times[res & 1]);// ? 22000 : 15000);
#else
const UINT8 val = (INPLOGIC(m_i[0]) ^ _check) | ((INPLOGIC(m_i[1]) ^ _check) << 1);
- UINT8 res = _invert ^ 1 ^_check;
+ UINT8 res = _invert ^ 1 ^_check;
switch (val)
{
- case 1:
- m_i[0].inactivate();
- break;
- case 2:
- m_i[1].inactivate();
- break;
- case 3:
- res = _invert ^ _check;
- break;
+ case 1:
+ m_i[0].inactivate();
+ break;
+ case 2:
+ m_i[1].inactivate();
+ break;
+ case 3:
+ res = _invert ^ _check;
+ break;
}
- OUTLOGIC(m_Q, res, times[res]);// ? 22000 : 15000);
+ OUTLOGIC(m_Q, res, times[res]);// ? 22000 : 15000);
#endif
}
diff --git a/src/emu/netlist/devices/nld_system.c b/src/emu/netlist/devices/nld_system.c
index 7e37bef8e19..e6cd2485603 100644
--- a/src/emu/netlist/devices/nld_system.c
+++ b/src/emu/netlist/devices/nld_system.c
@@ -51,12 +51,12 @@ NETLIB_RESET(ttl_input)
NETLIB_UPDATE(ttl_input)
{
- OUTLOGIC(m_Q, m_IN.Value() & 1, netlist_time::from_nsec(1));
+ OUTLOGIC(m_Q, m_IN.Value() & 1, netlist_time::from_nsec(1));
}
NETLIB_UPDATE_PARAM(ttl_input)
{
- update();
+ update();
}
// ----------------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ NETLIB_UPDATE_PARAM(ttl_input)
NETLIB_START(analog_input)
{
register_output("Q", m_Q);
- register_param("IN", m_IN, 0.0);
+ register_param("IN", m_IN, 0.0);
}
NETLIB_RESET(analog_input)
@@ -75,10 +75,10 @@ NETLIB_RESET(analog_input)
NETLIB_UPDATE(analog_input)
{
- OUTANALOG(m_Q, m_IN.Value(), NLTIME_IMMEDIATE);
+ OUTANALOG(m_Q, m_IN.Value(), NLTIME_IMMEDIATE);
}
NETLIB_UPDATE_PARAM(analog_input)
{
- update();
+ update();
}
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index ca5f9b70316..2c214ed352a 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -27,14 +27,14 @@
#define MAINCLOCK(_name, _freq) \
NET_REGISTER_DEV(mainclock, _name) \
- PARAM(_name.FREQ, _freq)
+ PARAM(_name.FREQ, _freq)
#define CLOCK(_name, _freq) \
NET_REGISTER_DEV(clock, _name) \
- PARAM(_name.FREQ, _freq)
+ PARAM(_name.FREQ, _freq)
#define GNDA() \
- NET_REGISTER_DEV(gnd, GND)
+ NET_REGISTER_DEV(gnd, GND)
// ----------------------------------------------------------------------------------------
// mainclock
@@ -47,7 +47,7 @@ public:
netlist_param_double_t m_freq;
netlist_time m_inc;
- ATTR_HOT inline static void mc_update(netlist_net_t &net);
+ ATTR_HOT inline static void mc_update(netlist_net_t &net);
);
// ----------------------------------------------------------------------------------------
@@ -76,7 +76,7 @@ NETLIB_DEVICE_WITH_PARAMS(ttl_input,
NETLIB_DEVICE_WITH_PARAMS(analog_input,
netlist_analog_output_t m_Q;
- netlist_param_double_t m_IN;
+ netlist_param_double_t m_IN;
);
// ----------------------------------------------------------------------------------------
@@ -86,29 +86,29 @@ NETLIB_DEVICE_WITH_PARAMS(analog_input,
class nld_gnd : public netlist_device_t
{
public:
- ATTR_COLD nld_gnd()
- : netlist_device_t(GND) { }
+ ATTR_COLD nld_gnd()
+ : netlist_device_t(GND) { }
- ATTR_COLD virtual ~nld_gnd() {}
+ ATTR_COLD virtual ~nld_gnd() {}
protected:
- ATTR_COLD void start()
- {
- register_output("Q", m_Q);
- }
+ ATTR_COLD void start()
+ {
+ register_output("Q", m_Q);
+ }
- ATTR_COLD void reset()
- {
- }
+ ATTR_COLD void reset()
+ {
+ }
- ATTR_HOT ATTR_ALIGN void update()
- {
- OUTANALOG(m_Q, 0.0, NLTIME_IMMEDIATE);
- }
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ OUTANALOG(m_Q, 0.0, NLTIME_IMMEDIATE);
+ }
private:
- netlist_analog_output_t m_Q;
+ netlist_analog_output_t m_Q;
};
@@ -120,38 +120,38 @@ private:
class nld_a_to_d_proxy : public netlist_device_t
{
public:
- ATTR_COLD nld_a_to_d_proxy(netlist_input_t &in_proxied)
- : netlist_device_t()
- {
- assert(in_proxied.family() == LOGIC);
- m_I.m_family_desc = in_proxied.m_family_desc;
- }
+ ATTR_COLD nld_a_to_d_proxy(netlist_input_t &in_proxied)
+ : netlist_device_t()
+ {
+ assert(in_proxied.family() == LOGIC);
+ m_I.m_family_desc = in_proxied.m_family_desc;
+ }
- ATTR_COLD virtual ~nld_a_to_d_proxy() {}
+ ATTR_COLD virtual ~nld_a_to_d_proxy() {}
- netlist_analog_input_t m_I;
- netlist_ttl_output_t m_Q;
+ netlist_analog_input_t m_I;
+ netlist_ttl_output_t m_Q;
protected:
- ATTR_COLD void start()
- {
- register_input("I", m_I);
- register_output("Q", m_Q);
- }
-
- ATTR_COLD void reset()
- {
- }
-
- ATTR_HOT ATTR_ALIGN void update()
- {
- if (m_I.Q_Analog() > m_I.m_family_desc->m_high_thresh_V)
- OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(1));
- else if (m_I.Q_Analog() < m_I.m_family_desc->m_low_thresh_V)
- OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(1));
- //else
- // OUTLOGIC(m_Q, m_Q.net().last_Q(), NLTIME_FROM_NS(1));
- }
+ ATTR_COLD void start()
+ {
+ register_input("I", m_I);
+ register_output("Q", m_Q);
+ }
+
+ ATTR_COLD void reset()
+ {
+ }
+
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ if (m_I.Q_Analog() > m_I.m_family_desc->m_high_thresh_V)
+ OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(1));
+ else if (m_I.Q_Analog() < m_I.m_family_desc->m_low_thresh_V)
+ OUTLOGIC(m_Q, 0, NLTIME_FROM_NS(1));
+ //else
+ // OUTLOGIC(m_Q, m_Q.net().last_Q(), NLTIME_FROM_NS(1));
+ }
};
@@ -162,24 +162,24 @@ protected:
class nld_base_d_to_a_proxy : public netlist_device_t
{
public:
- ATTR_COLD nld_base_d_to_a_proxy(netlist_output_t &out_proxied)
- : netlist_device_t()
- {
- assert(out_proxied.family() == LOGIC);
- m_family_desc = out_proxied.m_family_desc;
- }
+ ATTR_COLD nld_base_d_to_a_proxy(netlist_output_t &out_proxied)
+ : netlist_device_t()
+ {
+ assert(out_proxied.family() == LOGIC);
+ m_family_desc = out_proxied.m_family_desc;
+ }
- ATTR_COLD virtual ~nld_base_d_to_a_proxy() {}
+ ATTR_COLD virtual ~nld_base_d_to_a_proxy() {}
- ATTR_COLD virtual netlist_core_terminal_t &out() = 0;
+ ATTR_COLD virtual netlist_core_terminal_t &out() = 0;
- netlist_ttl_input_t m_I;
+ netlist_ttl_input_t m_I;
protected:
- ATTR_COLD void start()
- {
- register_input("I", m_I);
- }
+ ATTR_COLD void start()
+ {
+ register_input("I", m_I);
+ }
private:
};
@@ -188,88 +188,88 @@ private:
class nld_d_to_a_proxy : public nld_base_d_to_a_proxy
{
public:
- ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied)
- : nld_base_d_to_a_proxy(out_proxied)
- {
- }
+ ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied)
+ : nld_base_d_to_a_proxy(out_proxied)
+ {
+ }
- ATTR_COLD virtual ~nld_d_to_a_proxy() {}
+ ATTR_COLD virtual ~nld_d_to_a_proxy() {}
protected:
- ATTR_COLD void start()
- {
- nld_base_d_to_a_proxy::start();
- register_output("Q", m_Q);
- }
-
- ATTR_COLD void reset()
- {
- //m_Q.initial(0);
- }
-
- ATTR_COLD virtual netlist_core_terminal_t &out()
- {
- return m_Q;
- }
-
- ATTR_HOT ATTR_ALIGN void update()
- {
- OUTANALOG(m_Q, INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V, NLTIME_FROM_NS(1));
- }
+ ATTR_COLD void start()
+ {
+ nld_base_d_to_a_proxy::start();
+ register_output("Q", m_Q);
+ }
+
+ ATTR_COLD void reset()
+ {
+ //m_Q.initial(0);
+ }
+
+ ATTR_COLD virtual netlist_core_terminal_t &out()
+ {
+ return m_Q;
+ }
+
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ OUTANALOG(m_Q, INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V, NLTIME_FROM_NS(1));
+ }
private:
- netlist_analog_output_t m_Q;
+ netlist_analog_output_t m_Q;
};
#else
class nld_d_to_a_proxy : public nld_base_d_to_a_proxy
{
public:
- ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied)
- : nld_base_d_to_a_proxy(out_proxied)
- {
- }
+ ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied)
+ : nld_base_d_to_a_proxy(out_proxied)
+ {
+ }
- ATTR_COLD virtual ~nld_d_to_a_proxy() {}
+ ATTR_COLD virtual ~nld_d_to_a_proxy() {}
protected:
- ATTR_COLD void start()
- {
- nld_base_d_to_a_proxy::start();
-
- register_sub(m_R, "R");
- register_output("_Q", m_Q);
- register_subalias("Q", m_R.m_N);
-
- connect(m_R.m_P, m_Q);
-
- //m_Q.initial(m_family_desc->m_low_V);
- //m_R.set_R(m_family_desc->m_R_low);
- }
-
- ATTR_COLD void reset()
- {
- //m_Q.initial(m_family_desc->m_low_V);
- //m_R.set_R(m_family_desc->m_R_low);
- m_R.do_reset();
- }
-
- ATTR_COLD virtual netlist_core_terminal_t &out()
- {
- return m_R.m_N;
- }
-
- ATTR_HOT ATTR_ALIGN void update()
- {
- double R = INPLOGIC(m_I) ? m_family_desc->m_R_high : m_family_desc->m_R_low;
- double V = INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V;
- //printf("%f %f\n", R, V);
- m_R.set_R(R);
- OUTANALOG(m_Q, V, NLTIME_FROM_NS(0));
- }
+ ATTR_COLD void start()
+ {
+ nld_base_d_to_a_proxy::start();
+
+ register_sub(m_R, "R");
+ register_output("_Q", m_Q);
+ register_subalias("Q", m_R.m_N);
+
+ connect(m_R.m_P, m_Q);
+
+ //m_Q.initial(m_family_desc->m_low_V);
+ //m_R.set_R(m_family_desc->m_R_low);
+ }
+
+ ATTR_COLD void reset()
+ {
+ //m_Q.initial(m_family_desc->m_low_V);
+ //m_R.set_R(m_family_desc->m_R_low);
+ m_R.do_reset();
+ }
+
+ ATTR_COLD virtual netlist_core_terminal_t &out()
+ {
+ return m_R.m_N;
+ }
+
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ double R = INPLOGIC(m_I) ? m_family_desc->m_R_high : m_family_desc->m_R_low;
+ double V = INPLOGIC(m_I) ? m_family_desc->m_high_V : m_family_desc->m_low_V;
+ //printf("%f %f\n", R, V);
+ m_R.set_R(R);
+ OUTANALOG(m_Q, V, NLTIME_FROM_NS(0));
+ }
private:
- netlist_analog_output_t m_Q;
- nld_R_base m_R;
+ netlist_analog_output_t m_Q;
+ nld_R_base m_R;
};
#endif