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

get freertos build

Browse Source
This commit is contained in:
hathach
2018-03-30 15:33:36 +07:00
parent 97db3c7c3d
commit 82da013dad
12 changed files with 118 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tinyusb/common/timeout_timer.h
View File

@@ -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

8
tinyusb/common/tusb_verify.h
View File

@@ -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