#include "analyzer.h"
#define USB_VENDOR 0x0c12
-#define USB_VENDOR_NAME "Zeroplus"
-#define USB_MODEL_NAME "Logic Cube"
-#define USB_MODEL_VERSION ""
+#define VENDOR_NAME "ZEROPLUS"
+#define MODEL_NAME "Logic Cube LAP-C"
+#define MODEL_VERSION NULL
+
+#define NUM_PROBES 16
#define USB_INTERFACE 0
#define USB_CONFIGURATION 1
#define NUM_TRIGGER_STAGES 4
{0x7016, "LAP-C(162000)", 16, 2048, 200},
};
-static int capabilities[] = {
+static int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_PROBECONFIG,
0,
};
-static const char *probe_names[] = {
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- "8",
- "9",
- "10",
- "11",
- "12",
- "13",
- "14",
- "15",
- "16",
- "17",
- "18",
- "19",
- "20",
- "21",
- "22",
- "23",
- "24",
- "25",
- "26",
- "27",
- "28",
- "29",
- "30",
- "31",
+/*
+ * ZEROPLUS LAP-C (16032) numbers the 16 probes A0-A7 and B0-B7.
+ * We currently ignore other untested/unsupported devices here.
+ */
+static const char *probe_names[NUM_PROBES + 1] = {
+ "A0",
+ "A1",
+ "A2",
+ "A3",
+ "A4",
+ "A5",
+ "A6",
+ "A7",
+ "B0",
+ "B1",
+ "B2",
+ "B3",
+ "B4",
+ "B5",
+ "B6",
+ "B7",
NULL,
};
-/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
static GSList *dev_insts = NULL;
static libusb_context *usb_context = NULL;
};
static struct sr_samplerates samplerates = {
- SR_HZ(0),
- SR_HZ(0),
- SR_HZ(0),
+ 0,
+ 0,
+ 0,
supported_samplerates,
};
-struct zp {
+/* Private, per-device-instance driver context. */
+struct context {
uint64_t cur_samplerate;
uint64_t limit_samples;
int num_channels; /* TODO: This isn't initialized before it's needed :( */
struct sr_usb_dev_inst *usb;
};
-static int hw_set_configuration(int device_index, int capability, void *value);
+static int hw_dev_config_set(int dev_index, int hwcap, void *value);
static unsigned int get_memory_size(int type)
{
static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
struct libusb_device_descriptor *des)
{
- struct zp *zp;
+ struct context *ctx;
unsigned int i;
- int err;
+ int ret;
/* Note: sdi is non-NULL, the caller already checked this. */
- if (!(zp = (*sdi)->priv)) {
+ if (!(ctx = (*sdi)->priv)) {
sr_err("zp: %s: (*sdi)->priv was NULL", __func__);
return -1;
}
- if ((err = libusb_get_device_descriptor(dev, des))) {
- sr_err("zp: failed to get device descriptor: %d", err);
+ if ((ret = libusb_get_device_descriptor(dev, des))) {
+ sr_err("zp: failed to get device descriptor: %d", ret);
return -1;
}
if (des->idVendor != USB_VENDOR)
return 0;
- if (libusb_get_bus_number(dev) == zp->usb->bus
- && libusb_get_device_address(dev) == zp->usb->address) {
+ if (libusb_get_bus_number(dev) == ctx->usb->bus
+ && libusb_get_device_address(dev) == ctx->usb->address) {
for (i = 0; i < ARRAY_SIZE(zeroplus_models); i++) {
if (!(des->idProduct == zeroplus_models[i].pid))
continue;
- sr_info("zp: Found ZeroPlus device 0x%04x (%s)",
+ sr_info("zp: Found ZEROPLUS device 0x%04x (%s)",
des->idProduct, zeroplus_models[i].model_name);
- zp->num_channels = zeroplus_models[i].channels;
- zp->memory_size = zeroplus_models[i].sample_depth * 1024;
+ ctx->num_channels = zeroplus_models[i].channels;
+ ctx->memory_size = zeroplus_models[i].sample_depth * 1024;
break;
}
- if (zp->num_channels == 0) {
- sr_err("zp: Unknown ZeroPlus device 0x%04x",
+ if (ctx->num_channels == 0) {
+ sr_err("zp: Unknown ZEROPLUS device 0x%04x",
des->idProduct);
return -2;
}
/* Found it. */
- if (!(err = libusb_open(dev, &(zp->usb->devhdl)))) {
+ if (!(ret = libusb_open(dev, &(ctx->usb->devhdl)))) {
(*sdi)->status = SR_ST_ACTIVE;
sr_info("zp: opened device %d on %d.%d interface %d",
- (*sdi)->index, zp->usb->bus,
- zp->usb->address, USB_INTERFACE);
+ (*sdi)->index, ctx->usb->bus,
+ ctx->usb->address, USB_INTERFACE);
} else {
- sr_err("zp: failed to open device: %d", err);
+ sr_err("zp: failed to open device: %d", ret);
*sdi = NULL;
}
}
return 0;
}
-static struct sr_dev_inst *zp_open_device(int device_index)
+static struct sr_dev_inst *zp_open_dev(int dev_index)
{
struct sr_dev_inst *sdi;
libusb_device **devlist;
struct libusb_device_descriptor des;
- int err, i;
+ int i;
- if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL;
libusb_get_device_list(usb_context, &devlist);
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
/* TODO: Error handling. */
- err = opendev4(&sdi, devlist[i], &des);
+ opendev4(&sdi, devlist[i], &des);
}
} else {
/* Status must be SR_ST_ACTIVE, i.e. already in use... */
return sdi;
}
-static void close_device(struct sr_dev_inst *sdi)
+static void close_dev(struct sr_dev_inst *sdi)
{
- struct zp *zp;
+ struct context *ctx;
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return; /* FIXME */
}
- if (!zp->usb->devhdl)
+ if (!ctx->usb->devhdl)
return;
sr_info("zp: closing device %d on %d.%d interface %d", sdi->index,
- zp->usb->bus, zp->usb->address, USB_INTERFACE);
- libusb_release_interface(zp->usb->devhdl, USB_INTERFACE);
- libusb_reset_device(zp->usb->devhdl);
- libusb_close(zp->usb->devhdl);
- zp->usb->devhdl = NULL;
+ ctx->usb->bus, ctx->usb->address, USB_INTERFACE);
+ libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE);
+ libusb_reset_device(ctx->usb->devhdl);
+ libusb_close(ctx->usb->devhdl);
+ ctx->usb->devhdl = NULL;
/* TODO: Call libusb_exit() here or only in hw_cleanup()? */
sdi->status = SR_ST_INACTIVE;
}
static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
{
- struct zp *zp;
+ struct context *ctx;
struct sr_probe *probe;
GSList *l;
int probe_bit, stage, i;
char *tc;
/* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
- zp = sdi->priv;
+ ctx = sdi->priv;
- zp->probe_mask = 0;
+ ctx->probe_mask = 0;
for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
- zp->trigger_mask[i] = 0;
- zp->trigger_value[i] = 0;
+ ctx->trigger_mask[i] = 0;
+ ctx->trigger_value[i] = 0;
}
stage = -1;
if (probe->enabled == FALSE)
continue;
probe_bit = 1 << (probe->index - 1);
- zp->probe_mask |= probe_bit;
+ ctx->probe_mask |= probe_bit;
if (probe->trigger) {
stage = 0;
for (tc = probe->trigger; *tc; tc++) {
- zp->trigger_mask[stage] |= probe_bit;
+ ctx->trigger_mask[stage] |= probe_bit;
if (*tc == '1')
- zp->trigger_value[stage] |= probe_bit;
+ ctx->trigger_value[stage] |= probe_bit;
stage++;
if (stage > NUM_TRIGGER_STAGES)
return SR_ERR;
* API callbacks
*/
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
{
struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int err, devcnt, i;
- struct zp *zp;
+ int ret, devcnt, i;
+ struct context *ctx;
/* Avoid compiler warnings. */
- (void)deviceinfo;
+ (void)devinfo;
/* Allocate memory for our private driver context. */
- if (!(zp = g_try_malloc(sizeof(struct zp)))) {
- sr_err("zp: %s: struct zp malloc failed", __func__);
+ if (!(ctx = g_try_malloc(sizeof(struct context)))) {
+ sr_err("zp: %s: ctx malloc failed", __func__);
return 0;
}
/* Set some sane defaults. */
- zp->cur_samplerate = 0;
- zp->limit_samples = 0;
- zp->num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
- zp->memory_size = 0;
- zp->probe_mask = 0;
- memset(zp->trigger_mask, 0, NUM_TRIGGER_STAGES);
- memset(zp->trigger_value, 0, NUM_TRIGGER_STAGES);
- // memset(zp->trigger_buffer, 0, NUM_TRIGGER_STAGES);
+ ctx->cur_samplerate = 0;
+ ctx->limit_samples = 0;
+ /* TODO: num_channels isn't initialized before it's needed :( */
+ ctx->num_channels = NUM_PROBES;
+ ctx->memory_size = 0;
+ ctx->probe_mask = 0;
+ memset(ctx->trigger_mask, 0, NUM_TRIGGER_STAGES);
+ memset(ctx->trigger_value, 0, NUM_TRIGGER_STAGES);
+ // memset(ctx->trigger_buffer, 0, NUM_TRIGGER_STAGES);
if (libusb_init(&usb_context) != 0) {
sr_err("zp: Failed to initialize USB.");
return 0;
}
- /* Find all ZeroPlus analyzers and add them to device list. */
+ /* Find all ZEROPLUS analyzers and add them to device list. */
devcnt = 0;
libusb_get_device_list(usb_context, &devlist); /* TODO: Errors. */
for (i = 0; devlist[i]; i++) {
- err = libusb_get_device_descriptor(devlist[i], &des);
- if (err != 0) {
- sr_err("zp: failed to get device descriptor: %d", err);
+ ret = libusb_get_device_descriptor(devlist[i], &des);
+ if (ret != 0) {
+ sr_err("zp: failed to get device descriptor: %d", ret);
continue;
}
if (des.idVendor == USB_VENDOR) {
/*
- * Definitely a Zeroplus.
+ * Definitely a ZEROPLUS.
* TODO: Any way to detect specific model/version in
- * the zeroplus range?
+ * the ZEROPLUS range?
*/
/* Register the device with libsigrok. */
if (!(sdi = sr_dev_inst_new(devcnt,
- SR_ST_INACTIVE, USB_VENDOR_NAME,
- USB_MODEL_NAME, USB_MODEL_VERSION))) {
+ SR_ST_INACTIVE, VENDOR_NAME,
+ MODEL_NAME, MODEL_VERSION))) {
sr_err("zp: %s: sr_dev_inst_new failed",
__func__);
return 0;
}
- sdi->priv = zp;
+ sdi->priv = ctx;
dev_insts =
g_slist_append(dev_insts, sdi);
- zp->usb = sr_usb_dev_inst_new(
+ ctx->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
devcnt++;
return devcnt;
}
-static int hw_opendev(int device_index)
+static int hw_dev_open(int dev_index)
{
struct sr_dev_inst *sdi;
- struct zp *zp;
- int err;
+ struct context *ctx;
+ int ret;
- if (!(sdi = zp_open_device(device_index))) {
+ if (!(sdi = zp_open_dev(dev_index))) {
sr_err("zp: unable to open device");
return SR_ERR;
}
- /* TODO: Note: sdi is retrieved in zp_open_device(). */
+ /* TODO: Note: sdi is retrieved in zp_open_dev(). */
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
- err = libusb_set_configuration(zp->usb->devhdl, USB_CONFIGURATION);
- if (err < 0) {
+ ret = libusb_set_configuration(ctx->usb->devhdl, USB_CONFIGURATION);
+ if (ret < 0) {
sr_err("zp: Unable to set USB configuration %d: %d",
- USB_CONFIGURATION, err);
+ USB_CONFIGURATION, ret);
return SR_ERR;
}
- err = libusb_claim_interface(zp->usb->devhdl, USB_INTERFACE);
- if (err != 0) {
- sr_err("zp: Unable to claim interface: %d", err);
+ ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+ if (ret != 0) {
+ sr_err("zp: Unable to claim interface: %d", ret);
return SR_ERR;
}
- analyzer_reset(zp->usb->devhdl);
- analyzer_initialize(zp->usb->devhdl);
+ analyzer_reset(ctx->usb->devhdl);
+ analyzer_initialize(ctx->usb->devhdl);
analyzer_set_memory_size(MEMORY_SIZE_512K);
// analyzer_set_freq(g_freq, g_freq_scale);
#endif
analyzer_set_compression(COMPRESSION_NONE);
- if (zp->cur_samplerate == 0) {
+ if (ctx->cur_samplerate == 0) {
/* Samplerate hasn't been set. Default to the slowest one. */
- if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE,
+ if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
&samplerates.list[0]) == SR_ERR)
return SR_ERR;
}
return SR_OK;
}
-static int hw_closedev(int device_index)
+static int hw_dev_close(int dev_index)
{
struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
/* TODO */
- close_device(sdi);
+ close_dev(sdi);
return SR_OK;
}
for (l = dev_insts; l; l = l->next) {
sdi = l->data;
/* Properly close all devices... */
- close_device(sdi);
+ close_dev(sdi);
/* ...and free all their memory. */
sr_dev_inst_free(sdi);
}
return SR_OK;
}
-static void *hw_get_device_info(int device_index, int device_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
{
struct sr_dev_inst *sdi;
- struct zp *zp;
+ struct context *ctx;
void *info;
- if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return NULL;
}
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return NULL;
}
- switch (device_info_id) {
- case SR_DI_INSTANCE:
+ sr_spew("zp: %s: dev_index %d, dev_info_id %d.", __func__,
+ dev_index, dev_info_id);
+
+ switch (dev_info_id) {
+ case SR_DI_INST:
info = sdi;
+ sr_spew("zp: %s: Returning sdi.", __func__);
break;
case SR_DI_NUM_PROBES:
- info = GINT_TO_POINTER(zp->num_channels);
+ info = GINT_TO_POINTER(ctx->num_channels);
+ sr_spew("zp: %s: Returning number of probes: %d.", __func__,
+ NUM_PROBES);
break;
case SR_DI_PROBE_NAMES:
info = probe_names;
+ sr_spew("zp: %s: Returning probenames.", __func__);
break;
case SR_DI_SAMPLERATES:
info = &samplerates;
+ sr_spew("zp: %s: Returning samplerates.", __func__);
break;
case SR_DI_TRIGGER_TYPES:
info = TRIGGER_TYPES;
+ sr_spew("zp: %s: Returning triggertypes: %s.", __func__, info);
break;
case SR_DI_CUR_SAMPLERATE:
- info = &zp->cur_samplerate;
+ info = &ctx->cur_samplerate;
+ sr_spew("zp: %s: Returning samplerate: %" PRIu64 "Hz.",
+ __func__, ctx->cur_samplerate);
break;
default:
/* Unknown device info ID, return NULL. */
return info;
}
-static int hw_get_status(int device_index)
+static int hw_dev_status_get(int dev_index)
{
struct sr_dev_inst *sdi;
- sdi = sr_dev_inst_get(dev_insts, device_index);
+ sdi = sr_dev_inst_get(dev_insts, dev_index);
if (sdi)
return sdi->status;
else
return SR_ST_NOT_FOUND;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
}
-static int set_configuration_samplerate(struct sr_dev_inst *sdi,
- uint64_t samplerate)
+static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{
- struct zp *zp;
+ struct context *ctx;
if (!sdi) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR_ARG;
}
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
else
analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
- zp->cur_samplerate = samplerate;
+ ctx->cur_samplerate = samplerate;
return SR_OK;
}
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, void *value)
{
struct sr_dev_inst *sdi;
- uint64_t *tmp_u64;
- struct zp *zp;
+ struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
- switch (capability) {
+ switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
- tmp_u64 = value;
- return set_configuration_samplerate(sdi, *tmp_u64);
+ return set_samplerate(sdi, *(uint64_t *)value);
case SR_HWCAP_PROBECONFIG:
return configure_probes(sdi, (GSList *)value);
case SR_HWCAP_LIMIT_SAMPLES:
- tmp_u64 = value;
- zp->limit_samples = *tmp_u64;
+ ctx->limit_samples = *(uint64_t *)value;
return SR_OK;
default:
return SR_ERR;
}
}
-static int hw_start_acquisition(int device_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
{
struct sr_dev_inst *sdi;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
struct sr_datafeed_header header;
+ struct sr_datafeed_meta_logic meta;
uint64_t samples_read;
int res;
unsigned int packet_num;
unsigned char *buf;
- struct zp *zp;
+ struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
/* push configured settings to device */
- analyzer_configure(zp->usb->devhdl);
+ analyzer_configure(ctx->usb->devhdl);
- analyzer_start(zp->usb->devhdl);
+ analyzer_start(ctx->usb->devhdl);
sr_info("zp: Waiting for data");
- analyzer_wait_data(zp->usb->devhdl);
+ analyzer_wait_data(ctx->usb->devhdl);
sr_info("zp: Stop address = 0x%x",
- analyzer_get_stop_address(zp->usb->devhdl));
+ analyzer_get_stop_address(ctx->usb->devhdl));
sr_info("zp: Now address = 0x%x",
- analyzer_get_now_address(zp->usb->devhdl));
+ analyzer_get_now_address(ctx->usb->devhdl));
sr_info("zp: Trigger address = 0x%x",
- analyzer_get_trigger_address(zp->usb->devhdl));
+ analyzer_get_trigger_address(ctx->usb->devhdl));
packet.type = SR_DF_HEADER;
packet.payload = &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
- header.samplerate = zp->cur_samplerate;
- header.num_logic_probes = zp->num_channels;
- sr_session_bus(session_data, &packet);
+ sr_session_send(cb_data, &packet);
+
+ /* Send metadata about the SR_DF_LOGIC packets to come. */
+ packet.type = SR_DF_META_LOGIC;
+ packet.payload = &meta;
+ meta.samplerate = ctx->cur_samplerate;
+ meta.num_probes = ctx->num_channels;
+ sr_session_send(cb_data, &packet);
if (!(buf = g_try_malloc(PACKET_SIZE))) {
sr_err("zp: %s: buf malloc failed", __func__);
}
samples_read = 0;
- analyzer_read_start(zp->usb->devhdl);
+ analyzer_read_start(ctx->usb->devhdl);
/* Send the incoming transfer to the session bus. */
- for (packet_num = 0; packet_num < (zp->memory_size * 4 / PACKET_SIZE);
+ for (packet_num = 0; packet_num < (ctx->memory_size * 4 / PACKET_SIZE);
packet_num++) {
- res = analyzer_read_data(zp->usb->devhdl, buf, PACKET_SIZE);
+ res = analyzer_read_data(ctx->usb->devhdl, buf, PACKET_SIZE);
sr_info("zp: Tried to read %llx bytes, actually read %x bytes",
PACKET_SIZE, res);
logic.length = PACKET_SIZE;
logic.unitsize = 4;
logic.data = buf;
- sr_session_bus(session_data, &packet);
+ sr_session_send(cb_data, &packet);
samples_read += res / 4;
}
- analyzer_read_stop(zp->usb->devhdl);
+ analyzer_read_stop(ctx->usb->devhdl);
g_free(buf);
packet.type = SR_DF_END;
- sr_session_bus(session_data, &packet);
+ sr_session_send(cb_data, &packet);
return SR_OK;
}
-/* This stops acquisition on ALL devices, ignoring device_index. */
-static int hw_stop_acquisition(int device_index, gpointer session_device_id)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
{
struct sr_datafeed_packet packet;
struct sr_dev_inst *sdi;
- struct zp *zp;
+ struct context *ctx;
packet.type = SR_DF_END;
- sr_session_bus(session_device_id, &packet);
+ sr_session_send(cb_data, &packet);
- if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR_BUG;
}
- if (!(zp = sdi->priv)) {
+ if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_BUG;
}
- analyzer_reset(zp->usb->devhdl);
+ analyzer_reset(ctx->usb->devhdl);
/* TODO: Need to cancel and free any queued up transfers. */
return SR_OK;
}
-SR_PRIV struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
+SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
.name = "zeroplus-logic-cube",
- .longname = "Zeroplus Logic Cube LAP-C series",
+ .longname = "ZEROPLUS Logic Cube LAP-C series",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
- .opendev = hw_opendev,
- .closedev = hw_closedev,
- .get_device_info = hw_get_device_info,
- .get_status = hw_get_status,
- .get_capabilities = hw_get_capabilities,
- .set_configuration = hw_set_configuration,
- .start_acquisition = hw_start_acquisition,
- .stop_acquisition = hw_stop_acquisition,
+ .dev_open = hw_dev_open,
+ .dev_close = hw_dev_close,
+ .dev_info_get = hw_dev_info_get,
+ .dev_status_get = hw_dev_status_get,
+ .hwcap_get_all = hw_hwcap_get_all,
+ .dev_config_set = hw_dev_config_set,
+ .dev_acquisition_start = hw_dev_acquisition_start,
+ .dev_acquisition_stop = hw_dev_acquisition_stop,
};
projects / libsigrok.git / blobdiff