Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 00:09:18 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Styling, no functional changes (nw)

Browse Source
This commit is contained in:
Wilbert Pol 2014-06-20 18:48:05 +00:00
parent c883ff93af
commit 236d4a2bc2
1 changed files with 131 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/mess/audio/wswan.c
View File

@ -141,10 +141,12 @@ void wswan_sound_device::sound_stream_update(sound_stream &stream, stream_sample
{ {
left = right = 0; left = right = 0;
if ( m_audio1.on ) { if ( m_audio1.on )
{
sample = m_audio1.signal; sample = m_audio1.signal;
m_audio1.pos++; m_audio1.pos++;
if ( m_audio1.pos >= m_audio1.period / 2 ) { if ( m_audio1.pos >= m_audio1.period / 2 )
{
m_audio1.pos = 0; m_audio1.pos = 0;
m_audio1.signal = -m_audio1.signal; m_audio1.signal = -m_audio1.signal;
} }
@ -152,14 +154,19 @@ void wswan_sound_device::sound_stream_update(sound_stream &stream, stream_sample
right += m_audio1.vol_right * sample; right += m_audio1.vol_right * sample;
} }
if ( m_audio2.on ) { if ( m_audio2.on )
if ( m_audio2_voice ) { {
if ( m_audio2_voice )
{
left += (m_voice_data - 128)*(m_master_volume & 0x0f); left += (m_voice_data - 128)*(m_master_volume & 0x0f);
right += (m_voice_data - 128)*(m_master_volume & 0x0f); right += (m_voice_data - 128)*(m_master_volume & 0x0f);
} else { }
else
{
sample = m_audio2.signal; sample = m_audio2.signal;
m_audio2.pos++; m_audio2.pos++;
if ( m_audio2.pos >= m_audio2.period / 2 ) { if ( m_audio2.pos >= m_audio2.period / 2 )
{
m_audio2.pos = 0; m_audio2.pos = 0;
m_audio2.signal = -m_audio2.signal; m_audio2.signal = -m_audio2.signal;
} }
@ -168,16 +175,20 @@ void wswan_sound_device::sound_stream_update(sound_stream &stream, stream_sample
} }
} }
if ( m_audio3.on ) { if ( m_audio3.on )
{
sample = m_audio3.signal; sample = m_audio3.signal;
m_audio3.pos++; m_audio3.pos++;
if ( m_audio3.pos >= m_audio3.period / 2 ) { if ( m_audio3.pos >= m_audio3.period / 2 )
{
m_audio3.pos = 0; m_audio3.pos = 0;
m_audio3.signal = -m_audio3.signal; m_audio3.signal = -m_audio3.signal;
} }
if ( m_audio3_sweep && m_sweep_time ) { if ( m_audio3_sweep && m_sweep_time )
{
m_sweep_count++; m_sweep_count++;
if ( m_sweep_count >= m_sweep_time ) { if ( m_sweep_count >= m_sweep_time )
{
m_sweep_count = 0; m_sweep_count = 0;
m_audio3.freq += m_sweep_step; m_audio3.freq += m_sweep_step;
m_audio3.period = machine().sample_rate() / (3072000 / ((2048 - (m_audio3.freq & 0x7ff)) << 5)); m_audio3.period = machine().sample_rate() / (3072000 / ((2048 - (m_audio3.freq & 0x7ff)) << 5));
@ -187,13 +198,18 @@ void wswan_sound_device::sound_stream_update(sound_stream &stream, stream_sample
right += m_audio3.vol_right * sample; right += m_audio3.vol_right * sample;
} }
if ( m_audio4.on ) { if ( m_audio4.on )
if ( m_audio4_noise ) { {
if ( m_audio4_noise )
{
sample = 0; sample = 0;
} else { }
else
{
sample = m_audio4.signal; sample = m_audio4.signal;
m_audio4.pos++; m_audio4.pos++;
if ( m_audio4.pos >= m_audio4.period / 2 ) { if ( m_audio4.pos >= m_audio4.period / 2 )
{
m_audio4.pos = 0; m_audio4.pos = 0;
m_audio4.signal = -m_audio4.signal; m_audio4.signal = -m_audio4.signal;
} }
@ -222,62 +238,79 @@ WRITE8_MEMBER( wswan_sound_device::port_w )
{ {
m_channel->update(); m_channel->update();
switch( offset ) { switch( offset )
{
case 0x80: /* Audio 1 freq (lo) */ case 0x80: /* Audio 1 freq (lo) */
wswan_ch_set_freq(&m_audio1, (m_audio1.freq & 0xff00) | data); wswan_ch_set_freq(&m_audio1, (m_audio1.freq & 0xff00) | data);
break; break;
case 0x81: /* Audio 1 freq (hi) */ case 0x81: /* Audio 1 freq (hi) */
wswan_ch_set_freq(&m_audio1, (data << 8 ) | (m_audio1.freq & 0x00ff)); wswan_ch_set_freq(&m_audio1, (data << 8 ) | (m_audio1.freq & 0x00ff));
break; break;
case 0x82: /* Audio 2 freq (lo) */ case 0x82: /* Audio 2 freq (lo) */
wswan_ch_set_freq(&m_audio2, (m_audio2.freq & 0xff00) | data); wswan_ch_set_freq(&m_audio2, (m_audio2.freq & 0xff00) | data);
break; break;
case 0x83: /* Audio 2 freq (hi) */ case 0x83: /* Audio 2 freq (hi) */
wswan_ch_set_freq(&m_audio2, (data << 8 ) | (m_audio2.freq & 0x00ff)); wswan_ch_set_freq(&m_audio2, (data << 8 ) | (m_audio2.freq & 0x00ff));
break; break;
case 0x84: /* Audio 3 freq (lo) */ case 0x84: /* Audio 3 freq (lo) */
wswan_ch_set_freq(&m_audio3, (m_audio3.freq & 0xff00) | data); wswan_ch_set_freq(&m_audio3, (m_audio3.freq & 0xff00) | data);
break; break;
case 0x85: /* Audio 3 freq (hi) */ case 0x85: /* Audio 3 freq (hi) */
wswan_ch_set_freq(&m_audio3, (data << 8) | (m_audio3.freq & 0x00ff)); wswan_ch_set_freq(&m_audio3, (data << 8) | (m_audio3.freq & 0x00ff));
break; break;
case 0x86: /* Audio 4 freq (lo) */ case 0x86: /* Audio 4 freq (lo) */
wswan_ch_set_freq(&m_audio4, (m_audio4.freq & 0xff00) | data); wswan_ch_set_freq(&m_audio4, (m_audio4.freq & 0xff00) | data);
break; break;
case 0x87: /* Audio 4 freq (hi) */ case 0x87: /* Audio 4 freq (hi) */
wswan_ch_set_freq(&m_audio4, (data << 8) | (m_audio4.freq & 0x00ff)); wswan_ch_set_freq(&m_audio4, (data << 8) | (m_audio4.freq & 0x00ff));
break; break;
case 0x88: /* Audio 1 volume */ case 0x88: /* Audio 1 volume */
m_audio1.vol_left = ( data & 0xF0 ) >> 4; m_audio1.vol_left = ( data & 0xF0 ) >> 4;
m_audio1.vol_right = data & 0x0F; m_audio1.vol_right = data & 0x0F;
break; break;
case 0x89: /* Audio 2 volume */ case 0x89: /* Audio 2 volume */
m_voice_data = data; m_voice_data = data;
m_audio2.vol_left = ( data & 0xF0 ) >> 4; m_audio2.vol_left = ( data & 0xF0 ) >> 4;
m_audio2.vol_right = data & 0x0F; m_audio2.vol_right = data & 0x0F;
break; break;
case 0x8A: /* Audio 3 volume */ case 0x8A: /* Audio 3 volume */
m_audio3.vol_left = ( data & 0xF0 ) >> 4; m_audio3.vol_left = ( data & 0xF0 ) >> 4;
m_audio3.vol_right = data & 0x0F; m_audio3.vol_right = data & 0x0F;
break; break;
case 0x8B: /* Audio 4 volume */ case 0x8B: /* Audio 4 volume */
m_audio4.vol_left = ( data & 0xF0 ) >> 4; m_audio4.vol_left = ( data & 0xF0 ) >> 4;
m_audio4.vol_right = data & 0x0F; m_audio4.vol_right = data & 0x0F;
break; break;
case 0x8C: /* Sweep step */ case 0x8C: /* Sweep step */
m_sweep_step = (INT8)data; m_sweep_step = (INT8)data;
break; break;
case 0x8D: /* Sweep time */ case 0x8D: /* Sweep time */
m_sweep_time = space.machine().sample_rate() / ( 3072000 / ( 8192 * (data + 1) ) ); m_sweep_time = space.machine().sample_rate() / ( 3072000 / ( 8192 * (data + 1) ) );
break; break;
case 0x8E: /* Noise control */ case 0x8E: /* Noise control */
m_noise_type = data & 0x07; m_noise_type = data & 0x07;
m_noise_reset = ( data & 0x08 ) >> 3; m_noise_reset = ( data & 0x08 ) >> 3;
m_noise_enable = ( data & 0x10 ) >> 4; m_noise_enable = ( data & 0x10 ) >> 4;
break; break;
case 0x8F: /* Sample location */ case 0x8F: /* Sample location */
m_sample_address = data << 6; m_sample_address = data << 6;
break; break;
case 0x90: /* Audio control */ case 0x90: /* Audio control */
m_audio1.on = data & 0x01; m_audio1.on = data & 0x01;
m_audio2.on = ( data & 0x02 ) >> 1; m_audio2.on = ( data & 0x02 ) >> 1;
@ -287,18 +320,22 @@ WRITE8_MEMBER( wswan_sound_device::port_w )
m_audio3_sweep = ( data & 0x40 ) >> 6; m_audio3_sweep = ( data & 0x40 ) >> 6;
m_audio4_noise = ( data & 0x80 ) >> 7; m_audio4_noise = ( data & 0x80 ) >> 7;
break; break;
case 0x91: /* Audio output */ case 0x91: /* Audio output */
m_mono = data & 0x01; m_mono = data & 0x01;
m_output_volume = ( data & 0x06 ) >> 1; m_output_volume = ( data & 0x06 ) >> 1;
m_external_stereo = ( data & 0x08 ) >> 3; m_external_stereo = ( data & 0x08 ) >> 3;
m_external_speaker = 1; m_external_speaker = 1;
break; break;
case 0x92: /* Noise counter shift register (lo) */ case 0x92: /* Noise counter shift register (lo) */
m_noise_shift = ( m_noise_shift & 0xFF00 ) | data; m_noise_shift = ( m_noise_shift & 0xFF00 ) | data;
break; break;
case 0x93: /* Noise counter shift register (hi) */ case 0x93: /* Noise counter shift register (hi) */
m_noise_shift = ( data << 8 ) | ( m_noise_shift & 0x00FF ); m_noise_shift = ( data << 8 ) | ( m_noise_shift & 0x00FF );
break; break;
case 0x94: /* Master volume */ case 0x94: /* Master volume */
m_master_volume = data; m_master_volume = data;
break; break;