X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fstlink_usb.c;h=bf146444b21bf74f831854f1d1c6db7b21128be7;hb=ec733561595c2a2ac134c868e799bde29d398191;hp=466a98c30eb493e13d8d76926c6d279d2e6bc123;hpb=338f5a1d4872b4fd49e8eef6bd1ff03330f284e2;p=openocd.git diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index 466a98c30e..bf146444b2 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011 by Mathias Kuester * + * Copyright (C) 2011-2012 by Mathias Kuester * * Mathias Kuester * * * * This code is based on https://github.com/texane/stlink * @@ -100,6 +100,7 @@ struct stlink_usb_handle_s { #define STLINK_DEV_MASS_MODE 0x01 #define STLINK_DEV_DEBUG_MODE 0x02 #define STLINK_DEV_SWIM_MODE 0x03 +#define STLINK_DEV_BOOTLOADER_MODE 0x04 #define STLINK_DEV_UNKNOWN_MODE -1 #define STLINK_DFU_EXIT 0x07 @@ -540,6 +541,7 @@ static int stlink_usb_init_mode(void *handle) case STLINK_DEV_SWIM_MODE: emode = STLINK_MODE_DEBUG_SWIM; break; + case STLINK_DEV_BOOTLOADER_MODE: default: emode = STLINK_MODE_UNKNOWN; break; @@ -778,7 +780,6 @@ static int stlink_usb_read_regs(void *handle) else h->txbuf[1] = STLINK_DEBUG_APIV2_READALLREGS; - res = stlink_usb_recv(handle, h->txbuf, STLINK_CMD_SIZE, h->rxbuf, 84); if (res != ERROR_OK)