MirrorMirror
/
headphones
mirror of https://github.com/ploopyco/headphones.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slight refactoring.

This commit is contained in:
George Norton 2023-06-19 16:10:15 +01:00
parent 062ca82e10
commit 04fa7fc89b
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/code/configuration_manager.c
View File

@ -521,7 +521,7 @@ void configuration_ep_on_cancel(struct usb_endpoint *ep) {
request->length = 0; request->length = 0;
} }
void apply_core1_config() { void apply_config_changes() {
if (reload_config) { if (reload_config) {
//uint32_t ints = save_and_disable_interrupts(); //uint32_t ints = save_and_disable_interrupts();
reload_config = false; reload_config = false;

3
firmware/code/configuration_manager.h
View File

@ -40,9 +40,8 @@ struct usb_endpoint;
void config_in_packet(struct usb_endpoint *ep); void config_in_packet(struct usb_endpoint *ep);
void config_out_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); void configuration_ep_on_cancel(struct usb_endpoint *ep);
extern void load_config(); extern void load_config();
extern void apply_core1_config(); extern void apply_config_changes();
#endif // CONFIGURATION_MANAGER_H #endif // CONFIGURATION_MANAGER_H

6
firmware/code/run.c
View File

@ -162,10 +162,7 @@ static void _as_audio_packet(struct usb_endpoint *ep) {
update_volume(); update_volume();
// Update filters if required // Update filters if required
apply_core1_config(); apply_config_changes();
// Wait for core 1 to finish
//multicore_fifo_pop_blocking();
// keep on truckin' // keep on truckin'
usb_grow_transfer(ep->current_transfer, 1); usb_grow_transfer(ep->current_transfer, 1);
@ -932,7 +929,6 @@ void usb_sound_card_init() {
config_in_transfer.type = &config_in_transfer_type; config_in_transfer.type = &config_in_transfer_type;
usb_set_default_transfer(&ep_configuration_in, &config_in_transfer); usb_set_default_transfer(&ep_configuration_in, &config_in_transfer);
config_out_transfer.type = &config_out_transfer_type; 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); usb_set_default_transfer(&ep_configuration_out, &config_out_transfer);
static struct usb_interface *const boot_device_interfaces[] = { static struct usb_interface *const boot_device_interfaces[] = {