libsigrok: Introduce sr_dbg/sr_info/sr_warn/sr_err.

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

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index e765b83452ec2df5c311ebf904f0d344f36e01b3..3cd4f03abee4f145f7df62858e4dcff673202b60 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -21,8 +21,11 @@
  * 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>
@@ -33,52 +36,82 @@ 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_warn("Unable to send control request: %d", err);
 
        return err;
 }
 
-
 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));
+       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;
        }
 
-       result = 0;
-       offset = 0;
-       while(1)
-       {
+       result = offset = 0;
+       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);
+               err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR |
+                                             LIBUSB_ENDPOINT_OUT, 0xa0, offset,
+                                             0x0000, buf, chunksize, 100);
+               if (err < 0) {
+                       sr_warn("Unable to send firmware to device: %d", err);
                        result = 1;
                        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;
 }
 
+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));
+
+       err = libusb_open(dev, &hdl);
+       if (err != 0) {
+               sr_warn("failed to open device: %d", err);
+               return 1;
+       }
+
+       err = libusb_set_configuration(hdl, configuration);
+       if (err != 0) {
+               sr_warn("Unable to set configuration: %d", err);
+               return 1;
+       }
+
+       if ((ezusb_reset(hdl, 1)) < 0)
+               return 1;
+
+       if (ezusb_install_firmware(hdl, filename) != 0)
+               return 1;
 
+       if ((ezusb_reset(hdl, 0)) < 0)
+               return 1;
+
+       libusb_close(hdl);
+
+       return 0;
+}