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

audio/williams.cpp : Remove unnecessary arguments in handlers

Browse Source
This commit is contained in:
cam900 2019-02-02 10:32:49 +09:00
parent e6a5262830
commit 8d0b0cd04c
7 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/mame/audio/williams.cpp
View File

@ -70,7 +70,7 @@ DEFINE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device, "wmsadpcm"
// williams_cvsd_sound_device - constructor
//-------------------------------------------------
williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, WILLIAMS_CVSD_SOUND, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
@ -87,7 +87,7 @@ williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mco
// latch
//-------------------------------------------------
WRITE16_MEMBER(williams_cvsd_sound_device::write)
void williams_cvsd_sound_device::write(u16 data)
{
synchronize(0, data);
}
@ -102,7 +102,7 @@ WRITE_LINE_MEMBER(williams_cvsd_sound_device::reset_write)
// going high halts the CPU
if (state)
{
bank_select_w(m_cpu->space(), 0, 0);
bank_select_w(0);
device_reset();
m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
@ -117,7 +117,7 @@ WRITE_LINE_MEMBER(williams_cvsd_sound_device::reset_write)
// bank_select_w - change memory banks
//-------------------------------------------------
WRITE8_MEMBER(williams_cvsd_sound_device::bank_select_w)
void williams_cvsd_sound_device::bank_select_w(u8 data)
{
m_rombank->set_entry(data & 0x0f);
}
@ -127,7 +127,7 @@ WRITE8_MEMBER(williams_cvsd_sound_device::bank_select_w)
// talkback_w - write to the talkback latch
//-------------------------------------------------
WRITE8_MEMBER(williams_cvsd_sound_device::talkback_w)
void williams_cvsd_sound_device::talkback_w(u8 data)
{
m_talkback = data;
logerror("CVSD Talkback = %02X\n", data);
@ -139,7 +139,7 @@ WRITE8_MEMBER(williams_cvsd_sound_device::talkback_w)
// the HC55516 and clock the data
//-------------------------------------------------
WRITE8_MEMBER(williams_cvsd_sound_device::cvsd_digit_clock_clear_w)
void williams_cvsd_sound_device::cvsd_digit_clock_clear_w(u8 data)
{
m_hc55516->digit_w(data);
m_hc55516->clock_w(0);
@ -150,7 +150,7 @@ WRITE8_MEMBER(williams_cvsd_sound_device::cvsd_digit_clock_clear_w)
// cvsd_clock_set_w - set the clock on the HC55516
//-------------------------------------------------
WRITE8_MEMBER(williams_cvsd_sound_device::cvsd_clock_set_w)
void williams_cvsd_sound_device::cvsd_clock_set_w(u8 data)
{
m_hc55516->clock_w(1);
}
@ -206,7 +206,7 @@ MACHINE_CONFIG_END
void williams_cvsd_sound_device::device_start()
{
// configure master CPU banks
uint8_t *rom = memregion("cpu")->base();
u8 *rom = memregion("cpu")->base();
for (int bank = 0; bank < 16; bank++)
{
//
@ -262,7 +262,7 @@ void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id
// williams_narc_sound_device - constructor
//-------------------------------------------------
williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, WILLIAMS_NARC_SOUND, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu%u", 0U),
@ -283,7 +283,7 @@ williams_narc_sound_device::williams_narc_sound_device(const machine_config &mco
// SYNC bits in bits 8 and 9
//-------------------------------------------------
READ16_MEMBER(williams_narc_sound_device::read)
u16 williams_narc_sound_device::read()
{
return m_talkback | (m_audio_sync << 8);
}
@ -294,7 +294,7 @@ READ16_MEMBER(williams_narc_sound_device::read)
// latch
//-------------------------------------------------
WRITE16_MEMBER(williams_narc_sound_device::write)
void williams_narc_sound_device::write(u16 data)
{
synchronize(TID_MASTER_COMMAND, data);
}
@ -309,8 +309,8 @@ WRITE_LINE_MEMBER(williams_narc_sound_device::reset_write)
// going high halts the CPU
if (state)
{
master_bank_select_w(m_cpu[0]->space(), 0, 0);
slave_bank_select_w(m_cpu[1]->space(), 0, 0);
master_bank_select_w(0);
slave_bank_select_w(0);
device_reset();
m_cpu[0]->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
m_cpu[1]->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
@ -330,7 +330,7 @@ WRITE_LINE_MEMBER(williams_narc_sound_device::reset_write)
// master CPU
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::master_bank_select_w)
void williams_narc_sound_device::master_bank_select_w(u8 data)
{
m_masterbank->set_entry(data & 0x0f);
}
@ -341,7 +341,7 @@ WRITE8_MEMBER(williams_narc_sound_device::master_bank_select_w)
// slave CPU
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::slave_bank_select_w)
void williams_narc_sound_device::slave_bank_select_w(u8 data)
{
m_slavebank->set_entry(data & 0x0f);
}
@ -352,7 +352,7 @@ WRITE8_MEMBER(williams_narc_sound_device::slave_bank_select_w)
// agent
//-------------------------------------------------
READ8_MEMBER(williams_narc_sound_device::command_r)
u8 williams_narc_sound_device::command_r()
{
m_cpu[0]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
m_sound_int_state = 0;
@ -365,7 +365,7 @@ READ8_MEMBER(williams_narc_sound_device::command_r)
// slave CPU
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::command2_w)
void williams_narc_sound_device::command2_w(u8 data)
{
synchronize(TID_SLAVE_COMMAND, data);
}
@ -376,7 +376,7 @@ WRITE8_MEMBER(williams_narc_sound_device::command2_w)
// CPU
//-------------------------------------------------
READ8_MEMBER(williams_narc_sound_device::command2_r)
u8 williams_narc_sound_device::command2_r()
{
m_cpu[1]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
return m_latch2;
@ -388,7 +388,7 @@ READ8_MEMBER(williams_narc_sound_device::command2_r)
// talkback latch from the master CPU
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::master_talkback_w)
void williams_narc_sound_device::master_talkback_w(u8 data)
{
m_talkback = data;
logerror("Master Talkback = %02X\n", data);
@ -400,7 +400,7 @@ WRITE8_MEMBER(williams_narc_sound_device::master_talkback_w)
// SYNC register
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::master_sync_w)
void williams_narc_sound_device::master_sync_w(u8 data)
{
timer_set(attotime::from_double(TIME_OF_74LS123(180000, 0.000001)), TID_SYNC_CLEAR, 0x01);
m_audio_sync |= 0x01;
@ -413,7 +413,7 @@ WRITE8_MEMBER(williams_narc_sound_device::master_sync_w)
// talkback latch from the slave CPU
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::slave_talkback_w)
void williams_narc_sound_device::slave_talkback_w(u8 data)
{
logerror("Slave Talkback = %02X\n", data);
}
@ -424,7 +424,7 @@ WRITE8_MEMBER(williams_narc_sound_device::slave_talkback_w)
// SYNC register
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::slave_sync_w)
void williams_narc_sound_device::slave_sync_w(u8 data)
{
timer_set(attotime::from_double(TIME_OF_74LS123(180000, 0.000001)), TID_SYNC_CLEAR, 0x02);
m_audio_sync |= 0x02;
@ -437,7 +437,7 @@ WRITE8_MEMBER(williams_narc_sound_device::slave_sync_w)
// the HC55516 and clock the data
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::cvsd_digit_clock_clear_w)
void williams_narc_sound_device::cvsd_digit_clock_clear_w(u8 data)
{
m_hc55516->digit_w(data);
m_hc55516->clock_w(0);
@ -448,7 +448,7 @@ WRITE8_MEMBER(williams_narc_sound_device::cvsd_digit_clock_clear_w)
// cvsd_clock_set_w - set the clock on the HC55516
//-------------------------------------------------
WRITE8_MEMBER(williams_narc_sound_device::cvsd_clock_set_w)
void williams_narc_sound_device::cvsd_clock_set_w(u8 data)
{
m_hc55516->clock_w(1);
}
@ -526,7 +526,7 @@ MACHINE_CONFIG_END
void williams_narc_sound_device::device_start()
{
// configure master CPU banks
uint8_t *rom = memregion("cpu0")->base();
u8 *rom = memregion("cpu0")->base();
for (int bank = 0; bank < 16; bank++)
{
//
@ -617,7 +617,7 @@ void williams_narc_sound_device::device_timer(emu_timer &timer, device_timer_id
// williams_adpcm_sound_device - constructor
//-------------------------------------------------
williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, WILLIAMS_ADPCM_SOUND, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
@ -635,7 +635,7 @@ williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &m
// latch
//-------------------------------------------------
WRITE16_MEMBER(williams_adpcm_sound_device::write)
void williams_adpcm_sound_device::write(u16 data)
{
synchronize(TID_COMMAND, data);
}
@ -650,7 +650,7 @@ WRITE_LINE_MEMBER(williams_adpcm_sound_device::reset_write)
// going high halts the CPU
if (state)
{
bank_select_w(m_cpu->space(), 0, 0);
bank_select_w(0);
device_reset();
m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
@ -676,18 +676,18 @@ READ_LINE_MEMBER(williams_adpcm_sound_device::irq_read)
// bank
//-------------------------------------------------
WRITE8_MEMBER(williams_adpcm_sound_device::bank_select_w)
void williams_adpcm_sound_device::bank_select_w(u8 data)
{
m_rombank->set_entry(data & 0x07);
}
//-------------------------------------------------
// bank_select_w - select the OKI6295 memory
// bank
// oki6295_bank_select_w - select the OKI6295
// memory bank
//-------------------------------------------------
WRITE8_MEMBER(williams_adpcm_sound_device::oki6295_bank_select_w)
void williams_adpcm_sound_device::oki6295_bank_select_w(u8 data)
{
m_okibank->set_entry(data & 7);
}
@ -698,7 +698,7 @@ WRITE8_MEMBER(williams_adpcm_sound_device::oki6295_bank_select_w)
// latch
//-------------------------------------------------
READ8_MEMBER(williams_adpcm_sound_device::command_r)
u8 williams_adpcm_sound_device::command_r()
{
m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
@ -713,7 +713,7 @@ READ8_MEMBER(williams_adpcm_sound_device::command_r)
// talkback_w - write to the talkback latch
//-------------------------------------------------
WRITE8_MEMBER(williams_adpcm_sound_device::talkback_w)
void williams_adpcm_sound_device::talkback_w(u8 data)
{
m_talkback = data;
logerror("ADPCM Talkback = %02X\n", data);
@ -779,7 +779,7 @@ MACHINE_CONFIG_END
void williams_adpcm_sound_device::device_start()
{
// configure banks
uint8_t *rom = memregion("cpu")->base();
u8 *rom = memregion("cpu")->base();
m_rombank->configure_entries(0, 8, &rom[0x10000], 0x8000);
membank("romupper")->set_base(&rom[0x10000 + 0x4000 + 7 * 0x8000]);

70
src/mame/audio/williams.h
View File

@ -37,16 +37,16 @@ class williams_cvsd_sound_device : public device_t,
{
public:
// construction/destruction
williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
// read/write
DECLARE_WRITE16_MEMBER(write);
void write(u16 data);
DECLARE_WRITE_LINE_MEMBER(reset_write);
// internal communications
DECLARE_WRITE8_MEMBER(bank_select_w);
DECLARE_WRITE8_MEMBER(cvsd_digit_clock_clear_w);
DECLARE_WRITE8_MEMBER(cvsd_clock_set_w);
void bank_select_w(u8 data);
void cvsd_digit_clock_clear_w(u8 data);
void cvsd_clock_set_w(u8 data);
void williams_cvsd_map(address_map &map);
@ -68,9 +68,9 @@ private:
required_memory_bank m_rombank;
// internal state
uint8_t m_talkback;
u8 m_talkback;
DECLARE_WRITE8_MEMBER(talkback_w);
void talkback_w(u8 data);
};
@ -81,25 +81,25 @@ class williams_narc_sound_device : public device_t,
{
public:
// construction/destruction
williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
// read/write
DECLARE_READ16_MEMBER(read);
DECLARE_WRITE16_MEMBER(write);
u16 read();
void write(u16 data);
DECLARE_WRITE_LINE_MEMBER(reset_write);
// internal communications
DECLARE_WRITE8_MEMBER(master_bank_select_w);
DECLARE_WRITE8_MEMBER(slave_bank_select_w);
DECLARE_READ8_MEMBER(command_r);
DECLARE_WRITE8_MEMBER(command2_w);
DECLARE_READ8_MEMBER(command2_r);
DECLARE_WRITE8_MEMBER(master_talkback_w);
DECLARE_WRITE8_MEMBER(master_sync_w);
DECLARE_WRITE8_MEMBER(slave_talkback_w);
DECLARE_WRITE8_MEMBER(slave_sync_w);
DECLARE_WRITE8_MEMBER(cvsd_digit_clock_clear_w);
DECLARE_WRITE8_MEMBER(cvsd_clock_set_w);
void master_bank_select_w(u8 data);
void slave_bank_select_w(u8 data);
u8 command_r();
void command2_w(u8 data);
u8 command2_r();
void master_talkback_w(u8 data);
void master_sync_w(u8 data);
void slave_talkback_w(u8 data);
void slave_sync_w(u8 data);
void cvsd_digit_clock_clear_w(u8 data);
void cvsd_clock_set_w(u8 data);
void williams_narc_master_map(address_map &map);
void williams_narc_slave_map(address_map &map);
@ -130,11 +130,11 @@ private:
required_memory_bank m_slavebank;
// internal state
uint8_t m_latch;
uint8_t m_latch2;
uint8_t m_talkback;
uint8_t m_audio_sync;
uint8_t m_sound_int_state;
u8 m_latch;
u8 m_latch2;
u8 m_talkback;
u8 m_audio_sync;
u8 m_sound_int_state;
};
@ -145,18 +145,18 @@ class williams_adpcm_sound_device : public device_t,
{
public:
// construction/destruction
williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
// read/write
DECLARE_WRITE16_MEMBER(write);
void write(u16 data);
DECLARE_WRITE_LINE_MEMBER(reset_write);
DECLARE_READ_LINE_MEMBER(irq_read);
// internal communications
DECLARE_WRITE8_MEMBER(bank_select_w);
DECLARE_WRITE8_MEMBER(oki6295_bank_select_w);
DECLARE_READ8_MEMBER(command_r);
DECLARE_WRITE8_MEMBER(talkback_w);
void bank_select_w(u8 data);
void oki6295_bank_select_w(u8 data);
u8 command_r();
void talkback_w(u8 data);
void williams_adpcm_map(address_map &map);
void williams_adpcm_oki_map(address_map &map);
@ -185,7 +185,7 @@ private:
required_memory_bank m_okibank;
// internal state
uint8_t m_latch;
uint8_t m_talkback;
uint8_t m_sound_int_state;
u8 m_latch;
u8 m_talkback;
u8 m_sound_int_state;
};

2
src/mame/drivers/mcr68.cpp
View File

@ -181,7 +181,7 @@ WRITE16_MEMBER(mcr68_state::archrivl_control_w)
{
COMBINE_DATA(&m_control_word);
m_cvsd_sound->reset_write(~m_control_word & 0x0400);
m_cvsd_sound->write(space, 0, m_control_word & 0x3ff);
m_cvsd_sound->write(m_control_word & 0x3ff);
}

4
src/mame/drivers/midyunit.cpp
View File

@ -155,13 +155,13 @@ WRITE8_MEMBER(midyunit_state::yawdim_oki_bank_w)
CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_strobe_r)
{
return (m_narc_sound->read(machine().dummy_space(), 0) >> 8) & 1;
return (m_narc_sound->read() >> 8) & 1;
}
CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_data_r)
{
return m_narc_sound->read(machine().dummy_space(), 0) & 0xff;
return m_narc_sound->read() & 0xff;
}

2
src/mame/machine/midtunit.cpp
View File

@ -546,7 +546,7 @@ WRITE16_MEMBER(midtunit_state::midtunit_sound_w)
case SOUND_ADPCM:
case SOUND_ADPCM_LARGE:
m_adpcm_sound->reset_write(~data & 0x100);
m_adpcm_sound->write(space, offset, data & 0xff);
m_adpcm_sound->write(data & 0xff);
/* the games seem to check for $82 loops, so this should be just barely enough */
m_fake_sound_state = 128;

8
src/mame/machine/midyunit.cpp
View File

@ -163,7 +163,7 @@ WRITE16_MEMBER(midyunit_state::term2_sound_w)
m_term2_adc->write(space, 0, ((data >> 12) & 3) | 4);
m_adpcm_sound->reset_write((~data & 0x100) >> 1);
m_adpcm_sound->write(space, offset, data);
m_adpcm_sound->write(data);
}
@ -577,18 +577,18 @@ WRITE16_MEMBER(midyunit_state::midyunit_sound_w)
switch (m_chip_type)
{
case SOUND_NARC:
m_narc_sound->write(space, offset, data);
m_narc_sound->write(data);
break;
case SOUND_CVSD_SMALL:
case SOUND_CVSD:
m_cvsd_sound->reset_write((~data & 0x100) >> 8);
m_cvsd_sound->write(space, offset, (data & 0xff) | ((data & 0x200) >> 1));
m_cvsd_sound->write((data & 0xff) | ((data & 0x200) >> 1));
break;
case SOUND_ADPCM:
m_adpcm_sound->reset_write((~data & 0x100) >> 8);
m_adpcm_sound->write(space, offset, data);
m_adpcm_sound->write(data);
break;
case SOUND_YAWDIM:

4
src/mame/machine/williams.cpp
View File

@ -523,13 +523,13 @@ TIMER_CALLBACK_MEMBER(joust2_state::joust2_deferred_snd_cmd_w)
WRITE_LINE_MEMBER(joust2_state::joust2_pia_3_cb1_w)
{
m_joust2_current_sound_data = (m_joust2_current_sound_data & ~0x100) | ((state << 8) & 0x100);
m_cvsd_sound->write(machine().dummy_space(), 0, m_joust2_current_sound_data);
m_cvsd_sound->write(m_joust2_current_sound_data);
}
WRITE8_MEMBER(joust2_state::joust2_snd_cmd_w)
{
m_joust2_current_sound_data = (m_joust2_current_sound_data & ~0xff) | (data & 0xff);
m_cvsd_sound->write(machine().dummy_space(), 0, m_joust2_current_sound_data);
m_cvsd_sound->write(m_joust2_current_sound_data);
machine().scheduler().synchronize(timer_expired_delegate(FUNC(joust2_state::joust2_deferred_snd_cmd_w),this), m_joust2_current_sound_data);
}