diff options
| author | Autechre | 2021-02-24 03:58:08 +0100 |
|---|---|---|
| committer | GitHub | 2021-02-24 03:58:08 +0100 |
| commit | 28aa08de9900000d2c42d903f8e5dfdbcdb55ea8 (patch) | |
| tree | fd76187fc7def92e5ed31f7e28611f916a2d8f70 | |
| parent | 300d0c0028e400eabd81dc718ee8cd8c6459b256 (diff) | |
| parent | 349e47f0b251b42c7a3d7e2d8072ce976a55b54c (diff) | |
| download | picogpsp-28aa08de9900000d2c42d903f8e5dfdbcdb55ea8.tar.gz picogpsp-28aa08de9900000d2c42d903f8e5dfdbcdb55ea8.tar.bz2 picogpsp-28aa08de9900000d2c42d903f8e5dfdbcdb55ea8.zip | |
Merge pull request #94 from davidgfnet/master
Small fixes to division by zero
| -rw-r--r-- | gba_memory.c | 2 | ||||
| -rw-r--r-- | sound.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gba_memory.c b/gba_memory.c index 2cb760a..7675bb0 100644 --- a/gba_memory.c +++ b/gba_memory.c @@ -199,7 +199,7 @@ static void sound_control_x(u32 value) #define sound_update_frequency_step(timer_number) \ timer[timer_number].frequency_step = \ - float_to_fp8_24(GBC_BASE_RATE / (timer_reload * sound_frequency)) \ + float_to_fp8_24((GBC_BASE_RATE / sound_frequency) / (timer_reload)) \ /* Main */ extern timer_type timer[4]; @@ -273,8 +273,11 @@ u32 gbc_sound_master_volume; else \ rate = rate + (rate >> gs->sweep_shift); \ \ - if(rate > 2048) \ - rate = 2048; \ + if(rate > 2047) { \ + rate = 2047; \ + gs->active_flag = 0; \ + break; \ + } \ \ frequency_step = float_to_fp16_16(((131072.0f / (2048 - rate)) * 8.0f) \ / sound_frequency); \ |