]> git.sur5r.net Git - openocd/commitdiff
drivers/cmsis_dap_usb: Return with ERROR_FAIL if no CMSIS-DAP device is found.
authorMasaki Muranaka <monaka@monami-ya.com>
Tue, 24 Jun 2014 00:33:05 +0000 (09:33 +0900)
committerSpencer Oliver <spen@spen-soft.co.uk>
Thu, 10 Jul 2014 21:18:08 +0000 (21:18 +0000)
Even if it does not return, the initialization will be failed.
But it is better to show why the error is caused.

Change-Id: I399c7c94a7156be22723a9715e594061bb414a7e
Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
Reviewed-on: http://openocd.zylin.com/2189
Tested-by: jenkins
Reviewed-by: Andrey Yurovsky <yurovsky@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/jtag/drivers/cmsis_dap_usb.c

index 4073d215aedd8ffedff5f06cf8d233dc213ee794..b8f004c4758dd19fd07fa86a07aea0909497833f 100644 (file)
@@ -208,6 +208,11 @@ static int cmsis_dap_usb_open(void)
 
        hid_free_enumeration(devs);
 
+       if (target_vid == 0 && target_pid == 0) {
+               LOG_ERROR("unable to find CMSIS-DAP device");
+               return ERROR_FAIL;
+       }
+
        if (hid_init() != 0) {
                LOG_ERROR("unable to open HIDAPI");
                return ERROR_FAIL;