diff options
Diffstat (limited to 'src/mame/audio/canyon.c')
-rw-r--r-- | src/mame/audio/canyon.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/audio/canyon.c b/src/mame/audio/canyon.c index f3e663a4a51..e7834699aac 100644 --- a/src/mame/audio/canyon.c +++ b/src/mame/audio/canyon.c @@ -45,7 +45,7 @@ WRITE8_MEMBER(canyon_state::canyon_whistle_w) static const discrete_555_desc canyonWhistl555 = { DISC_555_OUT_CAP | DISC_555_OUT_AC, - 5, // B+ voltage of 555 + 5, // B+ voltage of 555 DEFAULT_555_VALUES }; @@ -65,12 +65,12 @@ static const discrete_lfsr_desc canyon_lfsr = }; /* Nodes - Sounds */ -#define CANYON_MOTORSND1 NODE_10 -#define CANYON_MOTORSND2 NODE_11 -#define CANYON_EXPLODESND NODE_12 -#define CANYON_WHISTLESND1 NODE_13 -#define CANYON_WHISTLESND2 NODE_14 -#define CANYON_NOISE NODE_15 +#define CANYON_MOTORSND1 NODE_10 +#define CANYON_MOTORSND2 NODE_11 +#define CANYON_EXPLODESND NODE_12 +#define CANYON_WHISTLESND1 NODE_13 +#define CANYON_WHISTLESND2 NODE_14 +#define CANYON_NOISE NODE_15 DISCRETE_SOUND_START(canyon) /************************************************/ @@ -126,15 +126,15 @@ DISCRETE_SOUND_START(canyon) DISCRETE_ADJUSTMENT(NODE_21, (214.0-27.0)/12/15, (4416.0-27.0)/12/15, DISC_LOGADJ, "MOTOR1") DISCRETE_MULTIPLY(NODE_22, NODE_20, NODE_21) - DISCRETE_MULTADD(NODE_23, NODE_22, 2, 27.0/6) /* F1 = /12*2 = /6 */ + DISCRETE_MULTADD(NODE_23, NODE_22, 2, 27.0/6) /* F1 = /12*2 = /6 */ DISCRETE_SQUAREWAVE(NODE_24, 1, NODE_23, (142.9/3), 50.0, 0, 0) DISCRETE_RCFILTER(NODE_25, NODE_24, 10000, 1e-7) - DISCRETE_MULTADD(NODE_26, NODE_22, 3, 27.0/4) /* F2 = /12*3 = /4 */ + DISCRETE_MULTADD(NODE_26, NODE_22, 3, 27.0/4) /* F2 = /12*3 = /4 */ DISCRETE_SQUAREWAVE(NODE_27, 1, NODE_26, (142.9/3), 50.0, 0, 0) DISCRETE_RCFILTER(NODE_28, NODE_27, 10000, 1e-7) - DISCRETE_MULTADD(NODE_29, NODE_22, 4, 27.0/3) /* F3 = /12*4 = /3 */ + DISCRETE_MULTADD(NODE_29, NODE_22, 4, 27.0/3) /* F3 = /12*4 = /3 */ DISCRETE_SQUAREWAVE(NODE_30, 1, NODE_29, (142.9/3), 100.0/3, 0, 360.0/3) DISCRETE_RCFILTER(NODE_31, NODE_30, 10000, 1e-7) @@ -149,15 +149,15 @@ DISCRETE_SOUND_START(canyon) DISCRETE_ADJUSTMENT(NODE_41, (214.0-27.0)/12/15, (4416.0-27.0)/12/15, DISC_LOGADJ, "MOTOR2") DISCRETE_MULTIPLY(NODE_42, NODE_40, NODE_41) - DISCRETE_MULTADD(NODE_43, NODE_42, 2, 27.0/6) /* F1 = /12*2 = /6 */ + DISCRETE_MULTADD(NODE_43, NODE_42, 2, 27.0/6) /* F1 = /12*2 = /6 */ DISCRETE_SQUAREWAVE(NODE_44, 1, NODE_43, (142.9/3), 50.0, 0, 0) DISCRETE_RCFILTER(NODE_45, NODE_44, 10000, 1e-7) - DISCRETE_MULTADD(NODE_46, NODE_42, 3, 27.0/4) /* F2 = /12*3 = /4 */ + DISCRETE_MULTADD(NODE_46, NODE_42, 3, 27.0/4) /* F2 = /12*3 = /4 */ DISCRETE_SQUAREWAVE(NODE_47, 1, NODE_46, (142.9/3), 50.0, 0, 0) DISCRETE_RCFILTER(NODE_48, NODE_47, 10000, 1e-7) - DISCRETE_MULTADD(NODE_49, NODE_42, 4, 27.0/3) /* F3 = /12*4 = /3 */ + DISCRETE_MULTADD(NODE_49, NODE_42, 4, 27.0/3) /* F3 = /12*4 = /3 */ DISCRETE_SQUAREWAVE(NODE_50, 1, NODE_49, (142.9/3), 100.0/3, 0, 360.0/3) DISCRETE_RCFILTER(NODE_51, NODE_50, 10000, 1e-7) @@ -187,15 +187,15 @@ DISCRETE_SOUND_START(canyon) /* frequency, then decays at the rate set by */ /* a 68k resistor and 22uf capacitor. */ /************************************************/ - DISCRETE_ADJUSTMENT(NODE_70, 50000, 100000, DISC_LINADJ, "WHISTLE1") /* R59 */ + DISCRETE_ADJUSTMENT(NODE_70, 50000, 100000, DISC_LINADJ, "WHISTLE1") /* R59 */ DISCRETE_MULTADD(NODE_71, CANYON_WHISTLE1_EN, 3.05-0.33, 0.33) - DISCRETE_RCDISC2(NODE_72, CANYON_WHISTLE1_EN, NODE_71, 1.0, NODE_71, 68000.0, 2.2e-5) /* CV */ + DISCRETE_RCDISC2(NODE_72, CANYON_WHISTLE1_EN, NODE_71, 1.0, NODE_71, 68000.0, 2.2e-5) /* CV */ DISCRETE_555_ASTABLE_CV(NODE_73, CANYON_WHISTLE1_EN, 33000, NODE_70, 1e-8, NODE_72, &canyonWhistl555) DISCRETE_MULTIPLY(CANYON_WHISTLESND1, NODE_73, 519.4/3.3) - DISCRETE_ADJUSTMENT(NODE_75, 50000, 100000, DISC_LINADJ, "WHISTLE2") /* R69 */ + DISCRETE_ADJUSTMENT(NODE_75, 50000, 100000, DISC_LINADJ, "WHISTLE2") /* R69 */ DISCRETE_MULTADD(NODE_76, CANYON_WHISTLE2_EN, 3.05-0.33, 0.33) - DISCRETE_RCDISC2(NODE_77, CANYON_WHISTLE2_EN, NODE_76, 1.0, NODE_76, 68000.0, 2.2e-5) /* CV */ + DISCRETE_RCDISC2(NODE_77, CANYON_WHISTLE2_EN, NODE_76, 1.0, NODE_76, 68000.0, 2.2e-5) /* CV */ DISCRETE_555_ASTABLE_CV(NODE_78, CANYON_WHISTLE2_EN, 33000, NODE_75, 1e-8, NODE_77, &canyonWhistl555) DISCRETE_MULTIPLY(CANYON_WHISTLESND2, NODE_78, 519.4/3.3) |