andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix build for lpcxpreso host

Browse Source
This commit is contained in:
hathach
2014-03-24 16:07:17 +07:00
parent bfd6c8bc1e
commit 6c9d03905e
18 changed files with 106 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/device/src/cdc_device_app.h
View File

@@ -43,8 +43,8 @@
* @{
*/
#ifndef _TUSB_CDCD_APP_H_
#define _TUSB_CDCD_APP_H_
#ifndef _TUSB_CDCD_DEVICE_APP_H_
#define _TUSB_CDCD_DEVICE_APP_H_
#include "board.h"
#include "tusb.h"
@@ -70,6 +70,6 @@ OSAL_TASK_FUNCTION( cdcd_serial_app_task , p_task_para);
}
#endif
#endif /* _TUSB_CDCD_APP_H_ */
#endif /* _TUSB_CDCD_DEVICE_APP_H_ */
/** @} */

6
demos/device/src/keyboard_device_app.h
View File

@@ -43,8 +43,8 @@
* @{
*/
#ifndef _TUSB_KEYBOARDD_APP_H_
#define _TUSB_KEYBOARDD_APP_H_
#ifndef _TUSB_KEYBOARDD_DEVICE_APP_H_
#define _TUSB_KEYBOARDD_DEVICE_APP_H_
#include "board.h"
#include "tusb.h"
@@ -69,6 +69,6 @@ OSAL_TASK_FUNCTION( keyboard_device_app_task , p_task_para);
}
#endif
#endif /* _TUSB_KEYBOARDD_APP_H_ */
#endif /* _TUSB_KEYBOARDD_DEVICE_APP_H_ */
/** @} */

11
demos/device/src/main.c
View File

@@ -79,6 +79,10 @@ void os_none_start_scheduler(void)
int main(void)
{
#if TUSB_CFG_OS == TUSB_OS_CMSIS_RTX
osKernelInitialize(); // CMSIS RTX requires kernel init before any other OS functions
#endif
board_init();
print_greeting();
@@ -98,10 +102,7 @@ int main(void)
#elif TUSB_CFG_OS == TUSB_OS_NONE
os_none_start_scheduler();
#elif TUSB_CFG_OS == TUSB_OS_CMSIS_RTX
while(1)
{
osDelay(osWaitForever); // CMSIS RTX osKernelStart already started, main() is a task
}
osKernelStart();
#else
#error need to start RTOS schduler
#endif
@@ -109,8 +110,6 @@ int main(void)
return 0;
}
//--------------------------------------------------------------------+
// HELPER FUNCTION
//--------------------------------------------------------------------+

6
demos/device/src/mouse_device_app.h
View File

@@ -43,8 +43,8 @@
* @{
*/
#ifndef _TUSB_MOUSED_APP_H_
#define _TUSB_MOUSED_APP_H_
#ifndef _TUSB_MOUSED_DEVICE_APP_H_
#define _TUSB_MOUSED_DEVICE_APP_H_
#include "board.h"
#include "tusb.h"
@@ -69,6 +69,6 @@ OSAL_TASK_FUNCTION( mouse_device_app_task , p_task_para);
}
#endif
#endif /* _TUSB_MOUSED_APP_H_ */
#endif /* _TUSB_MOUSED_DEVICE_APP_H_ */
/** @} */

6
demos/device/src/msc_device_app.h
View File

@@ -43,8 +43,8 @@
* @{
*/
#ifndef _TUSB_MSCD_APP_H_
#define _TUSB_MSCD_APP_H_
#ifndef _TUSB_MSCD_DEVICE_APP_H_
#define _TUSB_MSCD_DEVICE_APP_H_
#include "board.h"
#include "tusb.h"
@@ -88,6 +88,6 @@ extern scsi_sense_fixed_data_t mscd_sense_data;
}
#endif
#endif /* _TUSB_MSCD_APP_H_ */
#endif /* _TUSB_MSCD_DEVICE_APP_H_ */
/** @} */