From b4c9ef9fd7167f37d0537147c535828f0b2186f9 Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Thu, 18 Jan 2018 16:51:58 +0000 Subject: [PATCH] Get rid of channel end in device reboot function --- CHANGELOG.rst | 1 + lib_xua/src/core/endpoint0/xua_endpoint0.c | 6 +++--- lib_xua/src/core/support/reboot.xc | 13 +++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 278e1263..d7224b95 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,7 @@ lib_xua Change Log so it shows up with a descriptive name in Windows Device Manager - CHANGE: DFU_BCD_DEVICE removed (now uses BCD_DEVICE) - CHANGE: Renaming in descriptors.h to avoid clashes with application + - CHANGE: Make device reboot function no-argument (was one channel end) - RESOLVED: FIR gain compensation for PDM mics set incorrectly for divide of 8 - RESOLVED: Incorrect xmosdfu DYLD path in test script code - RESOLVED: xmosdfu cannot find XMOS device on modern MacBook Pro (#17897) diff --git a/lib_xua/src/core/endpoint0/xua_endpoint0.c b/lib_xua/src/core/endpoint0/xua_endpoint0.c index c1b14088..390b6cb3 100755 --- a/lib_xua/src/core/endpoint0/xua_endpoint0.c +++ b/lib_xua/src/core/endpoint0/xua_endpoint0.c @@ -56,7 +56,7 @@ #if (XUA_DFU_EN == 1) #include "xua_dfu.h" #define DFU_IF_NUM INPUT_INTERFACES + OUTPUT_INTERFACES + MIDI_INTERFACES + 1 -extern void device_reboot(chanend); +extern void device_reboot(void); #endif unsigned int DFU_mode_active = 0; // 0 - App active, 1 - DFU active @@ -579,7 +579,7 @@ void XUA_Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, if(reset) { DFUDelay(50000000); - device_reboot(c_audioControl); + device_reboot(); } } #endif @@ -794,7 +794,7 @@ void XUA_Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, /* Send reboot command */ DFUDelay(5000000); - device_reboot(c_audioControl); + device_reboot(); } } #endif diff --git a/lib_xua/src/core/support/reboot.xc b/lib_xua/src/core/support/reboot.xc index f23ebdd2..59612418 100644 --- a/lib_xua/src/core/support/reboot.xc +++ b/lib_xua/src/core/support/reboot.xc @@ -30,8 +30,10 @@ static void reset_tile(unsigned const tileId) write_sswitch_reg_no_ack(tileId, 6, pllVal); } -/* Note - resetting is per *node* not tile */ -static inline void device_reboot_aux(void) +/* Reboots XMOS device by writing to the PLL config register + * Note - resetting is per *node* not tile + */ +void device_reboot(void) { #if (XUD_SERIES_SUPPORT == 1) /* Disconnect from bus */ @@ -96,11 +98,6 @@ static inline void device_reboot_aux(void) /* Finally reboot the node this tile resides on */ reset_tile(localTileId); #endif -} -/* Reboots XMOS device by writing to the PLL config register */ -void device_reboot(chanend spare) -{ - device_reboot_aux(); - while(1); + while (1); }