lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turn some sound macro functions in gba_memory.c into real functions

This commit is contained in:
twinaphex 2014-12-11 02:49:46 +01:00
parent d64b61a65e
commit 67525fe8ea
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
gba_memory.c
View File

@ -144,20 +144,20 @@ static u32 gbc_sound_wave_volume[4] = { 0, 16384, 8192, 4096 };
address16(io_registers, 0x7C) = value; \ address16(io_registers, 0x7C) = value; \
} \ } \
#define gbc_trigger_sound_channel(channel) \ static void gbc_trigger_sound(u32 value)
gbc_sound_master_volume_right = value & 0x07; \ {
gbc_sound_master_volume_left = (value >> 4) & 0x07; \ u32 channel;
gbc_sound_channel[channel].status = ((value >> (channel + 8)) & 0x01) | \
((value >> (channel + 11)) & 0x03) \
#define gbc_trigger_sound() \ /* Trigger all 4 GBC sound channels */
{ \ for (channel = 0; channel < 4; channel++)
gbc_trigger_sound_channel(0); \ {
gbc_trigger_sound_channel(1); \ gbc_sound_master_volume_right = value & 0x07;
gbc_trigger_sound_channel(2); \ gbc_sound_master_volume_left = (value >> 4) & 0x07;
gbc_trigger_sound_channel(3); \ gbc_sound_channel[channel].status =
address16(io_registers, 0x80) = value; \ ((value >> (channel + 8)) & 0x01) | ((value >> (channel + 11)) & 0x03);
} \ }
address16(io_registers, 0x80) = value;
}
#define trigger_sound() \ #define trigger_sound() \
{ \ { \
@ -178,21 +178,24 @@ static u32 gbc_sound_wave_volume[4] = { 0, 16384, 8192, 4096 };
address16(io_registers, 0x82) = value; \ address16(io_registers, 0x82) = value; \
} \ } \
#define sound_on() \ static void sound_control_x(u32 value)
if(value & 0x80) \ {
{ \ if (value & 0x80)
if(sound_on != 1) \ {
sound_on = 1; \ if (sound_on != 1)
} \ sound_on = 1;
else \ }
{ \ else
u32 i; \ {
for(i = 0; i < 4; i++) \ u32 i;
gbc_sound_channel[i].active_flag = 0; \ for (i = 0; i < 4; i++)
sound_on = 0; \ gbc_sound_channel[i].active_flag = 0;
} \ sound_on = 0;
address16(io_registers, 0x84) = \ }
(address16(io_registers, 0x84) & 0x000F) | (value & 0xFFF0); \
address16(io_registers, 0x84) =
(address16(io_registers, 0x84) & 0x000F) | (value & 0xFFF0);
}
#define sound_update_frequency_step(timer_number) \ #define sound_update_frequency_step(timer_number) \
timer[timer_number].frequency_step = \ timer[timer_number].frequency_step = \
@ -1062,12 +1065,12 @@ cpu_alert_type function_cc write_io_register8(u32 address, u32 value)
// Sound control L // Sound control L
case 0x80: case 0x80:
access_register8_low(0x80); access_register8_low(0x80);
gbc_trigger_sound(); gbc_trigger_sound(value);
break; break;
case 0x81: case 0x81:
access_register8_high(0x80); access_register8_high(0x80);
gbc_trigger_sound(); gbc_trigger_sound(value);
break; break;
// Sound control H // Sound control H
@ -1083,7 +1086,7 @@ cpu_alert_type function_cc write_io_register8(u32 address, u32 value)
// Sound control X // Sound control X
case 0x84: case 0x84:
sound_on(); sound_control_x(value);
break; break;
// Sound wave RAM // Sound wave RAM
@ -1341,7 +1344,7 @@ cpu_alert_type function_cc write_io_register16(u32 address, u32 value)
// Sound control L // Sound control L
case 0x80: case 0x80:
gbc_trigger_sound(); gbc_trigger_sound(value);
break; break;
// Sound control H // Sound control H
@ -1351,7 +1354,7 @@ cpu_alert_type function_cc write_io_register16(u32 address, u32 value)
// Sound control X // Sound control X
case 0x84: case 0x84:
sound_on(); sound_control_x(value);
break; break;
// Sound wave RAM // Sound wave RAM