summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-01-26 12:36:51 +1100
committer Vas Crabb <vas@vastheman.com>2020-01-26 12:39:27 +1100
commita7fec751edac3808f3b64986c2409be4240c7eb9 (patch)
tree71241d1d0afe70d39511bab822cba278a5b3009f /src/devices/sound
parent832c38bb8d20142a44c694d43e7670c938d19377 (diff)
srcclean, manual adjustments (nw)
Diffstat (limited to 'src/devices/sound')
-rw-r--r--src/devices/sound/c6280.cpp80
-rw-r--r--src/devices/sound/huc6230.cpp2
-rw-r--r--src/devices/sound/vrender0.cpp86
-rw-r--r--src/devices/sound/vrender0.h2
4 files changed, 85 insertions, 85 deletions
diff --git a/src/devices/sound/c6280.cpp b/src/devices/sound/c6280.cpp
index 8081f7da1d7..8b0c4322e79 100644
--- a/src/devices/sound/c6280.cpp
+++ b/src/devices/sound/c6280.cpp
@@ -171,46 +171,46 @@ void c6280_device::sound_stream_update(sound_stream &stream, stream_sample_t **i
/* Write Register Layout
- 76543210
- 00 -----xxx Channel Select
- -----000 Channel 0
- -----001 Channel 1
- -----010 Channel 2
- -----011 Channel 3
- -----100 Channel 4
- -----101 Channel 5
-
- 01 xxxx---- Overall Left Volume
- ----xxxx Overall Right Volume
-
- 02 xxxxxxxx Frequency (Low 8 bits)
-
- 03 ----xxxx Frequency (High 4 bits)
-
- 04 x------- Channel Enable
- -x------ Direct D/A
- 00------ Write Data
- 01------ Reset Counter
- 10------ Mixing (Sound Output)
- 11------ Direct D/A
- ---xxxxx Channel Master Volume
-
- 05 xxxx---- Channel Left Volume
- ----xxxx Channel Right Volume
-
- 06 ---xxxxx Waveform Data
-
- 07 x------- Noise Enable (channel 5, 6 only)
- ---xxxxx Noise Frequency ^ 0x1f
-
- 08 xxxxxxxx LFO Frequency
-
- 09 x------- LFO Reset
- ------xx LFO Control
- ------00 LFO off
- ------01 Direct Addition
- ------10 2 bit Shift Addition
- ------11 4 bit Shift Addition
+ 76543210
+ 00 -----xxx Channel Select
+ -----000 Channel 0
+ -----001 Channel 1
+ -----010 Channel 2
+ -----011 Channel 3
+ -----100 Channel 4
+ -----101 Channel 5
+
+ 01 xxxx---- Overall Left Volume
+ ----xxxx Overall Right Volume
+
+ 02 xxxxxxxx Frequency (Low 8 bits)
+
+ 03 ----xxxx Frequency (High 4 bits)
+
+ 04 x------- Channel Enable
+ -x------ Direct D/A
+ 00------ Write Data
+ 01------ Reset Counter
+ 10------ Mixing (Sound Output)
+ 11------ Direct D/A
+ ---xxxxx Channel Master Volume
+
+ 05 xxxx---- Channel Left Volume
+ ----xxxx Channel Right Volume
+
+ 06 ---xxxxx Waveform Data
+
+ 07 x------- Noise Enable (channel 5, 6 only)
+ ---xxxxx Noise Frequency ^ 0x1f
+
+ 08 xxxxxxxx LFO Frequency
+
+ 09 x------- LFO Reset
+ ------xx LFO Control
+ ------00 LFO off
+ ------01 Direct Addition
+ ------10 2 bit Shift Addition
+ ------11 4 bit Shift Addition
*/
WRITE8_MEMBER( c6280_device::c6280_w )
diff --git a/src/devices/sound/huc6230.cpp b/src/devices/sound/huc6230.cpp
index 7969e1c3ae0..5537f3ffea6 100644
--- a/src/devices/sound/huc6230.cpp
+++ b/src/devices/sound/huc6230.cpp
@@ -12,7 +12,7 @@
Related patent:
- https://patents.google.com/patent/US5692099
- https://patents.google.com/patent/US6453286
- - https://patents.google.com/patent/US5548655A
+ - https://patents.google.com/patent/US5548655A
*/
#include "emu.h"
diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp
index c302905c76a..833acdc46bb 100644
--- a/src/devices/sound/vrender0.cpp
+++ b/src/devices/sound/vrender0.cpp
@@ -7,11 +7,11 @@
VRENDER ZERO
AUDIO EMULATION
- TODO
- - Envelope, Interrupt functions aren't verified from real hardware behavior.
- - Reverb, Pingpong/Reversed loop, Most of Channel/Overall control registers
- are Not implemented
- - Sample Rate is unverified
+ TODO
+ - Envelope, Interrupt functions aren't verified from real hardware behavior.
+ - Reverb, Pingpong/Reversed loop, Most of Channel/Overall control registers
+ are Not implemented
+ - Sample Rate is unverified
*************************************************************************************/
static inline s32 sign_ext(s32 val, s32 bit)
@@ -91,10 +91,10 @@ void vr0sound_device::sound_map(address_map &map)
-------- xxxxxxxx ChnClkNum (Clock Number per Channel)
602 x------- -------- RS (Run Sound)
-------- --x----- TM (Texture Memory)
- -------- ---x---- RE (Reverb Enable)
- -------- -----x-- CW (32bit Adder Wait)
- -------- ------x- AW (16bit Adder Wait)
- -------- -------x MW (Multipler Wait)
+ -------- ---x---- RE (Reverb Enable)
+ -------- -----x-- CW (32bit Adder Wait)
+ -------- ------x- AW (16bit Adder Wait)
+ -------- -------x MW (Multipler Wait)
*/
map(0x404, 0x407).rw(FUNC(vr0sound_device::status_r), FUNC(vr0sound_device::status_w));
@@ -281,12 +281,12 @@ void vr0sound_device::revfactor_w(offs_t offset, u16 data, u16 mem_mask)
}
/*
- Buffer Address
- 1 0
- fedcba9876543210 fedcba9876543210
- ----------0xxxxx x--------------- BufferSAddr
- ---------------- -xxx------------ Buffer Select
- ---------------- ----xxxxxxxxxxxx Buffer Pointer
+ Buffer Address
+ 1 0
+ fedcba9876543210 fedcba9876543210
+ ----------0xxxxx x--------------- BufferSAddr
+ ---------------- -xxx------------ Buffer Select
+ ---------------- ----xxxxxxxxxxxx Buffer Pointer
*/
u16 vr0sound_device::buffersaddr_r(offs_t offset)
@@ -362,39 +362,39 @@ void vr0sound_device::ctrl_w(offs_t offset, u16 data, u16 mem_mask)
/*
Channel Parameter Register (32 bytes for each channels)
- fedcba98 76543210
-00 xxxxxxxx xxxxxxxx CurSAddr (15:0)
-02 xxxxxxxx xxxxxxxx CurSAddr (31:16)
-04 xxxxxxxx xxxxxxxx EnvVol (15:0)
-06 -11x---- -------- Loop Direction(LD)
- -11-xxxx -------- EnvStage
- -------- xxxxxxxx EnvVol (23:16)
-08 xxxxxxxx xxxxxxxx DSAddr (15:0)
-0a -xxxxxxx -------- Modes
-0c xxxxxxxx xxxxxxxx LoopBegin (15:0)
-0e -xxxxxxx -------- LChnVol
- -------- --xxxxxx LoopBegin (21:16)
-10 xxxxxxxx xxxxxxxx LoopEnd (15:0)
-12 -xxxxxxx -------- RChnVol
- -------- --xxxxxx LoopEnd (21:16)
-14 xxxxxxxx xxxxxxxx EnvRate0 (15:0)
-16 xxxxxxxx xxxxxxxx EnvRate1 (15:0)
-18 xxxxxxxx xxxxxxxx EnvRate2 (15:0)
-1a xxxxxxxx xxxxxxxx EnvRate3 (15:0)
-1c x------- -------- EnvRate1 (16)
- -xxxxxxx -------- EnvTarget1
- -------- x------- EnvRate0 (16)
- -------- -xxxxxxx EnvTarget0
-1e x------- -------- EnvRate3 (16)
- -xxxxxxx -------- EnvTarget3
- -------- x------- EnvRate2 (16)
- -------- -xxxxxxx EnvTarget2
+ fedcba98 76543210
+00 xxxxxxxx xxxxxxxx CurSAddr (15:0)
+02 xxxxxxxx xxxxxxxx CurSAddr (31:16)
+04 xxxxxxxx xxxxxxxx EnvVol (15:0)
+06 -11x---- -------- Loop Direction(LD)
+ -11-xxxx -------- EnvStage
+ -------- xxxxxxxx EnvVol (23:16)
+08 xxxxxxxx xxxxxxxx DSAddr (15:0)
+0a -xxxxxxx -------- Modes
+0c xxxxxxxx xxxxxxxx LoopBegin (15:0)
+0e -xxxxxxx -------- LChnVol
+ -------- --xxxxxx LoopBegin (21:16)
+10 xxxxxxxx xxxxxxxx LoopEnd (15:0)
+12 -xxxxxxx -------- RChnVol
+ -------- --xxxxxx LoopEnd (21:16)
+14 xxxxxxxx xxxxxxxx EnvRate0 (15:0)
+16 xxxxxxxx xxxxxxxx EnvRate1 (15:0)
+18 xxxxxxxx xxxxxxxx EnvRate2 (15:0)
+1a xxxxxxxx xxxxxxxx EnvRate3 (15:0)
+1c x------- -------- EnvRate1 (16)
+ -xxxxxxx -------- EnvTarget1
+ -------- x------- EnvRate0 (16)
+ -------- -xxxxxxx EnvTarget0
+1e x------- -------- EnvRate3 (16)
+ -xxxxxxx -------- EnvTarget3
+ -------- x------- EnvRate2 (16)
+ -------- -xxxxxxx EnvTarget2
*/
u16 vr0sound_device::channel_t::read(offs_t offset)
{
u16 ret = 0;
-
+
switch (offset)
{
case 0x00/2:
diff --git a/src/devices/sound/vrender0.h b/src/devices/sound/vrender0.h
index f14567840de..89432d4303b 100644
--- a/src/devices/sound/vrender0.h
+++ b/src/devices/sound/vrender0.h
@@ -142,7 +142,7 @@ private:
// Registers
u32 m_Status = 0; // Status (0 Idle, 1 Busy)
- u32 m_NoteOn = 0; // Note On (0 Off, 1 On) (Not Implemented)
+ u32 m_NoteOn = 0; // Note On (0 Off, 1 On) (Not Implemented)
u8 m_RevFactor = 0; // Reverb Factor (Not Implemented)
u32 m_BufferAddr = 0; // 21bit Reverb Buffer Start Address (Not Implemented)
u16 m_BufferSize[4] = {0, 0, 0, 0}; // Reverb Buffer Size (Not Implemented)