*/
#include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "protocol.h"
#include <libusb.h>
#include <stdlib.h>
#include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "protocol.h"
#define VICTOR_VID 0x1244
#define VICTOR_PID 0xd237
"P1",
};
-
/* Properly close and free all devices. */
static int clear_instances(void)
{
return SR_OK;
}
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
{
struct drv_context *drvc;
sr_err("Driver context malloc failed.");
return SR_ERR_MALLOC;
}
+ drvc->sr_ctx = sr_ctx;
di->priv = drvc;
return SR_OK;
clear_instances();
devices = NULL;
- libusb_get_device_list(NULL, &devlist);
+ libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des)) != 0) {
sr_warn("Failed to get device descriptor: %s",
continue;
devcnt = g_slist_length(drvc->instances);
- if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE, VICTOR_VENDOR,
- NULL, NULL)))
+ if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE,
+ VICTOR_VENDOR, NULL, NULL)))
return NULL;
sdi->driver = di;
static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct drv_context *drvc = di->priv;
libusb_device **devlist;
int ret, i;
}
devc = sdi->priv;
- libusb_get_device_list(NULL, &devlist);
+ libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
|| libusb_get_device_address(devlist[i]) != devc->usb->address)
continue;
if ((ret = libusb_open(devlist[i], &devc->usb->devhdl))) {
- sr_err("Failed to open device: %s", libusb_error_name(ret));
+ sr_err("Failed to open device: %s.", libusb_error_name(ret));
return SR_ERR;
}
break;
/* The device reports as HID class, so the kernel would have
* claimed it. */
if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
- if (libusb_detach_kernel_driver(devc->usb->devhdl, 0) < 0) {
- sr_err("Failed to detach kernel driver.");
+ if ((ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0)) < 0) {
+ sr_err("Failed to detach kernel driver: %s.",
+ libusb_error_name(ret));
return SR_ERR;
}
}
if ((ret = libusb_claim_interface(devc->usb->devhdl,
VICTOR_INTERFACE))) {
- sr_err("Failed to claim interface: %s", libusb_error_name(ret));
+ sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
return SR_ERR;
}
sdi->status = SR_ST_ACTIVE;
static int hw_info_get(int info_id, const void **data,
const struct sr_dev_inst *sdi)
{
-
(void)sdi;
switch (info_id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_NUM_PROBES:
- *data = GINT_TO_POINTER(1);
- break;
- case SR_DI_PROBE_NAMES:
- *data = probe_names;
- break;
- default:
- return SR_ERR_ARG;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
+ break;
+ case SR_DI_NUM_PROBES:
+ *data = GINT_TO_POINTER(1);
+ break;
+ case SR_DI_PROBE_NAMES:
+ *data = probe_names;
+ break;
+ default:
+ sr_err("Unknown info_id: %d.", info_id);
+ return SR_ERR_ARG;
}
return SR_OK;
devc = sdi->priv;
ret = SR_OK;
switch (hwcap) {
- case SR_HWCAP_LIMIT_MSEC:
- devc->limit_msec = *(const int64_t *)value;
- now = g_get_monotonic_time() / 1000;
- devc->end_time = now + devc->limit_msec;
- sr_dbg("setting time limit to %" PRIu64 "ms.",
- devc->limit_msec);
- break;
- case SR_HWCAP_LIMIT_SAMPLES:
- devc->limit_samples = *(const uint64_t *)value;
- sr_dbg("setting sample limit to %" PRIu64 ".",
- devc->limit_samples);
- break;
+ case SR_HWCAP_LIMIT_MSEC:
+ devc->limit_msec = *(const int64_t *)value;
+ now = g_get_monotonic_time() / 1000;
+ devc->end_time = now + devc->limit_msec;
+ sr_dbg("Setting time limit to %" PRIu64 "ms.",
+ devc->limit_msec);
+ break;
+ case SR_HWCAP_LIMIT_SAMPLES:
+ devc->limit_samples = *(const uint64_t *)value;
+ sr_dbg("Setting sample limit to %" PRIu64 ".",
+ devc->limit_samples);
+ break;
default:
sr_err("Unknown hardware capability: %d.", hwcap);
ret = SR_ERR_ARG;
/* USB device was unplugged. */
hw_dev_acquisition_stop(sdi, sdi);
} else if (transfer->status == LIBUSB_TRANSFER_COMPLETED) {
- sr_dbg("got %d-byte packet", transfer->actual_length);
+ sr_dbg("Got %d-byte packet.", transfer->actual_length);
if (transfer->actual_length == DMM_DATA_SIZE) {
victor_dmm_receive_data(sdi, transfer->buffer);
if (devc->limit_samples) {
if (sdi->status == SR_ST_ACTIVE) {
/* Send the same request again. */
if ((ret = libusb_submit_transfer(transfer) != 0)) {
- sr_err("unable to resubmit transfer: %s", libusb_error_name(ret));
+ sr_err("Unable to resubmit transfer: %s.",
+ libusb_error_name(ret));
libusb_free_transfer(transfer);
g_free(transfer->buffer);
hw_dev_acquisition_stop(sdi, sdi);
libusb_free_transfer(transfer);
g_free(transfer->buffer);
}
-
}
static int handle_events(int fd, int revents, void *cb_data)
{
struct dev_context *devc;
+ struct drv_context *drvc = di->priv;
struct sr_datafeed_packet packet;
struct sr_dev_inst *sdi;
struct timeval tv;
}
memset(&tv, 0, sizeof(struct timeval));
- libusb_handle_events_timeout_completed(NULL, &tv, NULL);
+ libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv,
+ NULL);
return TRUE;
}
struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
+ struct drv_context *drvc = di->priv;
const struct libusb_pollfd **pfd;
struct libusb_transfer *transfer;
int ret, i;
meta.num_probes = 1;
sr_session_send(devc->cb_data, &packet);
- pfd = libusb_get_pollfds(NULL);
+ pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
for (i = 0; pfd[i]; i++) {
/* Handle USB events every 100ms, for decent latency. */
sr_source_add(pfd[i]->fd, pfd[i]->events, 100,
* times you ask, but we want to keep step with the USB events
* handling above. */
libusb_fill_interrupt_transfer(transfer, devc->usb->devhdl,
- VICTOR_ENDPOINT, buf, DMM_DATA_SIZE, receive_transfer, cb_data, 100);
+ VICTOR_ENDPOINT, buf, DMM_DATA_SIZE, receive_transfer,
+ cb_data, 100);
if ((ret = libusb_submit_transfer(transfer) != 0)) {
- sr_err("unable to submit transfer: %s", libusb_error_name(ret));
+ sr_err("Unable to submit transfer: %s.", libusb_error_name(ret));
libusb_free_transfer(transfer);
g_free(buf);
return SR_ERR;
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
-
(void)cb_data;
if (!di->priv) {
projects / libsigrok.git / blobdiff