link-mso19: Add debug messages.

[libsigrok.git] / hardware / common / ezusb.c

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 3cd4f03abee4f145f7df62858e4dcff673202b60..426af3ab6e3a27e88bb28cbe333d8f39814ab00c 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -21,8 +21,6 @@
  * Helper functions for the Cypress EZ-USB / FX2 series chips.
  */
 
-#include <sigrok.h>
-#include <sigrok-internal.h>
 #include <libusb.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -30,6 +28,8 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {
@@ -56,10 +56,11 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
        if ((fw = g_fopen(filename, "rb")) == NULL) {
                sr_warn("Unable to open firmware file %s for reading: %s",
                        filename, strerror(errno));
-               return 1;
+               return SR_ERR;
        }
 
-       result = offset = 0;
+       result = SR_OK;
+       offset = 0;
        while (1) {
                chunksize = fread(buf, 1, 4096, fw);
                if (chunksize == 0)
@@ -69,7 +70,7 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
                                              0x0000, buf, chunksize, 100);
                if (err < 0) {
                        sr_warn("Unable to send firmware to device: %d", err);
-                       result = 1;
+                       result = SR_ERR;
                        break;
                }
                sr_info("Uploaded %d bytes", chunksize);
@@ -90,28 +91,33 @@ int ezusb_upload_firmware(libusb_device *dev, int configuration,
        sr_info("uploading firmware to device on %d.%d",
                  libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
-       err = libusb_open(dev, &hdl);
-       if (err != 0) {
+       if ((err = libusb_open(dev, &hdl)) < 0) {
                sr_warn("failed to open device: %d", err);
-               return 1;
+               return SR_ERR;
        }
 
-       err = libusb_set_configuration(hdl, configuration);
-       if (err != 0) {
+       if (libusb_kernel_driver_active(hdl, 0)) {
+               if ((err = libusb_detach_kernel_driver(hdl, 0)) < 0) {
+                       sr_warn("failed to detach kernel driver: %d", err);
+                       return SR_ERR;
+               }
+       }
+
+       if ((err = libusb_set_configuration(hdl, configuration)) < 0) {
                sr_warn("Unable to set configuration: %d", err);
-               return 1;
+               return SR_ERR;
        }
 
        if ((ezusb_reset(hdl, 1)) < 0)
-               return 1;
+               return SR_ERR;
 
-       if (ezusb_install_firmware(hdl, filename) != 0)
-               return 1;
+       if (ezusb_install_firmware(hdl, filename) < 0)
+               return SR_ERR;
 
        if ((ezusb_reset(hdl, 0)) < 0)
-               return 1;
+               return SR_ERR;
 
        libusb_close(hdl);
 
-       return 0;
+       return SR_OK;
 }