Skip to content

Commit add61d2

Browse files
author
couriersud
committed
Convert 7430 to macro module.
1 parent 38d3050 commit add61d2

File tree

7 files changed

+87
-139
lines changed

7 files changed

+87
-139
lines changed

‎scripts/src/netlist.lua‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ project "netlist"
8686
MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
8787
MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
8888
MAME_DIR .. "src/lib/netlist/devices/nld_4066.h",
89-
MAME_DIR .. "src/lib/netlist/devices/nld_7430.cpp",
90-
MAME_DIR .. "src/lib/netlist/devices/nld_7430.h",
9189
MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp",
9290
MAME_DIR .. "src/lib/netlist/devices/nld_7448.h",
9391
MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp",

‎src/lib/netlist/devices/net_lib.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ void initialize_factory(factory_list_t &factory)
9898
ENTRY(switch2, SWITCH2, "-")
9999
ENTRY(nicRSFF, NETDEV_RSFF, "+S,R")
100100
ENTRY(nicDelay, NETDEV_DELAY, "-")
101-
ENTRY(7430, TTL_7430_NAND, "+A,B,C,D,E,F,G,H")
102101
ENTRY(7450, TTL_7450_ANDORINVERT, "+A,B,C,D")
103102
ENTRY(7486, TTL_7486_XOR, "+A,B")
104103
ENTRY(7448, TTL_7448, "+A,B,C,D,LTQ,BIQ,RBIQ")
@@ -127,7 +126,6 @@ void initialize_factory(factory_list_t &factory)
127126
ENTRY(NE555, NE555, "-")
128127
ENTRY(r2r_dac, R2R_DAC, "+VIN,R,N")
129128
ENTRY(4538_dip, CD4538_DIP, "-")
130-
ENTRY(7430_dip, TTL_7430_DIP, "-")
131129
ENTRY(7448_dip, TTL_7448_DIP, "-")
132130
ENTRY(7450_dip, TTL_7450_DIP, "-")
133131
ENTRY(7474_dip, TTL_7474_DIP, "-")

‎src/lib/netlist/devices/net_lib.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "nld_4020.h"
1818
#include "nld_4066.h"
19-
#include "nld_7430.h"
2019
#include "nld_7448.h"
2120
#include "nld_7450.h"
2221
#include "nld_7474.h"

‎src/lib/netlist/devices/nld_7430.cpp‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎src/lib/netlist/devices/nld_7430.h‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎src/lib/netlist/macro/nlm_ttl74xx.cpp‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,46 @@ NETLIST_START(TTL_7427_DIP)
381381
)
382382
NETLIST_END()
383383

384+
/*
385+
* DM7430: 8-Input NAND Gate
386+
*
387+
* ________
388+
* Y = ABCDEFGH
389+
* +---+---+---+---+---+---+---+---++---+
390+
* | A | B | C | D | E | F | G | H || Y |
391+
* +===+===+===+===+===+===+===+===++===+
392+
* | X | X | X | X | X | X | X | 0 || 1 |
393+
* | X | X | X | X | X | X | 0 | X || 1 |
394+
* | X | X | X | X | X | 0 | X | X || 1 |
395+
* | X | X | X | X | 0 | X | X | X || 1 |
396+
* | X | X | X | 0 | X | X | X | X || 1 |
397+
* | X | X | 0 | X | X | X | X | X || 1 |
398+
* | X | 0 | X | X | X | X | X | X || 1 |
399+
* | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 || 0 |
400+
* +---+---+---+---+---+---+---+---++---+
401+
*
402+
* Naming conventions follow National Semiconductor datasheet
403+
*/
404+
405+
NETLIST_START(TTL_7430_DIP)
406+
TTL_7430_GATE(s1)
407+
408+
DUMMY_INPUT(GND)
409+
DUMMY_INPUT(VCC)
410+
DUMMY_INPUT(NC)
411+
412+
DIPPINS( /* +--------------+ */
413+
s1.A, /* A |1 ++ 14| VCC */ VCC.I,
414+
s1.B, /* B |2 13| NC */ NC.I,
415+
s1.C, /* C |3 12| H */ s1.H,
416+
s1.D, /* D |4 7420 11| G */ s1.G,
417+
s1.E, /* E |5 10| NC */ NC.I,
418+
s1.F, /* F |6 9| NC */ NC.I,
419+
GND.I, /* GND |7 8| Y */ s1.Q
420+
/* +--------------+ */
421+
)
422+
NETLIST_END()
423+
384424
/*
385425
* DM7432: Quad 2-Input OR Gates
386426
*
@@ -629,6 +669,34 @@ NETLIST_START(TTL74XX_lib)
629669
TT_FAMILY("74XX")
630670
TRUTHTABLE_END()
631671

672+
TRUTHTABLE_START(TTL_7430_GATE, 8, 1, 0, "")
673+
TT_HEAD("A,B,C,D,E,F,G,H|Q ")
674+
TT_LINE("0,X,X,X,X,X,X,X|1|22")
675+
TT_LINE("X,0,X,X,X,X,X,X|1|22")
676+
TT_LINE("X,X,0,X,X,X,X,X|1|22")
677+
TT_LINE("X,X,X,0,X,X,X,X|1|22")
678+
TT_LINE("X,X,X,X,0,X,X,X|1|22")
679+
TT_LINE("X,X,X,X,X,0,X,X|1|22")
680+
TT_LINE("X,X,X,X,X,X,0,X|1|22")
681+
TT_LINE("X,X,X,X,X,X,X,0|1|22")
682+
TT_LINE("1,1,1,1,1,1,1,1|0|15")
683+
TT_FAMILY("74XX")
684+
TRUTHTABLE_END()
685+
686+
TRUTHTABLE_START(TTL_7430_NAND, 8, 1, 0, "A,B,C,D,E,F,G,H")
687+
TT_HEAD("A,B,C,D,E,F,G,H|Q ")
688+
TT_LINE("0,X,X,X,X,X,X,X|1|22")
689+
TT_LINE("X,0,X,X,X,X,X,X|1|22")
690+
TT_LINE("X,X,0,X,X,X,X,X|1|22")
691+
TT_LINE("X,X,X,0,X,X,X,X|1|22")
692+
TT_LINE("X,X,X,X,0,X,X,X|1|22")
693+
TT_LINE("X,X,X,X,X,0,X,X|1|22")
694+
TT_LINE("X,X,X,X,X,X,0,X|1|22")
695+
TT_LINE("X,X,X,X,X,X,X,0|1|22")
696+
TT_LINE("1,1,1,1,1,1,1,1|0|15")
697+
TT_FAMILY("74XX")
698+
TRUTHTABLE_END()
699+
632700
TRUTHTABLE_START(TTL_7432_GATE, 2, 1, 0, "")
633701
TT_HEAD("A,B|Q ")
634702
TT_LINE("1,X|1|22")
@@ -675,6 +743,7 @@ NETLIST_START(TTL74XX_lib)
675743
LOCAL_LIB_ENTRY(TTL_7420_DIP)
676744
LOCAL_LIB_ENTRY(TTL_7425_DIP)
677745
LOCAL_LIB_ENTRY(TTL_7427_DIP)
746+
LOCAL_LIB_ENTRY(TTL_7430_DIP)
678747
LOCAL_LIB_ENTRY(TTL_7432_DIP)
679748
LOCAL_LIB_ENTRY(TTL_7437_DIP)
680749
NETLIST_END()

‎src/lib/netlist/macro/nlm_ttl74xx.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,24 @@
132132
NET_REGISTER_DEV(TTL_7427_DIP, _name)
133133

134134

135+
#define TTL_7430_GATE(_name) \
136+
NET_REGISTER_DEV(TTL_7430_GATE, _name)
137+
138+
#define TTL_7430_NAND(_name, _I1, _I2, _I3, _I4, _I5, _I6, _I7, _I8) \
139+
NET_REGISTER_DEV(TTL_7430_NAND, _name) \
140+
NET_CONNECT(_name, A, _I1) \
141+
NET_CONNECT(_name, B, _I2) \
142+
NET_CONNECT(_name, C, _I3) \
143+
NET_CONNECT(_name, D, _I4) \
144+
NET_CONNECT(_name, E, _I5) \
145+
NET_CONNECT(_name, F, _I6) \
146+
NET_CONNECT(_name, G, _I7) \
147+
NET_CONNECT(_name, H, _I8)
148+
149+
#define TTL_7430_DIP(_name) \
150+
NET_REGISTER_DEV(TTL_7430_DIP, _name)
151+
152+
135153
#define TTL_7432_GATE(_name) \
136154
NET_REGISTER_DEV(TTL_7432_OR, _name)
137155

0 commit comments

Comments
 (0)