summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar couriersud <couriersud@gmx.org>2019-11-14 22:59:07 +0100
committerGravatarGravatar couriersud <couriersud@gmx.org>2019-11-14 22:59:07 +0100
commitdc4fa0420182bffb9be8d5e9f654d94b9aafe6b1 (patch)
treeeeda982478b0204dc16ed77eb2e0dd8b79ceb0e5 /src/mame
parentce3c38914d4b710e2e40c212af0d61aa4b328de0 (diff)
netlist: Proxy and power terminal hack removal. [Couriersud]
- Devices ttlhigh and ttlhow are no longer automatically created. - All logic input devices (e.g. TTL_INPUT, LOGIC_INPUT) now need to have their power terminals (VCC, GND) connected. This opens the route for more appropriate proxy devices but comes at a cost. If the connections are omitted your circuit will not work as expected. Example: LOGIC_INPUT(I_SD0, 1, "AY8910PORT") NET_C(VCC, I_SD0.VCC) NET_C(GND, I_SD0.GND) - Updated all netlists. - Removed proxy information from terminal objects. This was replaced by a lookup hash whose life-span does not exceed netlest setup. These changes enable the removal of a number of hacks from the source going forward.
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/nl_cheekyms.cpp5
-rw-r--r--src/mame/audio/nl_gamemachine.cpp3
-rw-r--r--src/mame/audio/nl_kidniki.cpp6
-rw-r--r--src/mame/audio/nl_mario.cpp4
-rw-r--r--src/mame/audio/nl_zac1b11142.cpp6
-rw-r--r--src/mame/machine/nl_breakout.cpp9
-rw-r--r--src/mame/machine/nl_gtrak10.cpp3
-rw-r--r--src/mame/machine/nl_hazelvid.cpp5
-rw-r--r--src/mame/machine/nl_palestra.cpp2
-rw-r--r--src/mame/machine/nl_pongf.cpp7
-rw-r--r--src/mame/machine/nl_rebound.cpp10
-rw-r--r--src/mame/machine/nl_stuntcyc.cpp13
-rw-r--r--src/mame/machine/nl_tp1983.cpp2
-rw-r--r--src/mame/machine/nl_tp1985.cpp2
14 files changed, 73 insertions, 4 deletions
diff --git a/src/mame/audio/nl_cheekyms.cpp b/src/mame/audio/nl_cheekyms.cpp
index 1e41bedba05..fd4485bbe7b 100644
--- a/src/mame/audio/nl_cheekyms.cpp
+++ b/src/mame/audio/nl_cheekyms.cpp
@@ -286,6 +286,11 @@ NETLIST_START(cheekyms)
NET_C(I_PEST_DIES.Q, IC2_1.RESET)
NET_C(I_COIN_EXTRA.Q, IC4_2.RESET)
+ NET_C(I_V5, I_MUTE.VCC, I_CHEESE.VCC, I_MUSIC.VCC, I_MOUSE.VCC, I_HAMMER.VCC,
+ I_PEST.VCC, I_MOUSE_DIES.VCC, I_PEST_DIES.VCC, I_COIN_EXTRA.VCC)
+ NET_C(I_V5, I_MUTE.GND, I_CHEESE.GND, I_MUSIC.GND, I_MOUSE.GND, I_HAMMER.GND,
+ I_PEST.GND, I_MOUSE_DIES.GND, I_PEST_DIES.GND, I_COIN_EXTRA.GND)
+
NETLIST_END()
diff --git a/src/mame/audio/nl_gamemachine.cpp b/src/mame/audio/nl_gamemachine.cpp
index 9d7f9a24388..ec039e6ab47 100644
--- a/src/mame/audio/nl_gamemachine.cpp
+++ b/src/mame/audio/nl_gamemachine.cpp
@@ -40,6 +40,9 @@ NETLIST_START(gamemachine)
LOGIC_INPUT(P14, 1, "OPENDRAIN")
LOGIC_INPUT(P15, 1, "OPENDRAIN")
+ NET_C(V5, P08.VCC, P09.VCC, P10.VCC, P11.VCC, P12.VCC, P13.VCC, P14.VCC, P15.VCC)
+ NET_C(GND, P08.GND, P09.GND, P10.GND, P11.GND, P12.GND, P13.GND, P14.GND, P15.GND)
+
RES(R1, RES_K(2.4))
RES(R2, RES_K(10))
RES(R3, RES_K(4.3))
diff --git a/src/mame/audio/nl_kidniki.cpp b/src/mame/audio/nl_kidniki.cpp
index 6784245956d..e36188048bf 100644
--- a/src/mame/audio/nl_kidniki.cpp
+++ b/src/mame/audio/nl_kidniki.cpp
@@ -368,7 +368,9 @@ NETLIST_START(kidniki)
PARAM(Solver.GS_LOOPS, 10)
//PARAM(Solver.METHOD, "SOR")
PARAM(Solver.METHOD, "MAT_CR")
+ PARAM(Solver.FPTYPE, "DOUBLE")
//PARAM(Solver.METHOD, "MAT")
+ //PARAM(Solver.PIVOT, 1)
//PARAM(Solver.METHOD, "GMRES")
PARAM(Solver.SOR_FACTOR, 1.313)
PARAM(Solver.DYNAMIC_TS, 0)
@@ -421,6 +423,7 @@ NETLIST_START(kidniki)
ALIAS(I_SOUND0, R_AY45L_A.2)
TTL_INPUT(SINH, 1)
+
#if (D6_EXISTS)
DIODE(D6, "1N914")
NET_C(D6.K, SINH)
@@ -438,6 +441,9 @@ NETLIST_START(kidniki)
LOGIC_INPUT(I_CH0, 1, "AY8910PORT")
LOGIC_INPUT(I_OH0, 1, "AY8910PORT")
+ NET_C(I_V5, I_SD0.VCC, I_BD0.VCC, I_CH0.VCC, I_OH0.VCC, SINH.VCC)
+ NET_C(GND, I_SD0.GND, I_BD0.GND, I_CH0.GND, I_OH0.GND, SINH.GND)
+
ANALOG_INPUT(I_MSM2K0, 0)
ANALOG_INPUT(I_MSM3K0, 0)
diff --git a/src/mame/audio/nl_mario.cpp b/src/mame/audio/nl_mario.cpp
index b97d1e08abf..5b427e48314 100644
--- a/src/mame/audio/nl_mario.cpp
+++ b/src/mame/audio/nl_mario.cpp
@@ -227,6 +227,10 @@ NETLIST_START(mario)
ANALOG_INPUT(V5, 5)
ALIAS(VCC, V5) // no-ttl-dip devices need VCC!
+ TTL_INPUT(ttlhigh, 1)
+ TTL_INPUT(ttllow, 0)
+ NET_C(VCC, ttlhigh.VCC, ttllow.VCC, SOUND0.VCC, SOUND1.VCC, SOUND7.VCC)
+ NET_C(GND, ttlhigh.GND, ttllow.GND, SOUND0.GND, SOUND1.GND, SOUND7.GND)
TTL_INPUT(SOUND0, 1)
INCLUDE(nl_mario_snd0)
diff --git a/src/mame/audio/nl_zac1b11142.cpp b/src/mame/audio/nl_zac1b11142.cpp
index 631bc2d233a..75ccf0fd9e6 100644
--- a/src/mame/audio/nl_zac1b11142.cpp
+++ b/src/mame/audio/nl_zac1b11142.cpp
@@ -369,6 +369,7 @@ NETLIST_START(zac1b11142)
LOGIC_INPUT(I_LEVEL, 1, "AY8910PORT")
LOGIC_INPUT(I_LEVELT, 1, "AY8910PORT")
LOGIC_INPUT(I_SW1, 1, "AY8910PORT")
+
ALIAS(IOA0, I_IOA0.Q)
ALIAS(IOA1, I_IOA1.Q)
ALIAS(IOA2, I_IOA2.Q)
@@ -378,6 +379,11 @@ NETLIST_START(zac1b11142)
ALIAS(LEVELT, I_LEVELT.Q)
ALIAS(SW1, I_SW1.Q)
+ NET_C(VCC, I_IOA0.VCC, I_IOA1.VCC, I_IOA2.VCC, I_IOA3.VCC, I_IOA4.VCC,
+ I_LEVEL.VCC, I_LEVELT.VCC, I_SW1.VCC)
+ NET_C(GND, I_IOA0.GND, I_IOA1.GND, I_IOA2.GND, I_IOA3.GND, I_IOA4.GND,
+ I_LEVEL.GND, I_LEVELT.GND, I_SW1.GND)
+
// AY-3-8910 4G/4H analog outputs
RES(R_AY4G_A, 1000)
RES(R_AY4G_B, 1000)
diff --git a/src/mame/machine/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index 3d57a511cf5..a0109992f53 100644
--- a/src/mame/machine/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
@@ -117,6 +117,13 @@ NETLIST_START(breakout)
ALIAS(GNDD ,GND.Q)
ALIAS(P ,V5.Q)
+ TTL_INPUT(ttlhigh, 1)
+ TTL_INPUT(ttllow, 0)
+ TTL_INPUT(antenna, 0)
+
+ NET_C(VCC, ttlhigh.VCC, ttllow.VCC, antenna.VCC)
+ NET_C(GND, ttlhigh.GND, ttllow.GND, antenna.GND)
+
//----------------------------------------------------------------
// Clock circuit
//----------------------------------------------------------------
@@ -168,8 +175,6 @@ NETLIST_START(breakout)
// Startup / Antenna latch
//----------------------------------------------------------------
- TTL_INPUT(antenna, 0)
-
DIODE(CR3, "1N914")
DIODE(CR4, "1N914")
DIODE(CR5, "1N914")
diff --git a/src/mame/machine/nl_gtrak10.cpp b/src/mame/machine/nl_gtrak10.cpp
index 48f76b00aab..b5d1ac67127 100644
--- a/src/mame/machine/nl_gtrak10.cpp
+++ b/src/mame/machine/nl_gtrak10.cpp
@@ -31,6 +31,9 @@ NETLIST_START(gtrak10)
TTL_INPUT(high, 1)
TTL_INPUT(low, 0)
+ NET_C(VCC, high.VCC, low.VCC)
+ NET_C(GND, high.GND, low.GND)
+
MAINCLOCK(CLOCK, 14318181)
ALIAS(P, high)
diff --git a/src/mame/machine/nl_hazelvid.cpp b/src/mame/machine/nl_hazelvid.cpp
index 49e9ce209e2..7634efc27a1 100644
--- a/src/mame/machine/nl_hazelvid.cpp
+++ b/src/mame/machine/nl_hazelvid.cpp
@@ -244,4 +244,9 @@ NETLIST_START(hazelvid)
NET_C(R21_POT.3, GND)
NET_C(R21_POT.2, GND)
+ NET_C(VCC, high.VCC, low.VCC, cpu_ba4.VCC, cpu_iowq.VCC, ba13.VCC, memwq.VCC, rwq.VCC, mrq.VCC,
+ cpu_db0.VCC, cpu_db1.VCC, cpu_db2.VCC, cpu_db3.VCC, cpu_db4.VCC, cpu_db5.VCC, cpu_db6.VCC, cpu_db7.VCC)
+ NET_C(GND, high.GND, low.GND, cpu_ba4.GND, cpu_iowq.GND, ba13.GND, memwq.GND, rwq.GND, mrq.GND,
+ cpu_db0.GND, cpu_db1.GND, cpu_db2.GND, cpu_db3.GND, cpu_db4.GND, cpu_db5.GND, cpu_db6.GND, cpu_db7.GND)
+
NETLIST_END()
diff --git a/src/mame/machine/nl_palestra.cpp b/src/mame/machine/nl_palestra.cpp
index 5dc6a65ac14..23835ce0606 100644
--- a/src/mame/machine/nl_palestra.cpp
+++ b/src/mame/machine/nl_palestra.cpp
@@ -42,6 +42,8 @@ NETLIST_START(palestra)
TTL_INPUT(high, 1)
TTL_INPUT(low, 0)
+ NET_C(VCC, high.VCC, low.VCC)
+ NET_C(GND, high.GND, low.GND)
/*
* board A2 -- score display
diff --git a/src/mame/machine/nl_pongf.cpp b/src/mame/machine/nl_pongf.cpp
index afb8fcedf4a..534791142c1 100644
--- a/src/mame/machine/nl_pongf.cpp
+++ b/src/mame/machine/nl_pongf.cpp
@@ -575,4 +575,11 @@ NETLIST_START(pongf)
ALIAS(videomix, RV3.2)
+ // ----------------------------------------------------------------------------------------
+ // power terminals
+ // ----------------------------------------------------------------------------------------
+
+ NET_C(VCC, high.VCC, low.VCC, antenna.VCC)
+ NET_C(GND, high.GND, low.GND, antenna.GND)
+
NETLIST_END()
diff --git a/src/mame/machine/nl_rebound.cpp b/src/mame/machine/nl_rebound.cpp
index 9843b95d698..17b477c4d10 100644
--- a/src/mame/machine/nl_rebound.cpp
+++ b/src/mame/machine/nl_rebound.cpp
@@ -81,6 +81,8 @@ static NETLIST_START(rebound_schematics)
SWITCH2(START_SW)
TTL_INPUT(antenna, 0)
+ NET_C(V5, antenna.VCC)
+ NET_C(GND, antenna.GND)
// DSW1a/b are actually only a 1 contact switches.
// The logic is needed to force high level on
@@ -116,6 +118,12 @@ static NETLIST_START(rebound_schematics)
NET_C(CON15, antenna)
+ // Coin Counter is connected to CON10 as well. Simulate using resistor
+
+ RES(RCOINCOUNTER, 10)
+ NET_C(RCOINCOUNTER.1, CON10)
+ NET_C(RCOINCOUNTER.2, V5)
+
/* -----------------------------------------------------------------------
* Real netlist start
* -----------------------------------------------------------------------*/
@@ -1289,8 +1297,6 @@ NETLIST_START(rebound)
LOCAL_SOURCE(rebound_schematics)
SOLVER(Solver, 480)
- PARAM(Solver.VNTOL, 1e-9)
- PARAM(Solver.RELTOL, 1e-9)
PARAM(Solver.DYNAMIC_TS, 1)
PARAM(Solver.DYNAMIC_LTE, 1e-6)
PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 5e-7)
diff --git a/src/mame/machine/nl_stuntcyc.cpp b/src/mame/machine/nl_stuntcyc.cpp
index d6997c2daee..03a1401929a 100644
--- a/src/mame/machine/nl_stuntcyc.cpp
+++ b/src/mame/machine/nl_stuntcyc.cpp
@@ -657,5 +657,18 @@ NETLIST_START(stuntcyc)
TTL_7404_INVERT(K8_2, CYCLE_RESET)
ALIAS(CYCLE_RESET_A_Q, K8_2.Q)
+
+ // Power terminals
+
+ NET_C(VCC, high.VCC, low.VCC, ANTENNA.VCC, FREESCORE_SW_B0.VCC, FREESCORE_SW_B1.VCC, FREESCORE_SW_B2.VCC, FREESCORE_SW_B3.VCC,
+ MISS_SW_B0.VCC, MISS_SW_B1.VCC, MISS_SW_B2.VCC, R38_2.VCC, R39_2.VCC)
+ NET_C(GND, high.GND, low.GND, ANTENNA.GND, FREESCORE_SW_B0.GND, FREESCORE_SW_B1.GND, FREESCORE_SW_B2.GND, FREESCORE_SW_B3.GND,
+ MISS_SW_B0.GND, MISS_SW_B1.GND, MISS_SW_B2.GND, R38_2.GND, R39_2.GND)
+
+ NET_C(VCC, OUT_probe_bit0.VCC, OUT_probe_bit1.VCC, OUT_probe_bit2.VCC, OUT_probe_bit3.VCC,
+ OUT_probe_bit4.VCC, OUT_probe_bit5.VCC, OUT_probe_bit6.VCC, OUT_probe_clock.VCC)
+ NET_C(GND, OUT_probe_bit0.GND, OUT_probe_bit1.GND, OUT_probe_bit2.GND, OUT_probe_bit3.GND,
+ OUT_probe_bit4.GND, OUT_probe_bit5.GND, OUT_probe_bit6.GND, OUT_probe_clock.GND)
+
#endif
NETLIST_END()
diff --git a/src/mame/machine/nl_tp1983.cpp b/src/mame/machine/nl_tp1983.cpp
index 1d33caf4174..48cc2968ff0 100644
--- a/src/mame/machine/nl_tp1983.cpp
+++ b/src/mame/machine/nl_tp1983.cpp
@@ -40,6 +40,8 @@ NETLIST_START(tp1983)
TTL_INPUT(high, 1)
TTL_INPUT(low, 0)
+ NET_C(VCC, high.VCC, low.VCC)
+ NET_C(GND, high.GND, low.GND)
// skipping D7.1 D7.2 D8.2 clock generator circuit
MAINCLOCK(clk, 250000.0)
diff --git a/src/mame/machine/nl_tp1985.cpp b/src/mame/machine/nl_tp1985.cpp
index 9d9d4a032de..f8e4c33a3f2 100644
--- a/src/mame/machine/nl_tp1985.cpp
+++ b/src/mame/machine/nl_tp1985.cpp
@@ -47,6 +47,8 @@ NETLIST_START(tp1985)
TTL_INPUT(high, 1)
TTL_INPUT(low, 0)
+ NET_C(VCC, high.VCC, low.VCC)
+ NET_C(GND, high.GND, low.GND)
MAINCLOCK(clk, 4000000.0)