Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Netlist: align naming of 9334/make nl_hazelvid.cpp parseable by nltool

Browse Source 
Renamed DM9334 to 9334 to align with naming convention used for other
93XX chips.
Added proper connection information for a number of chips to
net_lib.cpp. This allows to parse and run nl_hazelvid.cpp using nltool:

nltool -t 1 -f nl_hazelvid.cpp
This commit is contained in:
couriersud 2016-12-25 02:07:42 +01:00
parent eea00cd6f8
commit 8446519012
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/netlist/devices/net_lib.cpp
View File

@ -107,12 +107,12 @@ static void initialize_factory(factory_list_t &factory)
ENTRY(switch2, SWITCH2, "-")
ENTRYX(nicRSFF, NETDEV_RSFF, "+S,R")
ENTRYX(nicDelay, NETDEV_DELAY, "-")
ENTRYX(2716, EPROM_2716, "-")
ENTRYX(2102A, RAM_2102A, "-")
ENTRYX(2716, EPROM_2716, "+GQ,EPQ,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10")
ENTRYX(2102A, RAM_2102A, "+CEQ,A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,RWQ,DI")
ENTRYX(7450, TTL_7450_ANDORINVERT, "+A,B,C,D")
ENTRYX(7448, TTL_7448, "+A,B,C,D,LTQ,BIQ,RBIQ")
ENTRYX(7473, TTL_7473, "+CLK1,J1,K1,CLRQ1,CLK2,J2,K2,CLRQ2")
ENTRYX(7473A, TTL_7473A, "+CLK1,J1,K1,CLRQ1,CLK2,J2,K2,CLRQ2")
ENTRYX(7473, TTL_7473, "+CLK,J,K,CLRQ")
ENTRYX(7473A, TTL_7473A, "+CLK,J,K,CLRQ")
ENTRYX(7474, TTL_7474, "+CLK,D,CLRQ,PREQ")
ENTRYX(7475, TTL_7475, "-")
ENTRYX(7477, TTL_7477, "-")
@ -124,27 +124,27 @@ static void initialize_factory(factory_list_t &factory)
ENTRYX(74107A, TTL_74107A, "+CLK,J,K,CLRQ")
ENTRYX(74123, TTL_74123, "-")
ENTRYX(74153, TTL_74153, "+C0,C1,C2,C3,A,B,G")
ENTRYX(74161, TTL_74161, "-")
ENTRYX(74161, TTL_74161, "+A,B,C,D,CLRQ,LOADQ,CLK,ENABLEP,ENABLET")
ENTRYX(74165, TTL_74165, "-")
ENTRYX(74166, TTL_74166, "-")
ENTRYX(74174, TTL_74174, "-")
ENTRYX(74175, TTL_74175, "-")
ENTRYX(74166, TTL_74166, "+CLK,CLKINH,SH_LDQ,SER,A,B,C,D,E,F,G,H,CLRQ")
ENTRYX(74174, TTL_74174, "+CLK,D1,D2,D3,D4,D5,D6,CLRQ")
ENTRYX(74175, TTL_74175, "+CLK,D1,D2,D3,D4,CLRQ")
ENTRYX(74192, TTL_74192, "-")
ENTRYX(74193, TTL_74193, "-")
ENTRYX(74193, TTL_74193, "+A,B,C,D,CLEAR,LOADQ,CU,CD")
ENTRYX(74194, TTL_74194, "-")
ENTRYX(74365, TTL_74365, "-")
ENTRYX(DM9334, TTL_DM9334, "-")
ENTRYX(74365, TTL_74365, "+G1Q,G2Q,A1,A2,A3,A4,A5,A6")
//ENTRY(74279, TTL_74279, "-") // only dip available
ENTRYX(SN74LS629, SN74LS629, "CAP")
ENTRYX(82S16, TTL_82S16, "-")
ENTRYX(82S115, PROM_82S115, "-")
ENTRYX(82S123, PROM_82S123, "-")
ENTRYX(82S126, PROM_82S126, "-")
ENTRYX(82S126, PROM_82S126, "+CE1Q,CE2Q,A0,A1,A2,A3,A4,A5,A6,A7")
ENTRYX(9310, TTL_9310, "-")
ENTRYX(9312, TTL_9312, "-")
ENTRYX(9316, TTL_9316, "+CLK,ENP,ENT,CLRQ,LOADQ,A,B,C,D")
ENTRYX(9322, TTL_9322, "-")
ENTRYX(AM2847, TTL_AM2847, "-")
ENTRYX(9334, TTL_9334, "+CQ,EQ,D,A0,A1,A2")
ENTRYX(AM2847, TTL_AM2847, "+CP,INA,INB,INC,IND,RCA,RCB,RCC,RCD")
ENTRYX(CD4020, CD4020, "")
ENTRYX(CD4066_GATE, CD4066_GATE, "")
/* entries with suffix WI are legacy only */
@ -152,7 +152,7 @@ static void initialize_factory(factory_list_t &factory)
//ENTRY(4066, CD_4066, "+A,B")
ENTRYX(NE555, NE555, "-")
ENTRYX(r2r_dac, R2R_DAC, "+VIN,R,N")
ENTRYX(tristate, TTL_TRISTATE, "-")
ENTRYX(tristate, TTL_TRISTATE, "+CEQ1,D1,CEQ2,D2")
ENTRYX(tristate3, TTL_TRISTATE3, "-")
ENTRYX(2102A_dip, RAM_2102A_DIP, "-")
ENTRYX(2716_dip, EPROM_2716_DIP, "-")
@ -190,8 +190,8 @@ static void initialize_factory(factory_list_t &factory)
ENTRYX(9312_dip, TTL_9312_DIP, "-")
ENTRYX(9316_dip, TTL_9316_DIP, "-")
ENTRYX(9322_dip, TTL_9322_DIP, "-")
ENTRYX(9334_dip, TTL_9334_DIP, "-")
ENTRYX(AM2847_dip, TTL_AM2847_DIP, "-")
ENTRYX(DM9334_dip, TTL_DM9334_DIP, "-")
ENTRYX(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2")
ENTRYX(NE555_dip, NE555_DIP, "-")
ENTRYX(MM5837_dip, MM5837_DIP, "-")

16
src/lib/netlist/devices/nld_dm9334.cpp
View File

@ -11,9 +11,9 @@ namespace netlist
{
namespace devices
{
NETLIB_OBJECT(DM9334)
NETLIB_OBJECT(9334)
{
NETLIB_CONSTRUCTOR(DM9334)
NETLIB_CONSTRUCTOR(9334)
, m_CQ(*this, "CQ")
, m_EQ(*this, "EQ")
, m_D(*this, "D")
@ -44,9 +44,9 @@ namespace netlist
state_var<unsigned> m_last_Q;
};
NETLIB_OBJECT_DERIVED(DM9334_dip, DM9334)
NETLIB_OBJECT_DERIVED(9334_dip, 9334)
{
NETLIB_CONSTRUCTOR_DERIVED(DM9334_dip, DM9334)
NETLIB_CONSTRUCTOR_DERIVED(9334_dip, 9334)
{
register_subalias("1", m_A[0]);
register_subalias("2", m_A[1]);
@ -67,7 +67,7 @@ namespace netlist
}
};
NETLIB_RESET(DM9334)
NETLIB_RESET(9334)
{
m_last_CQ = 0;
m_last_EQ = 0;
@ -76,7 +76,7 @@ namespace netlist
m_last_Q = 0;
}
NETLIB_UPDATE(DM9334)
NETLIB_UPDATE(9334)
{
uint_fast8_t a = 0;
for (std::size_t i=0; i<3; i++)
@ -142,8 +142,8 @@ namespace netlist
m_Q[i].push((q >> i) & 1, delay);
}
NETLIB_DEVICE_IMPL(DM9334)
NETLIB_DEVICE_IMPL(DM9334_dip)
NETLIB_DEVICE_IMPL(9334)
NETLIB_DEVICE_IMPL(9334_dip)
} //namespace devices
} // namespace netlist

8
src/lib/netlist/devices/nld_dm9334.h
View File

@ -67,8 +67,8 @@
#include "nl_setup.h"
#define TTL_DM9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \
NET_REGISTER_DEV(TTL_DM9334, name) \
#define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \
NET_REGISTER_DEV(TTL_9334, name) \
NET_CONNECT(name, CQ, cCQ) \
NET_CONNECT(name, EQ, cEQ) \
NET_CONNECT(name, D, cD) \
@ -76,7 +76,7 @@
NET_CONNECT(name, A1, cA1) \
NET_CONNECT(name, A2, cA2)
#define TTL_DM9334_DIP(name) \
NET_REGISTER_DEV(TTL_DM9334_DIP, name)
#define TTL_9334_DIP(name) \
NET_REGISTER_DEV(TTL_9334_DIP, name)
#endif /* NLD_DM9334_H_ */

2
src/mame/machine/nl_hazelvid.cpp
View File

@ -51,7 +51,7 @@ NETLIST_START(hazelvid)
PROM_82S126(u71, low, low, u70.QA, u70.QB, u70.QC, u70.QD, u69.QA, u69.QB, u69.QC, low)
/* signal decoding */
TTL_DM9334(u72, high, u81.Q1Q, u71.O4, u71.O1, u71.O2, u71.O3)
TTL_9334(u72, high, u81.Q1Q, u71.O4, u71.O1, u71.O2, u71.O3)
ALIAS(hms, u72.Q1)
ALIAS(hmsd, u72.Q2)
ALIAS(hblank, u72.Q3)