From 5de50d54b99d009d44d6f3f41101956d49633350 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 18 Feb 2018 09:54:34 -0500 Subject: [PATCH] Build fixes (nw) --- src/devices/sound/okim9810.cpp | 11 ++++++----- src/devices/sound/okim9810.h | 3 ++- src/mame/drivers/hyperscan.cpp | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/devices/sound/okim9810.cpp b/src/devices/sound/okim9810.cpp index a425304293f..cd4bdb5a523 100644 --- a/src/devices/sound/okim9810.cpp +++ b/src/devices/sound/okim9810.cpp @@ -96,8 +96,8 @@ okim9810_device::okim9810_device(const machine_config &mconfig, const char *tag, m_serial_bits(0), m_ud(0), m_si(0), - m_sd(0) - + m_sd(0), + m_cmd(0) { } @@ -129,6 +129,7 @@ void okim9810_device::device_start() save_item(NAME(m_ud)); save_item(NAME(m_si)); save_item(NAME(m_sd)); + save_item(NAME(m_cmd)); for (int i = 0; i < OKIM9810_VOICES; i++) { @@ -487,7 +488,7 @@ void okim9810_device::write_tmp_register(uint8_t data) default: break; } - osd_printf_debug("DADR direct offset %02 = %02x => ", m_dadr, m_TMP_register); + osd_printf_debug("DADR direct offset %02x = %02x => ", m_dadr, m_TMP_register); m_dadr++; } } @@ -519,7 +520,7 @@ WRITE_LINE_MEMBER( okim9810_device::si_w ) m_serial_bits++; if (m_serial_bits >= 8) { - if (m_cmd = 0) + if (m_cmd == 0) { write_command(m_serial_write_latch); } @@ -635,7 +636,7 @@ void okim9810_device::okim_voice::generate_audio(device_rom_interface &rom, // If interpSampleNum == 0, we are at the beginning of a new interp chunk, gather data if (m_interpSampleNum == 0) { - if (m_playbackAlgo & 8BIT_PLAYBACK) // 8-bit case + if (m_playbackAlgo & EIGHTBIT_PLAYBACK) // 8-bit case { // If m_sample == 0, we have begun to play a new voice. Get both the first byte & the second. if (m_sample == 0) diff --git a/src/devices/sound/okim9810.h b/src/devices/sound/okim9810.h index a2bb7708961..f2835be7dfc 100644 --- a/src/devices/sound/okim9810.h +++ b/src/devices/sound/okim9810.h @@ -78,7 +78,7 @@ protected: ADPCM2_PLAYBACK = 1, NONLINEAR8_PLAYBACK = 2, STRAIGHT8_PLAYBACK = 3, - 8BIT_PLAYBACK = 2 + EIGHTBIT_PLAYBACK = 2 }; enum @@ -169,6 +169,7 @@ protected: int m_ud; int m_si; int m_sd; + int m_cmd; static constexpr int OKIM9810_VOICES = 8; okim_voice m_voice[OKIM9810_VOICES]; diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index 3ff6200e0c8..d5d6b7636bc 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -55,7 +55,7 @@ #include "emu.h" #include "cpu/score/score.h" #include "screen.h" - +#include "softlist_dev.h" #define LOG_SPG290_REGISTER_ACCESS (1)