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

Conflicted merge in mixer

Browse Source
This commit is contained in:
Ross Owen
2013-12-12 11:50:32 +00:00
parent a3ea0d2858 577b5f500d
commit 1fa6e99473
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_dfu/src/dfu.xc
View File

@@ -357,7 +357,7 @@ int DFUReportResetState(chanend ?c_user_cmd)
return inDFU;
}
int XMOS_DFU_RevertFactory(chanend ?c_user_cmd)
static int XMOS_DFU_RevertFactory(chanend ?c_user_cmd)
{
unsigned s = 0;
@@ -371,7 +371,7 @@ int XMOS_DFU_RevertFactory(chanend ?c_user_cmd)
return 0;
}
int XMOS_DFU_SelectImage(unsigned int index, chanend ?c_user_cmd)
static int XMOS_DFU_SelectImage(unsigned int index, chanend ?c_user_cmd)
{
// Select the image index for firmware update
// Currently not used or implemented
@@ -379,12 +379,12 @@ int XMOS_DFU_SelectImage(unsigned int index, chanend ?c_user_cmd)
}
int XMOS_DFU_SaveState()
static int XMOS_DFU_SaveState()
{
return 0;
}
int XMOS_DFU_LoadState()
static int XMOS_DFU_LoadState()
{
return 0;
}