SR_CONF_SAMPLERATE,
SR_CONF_LIMIT_SAMPLES,
SR_CONF_TRIGGER_TYPE,
- SR_CONF_CAPTURE_RATIO
+ SR_CONF_CAPTURE_RATIO,
};
-SR_PRIV const uint64_t ikalogic_scanalogic2_samplerates[NUM_SAMPLERATES] = {
+SR_PRIV const uint64_t sl2_samplerates[NUM_SAMPLERATES] = {
SR_KHZ(1.25),
SR_KHZ(10),
SR_KHZ(50),
SR_MHZ(2.5),
SR_MHZ(5),
SR_MHZ(10),
- SR_MHZ(20)
+ SR_MHZ(20),
};
static const char *probe_names[NUM_PROBES + 1] = {
"0", "1", "2", "3",
- NULL
+ NULL,
};
SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
if (usb_devices == NULL)
return NULL;
- for (l = usb_devices; l; l = l->next)
- {
+ for (l = usb_devices; l; l = l->next) {
usb = l->data;
- ret = ikalogic_scanalogic2_get_device_info(*usb, &dev_info);
-
- if (ret != SR_OK) {
- sr_warn("Failed to get device information.\n");
+ if ((ret = sl2_get_device_info(*usb, &dev_info)) < 0) {
+ sr_warn("Failed to get device information: %d.", ret);
sr_usb_dev_inst_free(usb);
continue;
}
- devc = g_try_malloc(sizeof(struct dev_context));
-
- if (!devc) {
+ if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
sr_err("Device instance malloc failed.");
sr_usb_dev_inst_free(usb);
continue;
fw_ver_str = g_strdup_printf("%u.%u", dev_info.fw_ver_major,
dev_info.fw_ver_minor);
-
if (!fw_ver_str) {
sr_err("Firmware string malloc failed.");
sr_usb_dev_inst_free(usb);
sdi = sr_dev_inst_new(device_index, SR_ST_INACTIVE, VENDOR_NAME,
MODEL_NAME, fw_ver_str);
-
g_free(fw_ver_str);
-
if (!sdi) {
sr_err("sr_dev_inst_new failed.");
sr_usb_dev_inst_free(usb);
devc->next_state = STATE_IDLE;
/* Set default samplerate. */
- ikalogic_scanalogic2_set_samplerate(sdi, DEFAULT_SAMPLERATE);
+ sl2_set_samplerate(sdi, DEFAULT_SAMPLERATE);
/* Set default capture ratio. */
devc->capture_ratio = 0;
PACKET_LENGTH);
libusb_fill_control_setup(devc->xfer_buf_in,
- USB_REQUEST_TYPE_IN, USB_HID_SET_REPORT,
+ USB_REQUEST_TYPE_IN, USB_HID_GET_REPORT,
USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
PACKET_LENGTH);
libusb_fill_control_setup(devc->xfer_buf_out,
static GSList *dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
static void clear_dev_context(void *priv)
{
- struct dev_context *devc = priv;
+ struct dev_context *devc;
- sr_dbg("Device context cleard.");
+ devc = priv;
+
+ sr_dbg("Device context cleared.");
libusb_free_transfer(devc->xfer_in);
libusb_free_transfer(devc->xfer_out);
*/
if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) {
ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE);
-
if (ret < 0) {
- sr_err("Failed to detach kernel driver: %i.",
+ sr_err("Failed to detach kernel driver: %s.",
libusb_error_name(ret));
return SR_ERR;
}
}
- ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
-
- if (ret) {
+ if ((ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE)) < 0) {
sr_err("Failed to claim interface: %s.",
libusb_error_name(ret));
return SR_ERR;
}
libusb_fill_control_transfer(devc->xfer_in, usb->devhdl,
- devc->xfer_buf_in, ikalogic_scanalogic2_receive_transfer_in,
+ devc->xfer_buf_in, sl2_receive_transfer_in,
sdi, USB_TIMEOUT);
libusb_fill_control_transfer(devc->xfer_out, usb->devhdl,
- devc->xfer_buf_out, ikalogic_scanalogic2_receive_transfer_out,
+ devc->xfer_buf_out, sl2_receive_transfer_out,
sdi, USB_TIMEOUT);
memset(buffer, 0, sizeof(buffer));
buffer[0] = CMD_RESET;
- ret = ikalogic_scanalogic2_transfer_out(usb->devhdl, buffer);
-
- if (ret != PACKET_LENGTH) {
+ if ((ret = sl2_transfer_out(usb->devhdl, buffer)) != PACKET_LENGTH) {
sr_err("Device reset failed: %s.", libusb_error_name(ret));
return SR_ERR;
}
/*
* Set the device to idle state. If the device is not in idle state it
- * possibly will reset itself after a few seconds without being used and
- * thereby close the connection.
+ * possibly will reset itself after a few seconds without being used
+ * and thereby close the connection.
*/
buffer[0] = CMD_IDLE;
- ret = ikalogic_scanalogic2_transfer_out(usb->devhdl, buffer);
-
- if (ret != PACKET_LENGTH) {
+ if ((ret = sl2_transfer_out(usb->devhdl, buffer)) != PACKET_LENGTH) {
sr_err("Failed to set device in idle state: %s.",
libusb_error_name(ret));
return SR_ERR;
static int cleanup(void)
{
- dev_clear();
-
- return SR_OK;
+ return dev_clear();
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
int ret;
+ (void)probe_group;
+
ret = SR_OK;
devc = sdi->priv;
return ret;
}
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
uint64_t samplerate, limit_samples, capture_ratio;
int ret;
+ (void)probe_group;
+
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
limit_samples = g_variant_get_uint64(data);
- ret = ikalogic_scanalogic2_set_limit_samples(sdi,
- limit_samples);
+ ret = sl2_set_limit_samples(sdi, limit_samples);
break;
case SR_CONF_SAMPLERATE:
samplerate = g_variant_get_uint64(data);
- ret = ikalogic_scanalogic2_set_samplerate(sdi, samplerate);
+ ret = sl2_set_samplerate(sdi, samplerate);
break;
case SR_CONF_CAPTURE_RATIO:
capture_ratio = g_variant_get_uint64(data);
- ret = ikalogic_scanalogic2_set_capture_ratio(sdi,
- capture_ratio);
+ ret = sl2_set_capture_ratio(sdi, capture_ratio);
break;
default:
return SR_ERR_NA;
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
GVariant *gvar;
GVariantBuilder gvb;
int ret;
(void)sdi;
+ (void)probe_group;
ret = SR_OK;
case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
- ikalogic_scanalogic2_samplerates,
- ARRAY_SIZE(ikalogic_scanalogic2_samplerates),
+ sl2_samplerates, ARRAY_SIZE(sl2_samplerates),
sizeof(uint64_t));
g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
*data = g_variant_builder_end(&gvb);
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
- const struct libusb_pollfd **pfd;
struct drv_context *drvc;
struct dev_context *devc;
uint16_t trigger_bytes, tmp;
* The trigger must be configured first because the calculation of the
* pre and post trigger samples depends on a configured trigger.
*/
- ikalogic_scanalogic2_configure_trigger(sdi);
- ikalogic_scanalogic2_calculate_trigger_samples(sdi);
+ sl2_configure_trigger(sdi);
+ sl2_calculate_trigger_samples(sdi);
trigger_bytes = devc->pre_trigger_bytes + devc->post_trigger_bytes;
tmp = GUINT16_TO_LE(devc->after_trigger_delay);
memcpy(devc->xfer_data_out + 10, &tmp, sizeof(tmp));
- if (!(pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx))) {
- sr_err("libusb_get_pollfds failed.");
- return SR_ERR;
- }
-
- /* Count the number of file descriptors. */
- for (devc->num_usbfd = 0; pfd[devc->num_usbfd]; devc->num_usbfd++);
-
- if (!(devc->usbfd = g_try_malloc(devc->num_usbfd * sizeof(int)))) {
- sr_err("File descriptor array malloc failed.");
- free(pfd);
-
- return SR_ERR_MALLOC;
- }
-
if ((ret = libusb_submit_transfer(devc->xfer_out)) != 0) {
- sr_err("Submit transfer failed: %s", libusb_error_name(ret));
- g_free(devc->usbfd);
+ sr_err("Submit transfer failed: %s.", libusb_error_name(ret));
return SR_ERR;
}
- for (i = 0; i < devc->num_usbfd; i++) {
- sr_source_add(pfd[i]->fd, pfd[i]->events, 100,
- ikalogic_scanalogic2_receive_data, (void *)sdi);
-
- devc->usbfd[i] = pfd[i]->fd;
- }
-
- free(pfd);
+ usb_source_add(drvc->sr_ctx, 100, ikalogic_scanalogic2_receive_data, (void *)sdi);
sr_dbg("Acquisition started successfully.");