From: Jiang Jiang Jian Date: Mon, 9 Jan 2017 05:25:45 +0000 (+0800) Subject: Merge branch 'bugfix/detect_ocd_when_panic' into 'master' X-Git-Tag: v2.0-rc1~66 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=633cd49f881175ab5acf1b939e913b1d73a82329;p=esp-idf 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 --- 633cd49f881175ab5acf1b939e913b1d73a82329