#include <libusb.h>
#include <stdio.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "gl_usb.h"
#define CTRL_IN (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
REQ_WRITEDATA,
};
-static struct libusb_device_handle *g_devh = NULL;
-
static int gl_write_address(libusb_device_handle *devh, unsigned int address)
{
unsigned char packet[8] = { address & 0xFF };
ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEADDR,
0, packet, 1, TIMEOUT);
if (ret != 1)
- sr_err("%s: libusb_control_transfer returned %d\n",
- __func__, ret);
+ sr_err("zp: %s: %s.", __func__, libusb_error_name(ret));
return ret;
}
ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEDATA,
0, packet, 1, TIMEOUT);
if (ret != 1)
- sr_err("%s: libusb_control_transfer returned %d\n",
- __func__, ret);
+ sr_err("zp: %s: %s.", __func__, libusb_error_name(ret));
return ret;
}
ret = libusb_control_transfer(devh, CTRL_IN, 0xc, REQ_READDATA,
0, packet, 1, TIMEOUT);
if (ret != 1)
- sr_err("%s: libusb_control_transfer returned %d, val=%hhx\n",
- __func__, ret, packet[0]);
+ sr_err("zp: %s: %s, val=%hhx.", __func__,
+ libusb_error_name(ret), packet[0]);
return (ret == 1) ? packet[0] : ret;
}
ret = libusb_control_transfer(devh, CTRL_OUT, 0x4, REQ_READBULK,
0, packet, 8, TIMEOUT);
if (ret != 8)
- sr_err("%s: libusb_control_transfer returned %d\n",
- __func__, ret);
+ sr_err("zp: %s: libusb_control_transfer: %s.", __func__,
+ libusb_error_name(ret));
ret = libusb_bulk_transfer(devh, EP1_BULK_IN, buffer, size,
&transferred, TIMEOUT);
if (ret < 0)
- sr_err("Bulk read error %d\n", ret);
+ sr_err("zp: %s: libusb_bulk_transfer: %s.", __func__,
+ libusb_error_name(ret));
return transferred;
}