Get rid of channel end in device reboot function

This commit is contained in:
Larry Snizek
2018-01-18 16:51:58 +00:00
parent fd76cf3021
commit b4c9ef9fd7
3 changed files with 9 additions and 11 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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);
}