X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=eff4cf9e994edc4712694beaae7738b9a1a77479;hb=54ac5277c5e462f1778300b9bc3fdd4709ecb2dc;hp=9ebb207e6d6a2f5779ead62720715f3ee600cdf1;hpb=904299164f5718109fea2b23bc34e1522c548db4;p=libsigrok.git
diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 9ebb207e..eff4cf9e 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -17,47 +17,49 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
#include
#include
#include
-#include "config.h"
-#include "sigrok.h"
+#include
+#include
-#define USB_VENDOR 0x0925
+#define USB_VENDOR 0x0925
#define USB_PRODUCT 0x3881
-#define USB_VENDOR_NAME "Saleae"
-#define USB_MODEL_NAME "Logic"
-#define USB_MODEL_VERSION ""
+#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.firmware"
+#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)
+#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
+/* 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,
+ SR_HWCAP_LOGIC_ANALYZER,
+ SR_HWCAP_SAMPLERATE,
/* These are really implemented in the driver, not the hardware. */
- HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_CONTINUOUS,
0,
};
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
static GSList *device_instances = NULL;
/*
@@ -66,7 +68,7 @@ static GSList *device_instances = NULL;
* upgrade -- this is like a global lock. No device will open until a proper
* delay after the last device was upgraded.
*/
-GTimeVal firmware_updated = { 0 };
+static GTimeVal firmware_updated = { 0, 0 };
static libusb_context *usb_context = NULL;
@@ -84,7 +86,7 @@ static uint64_t supported_samplerates[] = {
0,
};
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
KHZ(200),
MHZ(24),
0,
@@ -98,14 +100,19 @@ 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 };
-int trigger_stage = TRIGGER_FIRED;
+
+static int trigger_stage = TRIGGER_FIRED;
static int hw_set_configuration(int device_index, int capability, void *value);
+static void hw_stop_acquisition(int device_index, gpointer session_device_id);
-/* returns 1 if the device's configuration profile match the Logic firmware's
- * configuration, 0 otherwise
+/**
+ * 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;
@@ -159,86 +166,18 @@ int check_conf_profile(libusb_device *dev)
return ret;
}
-static int opendev2(int device_index, struct sigrok_device_instance **sdi,
- libusb_device *dev, struct libusb_device_descriptor *des,
- int *skip)
-{
- int err;
-
- if ((err = libusb_get_device_descriptor(dev, des))) {
- g_warning("failed to get device descriptor: %d", err);
- return -1;
- }
-
- if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT)
- return 0;
-
- if (*skip != device_index) {
- /* Skip devices of this type that aren't the one we want. */
- *skip += 1;
- return 0;
- }
-
- /*
- * Should check the bus here, since we know that already. But what are
- * we going to do if it doesn't match after the right number of skips?
- */
- if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
- (*sdi)->usb->address = libusb_get_device_address(dev);
- (*sdi)->status = ST_ACTIVE;
- g_message("opened device %d on %d.%d interface %d",
- (*sdi)->index, (*sdi)->usb->bus,
- (*sdi)->usb->address, USB_INTERFACE);
- } else {
- g_warning("failed to open device: %d", err);
- *sdi = NULL;
- }
-
- return 0;
-}
-
-static int opendev3(int device_index, struct sigrok_device_instance **sdi,
- libusb_device *dev, struct libusb_device_descriptor *des)
-{
- int err;
-
- if ((err = libusb_get_device_descriptor(dev, des))) {
- g_warning("failed to get device descriptor: %d", err);
- return -1;
- }
-
- if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT)
- return 0;
-
- if (libusb_get_bus_number(dev) == (*sdi)->usb->bus
- && libusb_get_device_address(dev) == (*sdi)->usb->address) {
- /* Found it. */
- if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
- (*sdi)->status = ST_ACTIVE;
- g_message("opened device %d on %d.%d interface %d",
- (*sdi)->index, (*sdi)->usb->bus,
- (*sdi)->usb->address, USB_INTERFACE);
- } else {
- g_warning("failed to open device: %d", err);
- *sdi = NULL;
- }
- }
-
- return 0;
-}
-
-struct sigrok_device_instance *sl_open_device(int device_index)
+static struct sr_device_instance *sl_open_device(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
libusb_device **devlist;
struct libusb_device_descriptor des;
int err, skip, i;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return NULL;
libusb_get_device_list(usb_context, &devlist);
- if (sdi->status == ST_INITIALIZING) {
+ if (sdi->status == SR_ST_INITIALIZING) {
/*
* This device was renumerating last time we touched it.
* opendev() guarantees we've waited long enough for it to
@@ -249,9 +188,10 @@ struct sigrok_device_instance *sl_open_device(int device_index)
for (i = 0; devlist[i]; i++) {
/* TODO: Error handling. */
err = opendev2(device_index, &sdi, devlist[i], &des,
- &skip);
+ &skip, USB_VENDOR, USB_PRODUCT,
+ USB_INTERFACE);
}
- } else if (sdi->status == ST_INACTIVE) {
+ } 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.
@@ -259,73 +199,51 @@ struct sigrok_device_instance *sl_open_device(int device_index)
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
/* TODO: Error handling. */
- err = opendev3(device_index, &sdi, devlist[i], &des);
+ err = opendev3(&sdi, devlist[i], &des, USB_VENDOR,
+ USB_PRODUCT, USB_INTERFACE);
}
} else {
- /* Status must be ST_ACTIVE, i.e. already in use... */
+ /* Status must be SR_ST_ACTIVE, i.e. already in use... */
sdi = NULL;
}
libusb_free_device_list(devlist, 1);
- if (sdi && sdi->status != ST_ACTIVE)
+ if (sdi && sdi->status != SR_ST_ACTIVE)
sdi = NULL;
return sdi;
}
-int upload_firmware(libusb_device *dev)
+static int upload_firmware(libusb_device *dev)
{
- struct libusb_device_handle *hdl;
- int err;
-
- g_message("uploading firmware to device on %d.%d",
- libusb_get_bus_number(dev), libusb_get_device_address(dev));
-
- err = libusb_open(dev, &hdl);
- if (err != 0) {
- g_warning("failed to open device: %d", err);
- return 1;
- }
-
- err = libusb_set_configuration(hdl, USB_CONFIGURATION);
- if (err != 0) {
- g_warning("Unable to set configuration: %d", err);
- return 1;
- }
-
- if ((ezusb_reset(hdl, 1)) < 0)
- return 1;
-
- if (ezusb_install_firmware(hdl, FIRMWARE) != 0)
- return 1;
+ int ret;
- if ((ezusb_reset(hdl, 0)) < 0)
+ ret = ezusb_upload_firmware(dev, USB_CONFIGURATION, FIRMWARE);
+ if (ret != 0)
return 1;
- libusb_close(hdl);
-
/* Remember when the last firmware update was done. */
g_get_current_time(&firmware_updated);
return 0;
}
-static void close_device(struct sigrok_device_instance *sdi)
+static void close_device(struct sr_device_instance *sdi)
{
if (sdi->usb->devhdl == NULL)
return;
- g_message("closing device %d on %d.%d interface %d", sdi->index,
+ 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;
+ sdi->status = SR_ST_INACTIVE;
}
-static int configure_probes(GSList * probes)
+static int configure_probes(GSList *probes)
{
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
int probe_bit, stage, i;
char *tc;
@@ -338,21 +256,22 @@ static int configure_probes(GSList * probes)
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;
- if (probe->trigger) {
- stage = 0;
- for (tc = probe->trigger; *tc; tc++) {
- trigger_mask[stage] |= probe_bit;
- if (*tc == '1')
- trigger_value[stage] |= probe_bit;
- stage++;
- if (stage > NUM_TRIGGER_STAGES)
- return SIGROK_ERR;
- }
+ if (!(probe->trigger))
+ continue;
+
+ stage = 0;
+ for (tc = probe->trigger; *tc; tc++) {
+ trigger_mask[stage] |= probe_bit;
+ if (*tc == '1')
+ trigger_value[stage] |= probe_bit;
+ stage++;
+ if (stage > NUM_TRIGGER_STAGES)
+ return SR_ERR;
}
}
@@ -365,25 +284,27 @@ static int configure_probes(GSList * probes)
else
trigger_stage = 0;
- return SIGROK_OK;
+ return SR_OK;
}
/*
* API callbacks
*/
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
struct libusb_device_descriptor des;
libusb_device **devlist;
int err, devcnt, i;
+ /* Avoid compiler warnings. */
+ deviceinfo = deviceinfo;
+
if (libusb_init(&usb_context) != 0) {
g_warning("Failed to initialize USB.");
return 0;
}
- libusb_set_debug(usb_context, 3);
/* Find all Saleae Logic devices and upload firmware to all of them. */
devcnt = 0;
@@ -398,7 +319,7 @@ static int hw_init(char *deviceinfo)
if (des.idVendor != USB_VENDOR || des.idProduct != USB_PRODUCT)
continue; /* Not a Saleae Logic... */
- sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING,
+ sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING,
USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
if (!sdi)
return 0;
@@ -411,16 +332,16 @@ static int hw_init(char *deviceinfo)
* or uploading the firmware again.
*/
if (upload_firmware(devlist[i]) > 0)
- g_warning("firmware upload failed for device %d", devcnt);
+ g_warning("firmware upload failed for "
+ "device %d", devcnt);
- sdi->usb = usb_device_instance_new
- (libusb_get_bus_number(devlist[i]), 0, NULL);
+ sdi->usb = sr_usb_device_instance_new
+ (libusb_get_bus_number(devlist[i]), 0, NULL);
} else {
/* Already has the firmware, so fix the new address. */
- sdi->usb = usb_device_instance_new
+ sdi->usb = sr_usb_device_instance_new
(libusb_get_bus_number(devlist[i]),
- libusb_get_device_address(devlist[i]),
- NULL);
+ libusb_get_device_address(devlist[i]), NULL);
}
devcnt++;
}
@@ -432,7 +353,7 @@ static int hw_init(char *deviceinfo)
static int hw_opendev(int device_index)
{
GTimeVal cur_time;
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
int timediff, err;
unsigned int cur, upd;
@@ -445,7 +366,7 @@ static int hw_opendev(int device_index)
timediff = cur - upd;
if (timediff < FIRMWARE_RENUM_DELAY) {
timediff = FIRMWARE_RENUM_DELAY - timediff;
- g_message("waiting %d ms for device to reset",
+ g_message("saleae: waiting %d ms for device to reset",
timediff);
g_usleep(timediff * 1000);
firmware_updated.tv_sec = 0;
@@ -454,30 +375,30 @@ static int hw_opendev(int device_index)
if (!(sdi = sl_open_device(device_index))) {
g_warning("unable to open device");
- return SIGROK_ERR;
+ return SR_ERR;
}
err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
if (err != 0) {
g_warning("Unable to claim interface: %d", err);
- return SIGROK_ERR;
+ return SR_ERR;
}
if (cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */
- if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
- &supported_samplerates[0]) == SIGROK_ERR)
- return SIGROK_ERR;
+ if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE,
+ &supported_samplerates[0]) == SR_ERR)
+ return SR_ERR;
}
- return SIGROK_OK;
+ return SR_OK;
}
static void hw_closedev(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- if ((sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if ((sdi = sr_get_device_instance(device_instances, device_index)))
close_device(sdi);
}
@@ -487,7 +408,7 @@ static void hw_cleanup(void)
/* Properly close all devices... */
for (l = device_instances; l; l = l->next)
- close_device((struct sigrok_device_instance *)l->data);
+ close_device((struct sr_device_instance *)l->data);
/* ...and free all their memory. */
for (l = device_instances; l; l = l->next)
@@ -502,26 +423,26 @@ static void hw_cleanup(void)
static void *hw_get_device_info(int device_index, int device_info_id)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
void *info = NULL;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
return NULL;
switch (device_info_id) {
- case DI_INSTANCE:
+ case SR_DI_INSTANCE:
info = sdi;
break;
- case DI_NUM_PROBES:
+ case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(NUM_PROBES);
break;
- case DI_SAMPLERATES:
+ case SR_DI_SAMPLERATES:
info = &samplerates;
break;
- case DI_TRIGGER_TYPES:
+ case SR_DI_TRIGGER_TYPES:
info = TRIGGER_TYPES;
break;
- case DI_CUR_SAMPLERATE:
+ case SR_DI_CUR_SAMPLERATE:
info = &cur_samplerate;
break;
}
@@ -531,13 +452,13 @@ static void *hw_get_device_info(int device_index, int device_info_id)
static int hw_get_status(int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- sdi = get_sigrok_device_instance(device_instances, device_index);
+ sdi = sr_get_device_instance(device_instances, device_index);
if (sdi)
return sdi->status;
else
- return ST_NOT_FOUND;
+ return SR_ST_NOT_FOUND;
}
static int *hw_get_capabilities(void)
@@ -545,7 +466,7 @@ static int *hw_get_capabilities(void)
return capabilities;
}
-static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
+static int set_configuration_samplerate(struct sr_device_instance *sdi,
uint64_t samplerate)
{
uint8_t divider;
@@ -557,11 +478,11 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
break;
}
if (supported_samplerates[i] == 0)
- return SIGROK_ERR_SAMPLERATE;
+ return SR_ERR_SAMPLERATE;
- divider = (uint8_t) (48 / (float)(samplerate / 1000000)) - 1;
+ divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
- g_message("setting samplerate to %" PRIu64 " Hz (divider %d)",
+ g_message("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)",
samplerate, divider);
buf[0] = 0x01;
buf[1] = divider;
@@ -569,32 +490,33 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
buf, 2, &result, 500);
if (ret != 0) {
g_warning("failed to set samplerate: %d", ret);
- return SIGROK_ERR;
+ return SR_ERR;
}
cur_samplerate = samplerate;
- return SIGROK_OK;
+ return SR_OK;
}
static int hw_set_configuration(int device_index, int capability, void *value)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
int ret;
uint64_t *tmp_u64;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
- return SIGROK_ERR;
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ return SR_ERR;
- if (capability == HWCAP_SAMPLERATE) {
+ if (capability == SR_HWCAP_SAMPLERATE) {
tmp_u64 = value;
ret = set_configuration_samplerate(sdi, *tmp_u64);
- } else if (capability == HWCAP_PROBECONFIG) {
+ } else if (capability == SR_HWCAP_PROBECONFIG) {
ret = configure_probes((GSList *) value);
- } else if (capability == HWCAP_LIMIT_SAMPLES) {
- limit_samples = strtoull(value, NULL, 10);
- ret = SIGROK_OK;
+ } else if (capability == SR_HWCAP_LIMIT_SAMPLES) {
+ tmp_u64 = value;
+ limit_samples = *tmp_u64;
+ ret = SR_OK;
} else {
- ret = SIGROK_ERR;
+ ret = SR_ERR;
}
return ret;
@@ -604,6 +526,11 @@ static int receive_data(int fd, int revents, void *user_data)
{
struct timeval tv;
+ /* Avoid compiler warnings. */
+ fd = fd;
+ revents = revents;
+ user_data = user_data;
+
tv.tv_sec = tv.tv_usec = 0;
libusb_handle_events_timeout(usb_context, &tv);
@@ -614,7 +541,7 @@ void receive_transfer(struct libusb_transfer *transfer)
{
static int num_samples = 0;
static int empty_transfer_count = 0;
- struct datafeed_packet packet;
+ struct sr_datafeed_packet packet;
void *user_data;
int cur_buflen, trigger_offset, i;
unsigned char *cur_buf, *new_buf;
@@ -628,11 +555,12 @@ void receive_transfer(struct libusb_transfer *transfer)
* transfer that come in.
*/
if (num_samples == -1) {
- libusb_free_transfer(transfer);
+ if (transfer)
+ libusb_free_transfer(transfer);
return;
}
- g_message("receive_transfer(): status %d received %d bytes",
+ g_message("saleae: receive_transfer(): status %d received %d bytes",
transfer->status, transfer->actual_length);
/* Save incoming transfer before reusing the transfer struct. */
@@ -656,9 +584,7 @@ void receive_transfer(struct libusb_transfer *transfer)
* The FX2 gave up. End the acquisition, the frontend
* will work out that the samplecount is short.
*/
- packet.type = DF_END;
- session_bus(user_data, &packet);
- num_samples = -1;
+ hw_stop_acquisition(-1, user_data);
}
return;
} else {
@@ -668,62 +594,70 @@ void receive_transfer(struct libusb_transfer *transfer)
trigger_offset = 0;
if (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] & trigger_mask[trigger_stage]) == trigger_value[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) {
- /* Match on all trigger stages, we're done */
+ if (trigger_stage == NUM_TRIGGER_STAGES || trigger_mask[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;
+ /*
+ * TODO: Send pre-trigger buffer to session bus.
+ * Tell the frontend we hit the trigger here.
+ */
+ packet.type = SR_DF_TRIGGER;
packet.length = 0;
- session_bus(user_data, &packet);
+ sr_session_bus(user_data, &packet);
- /* Send the samples that triggered it, since we're skipping past them. */
- packet.type = DF_LOGIC8;
+ /*
+ * Send the samples that triggered it, since we're
+ * skipping past them.
+ */
+ packet.type = SR_DF_LOGIC;
packet.length = trigger_stage;
+ packet.unitsize = 1;
packet.payload = trigger_buffer;
- session_bus(user_data, &packet);
- break;
+ sr_session_bus(user_data, &packet);
trigger_stage = TRIGGER_FIRED;
+ break;
}
- } else if (trigger_stage > 0) {
- /*
- * We had a match before, but not in the next sample. However, we may
- * have a match on this stage in the next bit -- trigger on 0001 will
- * fail on seeing 00001, so we need to go back to stage 0 -- but at
- * the next sample from the one that matched originally, which the
- * counter increment at the end of the loop takes care of.
- */
+ return;
+ }
+
+ /*
+ * We had a match before, but not in the next sample. However, we may
+ * have a match on this stage in the next bit -- trigger on 0001 will
+ * fail on seeing 00001, so we need to go back to stage 0 -- but at
+ * 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 (i < -1)
- /* Oops, went back past this buffer. */
- i = -1;
+ i = -1; /* Oops, went back past this buffer. */
/* Reset trigger stage. */
trigger_stage = 0;
}
+
+
}
}
if (trigger_stage == TRIGGER_FIRED) {
/* Send the incoming transfer to the session bus. */
- packet.type = DF_LOGIC8;
+ packet.type = SR_DF_LOGIC;
packet.length = cur_buflen - trigger_offset;
+ packet.unitsize = 1;
packet.payload = cur_buf + trigger_offset;
- session_bus(user_data, &packet);
+ sr_session_bus(user_data, &packet);
g_free(cur_buf);
num_samples += cur_buflen;
- if (num_samples > limit_samples) {
- /* End the acquisition. */
- packet.type = DF_END;
- session_bus(user_data, &packet);
- num_samples = -1;
+ if (limit_samples && (unsigned int) num_samples > limit_samples) {
+ hw_stop_acquisition(-1, user_data);
}
} else {
/*
@@ -735,21 +669,21 @@ void receive_transfer(struct libusb_transfer *transfer)
static int hw_start_acquisition(int device_index, gpointer session_device_id)
{
- struct sigrok_device_instance *sdi;
- struct datafeed_packet *packet;
- struct datafeed_header *header;
+ struct sr_device_instance *sdi;
+ struct sr_datafeed_packet *packet;
+ struct sr_datafeed_header *header;
struct libusb_transfer *transfer;
const struct libusb_pollfd **lupfd;
int size, i;
unsigned char *buf;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
- return SIGROK_ERR;
+ if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ return SR_ERR;
- packet = g_malloc(sizeof(struct datafeed_packet));
- header = g_malloc(sizeof(struct datafeed_header));
+ packet = g_malloc(sizeof(struct sr_datafeed_packet));
+ header = g_malloc(sizeof(struct sr_datafeed_header));
if (!packet || !header)
- return SIGROK_ERR;
+ return SR_ERR;
/* Start with 2K transfer, subsequently increased to 4K. */
size = 2048;
@@ -763,51 +697,55 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
/* TODO: Free them all. */
libusb_free_transfer(transfer);
g_free(buf);
- return SIGROK_ERR;
+ return SR_ERR;
}
size = 4096;
}
lupfd = libusb_get_pollfds(usb_context);
for (i = 0; lupfd[i]; i++)
- source_add(lupfd[i]->fd, lupfd[i]->events, -1, receive_data,
- NULL);
+ sr_source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data,
+ NULL);
free(lupfd);
- packet->type = DF_HEADER;
- packet->length = sizeof(struct datafeed_header);
+ packet->type = SR_DF_HEADER;
+ packet->length = sizeof(struct sr_datafeed_header);
packet->payload = (unsigned char *)header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
header->samplerate = cur_samplerate;
- header->protocol_id = PROTO_RAW;
- header->num_probes = NUM_PROBES;
- session_bus(session_device_id, packet);
+ header->protocol_id = SR_PROTO_RAW;
+ header->num_logic_probes = NUM_PROBES;
+ header->num_analog_probes = 0;
+ sr_session_bus(session_device_id, packet);
g_free(header);
g_free(packet);
- return SIGROK_OK;
+ return SR_OK;
}
/* This stops acquisition on ALL devices, ignoring device_index. */
static void hw_stop_acquisition(int device_index, gpointer session_device_id)
{
- struct datafeed_packet packet;
+ struct sr_datafeed_packet packet;
- packet.type = DF_END;
- session_bus(session_device_id, &packet);
+ /* Avoid compiler warnings. */
+ device_index = device_index;
+
+ packet.type = SR_DF_END;
+ sr_session_bus(session_device_id, &packet);
receive_transfer(NULL);
/* TODO: Need to cancel and free any queued up transfers. */
}
-struct device_plugin saleae_logic_plugin_info = {
+struct sr_device_plugin saleae_logic_plugin_info = {
"saleae-logic",
+ "Saleae Logic",
1,
hw_init,
hw_cleanup,
-
hw_opendev,
hw_closedev,
hw_get_device_info,