From cdc2d74016f26492cf444a6f14ee82e104275874 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 19 Jun 2015 16:11:59 +0100 Subject: [PATCH] xpd: Cleaned up whitespace --- module_dfu/src/dfu.xc | 44 +++++++++++++------------- module_dfu/src/dfu_interface.h | 2 +- module_dfu/src/flash_interface.c | 2 +- module_usb_audio/audio.xc | 8 ++--- module_usb_audio/endpoint0/endpoint0.c | 4 +-- module_usb_audio/flashlib_user.c | 2 +- module_usb_audio/main.xc | 14 ++++---- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/module_dfu/src/dfu.xc b/module_dfu/src/dfu.xc index 0115db24..5d0f70cf 100644 --- a/module_dfu/src/dfu.xc +++ b/module_dfu/src/dfu.xc @@ -276,7 +276,7 @@ static int DFU_GetStatus(unsigned int request_len, unsigned data_buffer[16], cha data_buffer[1] = DFU_state; return 6; - + } static int DFU_ClrStatus(unsigned &DFU_state) @@ -407,19 +407,19 @@ static int XMOS_DFU_LoadState() [[distributable]] void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) { - while(1) + while(1) { select { - case i.HandleDfuRequest(USB_SetupPacket_t &sp, unsigned data_buffer[], unsigned data_buffer_length, unsigned dfuState) + case i.HandleDfuRequest(USB_SetupPacket_t &sp, unsigned data_buffer[], unsigned data_buffer_length, unsigned dfuState) -> {unsigned reset_device_after_ack, int return_data_len, unsigned dfu_reset_override, unsigned returnVal, unsigned newDfuState}: - + reset_device_after_ack = 0; return_data_len = 0; dfu_reset_override = 0; unsigned tmpDfuState; returnVal = 0; - + // Map Standard DFU commands onto device level firmware upgrade mechanism switch (sp.bRequest) { @@ -428,7 +428,7 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) return_data_len = DFU_Detach(sp.wValue, c_user_cmd, tmpDfuState); newDfuState = tmpDfuState;; break; - + case DFU_DNLOAD: unsigned data[16]; for(int i = 0; i < 16; i++) @@ -436,9 +436,9 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) tmpDfuState = dfuState; returnVal = DFU_Dnload(sp.wLength, sp.wValue, data, c_user_cmd, return_data_len, tmpDfuState); newDfuState = tmpDfuState; - + break; - + case DFU_UPLOAD: unsigned data_out[16]; tmpDfuState = dfuState; @@ -447,7 +447,7 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) for(int i = 0; i < 16; i++) data_buffer[i] = data_out[i]; break; - + case DFU_GETSTATUS: unsigned data_out[16]; tmpDfuState = dfuState; @@ -456,13 +456,13 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) for(int i = 0; i < 16; i++) data_buffer[i] = data_out[i]; break; - + case DFU_CLRSTATUS: tmpDfuState = dfuState; return_data_len = DFU_ClrStatus(tmpDfuState); newDfuState = tmpDfuState; break; - + case DFU_GETSTATE: unsigned data_out[16]; tmpDfuState = dfuState; @@ -471,49 +471,49 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) for(int i = 0; i < 16; i++) data_buffer[i] = data_out[i]; break; - + case DFU_ABORT: tmpDfuState = dfuState; return_data_len = DFU_Abort(tmpDfuState); newDfuState = tmpDfuState; break; - + /* XMOS Custom DFU requests */ case XMOS_DFU_RESETDEVICE: reset_device_after_ack = 1; return_data_len = 0; break; - + case XMOS_DFU_REVERTFACTORY: return_data_len = XMOS_DFU_RevertFactory(c_user_cmd); break; - + case XMOS_DFU_RESETINTODFU: reset_device_after_ack = 1; dfu_reset_override = 0x11042011; return_data_len = 0; break; - + case XMOS_DFU_RESETFROMDFU: reset_device_after_ack = 1; dfu_reset_override = 0; return_data_len = 0; break; - + case XMOS_DFU_SELECTIMAGE: return_data_len = XMOS_DFU_SelectImage(sp.wValue, c_user_cmd); break; - + case XMOS_DFU_SAVESTATE: /* Save passed state to flash */ return_data_len = XMOS_DFU_SaveState(); break; - + case XMOS_DFU_RESTORESTATE: /* Restore saved state from flash */ return_data_len = XMOS_DFU_LoadState(); break; - + default: break; } @@ -523,7 +523,7 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) return; } } -} +} int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, chanend ?c_user_cmd, unsigned int altInterface, client interface i_dfu i,int &reset) { @@ -533,7 +533,7 @@ int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, ch unsigned int reset_device_after_ack = 0; unsigned int returnVal = 0; unsigned int dfuState = g_DFU_state; - + if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) { // Host to device diff --git a/module_dfu/src/dfu_interface.h b/module_dfu/src/dfu_interface.h index 45461147..1d3fc901 100644 --- a/module_dfu/src/dfu_interface.h +++ b/module_dfu/src/dfu_interface.h @@ -6,7 +6,7 @@ interface i_dfu { - {unsigned, int, unsigned, unsigned, unsigned} HandleDfuRequest(USB_SetupPacket_t &sp, unsigned data_buffer[], unsigned data_buffer_length, unsigned dfuState); + {unsigned, int, unsigned, unsigned, unsigned} HandleDfuRequest(USB_SetupPacket_t &sp, unsigned data_buffer[], unsigned data_buffer_length, unsigned dfuState); void finish(); }; #endif diff --git a/module_dfu/src/flash_interface.c b/module_dfu/src/flash_interface.c index 4aeb285c..e0578210 100755 --- a/module_dfu/src/flash_interface.c +++ b/module_dfu/src/flash_interface.c @@ -62,7 +62,7 @@ int flash_cmd_init(void) #endif if (fl_getFactoryImage(&image) != 0) - { + { return 1; } diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc index bc11b40f..8fa92ed2 100755 --- a/module_usb_audio/audio.xc +++ b/module_usb_audio/audio.xc @@ -879,12 +879,12 @@ void testct_byref(chanend c, int &returnVal) if(testct(c)) returnVal = 1; } - + [[combinable]] static void dummy_deliver(chanend c_out, unsigned &command) { - int ct; - + int ct; + while (1) { @@ -1238,7 +1238,7 @@ chanend ?c_config, chanend ?c outct(c_mix_out, XS1_CT_END); outuint(c_mix_out, 0); - + while (1) { #if XUD_TILE != 0 diff --git a/module_usb_audio/endpoint0/endpoint0.c b/module_usb_audio/endpoint0/endpoint0.c index 02eceab4..b6190ec4 100755 --- a/module_usb_audio/endpoint0/endpoint0.c +++ b/module_usb_audio/endpoint0/endpoint0.c @@ -571,10 +571,10 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, // Handshake chkct(c_audioControl, XS1_CT_END); } - + /* This will return 1 if reset requested */ result = DFUDeviceRequests(ep0_out, &ep0_in, &sp, null, g_interfaceAlt[sp.wIndex], dfuInterface, &reset); - + if(reset && result == XUD_RES_OKAY) { DFUDelay(50000000); diff --git a/module_usb_audio/flashlib_user.c b/module_usb_audio/flashlib_user.c index 167ca05e..8517aa52 100644 --- a/module_usb_audio/flashlib_user.c +++ b/module_usb_audio/flashlib_user.c @@ -32,7 +32,7 @@ typedef struct { clock qspiClkblk; } fl_QSPIPorts; */ -fl_QSPIPorts p_qflash = +fl_QSPIPorts p_qflash = { XS1_PORT_1B, XS1_PORT_1C, diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc index 686ba3f2..623b5686 100755 --- a/module_usb_audio/main.xc +++ b/module_usb_audio/main.xc @@ -299,7 +299,7 @@ void usb_audio_core(chanend c_mix_out #else #define c_EANativeTransport_ctrl null #endif - + par { /* USB Interface Core */ @@ -521,23 +521,23 @@ int main() #endif #ifdef DFU - interface i_dfu dfuInterface; + interface i_dfu dfuInterface; #else - #define dfuInterface null + #define dfuInterface null #endif USER_MAIN_DECLARATIONS par - { - on tile[XUD_TILE]: + { + on tile[XUD_TILE]: par { #if (XUD_TILE == 0) /* Check if USB is on the flash tile (tile 0) */ - [[distribute]] - DFUHandler(dfuInterface, null); + [[distribute]] + DFUHandler(dfuInterface, null); #endif usb_audio_core(c_mix_out #ifdef MIDI