From 04fa7fc89b915b8bd19e5bb5eed5d4f9074bec74 Mon Sep 17 00:00:00 2001 From: George Norton Date: Mon, 19 Jun 2023 16:10:15 +0100 Subject: [PATCH] Slight refactoring. --- firmware/code/configuration_manager.c | 2 +- firmware/code/configuration_manager.h | 3 +-- firmware/code/run.c | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/firmware/code/configuration_manager.c b/firmware/code/configuration_manager.c index 2c43d4c..0a3e7e1 100644 --- a/firmware/code/configuration_manager.c +++ b/firmware/code/configuration_manager.c @@ -521,7 +521,7 @@ void configuration_ep_on_cancel(struct usb_endpoint *ep) { request->length = 0; } -void apply_core1_config() { +void apply_config_changes() { if (reload_config) { //uint32_t ints = save_and_disable_interrupts(); reload_config = false; diff --git a/firmware/code/configuration_manager.h b/firmware/code/configuration_manager.h index 466cb84..70e32d5 100644 --- a/firmware/code/configuration_manager.h +++ b/firmware/code/configuration_manager.h @@ -40,9 +40,8 @@ struct usb_endpoint; void config_in_packet(struct usb_endpoint *ep); void config_out_packet(struct usb_endpoint *ep); -void configuration_ep_on_stall_change(struct usb_endpoint *ep); void configuration_ep_on_cancel(struct usb_endpoint *ep); extern void load_config(); -extern void apply_core1_config(); +extern void apply_config_changes(); #endif // CONFIGURATION_MANAGER_H \ No newline at end of file diff --git a/firmware/code/run.c b/firmware/code/run.c index eb595f3..6379ba7 100644 --- a/firmware/code/run.c +++ b/firmware/code/run.c @@ -162,10 +162,7 @@ static void _as_audio_packet(struct usb_endpoint *ep) { update_volume(); // Update filters if required - apply_core1_config(); - - // Wait for core 1 to finish - //multicore_fifo_pop_blocking(); + apply_config_changes(); // keep on truckin' usb_grow_transfer(ep->current_transfer, 1); @@ -932,7 +929,6 @@ void usb_sound_card_init() { config_in_transfer.type = &config_in_transfer_type; usb_set_default_transfer(&ep_configuration_in, &config_in_transfer); config_out_transfer.type = &config_out_transfer_type; - ep_configuration_out.on_stall_change = configuration_ep_on_stall_change; usb_set_default_transfer(&ep_configuration_out, &config_out_transfer); static struct usb_interface *const boot_device_interfaces[] = {