diff options
Diffstat (limited to 'src/lib/netlist/macro')
-rw-r--r-- | src/lib/netlist/macro/nlm_cd4xxx.cpp | 1 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_cd4xxx.h | 3 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_opamp.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_opamp.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_other.cpp | 1 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_other.h | 3 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.cpp | 7 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.h | 4 |
8 files changed, 18 insertions, 9 deletions
diff --git a/src/lib/netlist/macro/nlm_cd4xxx.cpp b/src/lib/netlist/macro/nlm_cd4xxx.cpp index 469ff13b954..ed805cb52dc 100644 --- a/src/lib/netlist/macro/nlm_cd4xxx.cpp +++ b/src/lib/netlist/macro/nlm_cd4xxx.cpp @@ -2,7 +2,6 @@ // copyright-holders:Couriersud #include "nlm_cd4xxx.h" -#include "devices/nld_truthtable.h" #include "devices/nld_system.h" #include "devices/nld_4020.h" #include "devices/nld_4066.h" diff --git a/src/lib/netlist/macro/nlm_cd4xxx.h b/src/lib/netlist/macro/nlm_cd4xxx.h index de10ff7a64d..446c2d6e435 100644 --- a/src/lib/netlist/macro/nlm_cd4xxx.h +++ b/src/lib/netlist/macro/nlm_cd4xxx.h @@ -22,6 +22,8 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ +#ifndef NL_AUTO_DEVICES + #define CD4001_NOR(name) \ NET_REGISTER_DEV(CD4001_NOR, name) @@ -44,6 +46,7 @@ #define CD4316_DIP(name) \ NET_REGISTER_DEV(CD4016_DIP, name) +#endif /* ---------------------------------------------------------------------------- * External declarations * ---------------------------------------------------------------------------*/ diff --git a/src/lib/netlist/macro/nlm_opamp.cpp b/src/lib/netlist/macro/nlm_opamp.cpp index 146f95b72b4..f363c88a100 100644 --- a/src/lib/netlist/macro/nlm_opamp.cpp +++ b/src/lib/netlist/macro/nlm_opamp.cpp @@ -1,9 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Couriersud #include "nlm_opamp.h" - -#include "analog/nld_opamps.h" -#include "devices/nld_system.h" +#include "devices/net_lib.h" /* * Generic layout with 4 opamps, VCC on pin 4 and GND on pin 11 diff --git a/src/lib/netlist/macro/nlm_opamp.h b/src/lib/netlist/macro/nlm_opamp.h index 6e3c1f615e7..ec717fdb2dc 100644 --- a/src/lib/netlist/macro/nlm_opamp.h +++ b/src/lib/netlist/macro/nlm_opamp.h @@ -11,6 +11,8 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ +#ifndef NL_AUTO_DEVICES + #define MB3614_DIP(name) \ NET_REGISTER_DEV(MB3614_DIP, name) @@ -23,6 +25,8 @@ #define LM3900(name) \ NET_REGISTER_DEV(LM3900, name) +#endif + /* ---------------------------------------------------------------------------- * External declarations * ---------------------------------------------------------------------------*/ diff --git a/src/lib/netlist/macro/nlm_other.cpp b/src/lib/netlist/macro/nlm_other.cpp index 84a3af4dc04..49f4404427a 100644 --- a/src/lib/netlist/macro/nlm_other.cpp +++ b/src/lib/netlist/macro/nlm_other.cpp @@ -2,7 +2,6 @@ // copyright-holders:Couriersud #include "nlm_other.h" -#include "devices/nld_truthtable.h" #include "devices/nld_system.h" /* diff --git a/src/lib/netlist/macro/nlm_other.h b/src/lib/netlist/macro/nlm_other.h index bb73d0105d2..f0e8ca05af0 100644 --- a/src/lib/netlist/macro/nlm_other.h +++ b/src/lib/netlist/macro/nlm_other.h @@ -11,12 +11,15 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ +#ifndef NL_AUTO_DEVICES + #define MC14584B_GATE(name) \ NET_REGISTER_DEV(MC14584B_GATE, name) #define MC14584B_DIP(name) \ NET_REGISTER_DEV(MC14584B_DIP, name) +#endif /* ---------------------------------------------------------------------------- * External declarations diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index c66314366d2..c8fe9912911 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -2,7 +2,6 @@ // copyright-holders:Couriersud #include "nlm_ttl74xx.h" -#include "devices/nld_truthtable.h" #include "devices/nld_system.h" @@ -377,7 +376,7 @@ static NETLIST_START(TTL_7427_DIP) s2.C, /* C2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -413,11 +412,11 @@ static NETLIST_START(TTL_7430_DIP) s1.A, /* A |1 ++ 14| VCC */ VCC.I, s1.B, /* B |2 13| NC */ NC.I, s1.C, /* C |3 12| H */ s1.H, - s1.D, /* D |4 7420 11| G */ s1.G, + s1.D, /* D |4 7430 11| G */ s1.G, s1.E, /* E |5 10| NC */ NC.I, s1.F, /* F |6 9| NC */ NC.I, GND.I, /* GND |7 8| Y */ s1.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h index 44b3db63bd3..526fbf395da 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.h +++ b/src/lib/netlist/macro/nlm_ttl74xx.h @@ -11,6 +11,8 @@ * Netlist Macros * ---------------------------------------------------------------------------*/ +#ifndef NL_AUTO_DEVICES + #define TTL_7400_GATE(name) \ NET_REGISTER_DEV(TTL_7400_GATE, name) @@ -200,6 +202,8 @@ #define TTL_74260_DIP(name) \ NET_REGISTER_DEV(TTL_74260_DIP, name) +#endif + /* ---------------------------------------------------------------------------- * External declarations * ---------------------------------------------------------------------------*/ |