X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=a029a3cbcb790d0635138e700c4989cedeb7843b;hb=6f4b1868e8ec8c132878d8b6d558f4af054cbd91;hp=f5b2d9e4443268956df325ccec771397dd993957;hpb=697785d1aedc0bf385ea21074d83d61b11d8ce29;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index f5b2d9e4..a029a3cb 100644 --- a/hardware/zeroplus-logic-cube/zeroplus.c +++ b/hardware/zeroplus-logic-cube/zeroplus.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,22 +17,25 @@ * along with this program. If not, see . */ -#include "config.h" #include #include +#include #include #include #include #include -#include -#include +#include "config.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" #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 @@ -62,7 +65,7 @@ static model_t zeroplus_models[] = { {0x7016, "LAP-C(162000)", 16, 2048, 200}, }; -static int capabilities[] = { +static const int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, SR_HWCAP_SAMPLERATE, SR_HWCAP_PROBECONFIG, @@ -73,8 +76,33 @@ static int capabilities[] = { 0, }; -/* List of struct sr_device_instance, maintained by opendev()/closedev(). */ -static GSList *device_instances = NULL; +/* + * 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 dev_open()/dev_close(). */ +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; @@ -87,7 +115,7 @@ 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), @@ -109,25 +137,30 @@ static uint64_t supported_samplerates[] = { 0, }; -static struct sr_samplerates samplerates = { - SR_HZ(0), - SR_HZ(0), - SR_HZ(0), +static const struct sr_samplerates samplerates = { + 0, + 0, + 0, supported_samplerates, }; -/* TODO: All of these should go in a device-specific struct. */ -static uint64_t cur_samplerate = 0; -static uint64_t limit_samples = 0; -static int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */ -static uint64_t memory_size = 0; -static uint8_t probe_mask = 0; -static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 }; -static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 }; - -// static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 }; +/* 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 :( */ + uint64_t memory_size; + uint8_t probe_mask; + uint8_t trigger_mask[NUM_TRIGGER_STAGES]; + 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_set_configuration(int device_index, int capability, void *value); +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const void *value); static unsigned int get_memory_size(int type) { @@ -143,47 +176,56 @@ static unsigned int get_memory_size(int type) return 0; } -static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, +static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev, struct libusb_device_descriptor *des) { + struct context *ctx; unsigned int i; - int err; + int ret; + + /* Note: sdi is non-NULL, the caller already checked this. */ + + if (!(ctx = (*sdi)->priv)) { + sr_err("zp: %s: (*sdi)->priv was NULL", __func__); + return -1; + } - if ((err = libusb_get_device_descriptor(dev, des))) { - sr_warn("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) == (*sdi)->usb->bus - && libusb_get_device_address(dev) == (*sdi)->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("Found PID=%04X (%s)", des->idProduct, - zeroplus_models[i].model_name); - num_channels = zeroplus_models[i].channels; - memory_size = zeroplus_models[i].sample_depth * 1024; + sr_info("zp: Found ZEROPLUS device 0x%04x (%s)", + des->idProduct, zeroplus_models[i].model_name); + ctx->num_channels = zeroplus_models[i].channels; + ctx->memory_size = zeroplus_models[i].sample_depth * 1024; break; } - if (num_channels == 0) { - sr_warn("Unknown ZeroPlus device %04X", des->idProduct); + if (ctx->num_channels == 0) { + sr_err("zp: Unknown ZEROPLUS device 0x%04x", + des->idProduct); return -2; } /* Found it. */ - if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) { + if (!(ret = libusb_open(dev, &(ctx->usb->devhdl)))) { (*sdi)->status = SR_ST_ACTIVE; - sr_info("opened device %d on %d.%d interface %d", - (*sdi)->index, (*sdi)->usb->bus, - (*sdi)->usb->address, USB_INTERFACE); + sr_info("zp: opened device %d on %d.%d interface %d", + (*sdi)->index, ctx->usb->bus, + ctx->usb->address, USB_INTERFACE); } else { - sr_warn("failed to open device: %d", err); + sr_err("zp: failed to open device: %d", ret); *sdi = NULL; } } @@ -191,14 +233,14 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev, return 0; } -static struct sr_device_instance *zp_open_device(int device_index) +static struct sr_dev_inst *zp_open_dev(int dev_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; libusb_device **devlist; struct libusb_device_descriptor des; - int err, i; + int i; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(zdi->instances, dev_index))) return NULL; libusb_get_device_list(usb_context, &devlist); @@ -207,7 +249,7 @@ static struct sr_device_instance *zp_open_device(int device_index) 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... */ @@ -221,30 +263,43 @@ static struct sr_device_instance *zp_open_device(int device_index) return sdi; } -static void close_device(struct sr_device_instance *sdi) +static void close_dev(struct sr_dev_inst *sdi) { - if (!sdi->usb->devhdl) + 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("closing device %d on %d.%d interface %d", sdi->index, - sdi->usb->bus, sdi->usb->address, USB_INTERFACE); - libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE); - libusb_close(sdi->usb->devhdl); - sdi->usb->devhdl = NULL; + 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(GSList *probes) +static int configure_probes(const struct sr_dev_inst *sdi, const GSList *probes) { - struct sr_probe *probe; - GSList *l; + struct context *ctx; + const struct sr_probe *probe; + const GSList *l; int probe_bit, stage, i; char *tc; - probe_mask = 0; + /* Note: sdi and sdi->priv are non-NULL, the caller checked this. */ + ctx = sdi->priv; + + ctx->probe_mask = 0; for (i = 0; i < NUM_TRIGGER_STAGES; i++) { - trigger_mask[i] = 0; - trigger_value[i] = 0; + ctx->trigger_mask[i] = 0; + ctx->trigger_value[i] = 0; } stage = -1; @@ -253,14 +308,14 @@ static int configure_probes(GSList *probes) if (probe->enabled == FALSE) continue; probe_bit = 1 << (probe->index - 1); - probe_mask |= probe_bit; + ctx->probe_mask |= probe_bit; if (probe->trigger) { stage = 0; for (tc = probe->trigger; *tc; tc++) { - trigger_mask[stage] |= probe_bit; + ctx->trigger_mask[stage] |= probe_bit; if (*tc == '1') - trigger_value[stage] |= probe_bit; + ctx->trigger_value[stage] |= probe_bit; stage++; if (stage > NUM_TRIGGER_STAGES) return SR_ERR; @@ -271,50 +326,100 @@ static int configure_probes(GSList *probes) 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... */ + close_dev(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 *deviceinfo) +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_device_instance *sdi; + struct sr_dev_inst *sdi; struct libusb_device_descriptor des; + GSList *devices; libusb_device **devlist; - int err, devcnt, i; + int ret, devcnt, i; + struct context *ctx; - /* Avoid compiler warnings. */ - deviceinfo = deviceinfo; + (void)options; + devices = NULL; - if (libusb_init(&usb_context) != 0) { - sr_warn("Failed to initialize USB."); + clear_instances(); + + /* Allocate memory for our private driver context. */ + if (!(ctx = g_try_malloc(sizeof(struct context)))) { + sr_err("zp: %s: ctx malloc failed", __func__); return 0; } - /* Find all ZeroPlus analyzers and add them to device list. */ + /* Set some sane defaults. */ + 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); + + /* Find all ZEROPLUS analyzers and add them to device list. */ devcnt = 0; - libusb_get_device_list(usb_context, &devlist); + 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_warn("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? */ - sdi = sr_device_instance_new(devcnt, - SR_ST_INACTIVE, USB_VENDOR_NAME, - USB_MODEL_NAME, USB_MODEL_VERSION); - if (!sdi) + /* Register the device with libsigrok. */ + if (!(sdi = sr_dev_inst_new(devcnt, + SR_ST_INACTIVE, VENDOR_NAME, + MODEL_NAME, MODEL_VERSION))) { + sr_err("zp: %s: sr_dev_inst_new failed", + __func__); return 0; - device_instances = - g_slist_append(device_instances, sdi); - sdi->usb = sr_usb_device_instance_new( + } + sdi->driver = zdi; + sdi->priv = ctx; + + 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); devcnt++; @@ -322,26 +427,42 @@ static int hw_init(const char *deviceinfo) } libusb_free_device_list(devlist, 1); - return devcnt; + return devices; } -static int hw_opendev(int device_index) +static int hw_dev_open(int dev_index) { - struct sr_device_instance *sdi; - int err; + 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 (!(sdi = zp_open_device(device_index))) { - sr_warn("unable to open device"); + if (!(ctx = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_ARG; + } + + ret = libusb_set_configuration(ctx->usb->devhdl, USB_CONFIGURATION); + if (ret < 0) { + sr_err("zp: Unable to set USB configuration %d: %d", + USB_CONFIGURATION, ret); return SR_ERR; } - err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE); - if (err != 0) { - sr_warn("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(sdi->usb->devhdl); - analyzer_initialize(sdi->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); @@ -360,99 +481,120 @@ static int hw_opendev(int device_index) #endif analyzer_set_compression(COMPRESSION_NONE); - if (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, - &samplerates.low) == SR_ERR) + if (hw_dev_config_set(sdi, 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_device_instance *sdi; + struct sr_dev_inst *sdi; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { - sr_err("lap-c: %s: sdi was NULL", __func__); + if (!(sdi = sr_dev_inst_get(zdi->instances, 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; } -static void hw_cleanup(void) +static int hw_cleanup(void) { - GSList *l; - - /* Properly close all devices... */ - for (l = device_instances; l; l = l->next) - close_device((struct sr_device_instance *)l->data); - /* ...and free all their memory. */ - for (l = device_instances; l; l = l->next) - g_free(l->data); - g_slist_free(device_instances); - device_instances = NULL; + clear_instances(); if (usb_context) libusb_exit(usb_context); usb_context = NULL; + + return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static int hw_info_get(int info_id, const void **data, + const struct sr_dev_inst *sdi) { - struct sr_device_instance *sdi; - void *info = NULL; + struct context *ctx; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) - return NULL; - - switch (device_info_id) { - case SR_DI_INSTANCE: - info = sdi; + switch (info_id) { + case SR_DI_INST: + *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(num_channels); + 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: + *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; + *data = TRIGGER_TYPES; + sr_spew("zp: %s: Returning triggertypes: %s.", __func__, TRIGGER_TYPES); break; case SR_DI_CUR_SAMPLERATE: - info = &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: + return SR_ERR_ARG; } - return info; + return SR_OK; } -static int hw_get_status(int device_index) +static int hw_dev_status_get(int dev_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; - sdi = sr_get_device_instance(device_instances, device_index); + sdi = sr_dev_inst_get(zdi->instances, dev_index); if (sdi) return sdi->status; else return SR_ST_NOT_FOUND; } -static int *hw_get_capabilities(void) +static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) { - return capabilities; -} + struct context *ctx; + + if (!sdi) { + sr_err("zp: %s: sdi was NULL", __func__); + return SR_ERR_ARG; + } + + if (!(ctx = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_ARG; + } + + sr_info("zp: Setting samplerate to %" PRIu64 "Hz.", samplerate); -/* TODO: This will set the same samplerate for all devices. */ -static int set_configuration_samplerate(uint64_t samplerate) -{ - sr_info("%s(%" PRIu64 ")", __FUNCTION__, samplerate); if (samplerate > SR_MHZ(1)) analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ); else if (samplerate > SR_KHZ(1)) @@ -460,129 +602,154 @@ static int set_configuration_samplerate(uint64_t samplerate) else analyzer_set_freq(samplerate, FREQ_SCALE_HZ); - 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(const struct sr_dev_inst *sdi, int hwcap, + const void *value) { - struct sr_device_instance *sdi; - uint64_t *tmp_u64; + struct context *ctx; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) - return SR_ERR; + 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(*tmp_u64); + return set_samplerate(sdi, *(const uint64_t *)value); case SR_HWCAP_PROBECONFIG: - return configure_probes((GSList *) value); + return configure_probes(sdi, (const GSList *)value); case SR_HWCAP_LIMIT_SAMPLES: - tmp_u64 = value; - limit_samples = *tmp_u64; + ctx->limit_samples = *(const uint64_t *)value; return SR_OK; default: return SR_ERR; } } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_dev_acquisition_start(int dev_index, void *cb_data) { - struct sr_device_instance *sdi; + 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 context *ctx; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(zdi->instances, 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; + } /* push configured settings to device */ - analyzer_configure(sdi->usb->devhdl); + analyzer_configure(ctx->usb->devhdl); - analyzer_start(sdi->usb->devhdl); - sr_info("Waiting for data"); - analyzer_wait_data(sdi->usb->devhdl); + analyzer_start(ctx->usb->devhdl); + sr_info("zp: Waiting for data"); + analyzer_wait_data(ctx->usb->devhdl); - sr_info("Stop address = 0x%x", - analyzer_get_stop_address(sdi->usb->devhdl)); - sr_info("Now address = 0x%x", - analyzer_get_now_address(sdi->usb->devhdl)); - sr_info("Trigger address = 0x%x", - analyzer_get_trigger_address(sdi->usb->devhdl)); + sr_info("zp: Stop address = 0x%x", + analyzer_get_stop_address(ctx->usb->devhdl)); + sr_info("zp: Now address = 0x%x", + analyzer_get_now_address(ctx->usb->devhdl)); + sr_info("zp: Trigger address = 0x%x", + analyzer_get_trigger_address(ctx->usb->devhdl)); packet.type = SR_DF_HEADER; - packet.length = sizeof(struct sr_datafeed_header); - packet.payload = (unsigned char *)&header; + packet.payload = &header; header.feed_version = 1; gettimeofday(&header.starttime, NULL); - header.samplerate = cur_samplerate; - header.protocol_id = SR_PROTO_RAW; - header.num_logic_probes = num_channels; - header.num_analog_probes = 0; - sr_session_bus(session_device_id, &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("zeroplus: %s: buf malloc failed", __func__); + sr_err("zp: %s: buf malloc failed", __func__); return SR_ERR_MALLOC; } - analyzer_read_start(sdi->usb->devhdl); + samples_read = 0; + analyzer_read_start(ctx->usb->devhdl); /* Send the incoming transfer to the session bus. */ - for (packet_num = 0; packet_num < (memory_size * 4 / PACKET_SIZE); + for (packet_num = 0; packet_num < (ctx->memory_size * 4 / PACKET_SIZE); packet_num++) { - res = analyzer_read_data(sdi->usb->devhdl, buf, PACKET_SIZE); -#if 0 - sr_info("Tried to read %llx bytes, actually read %x bytes", + 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); -#endif packet.type = SR_DF_LOGIC; - packet.length = PACKET_SIZE; - packet.unitsize = 4; - packet.payload = buf; - sr_session_bus(session_device_id, &packet); + packet.payload = &logic; + logic.length = PACKET_SIZE; + logic.unitsize = 4; + logic.data = buf; + sr_session_send(cb_data, &packet); + samples_read += res / 4; } - analyzer_read_stop(sdi->usb->devhdl); + analyzer_read_stop(ctx->usb->devhdl); g_free(buf); packet.type = SR_DF_END; - sr_session_bus(session_device_id, &packet); + sr_session_send(cb_data, &packet); return SR_OK; } -/* This stops acquisition on ALL devices, ignoring device_index. */ -static void 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_device_instance *sdi; + struct sr_dev_inst *sdi; + struct context *ctx; packet.type = SR_DF_END; - sr_session_bus(session_device_id, &packet); + sr_session_send(cb_data, &packet); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) - return; /* TODO: Cry? */ + if (!(sdi = sr_dev_inst_get(zdi->instances, dev_index))) { + sr_err("zp: %s: sdi was NULL", __func__); + return SR_ERR_BUG; + } + + if (!(ctx = sdi->priv)) { + sr_err("zp: %s: sdi->priv was NULL", __func__); + return SR_ERR_BUG; + } - analyzer_reset(sdi->usb->devhdl); + analyzer_reset(ctx->usb->devhdl); /* TODO: Need to cancel and free any queued up transfers. */ + + return SR_OK; } -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, + .scan = hw_scan, + .dev_open = hw_dev_open, + .dev_close = hw_dev_close, + .info_get = hw_info_get, + .dev_status_get = hw_dev_status_get, + .dev_config_set = hw_dev_config_set, + .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_stop = hw_dev_acquisition_stop, + .instances = NULL, };