/*
* 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
#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)
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "ezusb: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
+SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
{
- int err;
+ int ret;
unsigned char buf[1];
- sr_info("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,
+ ret = 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);
+ if (ret < 0)
+ sr_err("Unable to send control request: %s.",
+ libusb_error_name(ret));
- return err;
+ return ret;
}
-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;
+ int offset, chunksize, ret, result;
unsigned char buf[4096];
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;
}
chunksize = fread(buf, 1, 4096, fw);
if (chunksize == 0)
break;
- err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR |
+ ret = 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);
+ if (ret < 0) {
+ sr_err("Unable to send firmware to device: %s.",
+ libusb_error_name(ret));
result = SR_ERR;
break;
}
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;
+ int ret;
sr_info("uploading firmware to device on %d.%d",
- libusb_get_bus_number(dev), libusb_get_device_address(dev));
+ 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);
+ if ((ret = libusb_open(dev, &hdl)) < 0) {
+ sr_err("failed to open device: %s.", libusb_error_name(ret));
return SR_ERR;
}
- 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);
+/*
+ * The libusbx darwin backend is broken: it can report a kernel driver being
+ * active, but detaching it always returns an error.
+ */
+#if !defined(__APPLE__)
+ if (libusb_kernel_driver_active(hdl, 0) == 1) {
+ if ((ret = libusb_detach_kernel_driver(hdl, 0)) < 0) {
+ sr_err("failed to detach kernel driver: %s",
+ libusb_error_name(ret));
return SR_ERR;
}
}
+#endif
- if ((err = libusb_set_configuration(hdl, configuration)) < 0) {
- sr_warn("Unable to set configuration: %d", err);
+ if ((ret = libusb_set_configuration(hdl, configuration)) < 0) {
+ sr_err("Unable to set configuration: %s",
+ libusb_error_name(ret));
return SR_ERR;
}