summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2025-09-09 12:02:31 +0200
committer hap <happppp@users.noreply.github.com>2025-09-09 12:21:07 +0200
commita9c424f85d2c81fc4e043d6e33e72cadaa8dfdfa (patch)
tree57523e877740de8b3b660f835f98d35ae11cce82
parent0c914a12bbdc20f2a39edc2523e68539f844d8d2 (diff)
mpu4_oki_sampled_sound: fix fatalerror on sound routing
-rw-r--r--src/mame/barcrest/mpu4.cpp14
-rw-r--r--src/mame/barcrest/mpu4_oki_sampled_sound.cpp4
-rw-r--r--src/mame/barcrest/mpu4mod4oki.cpp1
3 files changed, 4 insertions, 15 deletions
diff --git a/src/mame/barcrest/mpu4.cpp b/src/mame/barcrest/mpu4.cpp
index 283975abe40..049cfdf71ae 100644
--- a/src/mame/barcrest/mpu4.cpp
+++ b/src/mame/barcrest/mpu4.cpp
@@ -669,7 +669,7 @@ void mpu4_state::dataport_rxd(int state)
/* IC4, 7 seg leds, 50Hz timer reel sensors, current sensors */
void mpu4_state::pia_ic4_porta_w(uint8_t data)
{
- if(m_ic23_active)
+ if (m_ic23_active)
{
if (m_use_pia4_porta_leds)
{
@@ -804,7 +804,6 @@ uint8_t mpu4_state::pia_ic5_porta_r()
LOG("%s: IC5 PIA Read of Port A (AUX1)\n", machine().describe_context());
-
uint8_t tempinput = m_aux1_port->read() | m_aux1_input;
return tempinput;
}
@@ -895,9 +894,9 @@ void mpu4_state::pia_ic5_portb_w(uint8_t data)
if (m_use_simplecard_leds)
{
- if(m_simplecard_leds_strobe != m_input_strobe)
+ if (m_simplecard_leds_strobe != m_input_strobe)
{
- for(int i=0; i<8; i++)
+ for (int i=0; i<8; i++)
{
m_mpu4leds[( ( (7 - m_input_strobe) | m_simplecard_leds_base) << 3) | i] = BIT(m_pia4->a_output(), i);
}
@@ -1869,7 +1868,6 @@ void mpu4_state::mpu4_install_mod4oki_space(address_space &space)
space.install_read_handler(0x08c0, 0x08c7, read8sm_delegate(*m_okicard, FUNC(mpu4_oki_sampled_sound::ic3_read)));
space.install_write_handler(0x08c0, 0x08c7, write8sm_delegate(*m_okicard, FUNC(mpu4_oki_sampled_sound::ic3_write)));
-
}
@@ -1884,7 +1882,6 @@ void mpu4_state::mpu4_config_common()
m_ic24_timer = timer_alloc(FUNC(mpu4_state::update_ic24), this);
-
save_item(NAME( m_mmtr_data ));
save_item(NAME( m_ay8913_address ));
save_item(NAME( m_signal_50hz ));
@@ -1956,7 +1953,6 @@ void mpu4_state::mpu4_config_common()
save_item(NAME( m_hopper2_opto ));
m_lamp_strobe_ext_persistence = 0;
-
}
MACHINE_START_MEMBER(mpu4_state, mod2)
@@ -2323,7 +2319,6 @@ void mpu4_state::mpu4_common(machine_config &config)
HOPPER(config, m_hopper1, attotime::from_msec(100));
-
SPEAKER(config, "mono").front_center();
DAC_1BIT(config, m_alarmdac, 0);
@@ -2345,9 +2340,7 @@ void mpu4_state::mpu4base(machine_config &config)
mpu4_common(config);
-
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
-
MC68681(config, m_duart68681, MPU4_MASTER_CLOCK); // ?
config.set_default_layout(layout_mpu4);
@@ -2409,7 +2402,6 @@ void mpu4_state::mod4oki_f(machine_config &config)
m_okicard->add_route(ALL_OUTPUTS, "mono", 1.0);
m_okicard->cb2_handler().set(FUNC(mpu4_state::pia_gb_cb2_w));
-
}
void mpu4_state::mod4oki_no_bacta_f(machine_config &config)
diff --git a/src/mame/barcrest/mpu4_oki_sampled_sound.cpp b/src/mame/barcrest/mpu4_oki_sampled_sound.cpp
index 86cfefa6bca..c202bd9d1c3 100644
--- a/src/mame/barcrest/mpu4_oki_sampled_sound.cpp
+++ b/src/mame/barcrest/mpu4_oki_sampled_sound.cpp
@@ -127,7 +127,6 @@ void mpu4_oki_sampled_sound::pia_gb_portb_w(uint8_t data)
LOG("Volume Set to %2x\n", data);
float percent = (32-m_global_volume)/32.0;
m_msm6376->set_output_gain(0, percent);
- m_msm6376->set_output_gain(1, percent);
}
}
m_msm6376->ch2_w(data & 0x02);
@@ -188,8 +187,7 @@ void mpu4_oki_sampled_sound::device_add_mconfig(machine_config &config)
m_pia_ic4ss->cb2_handler().set(FUNC(mpu4_oki_sampled_sound::pia_gb_cb2_w));
OKIM6376(config, m_msm6376, 128000); //Adjusted by IC3, default to 16KHz sample. Can also be 85430 at 10.5KHz and 64000 at 8KHz
- m_msm6376->add_route(0, *this, 1.0);
- m_msm6376->add_route(1, *this, 1.0);
+ m_msm6376->add_route(ALL_OUTPUTS, *this, 1.0);
}
diff --git a/src/mame/barcrest/mpu4mod4oki.cpp b/src/mame/barcrest/mpu4mod4oki.cpp
index 79593c90270..1c8344d2538 100644
--- a/src/mame/barcrest/mpu4mod4oki.cpp
+++ b/src/mame/barcrest/mpu4mod4oki.cpp
@@ -175,7 +175,6 @@ namespace {
class mpu4mod4oki_machines_state : public mpu4_state
{
public:
-
mpu4mod4oki_machines_state(const machine_config& mconfig, device_type type, const char* tag) :
mpu4_state(mconfig, type, tag)
{