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

xpd: Cleaned up whitespace

Browse Source
This commit is contained in:
Ross Owen
2015-06-19 16:11:59 +01:00
parent 8b98db1b0f
commit cdc2d74016
7 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
module_dfu/src/dfu.xc
View File

@@ -276,7 +276,7 @@ static int DFU_GetStatus(unsigned int request_len, unsigned data_buffer[16], cha
data_buffer[1] = DFU_state; data_buffer[1] = DFU_state;
return 6; return 6;
} }
static int DFU_ClrStatus(unsigned &DFU_state) static int DFU_ClrStatus(unsigned &DFU_state)
@@ -407,19 +407,19 @@ static int XMOS_DFU_LoadState()
[[distributable]] [[distributable]]
void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd) void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
{ {
while(1) while(1)
{ {
select 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}: -> {unsigned reset_device_after_ack, int return_data_len, unsigned dfu_reset_override, unsigned returnVal, unsigned newDfuState}:
reset_device_after_ack = 0; reset_device_after_ack = 0;
return_data_len = 0; return_data_len = 0;
dfu_reset_override = 0; dfu_reset_override = 0;
unsigned tmpDfuState; unsigned tmpDfuState;
returnVal = 0; returnVal = 0;
// Map Standard DFU commands onto device level firmware upgrade mechanism // Map Standard DFU commands onto device level firmware upgrade mechanism
switch (sp.bRequest) 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); return_data_len = DFU_Detach(sp.wValue, c_user_cmd, tmpDfuState);
newDfuState = tmpDfuState;; newDfuState = tmpDfuState;;
break; break;
case DFU_DNLOAD: case DFU_DNLOAD:
unsigned data[16]; unsigned data[16];
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
@@ -436,9 +436,9 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
tmpDfuState = dfuState; tmpDfuState = dfuState;
returnVal = DFU_Dnload(sp.wLength, sp.wValue, data, c_user_cmd, return_data_len, tmpDfuState); returnVal = DFU_Dnload(sp.wLength, sp.wValue, data, c_user_cmd, return_data_len, tmpDfuState);
newDfuState = tmpDfuState; newDfuState = tmpDfuState;
break; break;
case DFU_UPLOAD: case DFU_UPLOAD:
unsigned data_out[16]; unsigned data_out[16];
tmpDfuState = dfuState; tmpDfuState = dfuState;
@@ -447,7 +447,7 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
data_buffer[i] = data_out[i]; data_buffer[i] = data_out[i];
break; break;
case DFU_GETSTATUS: case DFU_GETSTATUS:
unsigned data_out[16]; unsigned data_out[16];
tmpDfuState = dfuState; tmpDfuState = dfuState;
@@ -456,13 +456,13 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
data_buffer[i] = data_out[i]; data_buffer[i] = data_out[i];
break; break;
case DFU_CLRSTATUS: case DFU_CLRSTATUS:
tmpDfuState = dfuState; tmpDfuState = dfuState;
return_data_len = DFU_ClrStatus(tmpDfuState); return_data_len = DFU_ClrStatus(tmpDfuState);
newDfuState = tmpDfuState; newDfuState = tmpDfuState;
break; break;
case DFU_GETSTATE: case DFU_GETSTATE:
unsigned data_out[16]; unsigned data_out[16];
tmpDfuState = dfuState; tmpDfuState = dfuState;
@@ -471,49 +471,49 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
data_buffer[i] = data_out[i]; data_buffer[i] = data_out[i];
break; break;
case DFU_ABORT: case DFU_ABORT:
tmpDfuState = dfuState; tmpDfuState = dfuState;
return_data_len = DFU_Abort(tmpDfuState); return_data_len = DFU_Abort(tmpDfuState);
newDfuState = tmpDfuState; newDfuState = tmpDfuState;
break; break;
/* XMOS Custom DFU requests */ /* XMOS Custom DFU requests */
case XMOS_DFU_RESETDEVICE: case XMOS_DFU_RESETDEVICE:
reset_device_after_ack = 1; reset_device_after_ack = 1;
return_data_len = 0; return_data_len = 0;
break; break;
case XMOS_DFU_REVERTFACTORY: case XMOS_DFU_REVERTFACTORY:
return_data_len = XMOS_DFU_RevertFactory(c_user_cmd); return_data_len = XMOS_DFU_RevertFactory(c_user_cmd);
break; break;
case XMOS_DFU_RESETINTODFU: case XMOS_DFU_RESETINTODFU:
reset_device_after_ack = 1; reset_device_after_ack = 1;
dfu_reset_override = 0x11042011; dfu_reset_override = 0x11042011;
return_data_len = 0; return_data_len = 0;
break; break;
case XMOS_DFU_RESETFROMDFU: case XMOS_DFU_RESETFROMDFU:
reset_device_after_ack = 1; reset_device_after_ack = 1;
dfu_reset_override = 0; dfu_reset_override = 0;
return_data_len = 0; return_data_len = 0;
break; break;
case XMOS_DFU_SELECTIMAGE: case XMOS_DFU_SELECTIMAGE:
return_data_len = XMOS_DFU_SelectImage(sp.wValue, c_user_cmd); return_data_len = XMOS_DFU_SelectImage(sp.wValue, c_user_cmd);
break; break;
case XMOS_DFU_SAVESTATE: case XMOS_DFU_SAVESTATE:
/* Save passed state to flash */ /* Save passed state to flash */
return_data_len = XMOS_DFU_SaveState(); return_data_len = XMOS_DFU_SaveState();
break; break;
case XMOS_DFU_RESTORESTATE: case XMOS_DFU_RESTORESTATE:
/* Restore saved state from flash */ /* Restore saved state from flash */
return_data_len = XMOS_DFU_LoadState(); return_data_len = XMOS_DFU_LoadState();
break; break;
default: default:
break; break;
} }
@@ -523,7 +523,7 @@ void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
return; 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) 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 reset_device_after_ack = 0;
unsigned int returnVal = 0; unsigned int returnVal = 0;
unsigned int dfuState = g_DFU_state; unsigned int dfuState = g_DFU_state;
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
{ {
// Host to device // Host to device

2
module_dfu/src/dfu_interface.h
View File

@@ -6,7 +6,7 @@
interface i_dfu 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(); void finish();
}; };
#endif #endif

2
module_dfu/src/flash_interface.c
View File

@@ -62,7 +62,7 @@ int flash_cmd_init(void)
#endif #endif
if (fl_getFactoryImage(&image) != 0) if (fl_getFactoryImage(&image) != 0)
{ {
return 1; return 1;
} }

8
module_usb_audio/audio.xc
View File

@@ -879,12 +879,12 @@ void testct_byref(chanend c, int &returnVal)
if(testct(c)) if(testct(c))
returnVal = 1; returnVal = 1;
} }
[[combinable]] [[combinable]]
static void dummy_deliver(chanend c_out, unsigned &command) static void dummy_deliver(chanend c_out, unsigned &command)
{ {
int ct; int ct;
while (1) while (1)
{ {
@@ -1238,7 +1238,7 @@ chanend ?c_config, chanend ?c
outct(c_mix_out, XS1_CT_END); outct(c_mix_out, XS1_CT_END);
outuint(c_mix_out, 0); outuint(c_mix_out, 0);
while (1) while (1)
{ {
#if XUD_TILE != 0 #if XUD_TILE != 0

4
module_usb_audio/endpoint0/endpoint0.c
View File

@@ -571,10 +571,10 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
// Handshake // Handshake
chkct(c_audioControl, XS1_CT_END); chkct(c_audioControl, XS1_CT_END);
} }
/* This will return 1 if reset requested */ /* This will return 1 if reset requested */
result = DFUDeviceRequests(ep0_out, &ep0_in, &sp, null, g_interfaceAlt[sp.wIndex], dfuInterface, &reset); result = DFUDeviceRequests(ep0_out, &ep0_in, &sp, null, g_interfaceAlt[sp.wIndex], dfuInterface, &reset);
if(reset && result == XUD_RES_OKAY) if(reset && result == XUD_RES_OKAY)
{ {
DFUDelay(50000000); DFUDelay(50000000);

2
module_usb_audio/flashlib_user.c
View File

@@ -32,7 +32,7 @@ typedef struct {
clock qspiClkblk; clock qspiClkblk;
} fl_QSPIPorts; } fl_QSPIPorts;
*/ */
fl_QSPIPorts p_qflash = fl_QSPIPorts p_qflash =
{ {
XS1_PORT_1B, XS1_PORT_1B,
XS1_PORT_1C, XS1_PORT_1C,

14
module_usb_audio/main.xc
View File

@@ -299,7 +299,7 @@ void usb_audio_core(chanend c_mix_out
#else #else
#define c_EANativeTransport_ctrl null #define c_EANativeTransport_ctrl null
#endif #endif
par par
{ {
/* USB Interface Core */ /* USB Interface Core */
@@ -521,23 +521,23 @@ int main()
#endif #endif
#ifdef DFU #ifdef DFU
interface i_dfu dfuInterface; interface i_dfu dfuInterface;
#else #else
#define dfuInterface null #define dfuInterface null
#endif #endif
USER_MAIN_DECLARATIONS USER_MAIN_DECLARATIONS
par par
{ {
on tile[XUD_TILE]: on tile[XUD_TILE]:
par par
{ {
#if (XUD_TILE == 0) #if (XUD_TILE == 0)
/* Check if USB is on the flash tile (tile 0) */ /* Check if USB is on the flash tile (tile 0) */
[[distribute]] [[distribute]]
DFUHandler(dfuInterface, null); DFUHandler(dfuInterface, null);
#endif #endif
usb_audio_core(c_mix_out usb_audio_core(c_mix_out
#ifdef MIDI #ifdef MIDI