#include <glib.h>
#include <libusb.h>
#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "analyzer.h"
#define USB_VENDOR 0x0c12
{0x7016, "LAP-C(162000)", 16, 2048, 200},
};
-static int hwcaps[] = {
+static const int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_PROBECONFIG,
};
/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
+static struct sr_dev_driver *zdi = &zeroplus_logic_cube_driver_info;
static libusb_context *usb_context = NULL;
* TODO: We shouldn't support 150MHz and 200MHz on devices that don't go up
* that high.
*/
-static uint64_t supported_samplerates[] = {
+static const uint64_t supported_samplerates[] = {
SR_HZ(100),
SR_HZ(500),
SR_KHZ(1),
0,
};
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
0,
0,
0,
uint8_t trigger_value[NUM_TRIGGER_STAGES];
// uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+ /* TODO: this belongs in the device instance */
struct sr_usb_dev_inst *usb;
};
-static int hw_dev_config_set(int dev_index, int hwcap, void *value);
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value);
+static int hw_dev_close(struct sr_dev_inst *sdi);
static unsigned int get_memory_size(int type)
{
struct libusb_device_descriptor des;
int i;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(zdi->instances, dev_index)))
return NULL;
libusb_get_device_list(usb_context, &devlist);
return sdi;
}
-static void close_dev(struct sr_dev_inst *sdi)
+static int configure_probes(const struct sr_dev_inst *sdi, const GSList *probes)
{
struct context *ctx;
-
- if (!(ctx = sdi->priv)) {
- sr_err("zp: %s: sdi->priv was NULL", __func__);
- return; /* FIXME */
- }
-
- if (!ctx->usb->devhdl)
- return;
-
- sr_info("zp: closing device %d on %d.%d interface %d", sdi->index,
- 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 context *ctx;
- struct sr_probe *probe;
- GSList *l;
+ const struct sr_probe *probe;
+ const GSList *l;
int probe_bit, stage, i;
char *tc;
return SR_OK;
}
+static void clear_instances(void)
+{
+ GSList *l;
+ struct sr_dev_inst *sdi;
+
+ for (l = zdi->instances; l; l = l->next) {
+ sdi = l->data;
+ /* Properly close all devices... */
+ hw_dev_close(sdi);
+ /* ...and free all their memory. */
+ sr_dev_inst_free(sdi);
+ }
+ g_slist_free(zdi->instances);
+ zdi->instances = NULL;
+
+}
+
/*
* API callbacks
*/
-static int hw_init(const char *devinfo)
+static int hw_init(void)
+{
+
+ if (libusb_init(&usb_context) != 0) {
+ sr_err("zp: Failed to initialize USB.");
+ return 0;
+ }
+
+ return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
{
struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
+ GSList *devices;
libusb_device **devlist;
int ret, devcnt, i;
struct context *ctx;
- /* Avoid compiler warnings. */
- (void)devinfo;
+ (void)options;
+ devices = NULL;
+
+ clear_instances();
/* Allocate memory for our private driver context. */
if (!(ctx = g_try_malloc(sizeof(struct context)))) {
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. */
devcnt = 0;
libusb_get_device_list(usb_context, &devlist); /* TODO: Errors. */
__func__);
return 0;
}
-
+ sdi->driver = zdi;
sdi->priv = ctx;
- dev_insts =
- g_slist_append(dev_insts, sdi);
+ devices = g_slist_append(devices, sdi);
+ zdi->instances = g_slist_append(zdi->instances, sdi);
ctx->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
}
libusb_free_device_list(devlist, 1);
- return devcnt;
+ return devices;
}
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
int ret;
- 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_dev(). */
-
if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
if (ctx->cur_samplerate == 0) {
/* Samplerate hasn't been set. Default to the slowest one. */
- if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
+ if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
&samplerates.list[0]) == SR_ERR)
return SR_ERR;
}
return SR_OK;
}
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
+ struct context *ctx;
- 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? */
+ if (!(ctx = sdi->priv)) {
+ sr_err("zp: %s: sdi->priv was NULL", __func__);
+ return SR_ERR;
}
- /* TODO */
- close_dev(sdi);
+ if (!ctx->usb->devhdl)
+ return SR_ERR;
+
+ sr_info("zp: closing device %d on %d.%d interface %d", sdi->index,
+ 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;
+ sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- for (l = dev_insts; l; l = l->next) {
- sdi = l->data;
- /* Properly close all devices... */
- close_dev(sdi);
- /* ...and free all their memory. */
- sr_dev_inst_free(sdi);
- }
- g_slist_free(dev_insts);
- dev_insts = NULL;
+ clear_instances();
if (usb_context)
libusb_exit(usb_context);
return SR_OK;
}
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+ const struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- void *info;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
- sr_err("zp: %s: sdi was NULL", __func__);
- return NULL;
- }
-
- if (!(ctx = sdi->priv)) {
- sr_err("zp: %s: sdi->priv was NULL", __func__);
- return NULL;
- }
-
- sr_spew("zp: %s: dev_index %d, dev_info_id %d.", __func__,
- dev_index, dev_info_id);
-
- switch (dev_info_id) {
+ switch (info_id) {
case SR_DI_INST:
- info = sdi;
+ *data = sdi;
sr_spew("zp: %s: Returning sdi.", __func__);
break;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
+ break;
case SR_DI_NUM_PROBES:
- info = GINT_TO_POINTER(ctx->num_channels);
- sr_spew("zp: %s: Returning number of probes: %d.", __func__,
- NUM_PROBES);
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = GINT_TO_POINTER(ctx->num_channels);
+ sr_spew("zp: %s: Returning number of channels: %d.",
+ __func__, ctx->num_channels);
+ } else
+ return SR_ERR;
break;
case SR_DI_PROBE_NAMES:
- info = probe_names;
+ *data = probe_names;
sr_spew("zp: %s: Returning probenames.", __func__);
break;
case SR_DI_SAMPLERATES:
- info = &samplerates;
+ *data = &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);
+ *data = TRIGGER_TYPES;
+ sr_spew("zp: %s: Returning triggertypes: %s.", __func__, TRIGGER_TYPES);
break;
case SR_DI_CUR_SAMPLERATE:
- info = &ctx->cur_samplerate;
- sr_spew("zp: %s: Returning samplerate: %" PRIu64 "Hz.",
- __func__, ctx->cur_samplerate);
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = &ctx->cur_samplerate;
+ sr_spew("zp: %s: Returning samplerate: %" PRIu64 "Hz.",
+ __func__, ctx->cur_samplerate);
+ } else
+ return SR_ERR;
break;
default:
- /* Unknown device info ID, return NULL. */
- sr_err("zp: %s: Unknown device info ID", __func__);
- info = NULL;
- break;
+ return SR_ERR_ARG;
}
- return info;
+ return SR_OK;
}
static int hw_dev_status_get(int dev_index)
{
struct sr_dev_inst *sdi;
- sdi = sr_dev_inst_get(dev_insts, dev_index);
+ sdi = sr_dev_inst_get(zdi->instances, dev_index);
if (sdi)
return sdi->status;
else
return SR_ST_NOT_FOUND;
}
-static int *hw_hwcap_get_all(void)
-{
- return hwcaps;
-}
-
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
{
struct context *ctx;
return SR_OK;
}
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
- sr_err("zp: %s: sdi was NULL", __func__);
- return SR_ERR;
- }
-
if (!(ctx = sdi->priv)) {
sr_err("zp: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
- return set_samplerate(sdi, *(uint64_t *)value);
+ return set_samplerate(sdi, *(const uint64_t *)value);
case SR_HWCAP_PROBECONFIG:
- return configure_probes(sdi, (GSList *)value);
+ return configure_probes(sdi, (const GSList *)value);
case SR_HWCAP_LIMIT_SAMPLES:
- ctx->limit_samples = *(uint64_t *)value;
+ ctx->limit_samples = *(const uint64_t *)value;
return SR_OK;
default:
return SR_ERR;
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 context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+ if (!(sdi = sr_dev_inst_get(zdi->instances, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR;
}
packet.payload = &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
- header.samplerate = ctx->cur_samplerate;
- header.num_logic_probes = ctx->num_channels;
+ 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))) {
packet.type = SR_DF_END;
sr_session_send(cb_data, &packet);
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+ if (!(sdi = sr_dev_inst_get(zdi->instances, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__);
return SR_ERR_BUG;
}
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
+ .scan = hw_scan,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
- .dev_info_get = hw_dev_info_get,
+ .info_get = hw_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,
+ .instances = NULL,
};
projects / libsigrok.git / blobdiff