Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 21:29:15 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove enable node from DISCRETE_LOGIC_INVERT

Browse Source
This commit is contained in:
Couriersud 2009-09-10 19:28:22 +00:00
parent 214affb3ee
commit 73b28be0b1
12 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/sound/disc_mth.c
View File

@ -650,19 +650,11 @@ static DISCRETE_RESET(dst_integrate)
* input[1] - input[0] value
*
************************************************************************/
#define DST_LOGIC_INV__ENABLE DISCRETE_INPUT(0)
#define DST_LOGIC_INV__IN DISCRETE_INPUT(1)
#define DST_LOGIC_INV__IN DISCRETE_INPUT(0)
static DISCRETE_STEP(dst_logic_inv)
{
if(DST_LOGIC_INV__ENABLE)
{
node->output[0] = DST_LOGIC_INV__IN ? 0.0 : 1.0;
}
else
{
node->output[0] = 0.0;
}
node->output[0] = DST_LOGIC_INV__IN ? 0.0 : 1.0;
}
/************************************************************************

6
src/emu/sound/discrete.h
View File

@ -258,7 +258,7 @@
* DISCRETE_BIT_DECODE(NODE,INP,BIT_N,VOUT)
* DISCRETE_BITS_DECODE(NODE,INP,BIT_FROM,BIT_TO,VOUT)
*
* DISCRETE_LOGIC_INVERT(NODE,ENAB,INP0)
* DISCRETE_LOGIC_INVERT(NODE,INP0)
* DISCRETE_LOGIC_AND(NODE,ENAB,INP0,INP1)
* DISCRETE_LOGIC_AND3(NODE,ENAB,INP0,INP1,INP2)
* DISCRETE_LOGIC_AND4(NODE,ENAB,INP0,INP1,INP2,INP3)
@ -1286,7 +1286,7 @@
*
***********************************************************************
*
* DISCRETE_LOGIC_INVERT - Logic invertor
* DISCRETE_LOGIC_INVERT - Logic invertor (no enable node)
* DISCRETE_LOGIC_AND - Logic AND gate (3 & 4 input also available)
* DISCRETE_LOGIC_NAND - Logic NAND gate (3 & 4 input also available)
* DISCRETE_LOGIC_OR - Logic OR gate (3 & 4 input also available)
@ -4294,7 +4294,7 @@ enum
#define DISCRETE_DIVIDE(NODE,ENAB,INP0,INP1) { NODE, DST_DIVIDE , 3, { ENAB,INP0,INP1 }, { ENAB,INP0,INP1 }, NULL, "DISCRETE_DIVIDE" },
#define DISCRETE_GAIN(NODE,INP0,GAIN) { NODE, DST_GAIN , 3, { INP0,NODE_NC,NODE_NC }, { INP0,GAIN,0 }, NULL, "DISCRETE_GAIN" },
#define DISCRETE_INVERT(NODE,INP0) { NODE, DST_GAIN , 3, { INP0,NODE_NC,NODE_NC }, { INP0,-1,0 }, NULL, "DISCRETE_INVERT" },
#define DISCRETE_LOGIC_INVERT(NODE,ENAB,INP0) { NODE, DST_LOGIC_INV , 2, { ENAB,INP0 }, { ENAB,INP0 }, NULL, "DISCRETE_LOGIC_INVERT" },
#define DISCRETE_LOGIC_INVERT(NODE,INP0) { NODE, DST_LOGIC_INV , 1, { INP0 }, { INP0 }, NULL, "DISCRETE_LOGIC_INVERT" },
#define DISCRETE_BIT_DECODE(NODE, INP, BIT_N, VOUT) { NODE, DST_BITS_DECODE , 3, { INP,NODE_NC,NODE_NC,NODE_NC }, { INP,BIT_N,BIT_N, VOUT }, NULL, "DISCRETE_BIT_DECODE" },
#define DISCRETE_BITS_DECODE(NODE, INP, BIT_FROM, BIT_TO, VOUT) { NODE, DST_BITS_DECODE , 4, { INP,NODE_NC,NODE_NC,NODE_NC }, { INP,BIT_FROM,BIT_TO, VOUT }, NULL, "DISCRETE_BITS_DECODE" },

4
src/mame/audio/bzone.c
View File

@ -220,7 +220,7 @@ static DISCRETE_SOUND_START(bzone)
DISCRETE_MULTIPLY(NODE_41, BZ_R16 / (BZ_R17 + BZ_R16), NODE_40)
/* one of two filter configurations active */
DISCRETE_LOGIC_INVERT(NODE_42, 1, BZ_INP_EXPLOLS)
DISCRETE_LOGIC_INVERT(NODE_42, BZ_INP_EXPLOLS)
DISCRETE_OP_AMP_FILTER(NODE_43, BZ_INP_EXPLOLS, 0, NODE_41,
DISC_OP_AMP_FILTER_IS_LOW_PASS_1M, &bzone_explo_1)
DISCRETE_OP_AMP_FILTER(NODE_44, NODE_42, 0, NODE_41,
@ -235,7 +235,7 @@ static DISCRETE_SOUND_START(bzone)
DISCRETE_MULTIPLY(NODE_51, BZ_R15 / (BZ_R14 + BZ_R15), NODE_50)
/* one of two filter configurations active */
DISCRETE_LOGIC_INVERT(NODE_52, 1, BZ_INP_SHELLLS)
DISCRETE_LOGIC_INVERT(NODE_52, BZ_INP_SHELLLS)
DISCRETE_OP_AMP_FILTER(NODE_53, BZ_INP_SHELLLS, 0, NODE_51,
DISC_OP_AMP_FILTER_IS_LOW_PASS_1M, &bzone_shell_1)
DISCRETE_OP_AMP_FILTER(NODE_54, NODE_52, 0, NODE_51,

10
src/mame/audio/dkong.c
View File

@ -648,8 +648,8 @@ static DISCRETE_SOUND_START(radarscp)
/* SIGNALS */
/************************************************/
DISCRETE_LOGIC_INVERT(DS_SOUND6,1,DS_SOUND6_INV)
DISCRETE_LOGIC_INVERT(DS_SOUND7,1,DS_SOUND7_INV)
DISCRETE_LOGIC_INVERT(DS_SOUND6,DS_SOUND6_INV)
DISCRETE_LOGIC_INVERT(DS_SOUND7,DS_SOUND7_INV)
/************************************************/
/* Noise */
@ -876,8 +876,8 @@ static DISCRETE_SOUND_START(dkongjr)
/* SIGNALS */
/************************************************/
DISCRETE_LOGIC_INVERT(DS_SOUND7,1,DS_SOUND7_INV)
DISCRETE_LOGIC_INVERT(DS_SOUND9,1,DS_SOUND9_INV)
DISCRETE_LOGIC_INVERT(DS_SOUND7,DS_SOUND7_INV)
DISCRETE_LOGIC_INVERT(DS_SOUND9,DS_SOUND9_INV)
/************************************************/
/* SOUND1 */
@ -885,7 +885,7 @@ static DISCRETE_SOUND_START(dkongjr)
DISCRETE_LS123(NODE_10, DS_SOUND1_INV, JR_R9, JR_C15)
DISCRETE_TRANSFORM2(NODE_11,NODE_104,TTL_HIGH,"0!1*")
DISCRETE_LOGIC_INVERT(NODE_12,1,NODE_10)
DISCRETE_LOGIC_INVERT(NODE_12,NODE_10)
DISCRETE_MIXER2(NODE_13, 1, NODE_10, NODE_11, &dkongjr_s1_mixer_desc)
DISCRETE_74LS624( NODE_14, 1, NODE_13, 0.98*DK_SUP_V, JR_C22, DISC_LS624_OUT_ENERGY)
DISCRETE_RCDISC_MODULATED(NODE_15, NODE_12, NODE_14, 120, JR_R27, RES_K(0.001), JR_R28, JR_C28, DK_SUP_V)

6
src/mame/audio/firetrk.c
View File

@ -197,7 +197,7 @@ DISCRETE_SOUND_START(firetrk)
DISCRETE_INPUT_LOGIC(FIRETRUCK_ATTRACT_EN)
DISCRETE_INPUT_NOT (FIRETRUCK_XTNDPLY_EN)
DISCRETE_LOGIC_INVERT(FIRETRUCK_ATTRACT_INV, 1, FIRETRUCK_ATTRACT_EN)
DISCRETE_LOGIC_INVERT(FIRETRUCK_ATTRACT_INV, FIRETRUCK_ATTRACT_EN)
/************************************************/
/* Motor sound circuit is based on a 556 VCO */
@ -401,7 +401,7 @@ DISCRETE_SOUND_START(superbug)
DISCRETE_INPUT_LOGIC(SUPERBUG_ATTRACT_EN)
DISCRETE_INPUT_LOGIC(SUPERBUG_ASR_EN)
DISCRETE_LOGIC_INVERT(SUPERBUG_ATTRACT_INV, 1, SUPERBUG_ATTRACT_EN)
DISCRETE_LOGIC_INVERT(SUPERBUG_ATTRACT_INV, SUPERBUG_ATTRACT_EN)
/************************************************/
/* Motor sound circuit is based on a 556 VCO */
@ -584,7 +584,7 @@ DISCRETE_SOUND_START(montecar)
DISCRETE_INPUT_LOGIC(MONTECAR_ATTRACT_INV)
DISCRETE_INPUT_NOT (MONTECAR_BEEPER_EN)
DISCRETE_LOGIC_INVERT(MONTECAR_ATTRACT_EN, 1, MONTECAR_ATTRACT_INV)
DISCRETE_LOGIC_INVERT(MONTECAR_ATTRACT_EN, MONTECAR_ATTRACT_INV)
/************************************************/
/* Motor sound circuit is based on a 556 VCO */

2
src/mame/audio/galaxian.c
View File

@ -336,7 +336,7 @@ static DISCRETE_SOUND_START(galaxian)
/* FIRE */
/************************************************/
DISCRETE_LOGIC_INVERT(NODE_170, 1, GAL_INP_FIRE)
DISCRETE_LOGIC_INVERT(NODE_170, GAL_INP_FIRE)
DISCRETE_MULTIPLY(NODE_171, TTL_OUT, GAL_INP_FIRE)
DISCRETE_MULTIPLY(NODE_172, TTL_OUT, NODE_170) // inverted
DISCRETE_RCFILTER(NODE_173, 1, NODE_172, GAL_R47, GAL_C28)

4
src/mame/audio/madalien.c
View File

@ -215,7 +215,7 @@ DISCRETE_SOUND_START( madalien )
NODE_50, // IC 1F pin 5 in
&madalien_555_1f)
// convert reset to active high for module use
DISCRETE_LOGIC_INVERT(NODE_53, 1, MADALIEN_8910_PORTB_45)
DISCRETE_LOGIC_INVERT(NODE_53, MADALIEN_8910_PORTB_45)
DISCRETE_COUNTER(NODE_54, 1,
NODE_53, // pin 7 in
NODE_52, // pin 1 in
@ -242,7 +242,7 @@ DISCRETE_SOUND_START( madalien )
NODE_64, // IC 1C pin 5 in
&madalien_555_1c)
// convert reset to active high for module use
DISCRETE_LOGIC_INVERT(NODE_66, 1, MADALIEN_8910_PORTB_6)
DISCRETE_LOGIC_INVERT(NODE_66, MADALIEN_8910_PORTB_6)
DISCRETE_COUNTER(NODE_67, 1,
NODE_66, // pin 7 in
NODE_65, // pin 1 in

4
src/mame/audio/mw8080bw.c
View File

@ -477,7 +477,6 @@ static DISCRETE_SOUND_START(maze)
/* After the 30s has expired, there is no sound until the next coin is inserted. */
/* There is also sound for the first 30s after power up even without a coin. */
DISCRETE_LOGIC_INVERT(NODE_20, /* IC E2, pin 8 */
1, /* ENAB */
MAZE_JOYSTICK_IN_USE) /* IN0 */
DISCRETE_555_MSTABLE(MAZE_GAME_OVER, /* IC F2, pin 3 */
1, /* RESET */
@ -493,7 +492,6 @@ static DISCRETE_SOUND_START(maze)
1, /* J */
0) /* K */
DISCRETE_LOGIC_INVERT(MAZE_TONE_ENABLE, /* IC F1, pin 6 */
1, /* ENAB */
MAZE_AUDIO_ENABLE) /* IN0 */
DISCRETE_LOGIC_AND3(NODE_21,
1, /* ENAB */
@ -3804,7 +3802,7 @@ static DISCRETE_SOUND_START(blueshrk)
/* so we will cheat and add a pulse 1 sample wide to trigger it */
DISCRETE_ONESHOT(NODE_30, BLUESHRK_HIT_EN, 1, /* 1 sample wide */ 0, DISC_ONESHOT_REDGE | DISC_ONESHOT_NORETRIG | DISC_OUT_ACTIVE_LOW)
DISCRETE_555_MSTABLE(NODE_31, BLUESHRK_HIT_EN, NODE_30, RES_K(47), CAP_U(2.2), &blueshrk_555_H1A)
DISCRETE_LOGIC_INVERT(NODE_32, 1, BLUESHRK_HIT_EN)
DISCRETE_LOGIC_INVERT(NODE_32, BLUESHRK_HIT_EN)
DISCRETE_COUNTER(NODE_33, 1, /*RST*/ NODE_32, /*CLK*/ NODE_31, 1, DISC_COUNT_UP, 0, DISC_CLK_ON_F_EDGE)
DISCRETE_SWITCH(NODE_34, 1, NODE_33, CAP_U(0.015) + CAP_U(0.01), CAP_U(0.022))
DISCRETE_555_ASTABLE(BLUESHRK_HIT_SND, BLUESHRK_HIT_EN, RES_K(22), RES_K(39), NODE_34, &blueshrk_555_H1B)

2
src/mame/audio/sprint4.c
View File

@ -143,7 +143,7 @@ static const discrete_mixer_desc sprint4_mixer =
/* setup the attract input and it's inverse */
#define SPRINT4_ATTRACT \
DISCRETE_INPUT_NOT(SPRINT4_ATTRACT_EN) \
DISCRETE_LOGIC_INVERT(SPRINT4_ATTRACT_INV, 1, SPRINT4_ATTRACT_EN)
DISCRETE_LOGIC_INVERT(SPRINT4_ATTRACT_INV, SPRINT4_ATTRACT_EN)
/* port tags used for the discrete adjusters */

16
src/mame/audio/tank8.c
View File

@ -147,56 +147,56 @@ DISCRETE_SOUND_START(tank8)
/* A 9334 has typical 3.6V output. */
/************************************************/
DISCRETE_LOGIC_INVERT(NODE_30, 1, TANK8_MOTOR1_EN)
DISCRETE_LOGIC_INVERT(NODE_30, TANK8_MOTOR1_EN)
DISCRETE_DAC_R1(NODE_32, 1, TANK8_MOTOR1_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_33, NODE_30, RES_K(220), RES_K(39), CAP_U(0.22), NODE_32, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_34, 1, NODE_33, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_35, 1, NODE_34, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR1, 1, NODE_35, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_40, 1, TANK8_MOTOR2_EN)
DISCRETE_LOGIC_INVERT(NODE_40, TANK8_MOTOR2_EN)
DISCRETE_DAC_R1(NODE_42, 1, TANK8_MOTOR2_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_43, NODE_40, RES_K(220), RES_K(39), CAP_U(0.22), NODE_42, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_44, 1, NODE_43, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_45, 1, NODE_44, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR2, 1, NODE_45, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_50, 1, TANK8_MOTOR3_EN)
DISCRETE_LOGIC_INVERT(NODE_50, TANK8_MOTOR3_EN)
DISCRETE_DAC_R1(NODE_52, 1, TANK8_MOTOR3_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_53, NODE_50, RES_K(220), RES_K(39), CAP_U(0.22), NODE_52, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_54, 1 , NODE_53, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_55, 1, NODE_54, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR3, 1, NODE_55, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_60, 1, TANK8_MOTOR4_EN)
DISCRETE_LOGIC_INVERT(NODE_60, TANK8_MOTOR4_EN)
DISCRETE_DAC_R1(NODE_62, 1, TANK8_MOTOR4_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_63, NODE_60, RES_K(220), RES_K(39), CAP_U(0.22), NODE_62, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_64, 1, NODE_63, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_65, 1, NODE_64, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR4, 1, NODE_65, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_70, 1, TANK8_MOTOR5_EN)
DISCRETE_LOGIC_INVERT(NODE_70, TANK8_MOTOR5_EN)
DISCRETE_DAC_R1(NODE_72, 1, TANK8_MOTOR5_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_73, NODE_70, RES_K(220), RES_K(39), CAP_U(0.22), NODE_72, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_74, 1, NODE_73, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_75, 1, NODE_74, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR5, 1, NODE_75, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_80, 1, TANK8_MOTOR6_EN)
DISCRETE_LOGIC_INVERT(NODE_80, TANK8_MOTOR6_EN)
DISCRETE_DAC_R1(NODE_82, 1, TANK8_MOTOR6_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_83, NODE_80, RES_K(220), RES_K(39), CAP_U(0.22), NODE_82, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_84, 1, NODE_83, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_85, 1, NODE_84, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR6, 1, NODE_85, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_90, 1, TANK8_MOTOR7_EN)
DISCRETE_LOGIC_INVERT(NODE_90, TANK8_MOTOR7_EN)
DISCRETE_DAC_R1(NODE_92, 1, TANK8_MOTOR7_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_93, NODE_90, RES_K(220), RES_K(39), CAP_U(0.22), NODE_92, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_94, 1, NODE_93, RES_K(22), CAP_U(0.001), 5.0)
DISCRETE_555_MSTABLE(NODE_95, 1, NODE_94, RES_K(56), CAP_U(0.1), &tank8_555_m)
DISCRETE_OP_AMP_FILTER(TANK8_MOTOR7, 1, NODE_95, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &tank8_filt)
DISCRETE_LOGIC_INVERT(NODE_100, 1, TANK8_MOTOR8_EN)
DISCRETE_LOGIC_INVERT(NODE_100, TANK8_MOTOR8_EN)
DISCRETE_DAC_R1(NODE_102, 1, TANK8_MOTOR8_EN, 3.6, &tank8_dac)
DISCRETE_555_ASTABLE_CV(NODE_103, NODE_100, RES_K(220), RES_K(39), CAP_U(0.22), NODE_102, &tank8_555_a)
DISCRETE_CRFILTER_VREF(NODE_104, 1, NODE_103, RES_K(22), CAP_U(0.001), 5.0)

2
src/mame/audio/triplhnt.c
View File

@ -148,7 +148,7 @@ DISCRETE_SOUND_START(triplhnt)
NODE_22, // from IC C11, pin 3
5, 1, 0, DISC_CLK_ON_R_EDGE) // /6 counter on rising edge
DISCRETE_TRANSFORM2(NODE_24, NODE_23, 2, "01>") // IC B6, pin 8
DISCRETE_LOGIC_INVERT(NODE_25, 1, NODE_22) // IC D9, pin 3
DISCRETE_LOGIC_INVERT(NODE_25, NODE_22) // IC D9, pin 3
DISCRETE_LOGIC_NAND(NODE_26, 1, NODE_25, TRIPLHNT_NOISE) // IC D9, pin 11
DISCRETE_LOGIC_XOR(NODE_27, 1, NODE_24, NODE_26) // IC B8, pin 6
DISCRETE_COUNTER(NODE_28, 1, TRIPLHNT_BEAR_EN, // IC B6, pin 12

4
src/mame/audio/vicdual.c
View File

@ -395,7 +395,7 @@ static DISCRETE_SOUND_START(headon)
* Bonus
************************************************/
DISCRETE_LOGIC_INVERT(NODE_70, 1, HEADON_BONUS_EN)
DISCRETE_LOGIC_INVERT(NODE_70, HEADON_BONUS_EN)
DISCRETE_MULTIPLY(NODE_71,NODE_70,12)
DISCRETE_INVERTER_OSC(NODE_73,NODE_71,0,RES_K(22),RES_M(1),CAP_N(470),RES_M(10),&headon_inverter_osc_2)
@ -418,7 +418,7 @@ static DISCRETE_SOUND_START(headon)
* FIXME: Just a prototype several filter missing
************************************************/
DISCRETE_LOGIC_INVERT(NODE_80, 1, HEADON_CRASH_EN)
DISCRETE_LOGIC_INVERT(NODE_80, HEADON_CRASH_EN)
DISCRETE_555_MSTABLE(NODE_81, 1, NODE_80, RES_K(470), CAP_U(1), &headon_555_crash)
// Mix with noise
DISCRETE_MULTIPLY(NODE_84, NODE_81, NODE_51)