diff options
| author | hathach <[email protected]> | 2013-09-18 20:56:29 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-09-18 20:56:29 +0700 |
| commit | 8738902495d6f6350793b3bfb9f57f21297f3407 (patch) | |
| tree | ec5b5c701c8e74124a25dfc5853872051d435953 | |
| parent | 243f1975096846b8f3e6f5013dc9d80e0cb4c231 (diff) | |
configAssert = hal_debugger_breakpoint
| -rw-r--r-- | vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c | 10 | ||||
| -rw-r--r-- | vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h | 16 | ||||
| -rw-r--r-- | vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h | 2 |
3 files changed, 19 insertions, 9 deletions
diff --git a/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c b/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c index dcd008928..079b04fe6 100644 --- a/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c +++ b/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c @@ -50,6 +50,16 @@ /***************************************************************************** * Public functions ****************************************************************************/ +// FIXME ethernet +#if 0 +void msDelay(uint32_t ms) +{ + portTickType xDelayTime; + + xDelayTime = xTaskGetTickCount(); + vTaskDelayUntil( &xDelayTime, ms ); +} +#endif /* Delay for the specified number of milliSeconds */ void FreeRTOSDelay(uint32_t ms) diff --git a/vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h b/vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h index 47f560c6a..6df1c1756 100644 --- a/vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h +++ b/vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h @@ -108,13 +108,13 @@ test tasks that check their own execution times. */ /* Set the following definitions to 1 to include the API function, or zero to exclude the API function. */ -#define INCLUDE_vTaskPrioritySet 1 -#define INCLUDE_uxTaskPriorityGet 1 -#define INCLUDE_vTaskDelete 1 -#define INCLUDE_vTaskCleanUpResources 1 -#define INCLUDE_vTaskSuspend 1 -#define INCLUDE_vTaskDelayUntil 1 -#define INCLUDE_vTaskDelay 1 +#define INCLUDE_vTaskPrioritySet 1 +#define INCLUDE_uxTaskPriorityGet 1 +#define INCLUDE_vTaskDelete 1 +#define INCLUDE_vTaskCleanUpResources 1 +#define INCLUDE_vTaskSuspend 1 +#define INCLUDE_vTaskDelayUntil 1 +#define INCLUDE_vTaskDelay 1 #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* Cortex-M specific definitions. */ @@ -142,7 +142,7 @@ to all Cortex-M ports, and do not rely on any particular library functions. */ /* Normal assert() semantics without relying on the provision of an assert.h header file. */ -#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); } +#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); hal_debugger_breakpoint(); } #define configUSE_CUSTOM_TICK 1 diff --git a/vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h b/vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h index e204478a2..6ab560ff3 100644 --- a/vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h +++ b/vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h @@ -144,7 +144,7 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Normal assert() semantics without relying on the provision of an assert.h header file. */ -#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); } +#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); hal_debugger_breakpoint(); } /* FreeRTOS hooks to NVIC vectors */ #define xPortPendSVHandler PendSV_Handler |