diff options
author | Couriersud <couriersud@users.noreply.github.com> | 2009-10-02 21:51:41 +0000 |
---|---|---|
committer | Couriersud <couriersud@users.noreply.github.com> | 2009-10-02 21:51:41 +0000 |
commit | e4c8040702dd99f0d755b567ded6bafdb179926d (patch) | |
tree | c1c8fbdee13215dafaee95b5487a8d25f6cd9337 | |
parent | fdbc12eb493556d3e31434a9c7f87ae272efd647 (diff) |
Remove capacitor aging code and assume range input is gnd for all 74LS629.
-rw-r--r-- | src/mame/audio/mario.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 55f025abc61..f859a95e36c 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -16,8 +16,6 @@ /* FIXME: Capacitor aging - only in for calibration now */ /* Adjustments are needed to bring this close to recordings */ -#define CAP_AGE(c, f) ((c) * (f)) - /* FIXME: Awaiting verification. VCO range inputs are shown */ /* as connected to +5V on schematics. This does not match */ /* recordings */ @@ -219,8 +217,6 @@ static DISCRETE_STEP( mario_custom_run ) else t2 = context->dt_in2_at_0; - //if (MARIO_CUSTOM_VOUT) - // printf("%f %f %f %f\n", MARIO_CUSTOM_IN1, MARIO_CUSTOM_IN2, 0.5 / t1, 0.5 / t2); while (sample_t > 0.0f) { /* state before time advance */ @@ -317,8 +313,8 @@ static DISCRETE_SOUND_START(mario) /************************************************/ DISCRETE_TASK_START() - DISCRETE_LS123(NODE_10, DS_SOUND0_INV, MR_R17, CAP_AGE(MR_C14, 0.7)) - DISCRETE_RCFILTER(NODE_11, 1, NODE_10, MR_R6, CAP_AGE(MR_C3, 0.5) ) + DISCRETE_LS123(NODE_10, DS_SOUND0_INV, MR_R17, MR_C14) + DISCRETE_RCFILTER(NODE_11, 1, NODE_10, MR_R6, MR_C3 ) DISCRETE_CUSTOM7(NODE_12, NODE_10, NODE_11, NODE_11, MR_C6, MR_C17, MR_MIXER_RPAR, MR_C31, &mario_custom_run_info) DISCRETE_MULTIPLY(DS_OUT_SOUND0, NODE_12, MR_MIXER_RPAR / MR_R20) @@ -329,8 +325,8 @@ static DISCRETE_SOUND_START(mario) /************************************************/ DISCRETE_TASK_START() - DISCRETE_LS123(NODE_20, DS_SOUND1_INV, MR_R18, CAP_AGE(MR_C15, 0.7)) - DISCRETE_RCFILTER(NODE_21, 1, NODE_20, MR_R7, CAP_AGE(MR_C4, 0.5) ) + DISCRETE_LS123(NODE_20, DS_SOUND1_INV, MR_R18, MR_C15) + DISCRETE_RCFILTER(NODE_21, 1, NODE_20, MR_R7, MR_C4 ) DISCRETE_CUSTOM7(NODE_22, NODE_20, NODE_21, NODE_21, MR_C5, MR_C16, MR_MIXER_RPAR, MR_C31, &mario_custom_run_info) DISCRETE_MULTIPLY(DS_OUT_SOUND1, NODE_22, MR_MIXER_RPAR / MR_R19) @@ -346,15 +342,15 @@ static DISCRETE_SOUND_START(mario) DISCRETE_BIT_DECODE(NODE_102, NODE_100, 3, 1) //LS157 2B DISCRETE_BIT_DECODE(NODE_104, NODE_100, 11, TTL_HIGH) //LS157 3B - DISCRETE_LS123(NODE_110, DS_SOUND7_INV, MR_R61, CAP_AGE(MR_C41, 0.6)) + DISCRETE_LS123(NODE_110, DS_SOUND7_INV, MR_R61, MR_C41) DISCRETE_TRANSFORM2(NODE_111, NODE_110, TTL_HIGH, "0!1*") DISCRETE_RCFILTER(NODE_112, 1, NODE_111, MR_R65, MR_C44) - DISCRETE_74LS624(NODE_113, NODE_112, VSS, MR_C40, DISC_LS624_OUT_LOGIC) + DISCRETE_74LS624(NODE_113, NODE_112, RUN_VCO_VOLTAGE /*VSS*/, MR_C40, DISC_LS624_OUT_LOGIC) DISCRETE_LOGIC_XOR(NODE_115, NODE_102, NODE_113) DISCRETE_RCFILTER(NODE_117, 1, NODE_104, MR_R64, MR_C43) - DISCRETE_74LS624(NODE_118, NODE_117, VSS, MR_C39, DISC_LS624_OUT_COUNT_F) + DISCRETE_74LS624(NODE_118, NODE_117, RUN_VCO_VOLTAGE /*VSS*/, MR_C39, DISC_LS624_OUT_COUNT_F) DISCRETE_LOGIC_AND(NODE_120, NODE_115, NODE_110) DISCRETE_MULTIPLY(NODE_121, NODE_120, TTL_HIGH * MR_MIXER_RPAR / MR_R41) |