From 6c00c8ef02f477f5e89cf73e7384f0ff42a76484 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 16 Dec 2022 13:42:12 +0100 Subject: ay8910: add machine().describe_context() to some logerror --- src/devices/sound/ay8910.cpp | 69 ++++++++++++++++++++++---------------------- src/mame/misc/epos.cpp | 16 +++++----- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index 1f0acab67d7..a38308f53f0 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -1001,7 +1001,7 @@ void ay8910_device::ay8910_write_reg(int r, int v) } } else if (m_mode & 0xf) - logerror("warning: activated unknown mode %02x at %s\n", m_mode & 0xf, name()); + logerror("%s: warning: activated unknown mode %02x at %s\n", machine().describe_context(), m_mode & 0xf, name()); } } m_envelope[0].set_shape(m_regs[AY_EASHAPE], m_env_step_mask); @@ -1012,12 +1012,12 @@ void ay8910_device::ay8910_write_reg(int r, int v) if (!m_port_a_write_cb.isnull()) m_port_a_write_cb((offs_t)0, m_regs[AY_PORTA]); else - logerror("warning: unmapped write %02x to %s Port A\n", v, name()); + logerror("%s: warning: unmapped write %02x to %s Port A\n", machine().describe_context(), v, name()); } else { #if LOG_IGNORED_WRITES - logerror("warning: write %02x to %s Port A set as input - ignored\n", v, name()); + logerror("%s: warning: write %02x to %s Port A set as input - ignored\n", machine().describe_context(), v, name()); #endif } break; @@ -1027,12 +1027,12 @@ void ay8910_device::ay8910_write_reg(int r, int v) if (!m_port_b_write_cb.isnull()) m_port_b_write_cb((offs_t)0, m_regs[AY_PORTB]); else - logerror("warning: unmapped write %02x to %s Port B\n", v, name()); + logerror("%s: warning: unmapped write %02x to %s Port B\n", machine().describe_context(), v, name()); } else { #if LOG_IGNORED_WRITES - logerror("warning: write %02x to %s Port B set as input - ignored\n", v, name()); + logerror("%s: warning: write %02x to %s Port B set as input - ignored\n", machine().describe_context(), v, name()); #endif } break; @@ -1451,7 +1451,7 @@ u8 ay8910_device::ay8910_read_ym() specifies those pull up resistors as 60k to 600k (min / max). We do need a callback for those two flags. Kid Niki (Irem m62) is one such case were it makes a difference in comparison to a standard TTL output. - */ + */ if (!m_port_a_read_cb.isnull()) m_regs[AY_PORTA] = m_port_a_read_cb(0); else @@ -1593,35 +1593,34 @@ ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, dev { } -ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, - psg_type_t psg_type, int streams, int ioports, int feature) - : device_t(mconfig, type, tag, owner, clock), - device_sound_interface(mconfig, *this), - m_type(psg_type), - m_streams(streams), - m_ioports(ioports), - m_ready(0), - m_channel(nullptr), - m_active(false), - m_register_latch(0), - m_last_enable(0), - m_prescale_noise(0), - m_noise_value(0), - m_count_noise(0), - m_rng(0), - m_noise_out(0), - m_mode(0), - m_env_step_mask((!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 0x0f : 0x1f), - m_step( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 2 : 1), - m_zero_is_off( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 1 : 0), - m_par( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param), - m_par_env( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param_env), - m_flags(AY8910_LEGACY_OUTPUT), - m_feature(feature), - m_port_a_read_cb(*this), - m_port_b_read_cb(*this), - m_port_a_write_cb(*this), - m_port_b_write_cb(*this) +ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, psg_type_t psg_type, int streams, int ioports, int feature) : + device_t(mconfig, type, tag, owner, clock), + device_sound_interface(mconfig, *this), + m_type(psg_type), + m_streams(streams), + m_ioports(ioports), + m_ready(0), + m_channel(nullptr), + m_active(false), + m_register_latch(0), + m_last_enable(0), + m_prescale_noise(0), + m_noise_value(0), + m_count_noise(0), + m_rng(0), + m_noise_out(0), + m_mode(0), + m_env_step_mask((!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 0x0f : 0x1f), + m_step( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 2 : 1), + m_zero_is_off( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 1 : 0), + m_par( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param), + m_par_env( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param_env), + m_flags(AY8910_LEGACY_OUTPUT), + m_feature(feature), + m_port_a_read_cb(*this), + m_port_b_read_cb(*this), + m_port_a_write_cb(*this), + m_port_b_write_cb(*this) { memset(&m_regs,0,sizeof(m_regs)); memset(&m_tone,0,sizeof(m_tone)); diff --git a/src/mame/misc/epos.cpp b/src/mame/misc/epos.cpp index 48980820c40..86ecaceb442 100644 --- a/src/mame/misc/epos.cpp +++ b/src/mame/misc/epos.cpp @@ -1045,14 +1045,14 @@ void tristar9000_state::init_tristar9000() *************************************/ // EPOS TRISTAR 8000 PCB based -GAME( 1982, megadon, 0, tristar8000, megadon, tristar8000_state, empty_init, ROT270, "Epos Corporation (Photar Industries license)", "Megadon", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, catapult, 0, tristar8000, catapult, tristar8000_state, empty_init, ROT270, "Epos Corporation", "Catapult", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // bad ROM, hold f2 for test mode -GAME( 1983, suprglob, 0, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "Super Glob", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, theglob, suprglob, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "The Glob", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, theglob2, suprglob, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "The Glob (earlier)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, theglob3, suprglob, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "The Glob (set 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, igmo, 0, tristar8000, igmo, tristar8000_state, empty_init, ROT270, "Epos Corporation", "IGMO", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, eeekk, 0, tristar8000, eeekk, tristar8000_state, empty_init, ROT270, "Epos Corporation", "Eeekk!", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, megadon, 0, tristar8000, megadon, tristar8000_state, empty_init, ROT270, "Epos Corporation (Photar Industries license)", "Megadon", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, catapult, 0, tristar8000, catapult, tristar8000_state, empty_init, ROT270, "Epos Corporation", "Catapult", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // bad ROM, hold f2 for test mode +GAME( 1983, suprglob, 0, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "Super Glob", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, theglob, suprglob, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "The Glob", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, theglob2, suprglob, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "The Glob (earlier)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, theglob3, suprglob, tristar8000, suprglob, tristar8000_state, empty_init, ROT270, "Epos Corporation", "The Glob (set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, igmo, 0, tristar8000, igmo, tristar8000_state, empty_init, ROT270, "Epos Corporation", "IGMO", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, eeekk, 0, tristar8000, eeekk, tristar8000_state, empty_init, ROT270, "Epos Corporation", "Eeekk!", MACHINE_SUPPORTS_SAVE ) // EPOS TRISTAR 9000 PCB based GAME( 1984, dealer, 0, tristar9000, dealer, tristar9000_state, init_tristar9000, ROT270, "Epos Corporation", "The Dealer", MACHINE_SUPPORTS_SAVE ) -- cgit v1.2.3