MAME SVN History

199869 Revisions

r39985 Monday 27th July, 2015 at 21:50:59 UTC by Couriersud
Move MC14584B to nlm_other.[ch] (nw)

[scripts/src]	netlist.lua
[src/emu/netlist]	nl_setup.c
[src/emu/netlist/devices]	net_lib.h
[src/emu/netlist/macro]	nlm_other.c* nlm_other.h*
[src/mame/audio]	nl_kidniki.c
[src/mame/drivers]	m62.c

trunk/scripts/src/netlist.lua
r248496	r248497
158	158	MAME_DIR .. "src/emu/netlist/macro/nlm_cd4xxx.h",
159	159	MAME_DIR .. "src/emu/netlist/macro/nlm_opamp.c",
160	160	MAME_DIR .. "src/emu/netlist/macro/nlm_opamp.h",
	161	MAME_DIR .. "src/emu/netlist/macro/nlm_other.c",
	162	MAME_DIR .. "src/emu/netlist/macro/nlm_other.h",
161	163	}

trunk/src/emu/netlist/devices/net_lib.h
r248496	r248497
59	59	#include "../macro/nlm_cd4xxx.h"
60	60	#include "../macro/nlm_ttl74xx.h"
61	61	#include "../macro/nlm_opamp.h"
	62	#include "../macro/nlm_other.h"
62	63
63	64	#include "../analog/nld_bjt.h"
64	65	#include "../analog/nld_fourterm.h"

trunk/src/emu/netlist/macro/nlm_other.c
r0	r248497
	1
	2	#include "nlm_other.h"
	3
	4	#include "devices/nld_truthtable.h"
	5	#include "devices/nld_system.h"
	6
	7	/*
	8	* MC14584B: Hex Schmitt Trigger
	9	* ON Semiconductor
	10	*
	11	* +--------------+
	12	* A1 \|1 ++ 14\| VCC
	13	* Y1 \|2 13\| A6
	14	* A2 \|3 12\| Y6
	15	* Y2 \|4 MC14584B 11\| A5
	16	* A3 \|5 10\| Y5
	17	* Y3 \|6 9\| A4
	18	* GND \|7 8\| Y4
	19	* +--------------+
	20	*
	21	*/
	22
	23	NETLIST_START(MC14584B_DIP)
	24	MC14584B_GATE(s1)
	25	MC14584B_GATE(s2)
	26	MC14584B_GATE(s3)
	27	MC14584B_GATE(s4)
	28	MC14584B_GATE(s5)
	29	MC14584B_GATE(s6)
	30
	31	DUMMY_INPUT(GND)
	32	DUMMY_INPUT(VCC)
	33
	34	DIPPINS( /* +--------------+ */
	35	s1.A, /* A1 \|1 ++ 14\| VCC */ VCC.I,
	36	s1.Q, /* Y1 \|2 13\| A6 */ s6.A,
	37	s2.A, /* A2 \|3 12\| Y6 */ s6.Q,
	38	s2.Q, /* Y2 \|4 7416 11\| A5 */ s5.A,
	39	s3.A, /* A3 \|5 10\| Y5 */ s5.Q,
	40	s3.Q, /* Y3 \|6 9\| A4 */ s4.A,
	41	GND.I, /* GND \|7 8\| Y4 */ s4.Q
	42	/* +--------------+ */
	43	)
	44	NETLIST_END()
	45
	46	NETLIST_START(otheric_lib)
	47	TRUTHTABLE_START(MC14584B_GATE, 1, 1, 0, "")
	48	TT_HEAD(" A \| Q ")
	49	TT_LINE(" 0 \| 1 \|100")
	50	TT_LINE(" 1 \| 0 \|100")
	51	TT_FAMILY("FAMILY(IVL=2.1 IVH=2.7 OVL=0.05 OVH=4.95 ORL=10.0 ORH=10.0)")
	52	TRUTHTABLE_END()
	53
	54	LOCAL_LIB_ENTRY(MC14584B_DIP)
	55	NETLIST_END()

trunk/src/emu/netlist/macro/nlm_other.h
r0	r248497
	1	#ifndef NLM_OTHER_H_
	2	#define NLM_OTHER_H_
	3
	4	#include "../nl_setup.h"
	5
	6	#ifndef __PLIB_PREPROCESSOR__
	7
	8	/* ----------------------------------------------------------------------------
	9	* Netlist Macros
	10	* ---------------------------------------------------------------------------*/
	11
	12	#define MC14584B_GATE(_name) \
	13	NET_REGISTER_DEV(MC14584B_GATE, _name)
	14
	15	#define MC14584B_DIP(_name) \
	16	NET_REGISTER_DEV(MC14584B_DIP, _name)
	17
	18
	19	/* ----------------------------------------------------------------------------
	20	* External declarations
	21	* ---------------------------------------------------------------------------*/
	22
	23	NETLIST_EXTERNAL(otheric_lib)
	24
	25	#endif
	26
	27	#endif

trunk/src/emu/netlist/nl_setup.c
r248496	r248497
30	30	LOCAL_SOURCE(TTL74XX_lib)
31	31	LOCAL_SOURCE(CD4XXX_lib)
32	32	LOCAL_SOURCE(OPAMP_lib)
	33	LOCAL_SOURCE(otheric_lib)
33	34
34	35	INCLUDE(diode_models);
35	36	INCLUDE(bjt_models);
r248496	r248497
37	38	INCLUDE(TTL74XX_lib);
38	39	INCLUDE(CD4XXX_lib);
39	40	INCLUDE(OPAMP_lib);
	41	INCLUDE(otheric_lib);
40	42
41	43	NETLIST_END()
42	44

trunk/src/mame/audio/nl_kidniki.c
r248496	r248497
15	15
16	16	#ifndef __PLIB_PREPROCESSOR__
17	17
18		#define MC14584B_GATE(_name) \
19		NET_REGISTER_DEV(MC14584B_GATE, _name)
20
21		#define MC14584B_DIP(_name) \
22		NET_REGISTER_DEV(MC14584B_DIP, _name)
23
24	18	#define LM324_DIP(_name) \
25	19	NET_REGISTER_DEV(LM324_DIP, _name)
26	20
r248496	r248497
119	113
120	114	LM324_DIP(XU1)
121	115	LM358_DIP(XU2)
122		//SUBMODEL(LM324_DIP,XU1)
123		//SUBMODEL(LM358_DIP,XU2)
124	116
125	117	MC14584B_DIP(XU3)
126	118
r248496	r248497
219	211	NET_C(XU3.6, R105.1, R106.2)
220	212	#if USE_FIXED_STV
221	213	//FIXME: We should have a NET_C_REMOVE
222		NET_C(/XU3.7,/ C69.2, C73.2, C72.2, C77.2, C67.2, C68.2, R65.2, R38.2, XU1.11, R54.2, Q4.E, R63.2, C47.2, R72.2, R67.2, R71.2, R68.2, C48.2, R46.2, C28.1, C32.1, R43.2, XU2.4, C56.1, C52.1,/* R77.2, C58.1, */ R48.2, R93.2, R94.2, R119.2, R104.2, R53.2, R34.2, R81.2, R92.2, R89.2, C33.1, R37.2, R36.1, R91.1, I_V0.Q, RV1.3)
	214	NET_C(XU3.7, C69.2, C73.2, C72.2, C77.2, C67.2, C68.2, R65.2, R38.2, XU1.11, R54.2, Q4.E, R63.2, C47.2, R72.2, R67.2, R71.2, R68.2, C48.2, R46.2, C28.1, C32.1, R43.2, XU2.4, C56.1, C52.1,/* R77.2, C58.1, */ R48.2, R93.2, R94.2, R119.2, R104.2, R53.2, R34.2, R81.2, R92.2, R89.2, C33.1, R37.2, R36.1, R91.1, I_V0.Q, RV1.3)
223	215	#else
224		NET_C(/XU3.7,/ C69.2, C73.2, C72.2, C77.2, C67.2, C68.2, R65.2, R38.2, XU1.11, R54.2, Q4.E, R63.2, C47.2, R72.2, R67.2, R71.2, R68.2, C48.2, R46.2, C28.1, C32.1, R43.2, XU2.4, C56.1, C52.1, R77.2, C58.1, R48.2, R93.2, R94.2, R119.2, R104.2, R53.2, R34.2, R81.2, R92.2, R89.2, C33.1, R37.2, R36.1, R91.1, I_V0.Q, RV1.3)
	216	NET_C(XU3.7, C69.2, C73.2, C72.2, C77.2, C67.2, C68.2, R65.2, R38.2, XU1.11, R54.2, Q4.E, R63.2, C47.2, R72.2, R67.2, R71.2, R68.2, C48.2, R46.2, C28.1, C32.1, R43.2, XU2.4, C56.1, C52.1, R77.2, C58.1, R48.2, R93.2, R94.2, R119.2, R104.2, R53.2, R34.2, R81.2, R92.2, R89.2, C33.1, R37.2, R36.1, R91.1, I_V0.Q, RV1.3)
225	217	#endif
226	218	NET_C(XU3.8, R108.1, R107.2)
227	219	NET_C(XU3.9, R108.2, C77.1)
r248496	r248497
230	222	NET_C(XU3.12, R98.1, R97.2)
231	223	NET_C(XU3.13, R98.2, C68.1)
232	224	#if USE_FIXED_STV
233		NET_C(/XU3.14,/ XU1.4, R66.1, R70.1, Q6.C, Q5.C, XU2.8, /* R78.1, */ R86.1, R83.1, Q3.C, I_V5.Q)
	225	NET_C(XU3.14, XU1.4, R66.1, R70.1, Q6.C, Q5.C, XU2.8, /* R78.1, */ R86.1, R83.1, Q3.C, I_V5.Q)
234	226	#else
235		NET_C(/XU3.14,/ XU1.4, R66.1, R70.1, Q6.C, Q5.C, XU2.8, R78.1, R86.1, R83.1, Q3.C, I_V5.Q)
	227	NET_C(XU3.14, XU1.4, R66.1, R70.1, Q6.C, Q5.C, XU2.8, R78.1, R86.1, R83.1, Q3.C, I_V5.Q)
236	228	#endif
237	229	NET_C(R96.1, R102.1, R106.1, R107.1, R101.1, R97.1, R65.1, C63.2)
238	230	NET_C(C63.1, R65_1.2)
r248496	r248497
445	437	ALIAS( 8, op1.VCC)
446	438	NETLIST_END()
447	439
448		NETLIST_START(MC14584B_DIP)
449		MC14584B_GATE(s1)
450		MC14584B_GATE(s2)
451		MC14584B_GATE(s3)
452		MC14584B_GATE(s4)
453		MC14584B_GATE(s5)
454		MC14584B_GATE(s6)
455
456		ALIAS( 1, s1.A)
457		ALIAS( 2, s1.Q)
458		ALIAS( 3, s2.A)
459		ALIAS( 4, s2.Q)
460		ALIAS( 5, s3.A)
461		ALIAS( 6, s3.Q)
462
463		ALIAS( 8, s4.Q)
464		ALIAS( 9, s4.A)
465		ALIAS(10, s5.Q)
466		ALIAS(11, s5.A)
467		ALIAS(12, s6.Q)
468		ALIAS(13, s6.A)
469		NETLIST_END()
470
471	440	NETLIST_START(kidniki_lib)
472		TRUTHTABLE_START(MC14584B_GATE, 1, 1, 0, "")
473		TT_HEAD(" A \| Q ")
474		TT_LINE(" 0 \| 1 \|100")
475		TT_LINE(" 1 \| 0 \|100")
476		TT_FAMILY("FAMILY(IVL=2.1 IVH=2.7 OVL=0.05 OVH=4.95 ORL=10.0 ORH=10.0)")
477		TRUTHTABLE_END()
478	441
479	442	LOCAL_LIB_ENTRY(LM324_DIP)
480	443	LOCAL_LIB_ENTRY(LM358_DIP)
481		LOCAL_LIB_ENTRY(MC14584B_DIP)
482	444
483	445	NETLIST_END()
484	446

trunk/src/mame/drivers/m62.c
r248496	r248497
2176	2176	membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000);
2177	2177	}
2178	2178
2179		GAME( 1984, kungfum, 0, kungfum, kungfum, driver_device, 0, ROT0, "Irem", "Kung-Fu Master (World)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2180		GAME( 1984, kungfumd, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "Irem (Data East USA license)", "Kung-Fu Master (US)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2181		GAME( 1984, spartanx, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "Irem", "Spartan X (Japan)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2182		GAME( 1984, kungfub, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 1)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2183		GAME( 1984, kungfub2, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 2)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2184		GAME( 1984, battroad, 0, battroad, battroad, m62_state, battroad, ROT90, "Irem", "The Battle-Road", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2185		GAME( 1984, ldrun, 0, ldrun, ldrun, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner (set 1)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2186		GAME( 1984, ldruna, ldrun, ldrun, ldrun, driver_device, 0, ROT0, "Irem (licensed from Broderbund, Digital Controls Inc. license)", "Lode Runner (set 2)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2187		GAME( 1984, ldrun2, 0, ldrun2, ldrun2, m62_state, ldrun2, ROT0, "Irem (licensed from Broderbund)", "Lode Runner II - The Bungeling Strikes Back", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND ) /* Japanese version is called Bangeringu Teikoku No Gyakushuu */
2188		GAME( 1985, ldrun3, 0, ldrun3, ldrun3, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - The Golden Labyrinth", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2189		GAME( 1985, ldrun3j, ldrun3, ldrun3, ldrun3, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - Majin No Fukkatsu (Japan)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2190		GAME( 1986, ldrun4, 0, ldrun4, ldrun4, m62_state, ldrun4, ROT0, "Irem (licensed from Broderbund)", "Lode Runner IV - Teikoku Karano Dasshutsu (Japan)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2191		GAME( 1985, lotlot, 0, lotlot, lotlot, driver_device, 0, ROT0, "Irem (licensed from Tokuma Shoten)", "Lot Lot", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2192		GAME( 1986, kidniki, 0, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kid Niki - Radical Ninja (World)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2193		GAME( 1986, kidnikiu, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem (Data East USA license)", "Kid Niki - Radical Ninja (US)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2194		GAME( 1986, yanchamr, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kaiketsu Yanchamaru (Japan)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2195		GAME( 1987, lithero, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "bootleg", "Little Hero", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2196		GAME( 1985, spelunkr, 0, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2197		GAME( 1985, spelunkrj,spelunkr, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker (Japan)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2198		GAME( 1986, spelunk2, 0, spelunk2, spelunk2, m62_state, spelunk2, ROT0, "Irem (licensed from Broderbund)", "Spelunker II", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2199		GAME( 1986, youjyudn, 0, youjyudn, youjyudn, m62_state, youjyudn, ROT270, "Irem", "Youjyuden (Japan)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
2200		GAME( 1985, horizon, 0, horizon, horizon, driver_device, 0, ROT0, "Irem", "Horizon (Irem)", GAME_SUPPORTS_SAVE \| GAME_IMPERFECT_SOUND )
	2179	GAME( 1984, kungfum, 0, kungfum, kungfum, driver_device, 0, ROT0, "Irem", "Kung-Fu Master (World)", GAME_SUPPORTS_SAVE )
	2180	GAME( 1984, kungfumd, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "Irem (Data East USA license)", "Kung-Fu Master (US)", GAME_SUPPORTS_SAVE )
	2181	GAME( 1984, spartanx, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "Irem", "Spartan X (Japan)", GAME_SUPPORTS_SAVE )
	2182	GAME( 1984, kungfub, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 1)", GAME_SUPPORTS_SAVE )
	2183	GAME( 1984, kungfub2, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 2)", GAME_SUPPORTS_SAVE )
	2184	GAME( 1984, battroad, 0, battroad, battroad, m62_state, battroad, ROT90, "Irem", "The Battle-Road", GAME_SUPPORTS_SAVE )
	2185	GAME( 1984, ldrun, 0, ldrun, ldrun, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner (set 1)", GAME_SUPPORTS_SAVE )
	2186	GAME( 1984, ldruna, ldrun, ldrun, ldrun, driver_device, 0, ROT0, "Irem (licensed from Broderbund, Digital Controls Inc. license)", "Lode Runner (set 2)", GAME_SUPPORTS_SAVE )
	2187	GAME( 1984, ldrun2, 0, ldrun2, ldrun2, m62_state, ldrun2, ROT0, "Irem (licensed from Broderbund)", "Lode Runner II - The Bungeling Strikes Back", GAME_SUPPORTS_SAVE ) /* Japanese version is called Bangeringu Teikoku No Gyakushuu */
	2188	GAME( 1985, ldrun3, 0, ldrun3, ldrun3, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - The Golden Labyrinth", GAME_SUPPORTS_SAVE )
	2189	GAME( 1985, ldrun3j, ldrun3, ldrun3, ldrun3, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - Majin No Fukkatsu (Japan)", GAME_SUPPORTS_SAVE )
	2190	GAME( 1986, ldrun4, 0, ldrun4, ldrun4, m62_state, ldrun4, ROT0, "Irem (licensed from Broderbund)", "Lode Runner IV - Teikoku Karano Dasshutsu (Japan)", GAME_SUPPORTS_SAVE )
	2191	GAME( 1985, lotlot, 0, lotlot, lotlot, driver_device, 0, ROT0, "Irem (licensed from Tokuma Shoten)", "Lot Lot", GAME_SUPPORTS_SAVE )
	2192	GAME( 1986, kidniki, 0, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kid Niki - Radical Ninja (World)", GAME_IMPERFECT_SOUND \| GAME_SUPPORTS_SAVE )
	2193	GAME( 1986, kidnikiu, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem (Data East USA license)", "Kid Niki - Radical Ninja (US)", GAME_IMPERFECT_SOUND \| GAME_SUPPORTS_SAVE )
	2194	GAME( 1986, yanchamr, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kaiketsu Yanchamaru (Japan)", GAME_IMPERFECT_SOUND \| GAME_SUPPORTS_SAVE )
	2195	GAME( 1987, lithero, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "bootleg", "Little Hero", GAME_IMPERFECT_SOUND \| GAME_SUPPORTS_SAVE )
	2196	GAME( 1985, spelunkr, 0, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker", GAME_SUPPORTS_SAVE )
	2197	GAME( 1985, spelunkrj,spelunkr, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker (Japan)", GAME_SUPPORTS_SAVE )
	2198	GAME( 1986, spelunk2, 0, spelunk2, spelunk2, m62_state, spelunk2, ROT0, "Irem (licensed from Broderbund)", "Spelunker II", GAME_IMPERFECT_SOUND \| GAME_SUPPORTS_SAVE )
	2199	GAME( 1986, youjyudn, 0, youjyudn, youjyudn, m62_state, youjyudn, ROT270, "Irem", "Youjyuden (Japan)", GAME_SUPPORTS_SAVE )
	2200	GAME( 1985, horizon, 0, horizon, horizon, driver_device, 0, ROT0, "Irem", "Horizon (Irem)", GAME_IMPERFECT_SOUND \| GAME_SUPPORTS_SAVE )

https://github.com/mamedev/mame/commit/e266587640052a9055da6b51a424a6149cf0f794

199869 Revisions