imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stlink: add generic open error routine

Browse Source 
Change-Id: I1cd18896ab2a37255471a2d160befed8dd8fb544
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/979
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2012-11-15 10:10:46 +00:00
parent 95025349fa
commit e0d4d46dbe
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/jtag/drivers/stlink_usb.c
View File

@ -1142,6 +1142,21 @@ static int stlink_usb_write_mem32(void *handle, uint32_t addr, uint16_t len,
return stlink_usb_get_rw_status(handle); return stlink_usb_get_rw_status(handle);
} }
/** */
static int stlink_usb_close(void *fd)
{
struct stlink_usb_handle_s *h;
h = (struct stlink_usb_handle_s *)fd;
if (h->fd)
jtag_libusb_close(h->fd);
free(fd);
return ERROR_OK;
}
/** */ /** */
static int stlink_usb_open(struct hl_interface_param_s *param, void **fd) static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
{ {
@ -1151,7 +1166,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
LOG_DEBUG("stlink_usb_open"); LOG_DEBUG("stlink_usb_open");
h = malloc(sizeof(struct stlink_usb_handle_s)); h = calloc(1, sizeof(struct stlink_usb_handle_s));
if (h == 0) { if (h == 0) {
LOG_DEBUG("malloc failed"); LOG_DEBUG("malloc failed");
@ -1171,14 +1186,14 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
if (jtag_libusb_open(vids, pids, &h->fd) != ERROR_OK) { if (jtag_libusb_open(vids, pids, &h->fd) != ERROR_OK) {
LOG_ERROR("open failed"); LOG_ERROR("open failed");
return ERROR_FAIL; goto error_open;
} }
jtag_libusb_set_configuration(h->fd, 0); jtag_libusb_set_configuration(h->fd, 0);
if (jtag_libusb_claim_interface(h->fd, 0) != ERROR_OK) { if (jtag_libusb_claim_interface(h->fd, 0) != ERROR_OK) {
LOG_DEBUG("claim interface failed"); LOG_DEBUG("claim interface failed");
return ERROR_FAIL; goto error_open;
} }
/* wrap version for first read */ /* wrap version for first read */
@ -1196,9 +1211,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
if (err != ERROR_OK) { if (err != ERROR_OK) {
LOG_ERROR("read version failed"); LOG_ERROR("read version failed");
jtag_libusb_close(h->fd); goto error_open;
free(h);
return err;
} }
/* compare usb vid/pid */ /* compare usb vid/pid */
@ -1227,9 +1240,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
if (err != ERROR_OK) { if (err != ERROR_OK) {
LOG_ERROR("mode (transport) not supported by device"); LOG_ERROR("mode (transport) not supported by device");
jtag_libusb_close(h->fd); goto error_open;
free(h);
return err;
} }
api = h->version.jtag_api_max; api = h->version.jtag_api_max;
@ -1249,20 +1260,17 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
if (err != ERROR_OK) { if (err != ERROR_OK) {
LOG_ERROR("init mode failed"); LOG_ERROR("init mode failed");
jtag_libusb_close(h->fd); goto error_open;
free(h);
return err;
} }
*fd = h; *fd = h;
return ERROR_OK; return ERROR_OK;
}
/** */ error_open:
static int stlink_usb_close(void *fd) stlink_usb_close(h);
{
return ERROR_OK; return ERROR_FAIL;
} }
/** */ /** */