From 9c4dc2b978bf6575343680142e9907ae56c9774e Mon Sep 17 00:00:00 2001 From: cam900 Date: Tue, 31 May 2022 14:06:16 +0900 Subject: [PATCH] Fix wrong link, Add modifier and contributor disclaimer in vgsound_emu core --- src/engine/platform/sound/k005289/k005289.cpp | 1 + src/engine/platform/sound/k005289/k005289.hpp | 1 + src/engine/platform/sound/n163/n163.cpp | 11 ++++++----- src/engine/platform/sound/n163/n163.hpp | 13 +++++++------ src/engine/platform/sound/oki/msm6295.cpp | 3 ++- src/engine/platform/sound/oki/msm6295.hpp | 5 +++-- src/engine/platform/sound/oki/util.hpp | 5 +++-- src/engine/platform/sound/oki/vox.hpp | 3 ++- src/engine/platform/sound/scc/scc.cpp | 5 +++-- src/engine/platform/sound/scc/scc.hpp | 1 + src/engine/platform/sound/vrcvi/vrcvi.cpp | 1 + src/engine/platform/sound/vrcvi/vrcvi.hpp | 1 + src/engine/platform/sound/x1_010/x1_010.cpp | 3 ++- src/engine/platform/sound/x1_010/x1_010.hpp | 5 +++-- 14 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/engine/platform/sound/k005289/k005289.cpp b/src/engine/platform/sound/k005289/k005289.cpp index 6c7164683..8b21245a1 100644 --- a/src/engine/platform/sound/k005289/k005289.cpp +++ b/src/engine/platform/sound/k005289/k005289.cpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900 Konami K005289 emulation core This chip is used at infamous Konami Bubble System, for part of Wavetable sound generator. diff --git a/src/engine/platform/sound/k005289/k005289.hpp b/src/engine/platform/sound/k005289/k005289.hpp index 69c48eebb..d042e1d14 100644 --- a/src/engine/platform/sound/k005289/k005289.hpp +++ b/src/engine/platform/sound/k005289/k005289.hpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900 Konami K005289 emulation core See k005289.cpp for more info. diff --git a/src/engine/platform/sound/n163/n163.cpp b/src/engine/platform/sound/n163/n163.cpp index 7ece05f6c..5d9deab1a 100644 --- a/src/engine/platform/sound/n163/n163.cpp +++ b/src/engine/platform/sound/n163/n163.cpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900, tildearrow Namco 163 Sound emulation core This chip is one of NES mapper with sound expansion, This one is by Namco. @@ -99,7 +100,7 @@ void n163_core::tick() m_ram[m_voice_cycle + 3] = bitfield(accum, 8, 8); m_ram[m_voice_cycle + 5] = bitfield(accum, 16, 8); - const u8 prev_voice_cycle = m_voice_cycle; + const u8 prev_voice_cycle = m_voice_cycle; // update voice cycle bool flush = m_multiplex ? true : false; @@ -112,8 +113,8 @@ void n163_core::tick() } // output 4 bit waveform and volume, multiplexed - const u8 chan_index = ((0x78-prev_voice_cycle)>>3)&7; - m_ch_out[chan_index]=wave * volume; + const u8 chan_index = ((0x78-prev_voice_cycle)>>3)&7; + m_ch_out[chan_index]=wave * volume; m_acc += m_ch_out[chan_index]; if (flush) { @@ -127,12 +128,12 @@ void n163_core::reset() // reset this chip m_disable = false; m_multiplex = true; - memset(m_ram,0,sizeof(m_ram)); + memset(m_ram,0,sizeof(m_ram)); m_voice_cycle = 0x78; m_addr_latch.reset(); m_out = 0; m_acc = 0; - memset(m_ch_out,0,sizeof(m_ch_out)); + memset(m_ch_out,0,sizeof(m_ch_out)); } // accessor diff --git a/src/engine/platform/sound/n163/n163.hpp b/src/engine/platform/sound/n163/n163.hpp index 921d9cc6f..800d1ea13 100644 --- a/src/engine/platform/sound/n163/n163.hpp +++ b/src/engine/platform/sound/n163/n163.hpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900, tildearrow Namco 163 Sound emulation core */ @@ -46,11 +47,11 @@ public: // sound output pin s16 out() { return m_out; } - // get channel output - s16 chan_out(u8 ch) { return m_ch_out[ch]; } + // get channel output + s16 chan_out(u8 ch) { return m_ch_out[ch]; } - // get voice cycle - u8 voice_cycle() { return m_voice_cycle; } + // get voice cycle + u8 voice_cycle() { return m_voice_cycle; } // register pool u8 reg(u8 addr) { return m_ram[addr & 0x7f]; } @@ -63,7 +64,7 @@ private: addr_latch_t() : addr(0) , incr(0) - { }; + { } void reset() { @@ -80,7 +81,7 @@ private: u8 m_voice_cycle = 0x78; // Voice cycle for processing addr_latch_t m_addr_latch; // address latch s16 m_out = 0; // output - s16 m_ch_out[8] = {0}; // per channel output + s16 m_ch_out[8] = {0}; // per channel output // demultiplex related bool m_multiplex = true; // multiplex flag, but less noisy = inaccurate! s16 m_acc = 0; // accumulated output diff --git a/src/engine/platform/sound/oki/msm6295.cpp b/src/engine/platform/sound/oki/msm6295.cpp index 7a455e1b5..1b7fe568a 100644 --- a/src/engine/platform/sound/oki/msm6295.cpp +++ b/src/engine/platform/sound/oki/msm6295.cpp @@ -1,8 +1,9 @@ /* License: BSD-3-Clause - see https://github.com/cam900/vgsound_emu/blob/main/LICENSE for more details + see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: tildearrow OKI MSM6295 emulation core It is 4 channel ADPCM playback chip from OKI semiconductor. diff --git a/src/engine/platform/sound/oki/msm6295.hpp b/src/engine/platform/sound/oki/msm6295.hpp index f5684a29b..5203f4340 100644 --- a/src/engine/platform/sound/oki/msm6295.hpp +++ b/src/engine/platform/sound/oki/msm6295.hpp @@ -1,8 +1,9 @@ /* License: BSD-3-Clause - see https://github.com/cam900/vgsound_emu/blob/main/LICENSE for more details + see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: tildearrow OKI MSM6295 emulation core See msm6295.cpp for more info. @@ -71,7 +72,7 @@ public: msm6295_core &m_host; u16 m_clock = 0; // clock counter bool m_busy = false; // busy status - bool m_muted = false; // muted + bool m_muted = false; // muted u8 m_command = 0; // current command u32 m_addr = 0; // current address s8 m_nibble = 0; // current nibble diff --git a/src/engine/platform/sound/oki/util.hpp b/src/engine/platform/sound/oki/util.hpp index 71e10cbe7..731772acc 100644 --- a/src/engine/platform/sound/oki/util.hpp +++ b/src/engine/platform/sound/oki/util.hpp @@ -1,8 +1,9 @@ /* License: BSD-3-Clause - see https://github.com/cam900/vgsound_emu/blob/main/LICENSE for more details + see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details - Copyright holders: cam900 + Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: tildearrow Various core utilities for vgsound_emu */ diff --git a/src/engine/platform/sound/oki/vox.hpp b/src/engine/platform/sound/oki/vox.hpp index b1fc6e236..c085c0b7c 100644 --- a/src/engine/platform/sound/oki/vox.hpp +++ b/src/engine/platform/sound/oki/vox.hpp @@ -1,8 +1,9 @@ /* License: BSD-3-Clause - see https://github.com/cam900/vgsound_emu/blob/main/LICENSE for more details + see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: tildearrow Dialogic ADPCM core */ diff --git a/src/engine/platform/sound/scc/scc.cpp b/src/engine/platform/sound/scc/scc.cpp index b045c6372..b22b41874 100644 --- a/src/engine/platform/sound/scc/scc.cpp +++ b/src/engine/platform/sound/scc/scc.cpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: Natt Akuma, tildearrow, Grauw Konami SCC emulation core Konami SCC means "Sound Creative Chip", it's actually MSX MegaROM/RAM Mapper with 5 channel Wavetable sound generator. @@ -373,12 +374,12 @@ void scc_core::reset() m_test.reset(); m_out = 0; - memset(m_reg,0,sizeof(m_reg)); + memset(m_reg,0,sizeof(m_reg)); } void scc_core::voice_t::reset() { - memset(wave,0,sizeof(wave)); + memset(wave,0,sizeof(wave)); enable = false; pitch = 0; volume = 0; diff --git a/src/engine/platform/sound/scc/scc.hpp b/src/engine/platform/sound/scc/scc.hpp index e5b737bec..8b5f5e001 100644 --- a/src/engine/platform/sound/scc/scc.hpp +++ b/src/engine/platform/sound/scc/scc.hpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: Natt Akuma, tildearrow, Grauw Konami SCC emulation core See scc.cpp for more info. diff --git a/src/engine/platform/sound/vrcvi/vrcvi.cpp b/src/engine/platform/sound/vrcvi/vrcvi.cpp index d0b491869..87ff05d7c 100644 --- a/src/engine/platform/sound/vrcvi/vrcvi.cpp +++ b/src/engine/platform/sound/vrcvi/vrcvi.cpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900, tildearrow Konami VRC VI sound emulation core It's one of NES mapper with built-in sound chip, and also one of 2 Konami VRCs with this feature. (rest one has OPLL derivatives.) diff --git a/src/engine/platform/sound/vrcvi/vrcvi.hpp b/src/engine/platform/sound/vrcvi/vrcvi.hpp index cec160dae..790061c82 100644 --- a/src/engine/platform/sound/vrcvi/vrcvi.hpp +++ b/src/engine/platform/sound/vrcvi/vrcvi.hpp @@ -3,6 +3,7 @@ see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900, tildearrow Konami VRC VI sound emulation core See vrcvi.cpp to more infos. diff --git a/src/engine/platform/sound/x1_010/x1_010.cpp b/src/engine/platform/sound/x1_010/x1_010.cpp index 8d2c61803..c047b854a 100644 --- a/src/engine/platform/sound/x1_010/x1_010.cpp +++ b/src/engine/platform/sound/x1_010/x1_010.cpp @@ -2,7 +2,8 @@ License: BSD-3-Clause see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details - Copyright holders: cam900 + Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900, tildearrow Seta/Allumer X1-010 Emulation core the chip has 16 voices, all voices can be switchable to Wavetable or PCM sample playback mode. diff --git a/src/engine/platform/sound/x1_010/x1_010.hpp b/src/engine/platform/sound/x1_010/x1_010.hpp index 93953e789..3f5d9d4e2 100644 --- a/src/engine/platform/sound/x1_010/x1_010.hpp +++ b/src/engine/platform/sound/x1_010/x1_010.hpp @@ -2,7 +2,8 @@ License: BSD-3-Clause see https://github.com/cam900/vgsound_emu/blob/vgsound_emu_v1/LICENSE for more details - Copyright holders: cam900 + Copyright holder(s): cam900 + Modifiers and Contributors for Furnace: cam900, tildearrow Seta/Allumer X1-010 Emulation core See x1_010.cpp for more info. @@ -63,7 +64,7 @@ public: // getters s32 output(u8 channel) { return m_out[channel & 1]; } - s32 chan_out(u8 channel) { return (m_voice[channel].data * (m_voice[channel].vol_out[0]+m_voice[channel].vol_out[1]))<<2; } + s32 chan_out(u8 channel) { return (m_voice[channel].data * (m_voice[channel].vol_out[0]+m_voice[channel].vol_out[1]))<<2; } // internal state void reset();