From 4ae4e2c7bd5d70ef84ef0ccbefc69d48783985d8 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 25 Jan 2018 11:26:30 -0500 Subject: [PATCH] Build fixes (nw) --- src/devices/sound/k054539.cpp | 7 +++---- src/mame/drivers/vgmplay.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index f485c5fab0e..a7f10d51217 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(K054539, k054539_device, "k054539", "K054539 ADPCM") k054539_device::k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, K054539, tag, owner, clock) - , device_sound_interface(mconfig, *this), + , device_sound_interface(mconfig, *this) , device_rom_interface(mconfig, *this, 24) , flags(0) , ram(nullptr) @@ -473,7 +473,6 @@ WRITE8_MEMBER(k054539_device::write) void k054539_device::device_post_load() { - int data = regs[0x22e]; cur_limit = rom_addr == 0x80 ? 0x4000 : 0x20000; } @@ -549,8 +548,8 @@ void k054539_device::device_reset() // rom_bank_updated - the rom bank has changed //------------------------------------------------- -void k053260_device::rom_bank_updated() +void k054539_device::rom_bank_updated() { - m_stream->update(); + stream->update(); } diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index fe22ca86676..9de4b54978b 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -81,7 +81,7 @@ public: A_YMZ280B = 0x00013050, A_YM2608 = 0x00013060, A_K054539A = 0x00014000, - A_K054539B = 0x00014400 + A_K054539B = 0x00014400, A_QSOUND = 0x00013070 }; @@ -556,6 +556,7 @@ void vgmplay_device::execute_run() } case 0xd3: + { uint16_t offset = m_file->read_byte(m_pc+1) << 16 | m_file->read_byte(m_pc+2); if (offset & 0x8000) m_io->write_byte(A_K054539B + (offset & 0x3ff), m_file->read_byte(m_pc+3)); @@ -563,6 +564,7 @@ void vgmplay_device::execute_run() m_io->write_byte(A_K054539A + (offset & 0x3ff), m_file->read_byte(m_pc+3)); m_pc += 4; break; + } case 0xe0: m_ym2612_stream_offset = m_file->read_dword(m_pc+1); @@ -1370,8 +1372,8 @@ static ADDRESS_MAP_START( soundchips_map, AS_IO, 8, vgmplay_state ) AM_RANGE(vgmplay_device::A_YMF271, vgmplay_device::A_YMF271+0xf) AM_DEVWRITE ("ymf271", ymf271_device, write) AM_RANGE(vgmplay_device::A_YMZ280B, vgmplay_device::A_YMZ280B+0x1) AM_DEVWRITE ("ymz280b", ymz280b_device, write) AM_RANGE(vgmplay_device::A_YM2608, vgmplay_device::A_YM2608+0x3) AM_DEVWRITE ("ym2608", ym2608_device, write) - AM_RANGE(vgmplay_device::A_K054539A, vgmplay_device::A_K054539A+0x22f) AM_DEVWRITE ("k054539a", k054539a_device, write) - AM_RANGE(vgmplay_device::A_K054539B, vgmplay_device::A_K054539B+0x22f) AM_DEVWRITE ("k054539b", k054539b_device, write) + AM_RANGE(vgmplay_device::A_K054539A, vgmplay_device::A_K054539A+0x22f) AM_DEVWRITE ("k054539a", k054539_device, write) + AM_RANGE(vgmplay_device::A_K054539B, vgmplay_device::A_K054539B+0x22f) AM_DEVWRITE ("k054539b", k054539_device, write) AM_RANGE(vgmplay_device::A_QSOUND, vgmplay_device::A_QSOUND+0x2) AM_DEVWRITE ("qsound", qsound_device, qsound_w) ADDRESS_MAP_END