/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* 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
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
+#include "saleae-logic.h"
+
+static struct fx2_profile supported_fx2[] = {
+ /* Saleae Logic */
+ { 0x0925, 0x3881, 0x0925, 0x3881, "Saleae", "Logic", NULL, 8 },
+ /* default Cypress FX2 without EEPROM */
+ { 0x04b4, 0x8613, 0x0925, 0x3881, "Cypress", "FX2", NULL, 16 },
+ { 0, 0, 0, 0, 0, 0, 0, 0 }
+};
-#define USB_VENDOR 0x0925
-#define USB_PRODUCT 0x3881
-#define USB_VENDOR_NAME "Saleae"
-#define USB_MODEL_NAME "Logic"
-#define USB_MODEL_VERSION ""
-
-#define USB_INTERFACE 0
-#define USB_CONFIGURATION 1
-#define NUM_PROBES 8
-#define NUM_TRIGGER_STAGES 4
-#define TRIGGER_TYPES "01"
-#define FIRMWARE FIRMWARE_DIR "/saleae-logic.fw"
-
-/* delay in ms */
-#define FIRMWARE_RENUM_DELAY 2000
-#define NUM_SIMUL_TRANSFERS 10
-#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)
-
-/* Software trigger implementation: positive values indicate trigger stage. */
-#define TRIGGER_FIRED -1
-
-/* There is only one model Saleae Logic, and this is what it supports: */
-static int capabilities[] = {
- HWCAP_LOGIC_ANALYZER,
- HWCAP_SAMPLERATE,
+static int hwcaps[] = {
+ SR_HWCAP_LOGIC_ANALYZER,
+ SR_HWCAP_SAMPLERATE,
/* These are really implemented in the driver, not the hardware. */
- HWCAP_LIMIT_SAMPLES,
- HWCAP_CONTINUOUS,
+ SR_HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_CONTINUOUS,
0,
};
-/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
-static GSList *device_instances = NULL;
-
/*
- * Since we can't keep track of a Saleae Logic device after upgrading the
- * firmware -- it re-enumerates into a different device address after the
- * upgrade -- this is like a global lock. No device will open until a proper
- * delay after the last device was upgraded.
+ * Probes are numbered 1-8.
+ *
+ * TODO: FX2 eval boards with the standard Cypress VID/PID can have 16 pins
+ * or probes in theory, which is not supported by the Saleae Logic firmware.
*/
-GTimeVal firmware_updated = { 0, 0 };
-
-static libusb_context *usb_context = NULL;
+static const char *probe_names[] = {
+ "0",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ "13",
+ "14",
+ "15",
+ NULL,
+};
static uint64_t supported_samplerates[] = {
- KHZ(200),
- KHZ(250),
- KHZ(500),
- MHZ(1),
- MHZ(2),
- MHZ(4),
- MHZ(8),
- MHZ(12),
- MHZ(16),
- MHZ(24),
+ SR_KHZ(200),
+ SR_KHZ(250),
+ SR_KHZ(500),
+ SR_MHZ(1),
+ SR_MHZ(2),
+ SR_MHZ(4),
+ SR_MHZ(8),
+ SR_MHZ(12),
+ SR_MHZ(16),
+ SR_MHZ(24),
0,
};
-static struct samplerates samplerates = {
- KHZ(200),
- MHZ(24),
- 0,
+static struct sr_samplerates samplerates = {
+ SR_KHZ(200),
+ SR_MHZ(24),
+ SR_HZ(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 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 };
+/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
+static GSList *dev_insts = NULL;
+static libusb_context *usb_context = NULL;
-int trigger_stage = TRIGGER_FIRED;
+static int new_saleae_logic_firmware = 0;
-static int hw_set_configuration(int device_index, int capability, void *value);
-static void hw_stop_acquisition(int device_index, gpointer session_device_id);
+static int hw_dev_config_set(int dev_index, int hwcap, void *value);
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id);
/**
* Check the USB configuration to determine if this is a Saleae Logic.
* @return 1 if the device's configuration profile match the Logic firmware's
* configuration, 0 otherwise.
*/
-int check_conf_profile(libusb_device *dev)
+static int check_conf_profile(libusb_device *dev)
{
struct libusb_device_descriptor des;
struct libusb_config_descriptor *conf_dsc = NULL;
break;
intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
- if (intf_dsc->bNumEndpoints != 2)
- /* Need 2 endpoints. */
+ if (intf_dsc->bNumEndpoints == 4) {
+ /* The new Saleae Logic firmware has 4 endpoints. */
+ new_saleae_logic_firmware = 1;
+ } else if (intf_dsc->bNumEndpoints == 2) {
+ /* The old Saleae Logic firmware has 2 endpoints. */
+ new_saleae_logic_firmware = 0;
+ } else {
+ /* Other number of endpoints -> not a Saleae Logic. */
break;
+ }
if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
(1 | LIBUSB_ENDPOINT_OUT))
- /* First endpoint should be 1 (outbound). */
+ /* The first endpoint should be 1 (outbound). */
break;
if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) !=
(2 | LIBUSB_ENDPOINT_IN))
- /* First endpoint should be 2 (inbound). */
+ /* The second endpoint should be 2 (inbound). */
break;
+ /* TODO: The new firmware has 4 endpoints... */
+
/* If we made it here, it must be a Saleae Logic. */
ret = 1;
}
return ret;
}
-struct sr_device_instance *sl_open_device(int device_index)
+static int sl_open_dev(int dev_index)
{
- struct sr_device_instance *sdi;
libusb_device **devlist;
struct libusb_device_descriptor des;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
int err, skip, i;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
- return NULL;
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ return SR_ERR;
+ ctx = sdi->priv;
+ if (sdi->status == SR_ST_ACTIVE)
+ /* already in use */
+ return SR_ERR;
+
+ skip = 0;
libusb_get_device_list(usb_context, &devlist);
- if (sdi->status == ST_INITIALIZING) {
- /*
- * This device was renumerating last time we touched it.
- * opendev() guarantees we've waited long enough for it to
- * have booted properly, so now we need to find it on
- * the bus and record its new address.
- */
- skip = 0;
- for (i = 0; devlist[i]; i++) {
- /* TODO: Error handling. */
- err = opendev2(device_index, &sdi, devlist[i], &des,
- &skip, USB_VENDOR, USB_PRODUCT,
- USB_INTERFACE);
+ for (i = 0; devlist[i]; i++) {
+ if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
+ sr_err("logic: failed to get device descriptor: %d", err);
+ continue;
}
- } else if (sdi->status == ST_INACTIVE) {
- /*
- * This device is fully enumerated, so we need to find this
- * device by vendor, product, bus and address.
- */
- libusb_get_device_list(usb_context, &devlist);
- for (i = 0; devlist[i]; i++) {
- /* TODO: Error handling. */
- err = opendev3(&sdi, devlist[i], &des, USB_VENDOR,
- USB_PRODUCT, USB_INTERFACE);
+
+ if (des.idVendor != ctx->profile->fw_vid
+ || des.idProduct != ctx->profile->fw_pid)
+ continue;
+
+ if (sdi->status == SR_ST_INITIALIZING) {
+ if (skip != dev_index) {
+ /* Skip devices of this type that aren't the one we want. */
+ skip += 1;
+ continue;
+ }
+ } else if (sdi->status == SR_ST_INACTIVE) {
+ /*
+ * This device is fully enumerated, so we need to find
+ * this device by vendor, product, bus and address.
+ */
+ if (libusb_get_bus_number(devlist[i]) != ctx->usb->bus
+ || libusb_get_device_address(devlist[i]) != ctx->usb->address)
+ /* this is not the one */
+ continue;
}
- } else {
- /* Status must be ST_ACTIVE, i.e. already in use... */
- sdi = NULL;
+
+ if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) {
+ if (ctx->usb->address == 0xff)
+ /*
+ * first time we touch this device after firmware upload,
+ * so we don't know the address yet.
+ */
+ ctx->usb->address = libusb_get_device_address(devlist[i]);
+
+ sdi->status = SR_ST_ACTIVE;
+ sr_info("logic: opened device %d on %d.%d interface %d",
+ sdi->index, ctx->usb->bus,
+ ctx->usb->address, USB_INTERFACE);
+ } else {
+ sr_err("logic: failed to open device: %d", err);
+ }
+
+ /* if we made it here, we handled the device one way or another */
+ break;
}
libusb_free_device_list(devlist, 1);
- if (sdi && sdi->status != ST_ACTIVE)
- sdi = NULL;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR;
- return sdi;
+ return SR_OK;
}
-int upload_firmware(libusb_device *dev)
+static void close_dev(struct sr_dev_inst *sdi)
{
- int ret;
-
- ret = ezusb_upload_firmware(dev, USB_CONFIGURATION, FIRMWARE);
- if (ret != 0)
- return 1;
-
- /* Remember when the last firmware update was done. */
- g_get_current_time(&firmware_updated);
+ struct context *ctx;
- return 0;
-}
+ ctx = sdi->priv;
-static void close_device(struct sr_device_instance *sdi)
-{
- if (sdi->usb->devhdl == NULL)
+ if (ctx->usb->devhdl == NULL)
return;
- g_message("saleae: 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;
- sdi->status = ST_INACTIVE;
+ sr_info("logic: 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_close(ctx->usb->devhdl);
+ ctx->usb->devhdl = NULL;
+ sdi->status = SR_ST_INACTIVE;
}
-static int configure_probes(GSList *probes)
+static int configure_probes(struct context *ctx, GSList *probes)
{
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
int probe_bit, stage, i;
char *tc;
- probe_mask = 0;
+ 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;
for (l = probes; l; l = l->next) {
- probe = (struct probe *)l->data;
+ probe = (struct sr_probe *)l->data;
if (probe->enabled == FALSE)
continue;
probe_bit = 1 << (probe->index - 1);
- probe_mask |= probe_bit;
+ ctx->probe_mask |= probe_bit;
if (!(probe->trigger))
continue;
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;
* We didn't configure any triggers, make sure acquisition
* doesn't wait for any.
*/
- trigger_stage = TRIGGER_FIRED;
+ ctx->trigger_stage = TRIGGER_FIRED;
else
- trigger_stage = 0;
+ ctx->trigger_stage = 0;
return SR_OK;
}
+static struct context *fx2_dev_new(void)
+{
+ struct context *ctx;
+
+ if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+ sr_err("logic: %s: ctx malloc failed", __func__);
+ return NULL;
+ }
+ ctx->trigger_stage = TRIGGER_FIRED;
+ ctx->usb = NULL;
+
+ return ctx;
+}
+
+
/*
* API callbacks
*/
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *devinfo)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
+ struct fx2_profile *fx2_prof;
+ struct context *ctx;
libusb_device **devlist;
- int err, devcnt, i;
+ int err, devcnt, i, j;
/* Avoid compiler warnings. */
- deviceinfo = deviceinfo;
+ (void)devinfo;
if (libusb_init(&usb_context) != 0) {
- g_warning("Failed to initialize USB.");
+ sr_err("logic: Failed to initialize USB.");
return 0;
}
devcnt = 0;
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
+ fx2_prof = NULL;
err = libusb_get_device_descriptor(devlist[i], &des);
if (err != 0) {
- g_warning("failed to get device descriptor: %d", err);
+ sr_err("logic: failed to get device descriptor: %d",
+ err);
continue;
}
- if (des.idVendor != USB_VENDOR || des.idProduct != USB_PRODUCT)
- continue; /* Not a Saleae Logic... */
+ for (j = 0; supported_fx2[j].orig_vid; j++) {
+ if (des.idVendor == supported_fx2[j].orig_vid
+ && des.idProduct == supported_fx2[j].orig_pid) {
+ fx2_prof = &supported_fx2[j];
+ break;
+ }
+ }
+ if (!fx2_prof)
+ /* not a supported VID/PID */
+ continue;
- sdi = sr_device_instance_new(devcnt, ST_INITIALIZING,
- USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
+ sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
+ fx2_prof->vendor, fx2_prof->model, fx2_prof->model_version);
if (!sdi)
return 0;
- device_instances = g_slist_append(device_instances, sdi);
+ ctx = fx2_dev_new();
+ ctx->profile = fx2_prof;
+ sdi->priv = ctx;
+ dev_insts = g_slist_append(dev_insts, sdi);
- if (check_conf_profile(devlist[i]) == 0) {
- /*
- * Continue on the off chance that the device is in a
- * working state. TODO: Could maybe try a USB reset,
- * or uploading the firmware again.
- */
- if (upload_firmware(devlist[i]) > 0)
- g_warning("firmware upload failed for "
- "device %d", devcnt);
-
- sdi->usb = usb_device_instance_new
- (libusb_get_bus_number(devlist[i]), 0, NULL);
- } else {
+ if (check_conf_profile(devlist[i])) {
/* Already has the firmware, so fix the new address. */
- sdi->usb = usb_device_instance_new
+ sr_dbg("logic: Found a Saleae Logic with %s firmware.",
+ new_saleae_logic_firmware ? "new" : "old");
+ sdi->status = SR_ST_INACTIVE;
+ ctx->usb = sr_usb_dev_inst_new
(libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
+ } else {
+ if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK)
+ /* Remember when the firmware on this device was updated */
+ g_get_current_time(&ctx->fw_updated);
+ else
+ sr_err("logic: firmware upload failed for "
+ "device %d", devcnt);
+ ctx->usb = sr_usb_dev_inst_new
+ (libusb_get_bus_number(devlist[i]), 0xff, NULL);
}
devcnt++;
}
return devcnt;
}
-static int hw_opendev(int device_index)
+static int hw_dev_open(int dev_index)
{
GTimeVal cur_time;
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
int timediff, err;
- unsigned int cur, upd;
-
- if (firmware_updated.tv_sec > 0) {
- /* Firmware was recently uploaded. */
- g_get_current_time(&cur_time);
- cur = cur_time.tv_sec * 1000 + cur_time.tv_usec / 1000;
- upd = firmware_updated.tv_sec * 1000 +
- firmware_updated.tv_usec / 1000;
- timediff = cur - upd;
- if (timediff < FIRMWARE_RENUM_DELAY) {
- timediff = FIRMWARE_RENUM_DELAY - timediff;
- g_message("saleae: waiting %d ms for device to reset",
- timediff);
- g_usleep(timediff * 1000);
- firmware_updated.tv_sec = 0;
+
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ return SR_ERR;
+ ctx = sdi->priv;
+
+ /*
+ * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
+ * for the FX2 to renumerate
+ */
+ err = 0;
+ if (GTV_TO_MSEC(ctx->fw_updated) > 0) {
+ sr_info("logic: waiting for device to reset");
+ /* takes at least 300ms for the FX2 to be gone from the USB bus */
+ g_usleep(300 * 1000);
+ timediff = 0;
+ while (timediff < MAX_RENUM_DELAY) {
+ if ((err = sl_open_dev(dev_index)) == SR_OK)
+ break;
+ g_usleep(100 * 1000);
+ g_get_current_time(&cur_time);
+ timediff = GTV_TO_MSEC(cur_time) - GTV_TO_MSEC(ctx->fw_updated);
}
+ sr_info("logic: device came back after %d ms", timediff);
+ } else {
+ err = sl_open_dev(dev_index);
}
- if (!(sdi = sl_open_device(device_index))) {
- g_warning("unable to open device");
+ if (err != SR_OK) {
+ sr_err("logic: unable to open device");
return SR_ERR;
}
+ ctx = sdi->priv;
- err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
+ err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
if (err != 0) {
- g_warning("Unable to claim interface: %d", err);
+ sr_err("logic: Unable to claim interface: %d", err);
return SR_ERR;
}
- 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, HWCAP_SAMPLERATE,
+ if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
&supported_samplerates[0]) == SR_ERR)
return SR_ERR;
}
return SR_OK;
}
-static void 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_dev_inst_get(dev_insts, dev_index))) {
+ sr_err("logic: %s: sdi was NULL", __func__);
+ return SR_ERR; /* TODO: SR_ERR_ARG? */
+ }
+
+ /* TODO */
+ close_dev(sdi);
- if ((sdi = sr_get_device_instance(device_instances, device_index)))
- close_device(sdi);
+ return SR_OK;
}
-static void hw_cleanup(void)
+static int hw_cleanup(void)
{
GSList *l;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
+ int ret = SR_OK;
+
+ /* Properly close and free all devices. */
+ for (l = dev_insts; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("logic: %s: sdi was NULL, continuing", __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ if (!(ctx = sdi->priv)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("logic: %s: sdi->priv was NULL, continuing",
+ __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ close_dev(sdi);
+ sr_usb_dev_inst_free(ctx->usb);
+ sr_dev_inst_free(sdi);
+ }
- /* 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;
+ g_slist_free(dev_insts);
+ dev_insts = NULL;
if (usb_context)
libusb_exit(usb_context);
usb_context = NULL;
+
+ return ret;
}
-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_device_instance *sdi;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
void *info = NULL;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL;
+ ctx = sdi->priv;
- switch (device_info_id) {
- case DI_INSTANCE:
+ switch (dev_info_id) {
+ case SR_DI_INST:
info = sdi;
break;
- case DI_NUM_PROBES:
- info = GINT_TO_POINTER(NUM_PROBES);
+ case SR_DI_NUM_PROBES:
+ info = GINT_TO_POINTER(ctx->profile->num_probes);
break;
- case DI_SAMPLERATES:
+ case SR_DI_PROBE_NAMES:
+ info = probe_names;
+ break;
+ case SR_DI_SAMPLERATES:
info = &samplerates;
break;
- case DI_TRIGGER_TYPES:
+ case SR_DI_TRIGGER_TYPES:
info = TRIGGER_TYPES;
break;
- case DI_CUR_SAMPLERATE:
- info = &cur_samplerate;
+ case SR_DI_CUR_SAMPLERATE:
+ info = &ctx->cur_samplerate;
break;
}
return info;
}
-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(dev_insts, dev_index);
if (sdi)
return sdi->status;
else
- return ST_NOT_FOUND;
+ return SR_ST_NOT_FOUND;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
+}
+
+static uint8_t new_firmware_divider_value(uint64_t samplerate)
+{
+ switch (samplerate) {
+ case SR_MHZ(24):
+ return 0xe0;
+ break;
+ case SR_MHZ(16):
+ return 0xd5;
+ break;
+ case SR_MHZ(12):
+ return 0xe2;
+ break;
+ case SR_MHZ(8):
+ return 0xd4;
+ break;
+ case SR_MHZ(4):
+ return 0xda;
+ break;
+ case SR_MHZ(2):
+ return 0xe6;
+ break;
+ case SR_MHZ(1):
+ return 0x8e;
+ break;
+ case SR_KHZ(500):
+ return 0xfe;
+ break;
+ case SR_KHZ(250):
+ return 0x9e;
+ break;
+ case SR_KHZ(200):
+ return 0x4e;
+ break;
+ }
+
+ /* Shouldn't happen. */
+ sr_err("logic: %s: Invalid samplerate %" PRIu64 "",
+ __func__, samplerate);
+ return 0;
}
-static int set_configuration_samplerate(struct sr_device_instance *sdi,
- uint64_t samplerate)
+static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{
+ struct context *ctx;
uint8_t divider;
int ret, result, i;
unsigned char buf[2];
+ ctx = sdi->priv;
for (i = 0; supported_samplerates[i]; i++) {
if (supported_samplerates[i] == samplerate)
break;
if (supported_samplerates[i] == 0)
return SR_ERR_SAMPLERATE;
- divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
+ if (new_saleae_logic_firmware)
+ divider = new_firmware_divider_value(samplerate);
+ else
+ divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
+
+ sr_info("logic: setting samplerate to %" PRIu64 " Hz (divider %d)",
+ samplerate, divider);
- g_message("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)",
- samplerate, divider);
- buf[0] = 0x01;
+ buf[0] = (new_saleae_logic_firmware) ? 0xd5 : 0x01;
buf[1] = divider;
- ret = libusb_bulk_transfer(sdi->usb->devhdl, 1 | LIBUSB_ENDPOINT_OUT,
+ ret = libusb_bulk_transfer(ctx->usb->devhdl, 1 | LIBUSB_ENDPOINT_OUT,
buf, 2, &result, 500);
if (ret != 0) {
- g_warning("failed to set samplerate: %d", ret);
+ sr_err("logic: failed to set samplerate: %d", ret);
return SR_ERR;
}
- 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_device_instance *sdi;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
int ret;
- uint64_t *tmp_u64;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
-
- if (capability == HWCAP_SAMPLERATE) {
- tmp_u64 = value;
- ret = set_configuration_samplerate(sdi, *tmp_u64);
- } else if (capability == HWCAP_PROBECONFIG) {
- ret = configure_probes((GSList *) value);
- } else if (capability == HWCAP_LIMIT_SAMPLES) {
- tmp_u64 = value;
- limit_samples = *tmp_u64;
+ ctx = sdi->priv;
+
+ if (hwcap == SR_HWCAP_SAMPLERATE) {
+ ret = set_samplerate(sdi, *(uint64_t *)value);
+ } else if (hwcap == SR_HWCAP_PROBECONFIG) {
+ ret = configure_probes(ctx, (GSList *) value);
+ } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
+ ctx->limit_samples = *(uint64_t *)value;
ret = SR_OK;
} else {
ret = SR_ERR;
struct timeval tv;
/* Avoid compiler warnings. */
- fd = fd;
- revents = revents;
- user_data = user_data;
+ (void)fd;
+ (void)revents;
+ (void)user_data;
tv.tv_sec = tv.tv_usec = 0;
libusb_handle_events_timeout(usb_context, &tv);
return TRUE;
}
-void receive_transfer(struct libusb_transfer *transfer)
+static void receive_transfer(struct libusb_transfer *transfer)
{
+ /* TODO: These statics have to move to the ctx struct. */
static int num_samples = 0;
static int empty_transfer_count = 0;
struct sr_datafeed_packet packet;
- void *user_data;
+ struct sr_datafeed_logic logic;
+ struct context *ctx;
int cur_buflen, trigger_offset, i;
unsigned char *cur_buf, *new_buf;
- /* hw_stop_acquisition() is telling us to stop. */
+ /* hw_dev_acquisition_stop() is telling us to stop. */
if (transfer == NULL)
num_samples = -1;
return;
}
- g_message("saleae: receive_transfer(): status %d received %d bytes",
- transfer->status, transfer->actual_length);
+ sr_info("logic: receive_transfer(): status %d received %d bytes",
+ transfer->status, transfer->actual_length);
/* Save incoming transfer before reusing the transfer struct. */
cur_buf = transfer->buffer;
cur_buflen = transfer->actual_length;
- user_data = transfer->user_data;
+ ctx = transfer->user_data;
/* Fire off a new request. */
- new_buf = g_malloc(4096);
+ if (!(new_buf = g_try_malloc(4096))) {
+ sr_err("logic: %s: new_buf malloc failed", __func__);
+ return; /* TODO: SR_ERR_MALLOC */
+ }
+
transfer->buffer = new_buf;
transfer->length = 4096;
if (libusb_submit_transfer(transfer) != 0) {
/* TODO: Stop session? */
- g_warning("eek");
+ /* TODO: Better error message. */
+ sr_err("logic: %s: libusb_submit_transfer error", __func__);
}
if (cur_buflen == 0) {
* The FX2 gave up. End the acquisition, the frontend
* will work out that the samplecount is short.
*/
- hw_stop_acquisition(-1, user_data);
+ hw_dev_acquisition_stop(-1, ctx->session_data);
}
return;
} else {
}
trigger_offset = 0;
- if (trigger_stage >= 0) {
+ if (ctx->trigger_stage >= 0) {
for (i = 0; i < cur_buflen; i++) {
- if ((cur_buf[i] & trigger_mask[trigger_stage]) == trigger_value[trigger_stage]) {
+ if ((cur_buf[i] & ctx->trigger_mask[ctx->trigger_stage]) == ctx->trigger_value[ctx->trigger_stage]) {
/* Match on this trigger stage. */
- trigger_buffer[trigger_stage] = cur_buf[i];
- trigger_stage++;
- if (trigger_stage == NUM_TRIGGER_STAGES || trigger_mask[trigger_stage] == 0) {
+ ctx->trigger_buffer[ctx->trigger_stage] = cur_buf[i];
+ ctx->trigger_stage++;
+
+ if (ctx->trigger_stage == NUM_TRIGGER_STAGES || ctx->trigger_mask[ctx->trigger_stage] == 0) {
/* Match on all trigger stages, we're done. */
trigger_offset = i + 1;
* TODO: Send pre-trigger buffer to session bus.
* Tell the frontend we hit the trigger here.
*/
- packet.type = DF_TRIGGER;
- packet.length = 0;
- session_bus(user_data, &packet);
+ packet.type = SR_DF_TRIGGER;
+ packet.payload = NULL;
+ sr_session_bus(ctx->session_data, &packet);
/*
* Send the samples that triggered it, since we're
* skipping past them.
*/
- packet.type = DF_LOGIC;
- packet.length = trigger_stage;
- packet.unitsize = 1;
- packet.payload = trigger_buffer;
- session_bus(user_data, &packet);
-
- trigger_stage = TRIGGER_FIRED;
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+ logic.length = ctx->trigger_stage;
+ logic.unitsize = 1;
+ logic.data = ctx->trigger_buffer;
+ sr_session_bus(ctx->session_data, &packet);
+
+ ctx->trigger_stage = TRIGGER_FIRED;
break;
}
return;
* the next sample from the one that matched originally, which the
* counter increment at the end of the loop takes care of.
*/
- if (trigger_stage > 0) {
- i -= trigger_stage;
+ if (ctx->trigger_stage > 0) {
+ i -= ctx->trigger_stage;
if (i < -1)
i = -1; /* Oops, went back past this buffer. */
/* Reset trigger stage. */
- trigger_stage = 0;
+ ctx->trigger_stage = 0;
}
-
-
}
}
- if (trigger_stage == TRIGGER_FIRED) {
+ if (ctx->trigger_stage == TRIGGER_FIRED) {
/* Send the incoming transfer to the session bus. */
- packet.type = DF_LOGIC;
- packet.length = cur_buflen - trigger_offset;
- packet.unitsize = 1;
- packet.payload = cur_buf + trigger_offset;
- session_bus(user_data, &packet);
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+ logic.length = cur_buflen - trigger_offset;
+ logic.unitsize = 1;
+ logic.data = cur_buf + trigger_offset;
+ sr_session_bus(ctx->session_data, &packet);
g_free(cur_buf);
num_samples += cur_buflen;
- if (limit_samples && (unsigned int) num_samples > limit_samples) {
- hw_stop_acquisition(-1, user_data);
+ if (ctx->limit_samples && (unsigned int) num_samples > ctx->limit_samples) {
+ hw_dev_acquisition_stop(-1, ctx->session_data);
}
} else {
/*
}
}
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
+ struct context *ctx;
struct libusb_transfer *transfer;
const struct libusb_pollfd **lupfd;
int size, i;
unsigned char *buf;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
+ ctx = sdi->priv;
+ ctx->session_data = session_data;
- packet = g_malloc(sizeof(struct sr_datafeed_packet));
- header = g_malloc(sizeof(struct sr_datafeed_header));
- if (!packet || !header)
- return SR_ERR;
+ if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
+ sr_err("logic: %s: packet malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
+
+ if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
+ sr_err("logic: %s: header malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
/* Start with 2K transfer, subsequently increased to 4K. */
size = 2048;
for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) {
- buf = g_malloc(size);
+ if (!(buf = g_try_malloc(size))) {
+ sr_err("logic: %s: buf malloc failed", __func__);
+ return SR_ERR_MALLOC;
+ }
transfer = libusb_alloc_transfer(0);
- libusb_fill_bulk_transfer(transfer, sdi->usb->devhdl,
+ libusb_fill_bulk_transfer(transfer, ctx->usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, size,
- receive_transfer, session_device_id, 40);
+ receive_transfer, ctx, 40);
if (libusb_submit_transfer(transfer) != 0) {
/* TODO: Free them all. */
libusb_free_transfer(transfer);
lupfd = libusb_get_pollfds(usb_context);
for (i = 0; lupfd[i]; i++)
- source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data,
- NULL);
- free(lupfd);
+ sr_source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data,
+ NULL);
+ free(lupfd); /* NOT g_free()! */
- packet->type = DF_HEADER;
- packet->length = sizeof(struct sr_datafeed_header);
- packet->payload = (unsigned char *)header;
+ packet->type = SR_DF_HEADER;
+ packet->payload = header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
- header->samplerate = cur_samplerate;
- header->protocol_id = PROTO_RAW;
- header->num_logic_probes = NUM_PROBES;
- header->num_analog_probes = 0;
- session_bus(session_device_id, packet);
+ header->samplerate = ctx->cur_samplerate;
+ header->num_logic_probes = ctx->profile->num_probes;
+ sr_session_bus(session_data, packet);
g_free(header);
g_free(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)
+/* This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
{
struct sr_datafeed_packet packet;
/* Avoid compiler warnings. */
- device_index = device_index;
+ (void)dev_index;
- packet.type = DF_END;
- session_bus(session_device_id, &packet);
+ packet.type = SR_DF_END;
+ sr_session_bus(session_data, &packet);
receive_transfer(NULL);
/* TODO: Need to cancel and free any queued up transfers. */
+
+ return SR_OK;
}
-struct device_plugin saleae_logic_plugin_info = {
- "saleae-logic",
- "Saleae Logic",
- 1,
- hw_init,
- hw_cleanup,
- hw_opendev,
- hw_closedev,
- hw_get_device_info,
- hw_get_status,
- hw_get_capabilities,
- hw_set_configuration,
- hw_start_acquisition,
- hw_stop_acquisition,
+SR_PRIV struct sr_dev_plugin saleae_logic_plugin_info = {
+ .name = "saleae-logic",
+ .longname = "Saleae Logic",
+ .api_version = 1,
+ .init = hw_init,
+ .cleanup = hw_cleanup,
+ .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