diff options
Diffstat (limited to 'src/mame/audio')
-rw-r--r-- | src/mame/audio/copsnrob.c | 56 | ||||
-rw-r--r-- | src/mame/audio/dkong.c | 114 | ||||
-rw-r--r-- | src/mame/audio/mario.c | 96 |
3 files changed, 133 insertions, 133 deletions
diff --git a/src/mame/audio/copsnrob.c b/src/mame/audio/copsnrob.c index d8cbcfbe46d..fa35a6e7169 100644 --- a/src/mame/audio/copsnrob.c +++ b/src/mame/audio/copsnrob.c @@ -184,7 +184,7 @@ static const discrete_555_cc_desc copsnrob_motor01_555cc = DISC_555_OUT_COUNT_R | DISCRETE_555_CC_TO_DISCHARGE_PIN, 5, /* v_pos */ DEFAULT_555_CC_SOURCE, - 1, /* v_out_high - ignored */ + 1, /* v_out_high - ignored */ 0.6 /* v_cc_junction */ }; @@ -202,7 +202,7 @@ static const discrete_555_cc_desc copsnrob_motor01_555cc = #define COPSNROB_MOTOR01(_output, _input, _num) \ /* simulate the RC connected to the transistor with a DAC */ \ DISCRETE_DAC_R1(COPSNROB_MOTOR01_NODE(_num, 0), \ - _input, 4.2, &copsnrob_motor01_cc_dac) /* DATA; VDATA - TTL with light load */ \ + _input, 4.2, &copsnrob_motor01_cc_dac) /* DATA; VDATA - TTL with light load */ \ DISCRETE_555_CC(COPSNROB_MOTOR01_NODE(_num, 1), /* IC F2, pin 10 from IC F3, pin 9 */ \ 1, /* RESET - IC F3, pin 10 */ \ COPSNROB_MOTOR01_NODE(_num, 0), /* VIN */ \ @@ -222,7 +222,7 @@ static const discrete_555_cc_desc copsnrob_motor01_555cc = COPSNROB_MOTOR01_NODE(_num, 3), 2, /* INP1, INP2 */ \ "02&2/12*+") /* get bits ready for DAC */\ DISCRETE_DAC_R1(_output, \ - COPSNROB_MOTOR01_NODE(_num, 4), 4.2, &copsnrob_motor01_out_dac) /* DATA; VDATA - TTL with light load */ + COPSNROB_MOTOR01_NODE(_num, 4), 4.2, &copsnrob_motor01_out_dac) /* DATA; VDATA - TTL with light load */ /************************************************ * MOTOR0/1 Definition Start @@ -235,7 +235,7 @@ static const discrete_555_cc_desc copsnrob_motor01_555cc = #define COPSNROB_MOTOR23(_output, _input, _num) \ /* simulate the RC connected to the 555 CV pin with a DAC */ \ DISCRETE_DAC_R1(COPSNROB_MOTOR23_NODE(_num, 0), \ - _input, 4.2, &copsnrob_motor23_cv_dac) /* DATA; VDATA - TTL with light load */ \ + _input, 4.2, &copsnrob_motor23_cv_dac) /* DATA; VDATA - TTL with light load */ \ DISCRETE_555_ASTABLE_CV(COPSNROB_MOTOR23_NODE(_num, 1), /* IC J2, pin 5 */ \ 1, /* RESET */ \ COPSNROB_R64, COPSNROB_R42, COPSNROB_C24, \ @@ -294,8 +294,8 @@ DISCRETE_STEP(copsnrob_custom_noise) t_used += node->info->sample_time; /* This clock will never run faster then the sample rate, - * so we do not bother to check. - */ + * so we do not bother to check. + */ if (t_used > t1) { /* calculate the overshoot time */ @@ -403,10 +403,10 @@ DISCRETE_STEP(copsnrob_zings_555_monostable) /* From testing a real IC */ /* Trigger going low overides everything. It forces the FF/Output high. - * If Threshold is high, the output will still go high as long as trigger is low. - * The output will then go low when trigger rises above it's 1/3VCC value. - * If threshold is below it's 2/3VCC value, the output will remain high. - */ + * If Threshold is high, the output will still go high as long as trigger is low. + * The output will then go low when trigger rises above it's 1/3VCC value. + * If threshold is below it's 2/3VCC value, the output will remain high. + */ if (ff_set) { flip_flop = 1; @@ -550,9 +550,9 @@ DISCRETE_STEP(copsnrob_zings_555_astable) v_trigger = v_cap1 / 3; /* This oscillator will never create a frequency greater then 1/2 the sample rate, - * so we won't worry about missing samples */ + * so we won't worry about missing samples */ /* No need to optimize the charge circuit. It always charges/discharges to a voltage - * greater then it will ever reach. */ + * greater then it will ever reach. */ if (flip_flop) { /* charge */ @@ -619,15 +619,15 @@ static const discrete_custom_info copsnrob_zings_555_astable = DISCRETE_SOUND_START(copsnrob) /************************************************ - * Input register mapping - ************************************************/ + * Input register mapping + ************************************************/ DISCRETE_INPUT_LOGIC(COPSNROB_MOTOR0_INV) DISCRETE_INPUT_LOGIC(COPSNROB_MOTOR1_INV) DISCRETE_INPUT_LOGIC(COPSNROB_MOTOR2_INV) DISCRETE_INPUT_LOGIC(COPSNROB_MOTOR3_INV) /* !! DISABLED UNTIL ADDRESS IS FOUND !! */ -// DISCRETE_INPUTX_LOGIC(COPSNROB_ZINGS_INV, 4, 0, 0) -// DISCRETE_INPUT_LOGIC(COPSNROB_FIRES_INV) +// DISCRETE_INPUTX_LOGIC(COPSNROB_ZINGS_INV, 4, 0, 0) +// DISCRETE_INPUT_LOGIC(COPSNROB_FIRES_INV) DISCRETE_INPUT_NOT(COPSNROB_CRASH_INV) /* inverted for counter use */ DISCRETE_INPUT_LOGIC(COPSNROB_SCREECH_INV) DISCRETE_INPUT_NOT(COPSNROB_AUDIO_ENABLE) /* IC A1, pins 2 & 12 */ @@ -639,20 +639,20 @@ DISCRETE_SOUND_START(copsnrob) DISCRETE_CONSTANT(COPSNROB_FIRES_INV, 4) /* data bit will be normally high */ /************************************************ - * MOTOR0/1 - ************************************************/ + * MOTOR0/1 + ************************************************/ COPSNROB_MOTOR01(COPSNROB_MOTOR0_SND, COPSNROB_MOTOR0_INV, 0) COPSNROB_MOTOR01(COPSNROB_MOTOR1_SND, COPSNROB_MOTOR1_INV, 1) /************************************************ - * MOTOR2/3 - ************************************************/ + * MOTOR2/3 + ************************************************/ COPSNROB_MOTOR23(COPSNROB_MOTOR2_SND, COPSNROB_MOTOR2_INV, 0) COPSNROB_MOTOR23(COPSNROB_MOTOR3_SND, COPSNROB_MOTOR3_INV, 1) /************************************************ - * CRASH - ************************************************/ + * CRASH + ************************************************/ DISCRETE_CUSTOM1(COPSNROB_NOISE_1, /* IC J2, pin 10 */ COPSNROB_2V, /* CLK */ &copsnrob_custom_noise) @@ -672,13 +672,13 @@ DISCRETE_SOUND_START(copsnrob) &copsnrob_crash_dac) /************************************************ - * SCREECH - ************************************************/ + * SCREECH + ************************************************/ DISCRETE_CONSTANT(COPSNROB_SCREECH_SND, 0) /************************************************ - * FZ (Fires, Zings) - ************************************************/ + * FZ (Fires, Zings) + ************************************************/ DISCRETE_CUSTOM3(NODE_60, /* IC D3, pin 5 */ /* We can ignore R47 & R48 */ COPSNROB_ZINGS_INV, /* IC D3, pin 6 */ @@ -699,8 +699,8 @@ DISCRETE_SOUND_START(copsnrob) COPSNROB_R73 / COPSNROB_R26) /************************************************ - * MIXER - ************************************************/ + * MIXER + ************************************************/ DISCRETE_MIXER5(NODE_90, /* IC B3, pin 3 */ COPSNROB_AUDIO_ENABLE, /* ENAB */ COPSNROB_MOTOR1_SND, COPSNROB_MOTOR0_SND, COPSNROB_FZ_SND, COPSNROB_SCREECH_SND, COPSNROB_CRASH_SND, diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index 148c82b1b5e..e0d6622b51c 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -910,18 +910,18 @@ DISCRETE_TASK_START(1) 4.14, 0.151) /* INP0; INP1 (measured) */ /* Breadboarded measurements IC 5K, pin 7 - D.R. Oct 2010 - V Hz - 0.151 3139 - 0.25 2883 - 0.5 2820 - 0.75 3336 - 1 3805 - 2 6498 - 3 9796 - 4 13440 - 4.14 13980 - */ + D.R. Oct 2010 + V Hz + 0.151 3139 + 0.25 2883 + 0.5 2820 + 0.75 3336 + 1 3805 + 2 6498 + 3 9796 + 4 13440 + 4.14 13980 + */ DISCRETE_74LS624(NODE_113, /* IC 5K, pin 7 */ 1, /* ENAB */ @@ -942,18 +942,18 @@ DISCRETE_TASK_START(1) 0.135, 4.15) /* measured Low/High */ /* Breadboarded measurements IC 5K, pin 10 - D.R. Oct 2010 - V Hz - 0.135 14450 - measured 74LS04 low - 0.25 13320 - 0.5 12980 - 0.75 15150 - 1 17270 - 2 28230 - 3 41910 - 4 56950 - 4.15 59400 - measured 74LS04 high - */ + D.R. Oct 2010 + V Hz + 0.135 14450 - measured 74LS04 low + 0.25 13320 + 0.5 12980 + 0.75 15150 + 1 17270 + 2 28230 + 3 41910 + 4 56950 + 4.15 59400 - measured 74LS04 high + */ DISCRETE_74LS624(NODE_118, /* IC 5K, pin 10 */ 1, /* ENAB */ @@ -984,18 +984,18 @@ DISCRETE_TASK_START(2) DISCRETE_MIXER2(NODE_13, 1, NODE_11, NODE_12, &dkongjr_s1_mixer_desc) /* Breadboarded measurements IC 8L, pin 10 - D.R. Oct 2010 - V Hz - 0.151 313 - 0.25 288 - 0.5 275 - 0.75 324 - 1 370 - 2 635 - 3 965 - 4 1325 - 4.14 1378 - */ + D.R. Oct 2010 + V Hz + 0.151 313 + 0.25 288 + 0.5 275 + 0.75 324 + 1 370 + 2 635 + 3 965 + 4 1325 + 4.14 1378 + */ DISCRETE_74LS624(NODE_14, /* IC 8L, pin 10 */ 1, /* ENAB */ @@ -1015,8 +1015,8 @@ DISCRETE_TASK_START(2) DISCRETE_TASK_END() /************************************************ - * SOUND2 - climbing - ************************************************/ + * SOUND2 - climbing + ************************************************/ DISCRETE_TASK_START(1) /* the noise source clock is a 74LS629 IC 7P, pin 10. @@ -1048,18 +1048,18 @@ DISCRETE_TASK_START(1) 0.134, 4.16) /* measured Low/High */ /* Breadboarded measurements IC 7P, pin 7 - D.R. Oct 2010 - V Hz - 0.134 570 - 0.25 538 - 0.5 489 - 0.75 560 - 1 636 - 2 1003 - 3 1484 - 4 2016 - 4.16 2111 - */ + D.R. Oct 2010 + V Hz + 0.134 570 + 0.25 538 + 0.5 489 + 0.75 560 + 1 636 + 2 1003 + 3 1484 + 4 2016 + 4.16 2111 + */ DISCRETE_74LS624(NODE_91, /* IC 7P, pin 7 */ 1, /* ENAB */ NODE_90, DK_SUP_V, /* VMOD - IC 7P, pin 2, VRNG */ @@ -1072,8 +1072,8 @@ DISCRETE_TASK_START(1) DISCRETE_TASK_END() /************************************************ - * DAC - ************************************************/ + * DAC + ************************************************/ DISCRETE_TASK_START(1) DISCRETE_INPUT_BUFFER(DS_DAC, 0) @@ -1094,8 +1094,8 @@ DISCRETE_TASK_START(1) DISCRETE_TASK_END() /************************************************ - * Amplifier - ************************************************/ + * Amplifier + ************************************************/ DISCRETE_TASK_START(3) DISCRETE_MIXER5(NODE_288, 1, DS_OUT_SOUND9, DS_OUT_SOUND0, DS_OUT_SOUND2, DS_OUT_SOUND1, DS_OUT_DAC, &dkongjr_mixer_desc) @@ -1106,9 +1106,9 @@ DISCRETE_TASK_START(3) DISCRETE_CRFILTER(NODE_295, NODE_288, 1000, JR_C13) /* approx -1.805V to 2.0V when playing, but turn on sound peaks at 2.36V */ /* we will set the full wav range to 1.18V which will cause clipping on the turn on - * sound and explosions. The real game would do this when the volume is turned up too. - * Reducing MAME's master volume to 50% will provide full unclipped volume. - */ + * sound and explosions. The real game would do this when the volume is turned up too. + * Reducing MAME's master volume to 50% will provide full unclipped volume. + */ DISCRETE_OUTPUT(NODE_295, 32767.0/1.18) DISCRETE_TASK_END() diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 11938782864..1c8f90cbd49 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -145,15 +145,15 @@ static DISCRETE_SOUND_START(mario) /************************************************ - * Input register mapping for mario - ************************************************/ + * Input register mapping for mario + ************************************************/ /* DISCRETE_INPUT_DATA */ DISCRETE_INPUT_NOT(DS_SOUND7_INV) /* IC 7L, pin 8 */ /************************************************ - * SOUND0 - ************************************************/ + * SOUND0 + ************************************************/ DISCRETE_TASK_START(1) DISCRETE_INPUT_PULSE(DS_SOUND0_INV, 1) /* IC 4C, pin 15 */ @@ -164,27 +164,27 @@ static DISCRETE_SOUND_START(mario) /* Breadboarded measurements IC 1J, pin 10 D.R. Oct 2010 V Hz - 0.115 14470 - 0.250 15190 - 0.500 14980 - 0.750 18150 - 1.000 21690 - 2.000 38790 - 3.000 58580 - 4.000 79890 + 0.115 14470 + 0.250 15190 + 0.500 14980 + 0.750 18150 + 1.000 21690 + 2.000 38790 + 3.000 58580 + 4.000 79890 */ /* Breadboarded measurements IC 2J, pin 10 D.R. Oct 2010 V Hz - 0.116 2458 - 0.250 2593 - 0.500 2540 - 0.750 3081 - 1.000 3676 - 2.000 6590 - 3.000 9974 - 4.000 13620 + 0.116 2458 + 0.250 2593 + 0.500 2540 + 0.750 3081 + 1.000 3676 + 2.000 6590 + 3.000 9974 + 4.000 13620 */ /* covert logic to measured voltage */ @@ -214,8 +214,8 @@ static DISCRETE_SOUND_START(mario) DISCRETE_TASK_END() /************************************************ - * SOUND1 - ************************************************/ + * SOUND1 + ************************************************/ DISCRETE_TASK_START(1) DISCRETE_INPUT_PULSE(DS_SOUND1_INV, 1) /* IC 4C, pin 14 */ @@ -226,27 +226,27 @@ static DISCRETE_SOUND_START(mario) /* Breadboarded measurements IC 1J, pin 7 D.R. Oct 2010 V Hz - 0.116 1380 - 0.250 1448 - 0.500 1419 - 0.750 1717 - 1.000 2053 - 2.000 3677 - 3.000 5561 - 4.000 7610 + 0.116 1380 + 0.250 1448 + 0.500 1419 + 0.750 1717 + 1.000 2053 + 2.000 3677 + 3.000 5561 + 4.000 7610 */ /* Breadboarded measurements IC 2J, pin 7 D.R. Oct 2010 V Hz - 0.112 8030 - 0.250 8490 - 0.500 8326 - 0.750 10030 - 1.000 12000 - 2.000 21460 - 3.000 32540 - 4.000 44300 + 0.112 8030 + 0.250 8490 + 0.500 8326 + 0.750 10030 + 1.000 12000 + 2.000 21460 + 3.000 32540 + 4.000 44300 */ /* covert logic to measured voltage */ @@ -276,8 +276,8 @@ static DISCRETE_SOUND_START(mario) DISCRETE_TASK_END() /************************************************ - * SOUND7 - ************************************************/ + * SOUND7 + ************************************************/ DISCRETE_TASK_START(1) DISCRETE_COUNTER(NODE_100, /* IC 3H */ @@ -349,8 +349,8 @@ static DISCRETE_SOUND_START(mario) DISCRETE_TASK_END() /************************************************ - * DAC - ************************************************/ + * DAC + ************************************************/ /* following the resistor DAC are two opamps. The first is a 1:1 amplifier, the second * is a filter circuit. Simulation in LTSPICE shows, that the following is equivalent: @@ -366,14 +366,14 @@ static DISCRETE_SOUND_START(mario) &mario_dac_amp) /* This provides a close simulation of the IC 3M, pin 10 filter circuit */ /* The Measured and SPICEd low freq gain is 1, it then has a high frequency - * drop close to the following RC filter. */ + * drop close to the following RC filter. */ DISCRETE_RCFILTER_VREF(DS_OUT_DAC, NODE_171, RES_K(750), CAP_P(180), 2.5) DISCRETE_TASK_END() /************************************************ - * MIXER - ************************************************/ + * MIXER + ************************************************/ DISCRETE_TASK_START(2) DISCRETE_MIXER4(NODE_297, @@ -382,9 +382,9 @@ static DISCRETE_SOUND_START(mario) &mario_mixer) /* approx -0.625V to 0.980V when playing, but turn on sound peaks at 2.38V */ /* we will set the full wav range to 1.19V which will cause clipping on the turn on - * sound. The real game would do this when the volume is turned up too. - * Reducing MAME's master volume to 50% will provide full unclipped volume. - */ + * sound. The real game would do this when the volume is turned up too. + * Reducing MAME's master volume to 50% will provide full unclipped volume. + */ DISCRETE_OUTPUT(NODE_297, 32767.0/1.19) DISCRETE_TASK_END() |