summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/mario.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio/mario.c')
-rw-r--r--src/mame/audio/mario.c319
1 files changed, 159 insertions, 160 deletions
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index ba4499224d0..b8daf3c973e 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -15,9 +15,9 @@
/* FIXME: Capacitor aging - only in for calibration now */
/* Adjustments are needed to bring this close to recordings */
-#define RUN_VCO_VOLTAGE (0.0) /* 5 in schematics */
+#define RUN_VCO_VOLTAGE (0.0) /* 5 in schematics */
-#define USE_8039 (0) /* set to 1 to try 8039 hack */
+#define USE_8039 (0) /* set to 1 to try 8039 hack */
#define ACTIVELOW_PORT_BIT(P,A,D) ((P & (~(1 << A))) | ((D ^ 1) << A))
#define ACTIVEHIGH_PORT_BIT(P,A,D) ((P & (~(1 << A))) | (D << A))
@@ -46,31 +46,31 @@
/* Discrete sound inputs */
-#define DS_SOUND0_INV NODE_01
-#define DS_SOUND1_INV NODE_02
-#define DS_SOUND7_INV NODE_05
-#define DS_DAC NODE_07
+#define DS_SOUND0_INV NODE_01
+#define DS_SOUND1_INV NODE_02
+#define DS_SOUND7_INV NODE_05
+#define DS_DAC NODE_07
-#define DS_SOUND0 NODE_208
-#define DS_SOUND1 NODE_209
-#define DS_SOUND7 NODE_212
+#define DS_SOUND0 NODE_208
+#define DS_SOUND1 NODE_209
+#define DS_SOUND7 NODE_212
-#define DS_OUT_SOUND0 NODE_241
-#define DS_OUT_SOUND1 NODE_242
-#define DS_OUT_SOUND7 NODE_248
-#define DS_OUT_DAC NODE_250
+#define DS_OUT_SOUND0 NODE_241
+#define DS_OUT_SOUND1 NODE_242
+#define DS_OUT_SOUND7 NODE_248
+#define DS_OUT_DAC NODE_250
/* Input definitions for write handlers */
-#define DS_SOUND0_INP DS_SOUND0_INV
-#define DS_SOUND1_INP DS_SOUND1_INV
-#define DS_SOUND7_INP DS_SOUND7_INV
+#define DS_SOUND0_INP DS_SOUND0_INV
+#define DS_SOUND1_INP DS_SOUND1_INV
+#define DS_SOUND7_INP DS_SOUND7_INV
/* General defines */
-#define VSS 5.0
-#define TTL_HIGH 4.0
-#define GND 0.0
+#define VSS 5.0
+#define TTL_HIGH 4.0
+#define GND 0.0
/****************************************************************
*
@@ -79,41 +79,41 @@
* Parts verified against a real TMA1-04-CPU Board.
****************************************************************/
-#define MR_R6 RES_K(4.7) /* verified */
-#define MR_R7 RES_K(4.7) /* verified */
-#define MR_R17 RES_K(27) /* 20 according to parts list */
+#define MR_R6 RES_K(4.7) /* verified */
+#define MR_R7 RES_K(4.7) /* verified */
+#define MR_R17 RES_K(27) /* 20 according to parts list */
/* 27 verified, 30K in schematics */
-#define MR_R18 RES_K(27) /* 20 according to parts list */
+#define MR_R18 RES_K(27) /* 20 according to parts list */
/* 27 verified, 30K in schematics */
-#define MR_R19 RES_K(22) /* verified */
-#define MR_R20 RES_K(22) /* verified */
-#define MR_R34 RES_M(2) /* */
-#define MR_R35 RES_M(1) /* */
-#define MR_R36 RES_M(1.8) /* */
-#define MR_R40 RES_K(22) /* verified */
-#define MR_R41 RES_K(100) /* verified */
-#define MR_R42 RES_K(43) /* verified */
-#define MR_R43 RES_K(100) /* verified */
-#define MR_R61 RES_K(47) /* verified */
-#define MR_R64 RES_K(20) /* verified */
-#define MR_R65 RES_K(10) /* verified */
-
-#define MR_C3 CAP_U(10) /* verified */
-#define MR_C4 CAP_U(4.7) /* verified */
-#define MR_C5 CAP_N(39) /* verified */
-#define MR_C6 CAP_N(3.9) /* verified */
-#define MR_C14 CAP_U(4.7) /* verified */
-#define MR_C15 CAP_U(4.7) /* verified */
-#define MR_C16 CAP_N(6.8) /* verified */
-#define MR_C17 CAP_N(22) /* verified */
-#define MR_C30 CAP_P(100) /* verified */
-#define MR_C31 CAP_U(0.022) /* verified */
-#define MR_C32 CAP_U(1) /* verified */
-#define MR_C39 CAP_N(4.7) /* verified */
-#define MR_C40 CAP_N(22) /* verified */
-#define MR_C41 CAP_U(4.7) /* verified */
-#define MR_C43 CAP_U(3.3) /* verified */
-#define MR_C44 CAP_U(3.3) /* verified */
+#define MR_R19 RES_K(22) /* verified */
+#define MR_R20 RES_K(22) /* verified */
+#define MR_R34 RES_M(2) /* */
+#define MR_R35 RES_M(1) /* */
+#define MR_R36 RES_M(1.8) /* */
+#define MR_R40 RES_K(22) /* verified */
+#define MR_R41 RES_K(100) /* verified */
+#define MR_R42 RES_K(43) /* verified */
+#define MR_R43 RES_K(100) /* verified */
+#define MR_R61 RES_K(47) /* verified */
+#define MR_R64 RES_K(20) /* verified */
+#define MR_R65 RES_K(10) /* verified */
+
+#define MR_C3 CAP_U(10) /* verified */
+#define MR_C4 CAP_U(4.7) /* verified */
+#define MR_C5 CAP_N(39) /* verified */
+#define MR_C6 CAP_N(3.9) /* verified */
+#define MR_C14 CAP_U(4.7) /* verified */
+#define MR_C15 CAP_U(4.7) /* verified */
+#define MR_C16 CAP_N(6.8) /* verified */
+#define MR_C17 CAP_N(22) /* verified */
+#define MR_C30 CAP_P(100) /* verified */
+#define MR_C31 CAP_U(0.022) /* verified */
+#define MR_C32 CAP_U(1) /* verified */
+#define MR_C39 CAP_N(4.7) /* verified */
+#define MR_C40 CAP_N(22) /* verified */
+#define MR_C41 CAP_U(4.7) /* verified */
+#define MR_C43 CAP_U(3.3) /* verified */
+#define MR_C44 CAP_U(3.3) /* verified */
#define MR_MIXER_RPAR RES_4_PARALLEL(MR_R20, MR_R19, MR_R41, MR_R40)
@@ -129,36 +129,36 @@
static const discrete_op_amp_info mario_dac_amp =
{
DISC_OP_AMP_IS_NORTON,
- MR_R34, MR_R36, 0, MR_R35, 0, /* r1, r2, r3, r4, c */
- 0, 5 /* vN, vP */
+ MR_R34, MR_R36, 0, MR_R35, 0, /* r1, r2, r3, r4, c */
+ 0, 5 /* vN, vP */
};
static const discrete_mixer_desc mario_mixer =
{
DISC_MIXER_IS_RESISTOR,
{MR_R20, MR_R19, MR_R41, MR_R40},
- {0}, {0}, 0, 0, MR_C31, MR_C32, 0, 1 /* r_node{}, c{}, rI, rF, cF, cAmp, vRef, gain*/
+ {0}, {0}, 0, 0, MR_C31, MR_C32, 0, 1 /* r_node{}, c{}, rI, rF, cF, cAmp, vRef, gain*/
};
-#define LS629_FREQ_R_IN RES_K(90)
+#define LS629_FREQ_R_IN RES_K(90)
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 */
+ 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 */
- DISCRETE_LS123(NODE_10, /* IC 2H, pin 13 */
- DS_SOUND0_INV, /* IC 2H, pin 2 */
+ DISCRETE_TASK_START(1)
+ DISCRETE_INPUT_PULSE(DS_SOUND0_INV, 1) /* IC 4C, pin 15 */
+ DISCRETE_LS123(NODE_10, /* IC 2H, pin 13 */
+ DS_SOUND0_INV, /* IC 2H, pin 2 */
MR_R17, MR_C14)
/* Breadboarded measurements IC 1J, pin 10
@@ -188,39 +188,39 @@ static DISCRETE_SOUND_START(mario)
*/
/* covert logic to measured voltage */
- DISCRETE_XTIME_BUFFER(NODE_11, /* IC 1H, pin 10 */
- NODE_10, /* IC 1H, pin 11 */
- 0.115, 4.0) /* measured Low/High */
+ DISCRETE_XTIME_BUFFER(NODE_11, /* IC 1H, pin 10 */
+ NODE_10, /* IC 1H, pin 11 */
+ 0.115, 4.0) /* measured Low/High */
/* work out cap charge of RC in parallel with 2 74LS629s */
DISCRETE_RCFILTER(NODE_12, NODE_11, RES_3_PARALLEL(MR_R6, LS629_FREQ_R_IN, LS629_FREQ_R_IN), MR_C3 )
/* work out voltage drop of RC in parallel with 2 74LS629s */
DISCRETE_GAIN(NODE_13, NODE_12, RES_VOLTAGE_DIVIDER(MR_R6, RES_2_PARALLEL(LS629_FREQ_R_IN, LS629_FREQ_R_IN)))
- DISCRETE_74LS624(NODE_14, /* IC 1J, pin 10 */
- 1, /* ENAB */
- NODE_13, 5, /* VMOD - IC 1J, pin 1; VRNG */
- MR_C6, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
+ DISCRETE_74LS624(NODE_14, /* IC 1J, pin 10 */
+ 1, /* ENAB */
+ NODE_13, 5, /* VMOD - IC 1J, pin 1; VRNG */
+ MR_C6, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
DISC_LS624_OUT_LOGIC_X)
- DISCRETE_74LS624(NODE_15, /* IC 2J, pin 10 */
- 1, /* ENAB */
- NODE_13, 5, /* VMOD - IC 2J, pin 1; VRNG */
- MR_C17, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
+ DISCRETE_74LS624(NODE_15, /* IC 2J, pin 10 */
+ 1, /* ENAB */
+ NODE_13, 5, /* VMOD - IC 2J, pin 1; VRNG */
+ MR_C17, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
DISC_LS624_OUT_LOGIC_X)
- DISCRETE_XTIME_XOR(NODE_16, /* IC IC 1K, pin 6 */
- NODE_14, NODE_15, /* IC 1K, pin 5; pin 4 */
- 0, 0) /* use x_time logic */
- DISCRETE_XTIME_AND(DS_OUT_SOUND0, /* IC 2K, pin 6 */
- NODE_10, NODE_16, /* IC 2K, pin 5; pin 4 */
- 0.066, 3.8) /* LOW; HIGH (varies due to load 3.7 - 4.4) */
+ DISCRETE_XTIME_XOR(NODE_16, /* IC IC 1K, pin 6 */
+ NODE_14, NODE_15, /* IC 1K, pin 5; pin 4 */
+ 0, 0) /* use x_time logic */
+ DISCRETE_XTIME_AND(DS_OUT_SOUND0, /* IC 2K, pin 6 */
+ NODE_10, NODE_16, /* IC 2K, pin 5; pin 4 */
+ 0.066, 3.8) /* LOW; HIGH (varies due to load 3.7 - 4.4) */
DISCRETE_TASK_END()
/************************************************
- * SOUND1
- ************************************************/
+ * SOUND1
+ ************************************************/
DISCRETE_TASK_START(1)
- DISCRETE_INPUT_PULSE(DS_SOUND1_INV, 1) /* IC 4C, pin 14 */
- DISCRETE_LS123(NODE_20, /* IC 2H, pin 5 */
- DS_SOUND1_INV, /* IC 2H, pin 10 */
+ DISCRETE_INPUT_PULSE(DS_SOUND1_INV, 1) /* IC 4C, pin 14 */
+ DISCRETE_LS123(NODE_20, /* IC 2H, pin 5 */
+ DS_SOUND1_INV, /* IC 2H, pin 10 */
MR_R18, MR_C15)
/* Breadboarded measurements IC 1J, pin 7
@@ -250,51 +250,51 @@ static DISCRETE_SOUND_START(mario)
*/
/* covert logic to measured voltage */
- DISCRETE_XTIME_BUFFER(NODE_21, /* IC 1H, pin 8 */
- NODE_20, /* IC 1H, pin 9 */
- 0.115, 4.0) /* measured Low/High */
+ DISCRETE_XTIME_BUFFER(NODE_21, /* IC 1H, pin 8 */
+ NODE_20, /* IC 1H, pin 9 */
+ 0.115, 4.0) /* measured Low/High */
/* work out cap charge of RC in parallel with 2 74LS629s */
DISCRETE_RCFILTER(NODE_22, NODE_21, RES_3_PARALLEL(MR_R7, LS629_FREQ_R_IN, LS629_FREQ_R_IN), MR_C4 )
/* work out voltage drop of RC in parallel with 2 74LS629s */
DISCRETE_GAIN(NODE_23, NODE_22, RES_VOLTAGE_DIVIDER(MR_R7, RES_2_PARALLEL(LS629_FREQ_R_IN, LS629_FREQ_R_IN)))
- DISCRETE_74LS624(NODE_24, /* IC 1J, pin 7 */
- 1, /* ENAB */
- NODE_23, 5, /* VMOD, VRNG */
- MR_C5, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
+ DISCRETE_74LS624(NODE_24, /* IC 1J, pin 7 */
+ 1, /* ENAB */
+ NODE_23, 5, /* VMOD, VRNG */
+ MR_C5, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
DISC_LS624_OUT_LOGIC_X)
- DISCRETE_74LS624(NODE_25, /* IC 2J, pin 7 */
- 1, /* ENAB */
- NODE_23, 5, /* VMOD, VRNG */
- MR_C16, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
+ DISCRETE_74LS624(NODE_25, /* IC 2J, pin 7 */
+ 1, /* ENAB */
+ NODE_23, 5, /* VMOD, VRNG */
+ MR_C16, 0, 0, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
DISC_LS624_OUT_LOGIC_X)
- DISCRETE_XTIME_XOR(NODE_26, /* IC IC 1K, pin 3 */
- NODE_24, NODE_25, /* IC 1K, pin 1; pin 2 */
- 0, 0) /* use x_time logic */
- DISCRETE_XTIME_AND(DS_OUT_SOUND1, /* IC 2K, pin 3 */
- NODE_20, NODE_26, /* IC 2K, pin 2; pin 1 */
- 0.066, 3.8) /* LOW; HIGH (varies due to load 3.7 - 4.4) */
+ DISCRETE_XTIME_XOR(NODE_26, /* IC IC 1K, pin 3 */
+ NODE_24, NODE_25, /* IC 1K, pin 1; pin 2 */
+ 0, 0) /* use x_time logic */
+ DISCRETE_XTIME_AND(DS_OUT_SOUND1, /* IC 2K, pin 3 */
+ NODE_20, NODE_26, /* IC 2K, pin 2; pin 1 */
+ 0.066, 3.8) /* LOW; HIGH (varies due to load 3.7 - 4.4) */
DISCRETE_TASK_END()
/************************************************
- * SOUND7
- ************************************************/
+ * SOUND7
+ ************************************************/
DISCRETE_TASK_START(1)
- DISCRETE_COUNTER(NODE_100, /* IC 3H */
- 1, 0, /* ENAB; RESET */
- NODE_118, /* CLK - IC 3H, pin 10 */
+ DISCRETE_COUNTER(NODE_100, /* IC 3H */
+ 1, 0, /* ENAB; RESET */
+ NODE_118, /* CLK - IC 3H, pin 10 */
0, 0x3FFF, DISC_COUNT_UP, 0, DISC_CLK_BY_COUNT | DISC_OUT_HAS_XTIME)
- DISCRETE_BIT_DECODE(NODE_102, /* IC 3H, pin 7 */
- NODE_100, 3, 0) /* output x_time logic */
- DISCRETE_BIT_DECODE(NODE_104, /* IC 3H, pin 1 */
- NODE_100, 11, 0) /* output x_time logic */
+ DISCRETE_BIT_DECODE(NODE_102, /* IC 3H, pin 7 */
+ NODE_100, 3, 0) /* output x_time logic */
+ DISCRETE_BIT_DECODE(NODE_104, /* IC 3H, pin 1 */
+ NODE_100, 11, 0) /* output x_time logic */
- DISCRETE_LS123(NODE_110, /* IC 4L, pin 13 */
- DS_SOUND7_INV, /* IC 4L, pin 2 */
+ DISCRETE_LS123(NODE_110, /* IC 4L, pin 13 */
+ DS_SOUND7_INV, /* IC 4L, pin 2 */
MR_R61, MR_C41)
- DISCRETE_XTIME_INVERTER(NODE_111, /* IC 4J, pin 8 */
- NODE_110, /* IC 4J, pin 9 */
- 0.151, 4.14) /* measured Low/High */
+ DISCRETE_XTIME_INVERTER(NODE_111, /* IC 4J, pin 8 */
+ NODE_110, /* IC 4J, pin 9 */
+ 0.151, 4.14) /* measured Low/High */
/* Breadboarded measurements IC 4K, pin 10
D.R. Oct 2010
@@ -310,15 +310,15 @@ static DISCRETE_SOUND_START(mario)
4.14 13980
*/
- DISCRETE_74LS624(NODE_113, /* IC 4K, pin 10 */
- 1, /* ENAB */
- NODE_111, 5, /* VMOD - IC 4K, pin 1; VRNG */
- MR_C40, MR_R65, MR_C44, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
+ DISCRETE_74LS624(NODE_113, /* IC 4K, pin 10 */
+ 1, /* ENAB */
+ NODE_111, 5, /* VMOD - IC 4K, pin 1; VRNG */
+ MR_C40, MR_R65, MR_C44, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
DISC_LS624_OUT_LOGIC_X)
- DISCRETE_XTIME_XOR(NODE_115, /* IC 6N, pin 3 */
- NODE_113, NODE_102, /* IC 6N, pin 1; pin 2 */
- 0, 0) /* use x_time logic */
+ DISCRETE_XTIME_XOR(NODE_115, /* IC 6N, pin 3 */
+ NODE_113, NODE_102, /* IC 6N, pin 1; pin 2 */
+ 0, 0) /* use x_time logic */
/* Breadboarded measurements IC 4K, pin 7
D.R. Oct 2010
@@ -334,57 +334,57 @@ static DISCRETE_SOUND_START(mario)
4.15 59400
*/
- DISCRETE_XTIME_INVERTER(NODE_117, /* IC 4J, pin 4 */
- NODE_104, /* IC 4J, pin 3 */
- 0.135, 4.15) /* measured Low/High */
- DISCRETE_74LS624(NODE_118, /* IC 4K, pin 7 */
- 1, /* ENAB */
- NODE_117, 5, /* VMOD - IC 4K, pin 2; VRNG */
- MR_C39, MR_R64, MR_C43, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
+ DISCRETE_XTIME_INVERTER(NODE_117, /* IC 4J, pin 4 */
+ NODE_104, /* IC 4J, pin 3 */
+ 0.135, 4.15) /* measured Low/High */
+ DISCRETE_74LS624(NODE_118, /* IC 4K, pin 7 */
+ 1, /* ENAB */
+ NODE_117, 5, /* VMOD - IC 4K, pin 2; VRNG */
+ MR_C39, MR_R64, MR_C43, 0, /* C; R_FREQ_IN; C_FREQ_IN; R_RNG_IN */
DISC_LS624_OUT_LOGIC_X)
- DISCRETE_XTIME_AND(DS_OUT_SOUND7, /* IC 2K, pin 11 */
- NODE_110, NODE_115, /* IC 2K, pin 12; pin 13 */
- 0.066, 4.07) /* LOW; HIGH (varies due to load 4.07 is lowest) */
+ DISCRETE_XTIME_AND(DS_OUT_SOUND7, /* IC 2K, pin 11 */
+ NODE_110, NODE_115, /* IC 2K, pin 12; pin 13 */
+ 0.066, 4.07) /* LOW; HIGH (varies due to load 4.07 is lowest) */
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:
- */
+ * is a filter circuit. Simulation in LTSPICE shows, that the following is equivalent:
+ */
DISCRETE_TASK_START(1)
DISCRETE_INPUT_BUFFER(DS_DAC, 0)
- DISCRETE_MULTIPLY(NODE_170, DS_DAC, TTL_HIGH / 256.0) /* MXR1 */
+ DISCRETE_MULTIPLY(NODE_170, DS_DAC, TTL_HIGH / 256.0) /* MXR1 */
/* this stage reduces the gain of the DAC by 50%, so yes the volume is much lower then the walk sound */
- DISCRETE_OP_AMP(NODE_171, /* IC 3M, pin 5 */
- 1, /* ENAB */
- NODE_170, 5, /* IN0 - IC 3M, pin 6; IN1 - IC 3M, pin 1 */
+ DISCRETE_OP_AMP(NODE_171, /* IC 3M, pin 5 */
+ 1, /* ENAB */
+ NODE_170, 5, /* IN0 - IC 3M, pin 6; IN1 - IC 3M, pin 1 */
&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,
- 1, /* ENAB */
+ 1, /* ENAB */
DS_OUT_SOUND0, DS_OUT_SOUND1, DS_OUT_SOUND7, DS_OUT_DAC,
&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()
@@ -398,7 +398,7 @@ DISCRETE_SOUND_END
static void set_ea(address_space &space, int ea)
{
- mario_state *state = space.machine().driver_data<mario_state>();
+ mario_state *state = space.machine().driver_data<mario_state>();
//printf("ea: %d\n", ea);
//machine.device("audiocpu")->execute().set_input_line(MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE);
if (state->m_eabank != NULL)
@@ -413,7 +413,7 @@ static void set_ea(address_space &space, int ea)
static SOUND_START( mario )
{
- mario_state *state = machine.driver_data<mario_state>();
+ mario_state *state = machine.driver_data<mario_state>();
device_t *audiocpu = machine.device("audiocpu");
#if USE_8039
UINT8 *SND = state->memregion("audiocpu")->base();
@@ -427,23 +427,23 @@ static SOUND_START( mario )
state->m_eabank = "bank1";
audiocpu->memory().space(AS_PROGRAM).install_read_bank(0x000, 0x7ff, "bank1");
state->membank("bank1")->configure_entry(0, state->memregion("audiocpu")->base());
- state->membank("bank1")->configure_entry(1, state->memregion("audiocpu")->base() + 0x1000);
+ state->membank("bank1")->configure_entry(1, state->memregion("audiocpu")->base() + 0x1000);
}
- state->save_item(NAME(state->m_last));
+ state->save_item(NAME(state->m_last));
state->save_item(NAME(state->m_portT));
}
static SOUND_RESET( mario )
{
- mario_state *state = machine.driver_data<mario_state>();
+ mario_state *state = machine.driver_data<mario_state>();
address_space &space = machine.device("audiocpu")->memory().space(AS_PROGRAM);
#if USE_8039
- set_ea(machine, 1);
+ set_ea(machine, 1);
#endif
- /* FIXME: convert to latch8 */
+ /* FIXME: convert to latch8 */
state->soundlatch_clear_byte_w(space, 0, 0);
state->soundlatch2_clear_byte_w(space, 0, 0);
state->soundlatch3_clear_byte_w(space, 0, 0);
@@ -504,7 +504,7 @@ WRITE8_MEMBER(mario_state::mario_sh_p1_w)
WRITE8_MEMBER(mario_state::mario_sh_p2_w)
{
- mario_state *state = machine().driver_data<mario_state>();
+ mario_state *state = machine().driver_data<mario_state>();
I8035_P2_W(space, data);
}
@@ -652,7 +652,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( masao_audio )
- MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
+ MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
MCFG_CPU_PROGRAM_MAP(masao_sound_map)
MCFG_SOUND_START(mario)
@@ -665,4 +665,3 @@ MACHINE_CONFIG_FRAGMENT( masao_audio )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-