refactor: remove unused synth/psg busy code which used to power LEDs

rhargreaves · rhargreaves · commit c4d315427f6e · 2025-06-09T16:02:02.000+01:00
diff --git a/src/midi_psg.c b/src/midi_psg.c
@@ -48,7 +48,6 @@ typedef struct MidiPsgChannel {
 static u8 userDefinedEnvelope[256];
 static u8* userDefinedEnvelopePtr;
 static const u8** envelopes;
-static u8 audible;
 static MidiPsgChannel psgChannels[MAX_PSG_CHANS];
 
 static u16 tone_for_midi_key(u8 midiKey);
@@ -182,11 +181,6 @@ static void apply_attenuation(MidiPsgChannel* psgChan, u8 newAtt)
 {
     if (newAtt != psgChan->attenuation) {
         PSG_setEnvelope(psgChan->chanNum, newAtt);
-        if (newAtt == PSG_ATTENUATION_SILENCE) {
-            CLEAR_BIT(audible, psgChan->chanNum);
-        } else {
-            SET_BIT(audible, psgChan->chanNum);
-        }
         psgChan->attenuation = newAtt;
     }
 }
@@ -316,11 +310,6 @@ static MidiPsgChannel* psg_channel(u8 chan)
     return &psgChannels[chan];
 }
 
-u8 midi_psg_busy(void)
-{
-    return audible;
-}
-
 void midi_psg_pitch(u8 chan, u8 pitch, s8 cents)
 {
     MidiPsgChannel* psgChan = psg_channel(chan);
diff --git a/src/midi_psg.h b/src/midi_psg.h
@@ -24,5 +24,4 @@ void midi_psg_program(u8 chan, u8 program);
 void midi_psg_pan(u8 chan, u8 pan);
 void midi_psg_tick(u16 delta);
 void midi_psg_load_envelope(const u8* eef);
-u8 midi_psg_busy(void);
 void midi_psg_pitch(u8 chan, u8 pitch, s8 cents);
diff --git a/src/synth.c b/src/synth.c
@@ -4,7 +4,6 @@
 
 static Global global;
 static FmChannel fmChannels[MAX_FM_CHANS];
-static u8 noteOn;
 static u8 volumes[MAX_FM_CHANS];
 
 static ParameterUpdatedCallback* parameterUpdatedCallback = NULL;
@@ -105,13 +104,11 @@ static void init_global(void)
 void synth_note_on(u8 channel)
 {
     write_reg_safe(0, YM_KEY_ON_OFF, 0xF0 + key_on_off_reg_offset(channel));
-    SET_BIT(noteOn, channel);
 }
 
 void synth_note_off(u8 channel)
 {
     write_reg_safe(0, YM_KEY_ON_OFF, key_on_off_reg_offset(channel));
-    CLEAR_BIT(noteOn, channel);
 }
 
 void synth_pitch(u8 channel, u8 octave, u16 freqNumber)
@@ -263,11 +260,6 @@ void synth_fms(u8 channel, u8 fms)
     channel_parameter_updated(channel);
 }
 
-u8 synth_busy(void)
-{
-    return noteOn;
-}
-
 void synth_preset(u8 channel, const FmPreset* preset)
 {
     FmChannel* chan = &fmChannels[channel];
diff --git a/src/synth.h b/src/synth.h
@@ -78,7 +78,6 @@ void synth_enable_lfo(u8 enable);
 void synth_global_lfo_frequency(u8 freq);
 void synth_ams(u8 channel, u8 ams);
 void synth_fms(u8 channel, u8 fms);
-u8 synth_busy(void);
 void synth_preset(u8 channel, const FmPreset* preset);
 const FmChannel* synth_channel_parameters(u8 channel);
 void synth_extract_preset(u8 channel, FmPreset* preset);
diff --git a/src/utils.h b/src/utils.h
@@ -1,8 +1,6 @@
 #pragma once
 #include "genesis.h"
 
-#define SET_BIT(var, pos) var |= 1 << pos;
-#define CLEAR_BIT(var, pos) var &= ~(1 << pos);
 #define CHECK_BIT(var, pos) ((var) & (1 << (pos)))
 #define LENGTH_OF(array) (sizeof(array) / sizeof(array[0]))
 
diff --git a/tests/unit/main.c b/tests/unit/main.c
@@ -104,7 +104,6 @@ int main(void)
         midi_test(test_midi_shifts_semitone_in_psg_envelope),
         midi_test(test_midi_pitch_shift_handles_upper_limit_psg_envelope),
         midi_test(test_midi_pitch_shift_handles_lower_limit_psg_envelope),
-        midi_test(test_midi_psg_sets_busy_indicators),
         midi_test(test_midi_channel_volume_sets_volume),
         midi_test(test_midi_pan_sets_synth_stereo_mode_right),
         midi_test(test_midi_pan_sets_synth_stereo_mode_left),
@@ -262,7 +261,6 @@ int main(void)
             test_synth_sets_operator_amplitude_modulation_and_decay_rate),
         synth_test(test_synth_sets_operator_ssg_eg),
         synth_test(test_synth_sets_global_LFO_enable_and_frequency),
-        synth_test(test_synth_sets_busy_indicators),
         synth_test(test_synth_sets_preset),
         synth_test(test_synth_sets_preset_retaining_pan),
         synth_test(
diff --git a/tests/unit/test_midi_psg.c b/tests/unit/test_midi_psg.c
@@ -412,23 +412,6 @@ void test_midi_loads_psg_envelope(UNUSED void** state)
     __real_midi_psg_tick();
 }
 
-void test_midi_psg_sets_busy_indicators(UNUSED void** state)
-{
-    for (u8 chan = 0; chan < MAX_PSG_CHANS; chan++) {
-        expect_psg_tone(chan, TONE_NTSC_C4);
-        expect_psg_attenuation(chan, PSG_ATTENUATION_LOUDEST);
-        __real_midi_note_on(chan + MIN_PSG_CHAN, MIDI_PITCH_C4, MAX_MIDI_VOLUME);
-    }
-
-    for (u8 chan = 0; chan < MAX_PSG_CHANS; chan += 2) {
-        expect_psg_attenuation(chan, PSG_ATTENUATION_SILENCE);
-        __real_midi_note_off(chan + MIN_PSG_CHAN, MIDI_PITCH_C4);
-    }
-
-    u8 busy = midi_psg_busy();
-    assert_int_equal(busy, 0b1010);
-}
-
 void test_midi_psg_supports_extreme_pitch_bend_sensitivity(UNUSED void** state)
 {
     expect_psg_tone(PSG_CH1, TONE_NTSC_C4);
diff --git a/tests/unit/test_midi_psg.h b/tests/unit/test_midi_psg.h
@@ -26,5 +26,4 @@ void test_midi_shifts_semitone_in_psg_envelope(UNUSED void** state);
 void test_midi_pitch_shift_handles_upper_limit_psg_envelope(UNUSED void** state);
 void test_midi_pitch_shift_handles_lower_limit_psg_envelope(UNUSED void** state);
 void test_midi_loads_psg_envelope(UNUSED void** state);
-void test_midi_psg_sets_busy_indicators(UNUSED void** state);
 void test_midi_psg_supports_extreme_pitch_bend_sensitivity(UNUSED void** state);
diff --git a/tests/unit/test_synth.c b/tests/unit/test_synth.c
@@ -509,16 +509,6 @@ void test_synth_sets_global_LFO_enable_and_frequency(UNUSED void** state)
     __real_synth_global_lfo_frequency(1);
 }
 
-void test_synth_sets_busy_indicators(UNUSED void** state)
-{
-    for (u8 chan = 0; chan < MAX_FM_CHANS; chan += 2) {
-        expect_ym2612_write_reg_any_data(0, YM_KEY_ON_OFF);
-        __real_synth_note_on(chan);
-    }
-    u8 busy = synth_busy();
-    assert_int_equal(busy, 0b00010101);
-}
-
 void test_synth_sets_preset(UNUSED void** state)
 {
     const u8 chan = 0;
diff --git a/tests/unit/test_synth.h b/tests/unit/test_synth.h
@@ -22,7 +22,6 @@ void test_synth_sets_operator_release_rate_and_sustain_level(UNUSED void** state
 void test_synth_sets_operator_amplitude_modulation_and_decay_rate(UNUSED void** state);
 void test_synth_sets_operator_ssg_eg(UNUSED void** state);
 void test_synth_sets_global_LFO_enable_and_frequency(UNUSED void** state);
-void test_synth_sets_busy_indicators(UNUSED void** state);
 void test_synth_sets_preset(UNUSED void** state);
 void test_synth_sets_preset_retaining_pan(UNUSED void** state);
 void test_synth_applies_volume_modifier_to_output_operators_algorithm_7(UNUSED void** state);

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ typedef struct MidiPsgChannel {`
`48`	`48`	`static u8 userDefinedEnvelope[256];`
`49`	`49`	`static u8* userDefinedEnvelopePtr;`
`50`	`50`	`static const u8** envelopes;`
`51`		`-static u8 audible;`
`52`	`51`	`static MidiPsgChannel psgChannels[MAX_PSG_CHANS];`
`53`	`52`
`54`	`53`	`static u16 tone_for_midi_key(u8 midiKey);`
`@@ -182,11 +181,6 @@ static void apply_attenuation(MidiPsgChannel* psgChan, u8 newAtt)`
`182`	`181`	`{`
`183`	`182`	`if (newAtt != psgChan->attenuation) {`
`184`	`183`	`PSG_setEnvelope(psgChan->chanNum, newAtt);`
`185`		`- if (newAtt == PSG_ATTENUATION_SILENCE) {`
`186`		`- CLEAR_BIT(audible, psgChan->chanNum);`
`187`		`- } else {`
`188`		`- SET_BIT(audible, psgChan->chanNum);`
`189`		`- }`
`190`	`184`	`psgChan->attenuation = newAtt;`
`191`	`185`	`}`
`192`	`186`	`}`
`@@ -316,11 +310,6 @@ static MidiPsgChannel* psg_channel(u8 chan)`
`316`	`310`	`return &psgChannels[chan];`
`317`	`311`	`}`
`318`	`312`
`319`		`-u8 midi_psg_busy(void)`
`320`		`-{`
`321`		`- return audible;`
`322`		`-}`
`323`		`-`
`324`	`313`	`void midi_psg_pitch(u8 chan, u8 pitch, s8 cents)`
`325`	`314`	`{`
`326`	`315`	`MidiPsgChannel* psgChan = psg_channel(chan);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`static Global global;`
`6`	`6`	`static FmChannel fmChannels[MAX_FM_CHANS];`
`7`		`-static u8 noteOn;`
`8`	`7`	`static u8 volumes[MAX_FM_CHANS];`
`9`	`8`
`10`	`9`	`static ParameterUpdatedCallback* parameterUpdatedCallback = NULL;`
`@@ -105,13 +104,11 @@ static void init_global(void)`
`105`	`104`	`void synth_note_on(u8 channel)`
`106`	`105`	`{`
`107`	`106`	`write_reg_safe(0, YM_KEY_ON_OFF, 0xF0 + key_on_off_reg_offset(channel));`
`108`		`- SET_BIT(noteOn, channel);`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`void synth_note_off(u8 channel)`
`112`	`110`	`{`
`113`	`111`	`write_reg_safe(0, YM_KEY_ON_OFF, key_on_off_reg_offset(channel));`
`114`		`- CLEAR_BIT(noteOn, channel);`
`115`	`112`	`}`
`116`	`113`
`117`	`114`	`void synth_pitch(u8 channel, u8 octave, u16 freqNumber)`
`@@ -263,11 +260,6 @@ void synth_fms(u8 channel, u8 fms)`
`263`	`260`	`channel_parameter_updated(channel);`
`264`	`261`	`}`
`265`	`262`
`266`		`-u8 synth_busy(void)`
`267`		`-{`
`268`		`- return noteOn;`
`269`		`-}`
`270`		`-`
`271`	`263`	`void synth_preset(u8 channel, const FmPreset* preset)`
`272`	`264`	`{`
`273`	`265`	`FmChannel* chan = &fmChannels[channel];`