From acb83e0a12d33dfb4bab04a0ad9d3a1105f68376 Mon Sep 17 00:00:00 2001 From: Couriersud Date: Sun, 25 Jan 2009 02:12:11 +0000 Subject: [PATCH] Minor changes to mario discrete sound --- src/mame/audio/mario.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index f010f249272..cbf5c4def2a 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -123,7 +123,7 @@ #define DISCRETE_LS123_INV(_N, _T, _R, _C) \ DISCRETE_ONESHOTR(_N, 0, _T, TTL_HIGH, (0.25 * (_R) * (_C) * (1.0+700./(_R))), DISC_ONESHOT_RETRIG | DISC_ONESHOT_REDGE | DISC_OUT_ACTIVE_LOW) -#define DISCRETE_BITSET(_N, _N1, _B) DISCRETE_TRANSFORM3(_N, _N1, 1 << ((_B)-1), 0, "01&2>") +#define DISCRETE_BITSET(_N, _N1, _B) DISCRETE_TRANSFORM3(_N, _N1, (1 << ((_B)-1)), 0, "01&2>") #define DISCRETE_ENERGY_NAND(_N, _E, _N1, _N2) DISCRETE_TRANSFORM3(_N, _N1, _N2, 1, "201*-") @@ -193,9 +193,9 @@ static DISCRETE_SOUND_START(mario) DISCRETE_BITSET(NODE_104, NODE_100, 12) //LS157 3B DISCRETE_LS123(NODE_110, DS_SOUND7_INV, MR_R61, MR_C41) - DISCRETE_TRANSFORM2(NODE_111, TTL_HIGH, NODE_110, "01-") + 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, 1, NODE_112, VSS, MR_C40, DISC_LS624_OUT_LOGIC) + DISCRETE_74LS624(NODE_113, 1, NODE_112, VSS, MR_C40, DISC_LS624_OUT_ENERGY) DISCRETE_LOGIC_XOR(NODE_115, 1, NODE_102, NODE_113)