From d908768c07b0db26ac24610eac5edd627490a77b Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Sat, 6 Jan 2024 15:05:59 +0100 Subject: Remove redundant code --- src/sequencer.c | 21 +++------------------ src/settings.c | 2 -- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/sequencer.c b/src/sequencer.c index ab21274..56279bc 100644 --- a/src/sequencer.c +++ b/src/sequencer.c @@ -161,8 +161,6 @@ play_step(void) { | SOUND_SWEEP_DIR(params->sweep_direction) | SOUND_SWEEP_TIME(params->sweep_time); } - SOUND_SQUARE1_FREQ = SOUND_FREQ_RESET; - SOUND_SQUARE1_CTRL = 0; asm("nop"); asm("nop"); asm("nop"); asm("nop"); asm("nop"); asm("nop"); @@ -200,12 +198,6 @@ play_step(void) { TriggerNote *trig = &pat->ch2.notes[step_counter]; ChannelSquareParams *params = &pat->ch2.params[step_counter]; if (trig->active && should_play(params->prob)) { - SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET; - SOUND_SQUARE2_CTRL = 0; - asm("nop"); asm("nop"); - asm("nop"); asm("nop"); - asm("nop"); asm("nop"); - asm("nop"); asm("nop"); SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(params->env_volume) | SOUND_SQUARE_ENV_TIME(params->env_time) | SOUND_SQUARE_ENV_DIR(params->env_direction) @@ -508,12 +500,12 @@ stop_sound(void) { asm("nop"); asm("nop"); asm("nop"); asm("nop"); SOUND_SQUARE1_FREQ = SOUND_FREQ_RESET; - SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET; - SOUND_WAVE_FREQ = SOUND_FREQ_RESET; - SOUND_NOISE_FREQ = SOUND_FREQ_RESET; SOUND_SQUARE1_CTRL = 0; + SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET; SOUND_SQUARE2_CTRL = 0; + SOUND_WAVE_FREQ = SOUND_FREQ_RESET; SOUND_WAVE_CTRL = 0; + SOUND_NOISE_FREQ = SOUND_FREQ_RESET; SOUND_NOISE_CTRL = 0; redraw_play_pause = true; redraw_pattern_buttons = true; @@ -1500,13 +1492,6 @@ handle_sequencer_input(void) { } } -static int in_ticks = 0; - -void -reset_serial_in(void) { - in_ticks = 0; -} - void serial_irq(void) { if (play_status) { diff --git a/src/settings.c b/src/settings.c index 7cebcf6..374618c 100644 --- a/src/settings.c +++ b/src/settings.c @@ -8,7 +8,6 @@ static Settings settings = { }; static int settings_cursor_loc = 0; -void reset_serial_in(void); void serial_irq(void); void stop_sound(void); void toggle_playing(void); @@ -17,7 +16,6 @@ void set_audio_settings(void) { stop_sound(); if (settings.sync == SYNC_IN_LINK) { - reset_serial_in(); irs_set(IRQ_SERIAL, serial_irq); irs_set(IRQ_TIMER_2, NULL); SIO_MODE = SIO_MODE_GP -- cgit v1.2.1