/*
* 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)
+SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
{
int err;
unsigned char buf[1];
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;
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;
}
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;
}
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;
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;
}