jtag/drivers/bcm2835gpio: fix bcm2835_peri_base output format

[openocd.git] / src / jtag / drivers / openjtag.c

diff --git a/src/jtag/drivers/openjtag.c b/src/jtag/drivers/openjtag.c
index 12ea463302a96e602e99d578769f0d02e2829d6b..fe3a8ff7f9ac042a7b243963708dd22a4f85f225 100644 (file)
--- a/src/jtag/drivers/openjtag.c
+++ b/src/jtag/drivers/openjtag.c
@@ -239,10 +239,10 @@ static int openjtag_buf_write_cy7c65215(
 
        ret = jtag_libusb_control_transfer(usbh, CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_WRITE, size, 0,
-                                                                          NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0) {
-               LOG_ERROR("vendor command failed, error %d", ret);
-               return ERROR_JTAG_DEVICE_ERROR;
+                                                                          NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK) {
+               LOG_ERROR("vendor command failed");
+               return ret;
        }
 
        if (jtag_libusb_bulk_write(usbh, ep_out, (char *)buf, size,
@@ -306,10 +306,10 @@ static int openjtag_buf_read_cy7c65215(
 
        ret = jtag_libusb_control_transfer(usbh, CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_READ, qty, 0,
-                                                                          NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0) {
-               LOG_ERROR("vendor command failed, error %d", ret);
-               return ERROR_JTAG_DEVICE_ERROR;
+                                                                          NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK) {
+               LOG_ERROR("vendor command failed");
+               return ret;
        }
 
        if (jtag_libusb_bulk_read(usbh, ep_in, (char *)buf, qty,
@@ -455,8 +455,8 @@ static int openjtag_init_cy7c65215(void)
        ret = jtag_libusb_control_transfer(usbh,
                                                                           CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_ENABLE,
-                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0) {
+                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK) {
                LOG_ERROR("could not enable JTAG module");
                goto err;
        }
@@ -466,7 +466,7 @@ static int openjtag_init_cy7c65215(void)
 err:
        if (usbh)
                jtag_libusb_close(usbh);
-       return ERROR_JTAG_INIT_FAILED;
+       return ret;
 }
 
 static int openjtag_init(void)
@@ -508,8 +508,8 @@ static int openjtag_quit_cy7c65215(void)
        ret = jtag_libusb_control_transfer(usbh,
                                                                           CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_DISABLE,
-                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0)
+                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK)
                LOG_WARNING("could not disable JTAG module");
 
        jtag_libusb_close(usbh);