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

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 30b43beb..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,18 +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];
@@ -42,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;
@@ -55,8 +54,8 @@ 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));
+		sr_err("Unable to open firmware file %s for reading: %s",
+		       filename, strerror(errno));
 		return SR_ERR;
 	}
 
@@ -70,7 +69,7 @@ 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);
+			sr_err("Unable to send firmware to device: %d", err);
 			result = SR_ERR;
 			break;
 		}
@@ -83,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;
@@ -93,19 +92,22 @@ int ezusb_upload_firmware(libusb_device *dev, int configuration,
 		  libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
 	if ((err = libusb_open(dev, &hdl)) < 0) {
-		sr_warn("failed to open device: %d", err);
+		sr_err("failed to open device: %d", err);
 		return SR_ERR;
 	}
 
+/* 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_warn("failed to detach kernel driver: %d", err);
+			sr_err("failed to detach kernel driver: %d", err);
 			return SR_ERR;
 		}
 	}
+#endif
 
 	if ((err = libusb_set_configuration(hdl, configuration)) < 0) {
-		sr_warn("Unable to set configuration: %d", err);
+		sr_err("Unable to set configuration: %d", err);
 		return SR_ERR;
 	}