Merge branch 'master' into feature/newlib_locking

This commit is contained in:
Angus Gratton
2016-08-25 11:11:35 +08:00
16 changed files with 290 additions and 33 deletions

View File

@@ -0,0 +1,7 @@
#ifndef PANIC_H
#define PANIC_H
void setBreakpointIfJtag(void *fn);
#endif

View File

@@ -118,8 +118,11 @@ typedef unsigned portBASE_TYPE UBaseType_t;
// portbenchmark
#include "portbenchmark.h"
#include "sdkconfig.h"
#define portMUX_DEBUG
#define portFIRST_TASK_HOOK CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG
typedef struct {
volatile uint32_t mux;