X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fezusb.c;h=6a4f329778192d9c18a1741a7c850c99baafe878;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=3cd4f03abee4f145f7df62858e4dcff673202b60;hpb=b08024a8363c7a019bebc05a25e2689e774326e8;p=libsigrok.git

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 3cd4f03a..6a4f3297 100644
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,17 +21,16 @@
  * 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>
 #include <stdio.h>
 #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)
+SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {
 	int err;
 	unsigned char buf[1];
@@ -41,12 +40,13 @@ int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 	err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
 				      0xe600, 0x0000, buf, 1, 100);
 	if (err < 0)
-		sr_warn("Unable to send control request: %d", err);
+		sr_err("Unable to send control request: %d", err);
 
 	return err;
 }
 
-int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
+SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
+				   const char *filename)
 {
 	FILE *fw;
 	int offset, chunksize, err, result;
@@ -54,12 +54,13 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
 
 	sr_info("Uploading firmware at %s", filename);
 	if ((fw = g_fopen(filename, "rb")) == NULL) {
-		sr_warn("Unable to open firmware file %s for reading: %s",
-			filename, strerror(errno));
-		return 1;
+		sr_err("Unable to open firmware file %s for reading: %s",
+		       filename, strerror(errno));
+		return SR_ERR;
 	}
 
-	result = offset = 0;
+	result = SR_OK;
+	offset = 0;
 	while (1) {
 		chunksize = fread(buf, 1, 4096, fw);
 		if (chunksize == 0)
@@ -68,8 +69,8 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
 					      LIBUSB_ENDPOINT_OUT, 0xa0, offset,
 					      0x0000, buf, chunksize, 100);
 		if (err < 0) {
-			sr_warn("Unable to send firmware to device: %d", err);
-			result = 1;
+			sr_err("Unable to send firmware to device: %d", err);
+			result = SR_ERR;
 			break;
 		}
 		sr_info("Uploaded %d bytes", chunksize);
@@ -81,8 +82,8 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
 	return result;
 }
 
-int ezusb_upload_firmware(libusb_device *dev, int configuration,
-			  const char *filename)
+SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
+				  const char *filename)
 {
 	struct libusb_device_handle *hdl;
 	int err;
@@ -90,28 +91,36 @@ 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) {
-		sr_warn("failed to open device: %d", err);
-		return 1;
+	if ((err = libusb_open(dev, &hdl)) < 0) {
+		sr_err("failed to open device: %d", err);
+		return SR_ERR;
 	}
 
-	err = libusb_set_configuration(hdl, configuration);
-	if (err != 0) {
-		sr_warn("Unable to set configuration: %d", err);
-		return 1;
+/* Neither Windows/MinGW nor Darwin/Mac support these libusb-1.0 calls. */
+#if !defined(_WIN32) && !defined(__APPLE__)
+	if (libusb_kernel_driver_active(hdl, 0)) {
+		if ((err = libusb_detach_kernel_driver(hdl, 0)) < 0) {
+			sr_err("failed to detach kernel driver: %d", err);
+			return SR_ERR;
+		}
+	}
+#endif
+
+	if ((err = libusb_set_configuration(hdl, configuration)) < 0) {
+		sr_err("Unable to set configuration: %d", err);
+		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;
 }