laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Added bus disconnect code to X200 reboot (see bugzilla #17377)

Browse Source
This commit is contained in:
Ross Owen
2017-05-25 11:51:50 +01:00
parent 317f466c78
commit f706e09d2a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module_usb_audio/reboot.xc
View File

@@ -7,6 +7,8 @@
#define XS1_SU_PERIPH_USB_ID 0x1 #define XS1_SU_PERIPH_USB_ID 0x1
#if (XUD_SERIES_SUPPORT == XUD_X200_SERIES) #if (XUD_SERIES_SUPPORT == XUD_X200_SERIES)
#include "xs2_su_registers.h"
#define XS2_SU_PERIPH_USB_ID 0x1
#define PLL_MASK 0x7FFFFFFF #define PLL_MASK 0x7FFFFFFF
#else #else
#define PLL_MASK 0xFFFFFFFF #define PLL_MASK 0xFFFFFFFF
@@ -33,6 +35,12 @@ void device_reboot_aux(void)
unsigned int tileId; unsigned int tileId;
unsigned int tileArrayLength; unsigned int tileArrayLength;
#if (XUD_SERIES_SUPPORT == XUD_X200_SERIES)
/* Disconnect from bus */
unsigned data[] = {4};
write_periph_32(usb_tile, XS2_SU_PERIPH_USB_ID, XS1_GLX_PER_UIFM_FUNC_CONTROL_NUM, 1, data);
#endif
/* Find size of tile array - note in future tools versions this will be available from platform.h */ /* Find size of tile array - note in future tools versions this will be available from platform.h */
asm volatile ("ldc %0, tile.globound":"=r"(tileArrayLength)); asm volatile ("ldc %0, tile.globound":"=r"(tileArrayLength));
@@ -61,14 +69,6 @@ void device_reboot_aux(void)
/* Reboots XMOS device by writing to the PLL config register */ /* Reboots XMOS device by writing to the PLL config register */
void device_reboot(chanend spare) void device_reboot(chanend spare)
{ {
#if (XUD_SERIES_SUPPORT != XUD_U_SERIES)
//outct(spare, XS1_CT_END); // have to do this before freeing the chanend
//inct(spare); // Receive end ct from usb_buffer to close down in both directions
/* Need a spare chanend so we can talk to the pll register */
//asm("freer res[%0]"::"r"(spare));
#endif
device_reboot_aux(); device_reboot_aux();
while(1); while(1);
} }