]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1820069 11a994d)
Merge branch 'bugfix/detect_ocd_when_panic' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Mon, 9 Jan 2017 05:25:45 +0000 (13:25 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Mon, 9 Jan 2017 05:25:45 +0000 (13:25 +0800)
commit633cd49f881175ab5acf1b939e913b1d73a82329
tree42577dac701ee22be3f3b58ce66e881382506a5btree | snapshot
parent18200699439b8d6020397f91229adfa5f8580bc1commit | diff
parent11a994d5d8c5d479ab436010ed20db59f11e16d1commit | diff
Merge branch 'bugfix/detect_ocd_when_panic' into 'master'

Fix OpenOCD detection code

In the current master, detection of an attached OCD is broken. This fixes it.

I also snuck in two unrelated checks in intr_alloc which return from a function that is asserted earlier in the code. This makes the code behave better when they are called erroneously in a production build.

See merge request !377
Unnamed repository; edit this file 'description' to name the repository.