diff options
author | 2015-04-20 00:56:16 +0200 | |
---|---|---|
committer | 2015-04-20 00:56:16 +0200 | |
commit | 6b8eb847eabae746f3684f7efa001f7925c9c501 (patch) | |
tree | a7e050c951905a4603e26dd6f7d4b894954c01ff | |
parent | 67d69aa02d91189dad82646ef89e6f789481c475 (diff) |
Document more work on breakout. Further additions to nl_dice_compat.h.
(nw)
-rw-r--r-- | nl_examples/breakout.c | 13 | ||||
-rw-r--r-- | src/emu/netlist/nl_dice_compat.h | 26 |
2 files changed, 32 insertions, 7 deletions
diff --git a/nl_examples/breakout.c b/nl_examples/breakout.c index a4b9ecb0efc..b7b95edd210 100644 --- a/nl_examples/breakout.c +++ b/nl_examples/breakout.c @@ -47,8 +47,7 @@ static AUDIO_DESC( breakout ) VIDEO_DESC_END #endif - -static Mono9602Desc n8_desc(K_OHM(33.0), U_FARAD(100.0), K_OHM(5.6), P_FARAD(0.0)); // No capacitor on 2nd 9602. +static Mono9602Desc n8_desc(K_OHM(33.0), U_FARAD(100.0), K_OHM(5.6), P_FARAD(0.01)); // No capacitor on 2nd 9602, assume very low internal capacitance static Mono9602Desc f3_desc(K_OHM(47.0), U_FARAD(1.0), K_OHM(47.0), U_FARAD(1.0)); static Mono9602Desc a7_desc(K_OHM(68.0), U_FARAD(1.0), K_OHM(22.0), U_FARAD(10.0)); @@ -85,8 +84,8 @@ CIRCUIT_LAYOUT( breakout ) CHIP("A4", 7408) CHIP("A5", 7400) CHIP("A6", 7474) - CHIP("A7", 9602, &a7_desc) - CHIP("A8", 9602, &a8_desc) + CHIP_9602_Mono(A7, &a7_desc) + CHIP_9602_Mono(A8, &a8_desc) CHIP("B2", 555_Astable, &b2_555_desc) CHIP("B3", 7402) @@ -104,7 +103,7 @@ CIRCUIT_LAYOUT( breakout ) CHIP("C6", 7486) CHIP("C7", 9316) CHIP("C8", 9316) - CHIP("C9", 555_Mono, &c9_555_desc) + CHIP_555_Mono(C9, &c9_555_desc) CHIP("D2", 7432) CHIP("D3", 7474) @@ -127,7 +126,7 @@ CIRCUIT_LAYOUT( breakout ) CHIP("F1", 9316) CHIP("F2", 7411) - CHIP("F3", 9602, &f3_desc) + CHIP_9602_Mono(F3, &f3_desc) CHIP("F4", 7474) CHIP("F5", 7474) CHIP("F6", 74193) @@ -191,7 +190,7 @@ CIRCUIT_LAYOUT( breakout ) CHIP("N5", 9312) CHIP("N6", 9310) CHIP("N7", 7408) //sometimes looks like H7 on schematic - CHIP("N8", 9602, &n8_desc) + CHIP_9602_Mono(N8, &n8_desc) CHIP("N9", 74192) //LM380 //speaker amplifier diff --git a/src/emu/netlist/nl_dice_compat.h b/src/emu/netlist/nl_dice_compat.h index 001170cd14b..917edad4cbb 100644 --- a/src/emu/netlist/nl_dice_compat.h +++ b/src/emu/netlist/nl_dice_compat.h @@ -46,6 +46,15 @@ public: Mono555Desc(nl_double res, nl_double cap) : r(res), c(cap) { } }; +struct Mono9602Desc +{ +public: + nl_double r1, c1, r2, c2; + + Mono9602Desc(nl_double res1, nl_double cap1, nl_double res2, nl_double cap2) + : r1(res1), c1(cap1), r2(res2), c2(cap2) { } +}; + struct SeriesRCDesc { public: @@ -66,6 +75,23 @@ public: NET_C(_name.8, V5) \ NET_CSTR(# _name ".1", "GND") +#define CHIP_9602_Mono(_name, _pdesc) \ + CHIP(# _name, 9602) \ + NET_C(VCC, _name.16) \ + NET_C(GND, _name.8) \ + RES(_name ## _R1, (_pdesc)->r1) \ + CAP(_name ## _C1, (_pdesc)->c1) \ + RES(_name ## _R2, (_pdesc)->r2) \ + CAP(_name ## _C2, (_pdesc)->c2) \ + NET_C(_name.1, _name ## _C1.1) \ + NET_C(_name.2, _name ## _C1.2) \ + NET_C(_name.2, _name ## _R1.2) \ + NET_C(VCC, _name ## _R1.1) \ + NET_C(_name.15, _name ## _C2.1) \ + NET_C(_name.14, _name ## _C2.2) \ + NET_C(_name.14, _name ## _R2.2) \ + NET_C(VCC, _name ## _R2.1) \ + #define CHIP_SERIES_RC(_name, _pdesc) \ RES(_name ## _R, (_pdesc)->r) \ CAP(_name ## _C, (_pdesc)->c) \ |