diff options
| author | hathach <[email protected]> | 2018-03-30 15:33:36 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-30 15:33:36 +0700 |
| commit | 82da013dadf2b2f69f362702ca40708fdec52df4 (patch) | |
| tree | bfa9a73206ace7aca38dbf008a8277a6ea2d20bc /tinyusb/common | |
| parent | 97db3c7c3d7cfbbb19dbda09809aa39bb19608b9 (diff) | |
get freertos build
Diffstat (limited to 'tinyusb/common')
| -rw-r--r-- | tinyusb/common/timeout_timer.h | 5 | ||||
| -rw-r--r-- | tinyusb/common/tusb_verify.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tinyusb/common/timeout_timer.h b/tinyusb/common/timeout_timer.h index f504cc91f..aafc8cce2 100644 --- a/tinyusb/common/timeout_timer.h +++ b/tinyusb/common/timeout_timer.h @@ -45,6 +45,7 @@ #define _TUSB_TIMEOUT_TTIMER_H_
#include "tusb_compiler.h"
+#include "tusb_hal.h"
#ifdef __cplusplus
extern "C" {
@@ -58,12 +59,12 @@ typedef struct { static inline void timeout_set(timeout_timer_t* tt, uint32_t msec)
{
tt->interval = msec;
- tt->start = osal_millis();
+ tt->start = tusb_hal_millis();
}
static inline bool timeout_expired(timeout_timer_t* tt)
{
- return ( osal_millis() - tt->start ) >= tt->interval;
+ return ( tusb_hal_millis() - tt->start ) >= tt->interval;
}
#ifdef __cplusplus
diff --git a/tinyusb/common/tusb_verify.h b/tinyusb/common/tusb_verify.h index 856ae7958..516a30a75 100644 --- a/tinyusb/common/tusb_verify.h +++ b/tinyusb/common/tusb_verify.h @@ -71,13 +71,13 @@ // Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7 #if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__) -// Cortex M CoreDebug->DHCSR -#define ARM_CM_DHCSR (*((volatile uint32_t*) 0xE000EDF0UL)) - static inline void verify_breakpoint(void) { + // Cortex M CoreDebug->DHCSR + volatile uint32_t* ARM_CM_DHCSR = ((volatile uint32_t*) 0xE000EDF0UL); + // Only halt mcu if debugger is attached - if ( ARM_CM_DHCSR & 1UL ) __asm("BKPT #0\n"); + if ( (*ARM_CM_DHCSR) & 1UL ) __asm("BKPT #0\n"); } #else |