#include <config.h>
#include "protocol.h"
-extern struct sr_dev_driver ikalogic_scanalogic2_driver_info;
-
extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
static void stop_acquisition(struct sr_dev_inst *sdi)
{
struct drv_context *drvc = sdi->driver->context;
- struct dev_context *devc;
-
- devc = sdi->priv;
- /* Remove USB file descriptors from polling. */
usb_source_remove(sdi->session, drvc->sr_ctx);
- std_session_send_df_end(devc->cb_data, LOG_PREFIX);
+ std_session_send_df_end(sdi);
sdi->status = SR_ST_ACTIVE;
}
static void abort_acquisition(struct sr_dev_inst *sdi)
{
struct drv_context *drvc = sdi->driver->context;
- struct dev_context *devc;
-
- devc = sdi->priv;
- /* Remove USB file descriptors from polling. */
usb_source_remove(sdi->session, drvc->sr_ctx);
- std_session_send_df_end(devc->cb_data, LOG_PREFIX);
+ std_session_send_df_end(sdi);
- sdi->driver->dev_close(sdi);
+ sr_dev_close(sdi);
}
static void buffer_sample_data(const struct sr_dev_inst *sdi)
if (devc->trigger_type != TRIGGER_TYPE_NONE &&
devc->pre_trigger_samples == 0) {
packet.type = SR_DF_TRIGGER;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
}
logic.length = n;
logic.unitsize = 1;
logic.data = buffer;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
packet.type = SR_DF_TRIGGER;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
n = 0;
}
logic.length = n;
logic.unitsize = 1;
logic.data = buffer;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
}
return SR_OK;
}
-SR_PRIV int sl2_set_capture_ratio(const struct sr_dev_inst *sdi,
- uint64_t capture_ratio)
-{
- struct dev_context *devc;
-
- devc = sdi->priv;
-
- if (capture_ratio > 100) {
- sr_err("Invalid capture ratio: %" PRIu64 " %%.", capture_ratio);
- return SR_ERR_ARG;
- }
-
- sr_info("Capture ratio set to %" PRIu64 " %%.", capture_ratio);
-
- devc->capture_ratio = capture_ratio;
-
- return SR_OK;
-}
-
SR_PRIV int sl2_set_after_trigger_delay(const struct sr_dev_inst *sdi,
uint64_t after_trigger_delay)
{
devc->post_trigger_bytes = post_trigger_bytes;
}
-SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
- struct device_info *dev_info)
+SR_PRIV int sl2_get_device_info(struct sr_dev_driver *di,
+ struct sr_usb_dev_inst usb, struct device_info *dev_info)
{
struct drv_context *drvc;
uint8_t buffer[PACKET_LENGTH];
int ret;
- drvc = ikalogic_scanalogic2_driver_info.context;
+ drvc = di->context;
if (!dev_info)
return SR_ERR_ARG;
if (sr_usb_open(drvc->sr_ctx->libusb_ctx, &usb) != SR_OK)
return SR_ERR;
- /*
- * Determine if a kernel driver is active on this interface and, if so,
- * detach it.
- */
if (libusb_kernel_driver_active(usb.devhdl, USB_INTERFACE) == 1) {
ret = libusb_detach_kernel_driver(usb.devhdl,
USB_INTERFACE);