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

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index e765b834..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
@@ -23,62 +23,104 @@
 
 #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];
 
-	g_message("setting CPU reset mode %s...", set_clear ? "on" : "off");
+	sr_info("setting CPU reset mode %s...", set_clear ? "on" : "off");
 	buf[0] = set_clear ? 1 : 0;
 	err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
-								  0xe600, 0x0000, buf, 1, 100);
-	if(err < 0)
-		g_warning("Unable to send control request: %d", err);
+				      0xe600, 0x0000, buf, 1, 100);
+	if (err < 0)
+		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;
 	unsigned char buf[4096];
 
-	g_message("Uploading firmware at %s", filename);
-	if((fw = fopen(filename, "r")) == NULL)
-	{
-		g_warning("Unable to open firmware file %s for reading: %s", filename, strerror(errno));
-		return 1;
+	sr_info("Uploading firmware at %s", filename);
+	if ((fw = g_fopen(filename, "rb")) == NULL) {
+		sr_err("Unable to open firmware file %s for reading: %s",
+		       filename, strerror(errno));
+		return SR_ERR;
 	}
 
-	result = 0;
+	result = SR_OK;
 	offset = 0;
-	while(1)
-	{
+	while (1) {
 		chunksize = fread(buf, 1, 4096, fw);
-		if(chunksize == 0)
+		if (chunksize == 0)
 			break;
-		err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT, 0xa0,
-									  offset, 0x0000, buf, chunksize, 100);
-		if(err < 0)
-		{
-			g_warning("Unable to send firmware to device: %d", err);
-			result = 1;
+		err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR |
+					      LIBUSB_ENDPOINT_OUT, 0xa0, offset,
+					      0x0000, buf, chunksize, 100);
+		if (err < 0) {
+			sr_err("Unable to send firmware to device: %d", err);
+			result = SR_ERR;
 			break;
 		}
-		g_message("Uploaded %d bytes", chunksize);
+		sr_info("Uploaded %d bytes", chunksize);
 		offset += chunksize;
 	}
 	fclose(fw);
-	g_message("Firmware upload done");
+	sr_info("Firmware upload done");
 
 	return result;
 }
 
+SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
+				  const char *filename)
+{
+	struct libusb_device_handle *hdl;
+	int err;
+
+	sr_info("uploading firmware to device on %d.%d",
+		  libusb_get_bus_number(dev), libusb_get_device_address(dev));
+
+	if ((err = libusb_open(dev, &hdl)) < 0) {
+		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_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 SR_ERR;
 
+	if (ezusb_install_firmware(hdl, filename) < 0)
+		return SR_ERR;
+
+	if ((ezusb_reset(hdl, 0)) < 0)
+		return SR_ERR;
+
+	libusb_close(hdl);
+
+	return SR_OK;
+}