#include <glib.h>
#include <libusb.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
#include "config.h"
-#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.fw"
+#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
+#define TRIGGER_FIRED -1
/* There is only one model Saleae Logic, and this is what it supports: */
static int capabilities[] = {
/* These are really implemented in the driver, not the hardware. */
HWCAP_LIMIT_SAMPLES,
+ HWCAP_CONTINUOUS,
0,
};
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);
libusb_device **devlist;
int err, devcnt, i;
- /* QUICK HACK */
+ /* 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;
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;
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;
} else if (capability == HWCAP_PROBECONFIG) {
ret = configure_probes((GSList *) value);
} else if (capability == HWCAP_LIMIT_SAMPLES) {
- limit_samples = strtoull(value, NULL, 10);
+ tmp_u64 = value;
+ limit_samples = *tmp_u64;
ret = SIGROK_OK;
} else {
ret = SIGROK_ERR;
{
struct timeval tv;
- /* QUICK HACK */
+ /* Avoid compiler warnings. */
fd = fd;
revents = revents;
user_data = user_data;
return TRUE;
}
-static void trigger_helper(int i, unsigned char *cur_buf,
- struct datafeed_packet *packet, void *user_data,
- int *trigger_offset)
-{
- 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. */
- *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);
-
- /*
- * Send the samples that triggered it, since we're
- * skipping past them.
- */
- packet->type = DF_LOGIC8;
- packet->length = trigger_stage;
- packet->payload = trigger_buffer;
- session_bus(user_data, packet);
- // break; // FIXME???
-
- trigger_stage = TRIGGER_FIRED;
- }
- 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)
- i = -1; /* Oops, went back past this buffer. */
- /* Reset trigger stage. */
- trigger_stage = 0;
- }
-}
-
void receive_transfer(struct libusb_transfer *transfer)
{
static int num_samples = 0;
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. */
trigger_offset = 0;
if (trigger_stage >= 0) {
for (i = 0; i < cur_buflen; i++) {
- trigger_helper(i, cur_buf, &packet, user_data,
- &trigger_offset);
+
+ 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. */
+ 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);
+
+ /*
+ * 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;
+ break;
+ }
+ 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)
+ 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 = DF_LOGIC;
packet.length = cur_buflen - trigger_offset;
+ packet.unitsize = 1;
packet.payload = cur_buf + trigger_offset;
session_bus(user_data, &packet);
g_free(cur_buf);
num_samples += cur_buflen;
- if ((unsigned int)num_samples > limit_samples) {
+ if (limit_samples && (unsigned int) num_samples > limit_samples) {
hw_stop_acquisition(-1, user_data);
}
} else {
gettimeofday(&header->starttime, NULL);
header->samplerate = cur_samplerate;
header->protocol_id = PROTO_RAW;
- header->num_probes = NUM_PROBES;
+ header->num_logic_probes = NUM_PROBES;
+ header->num_analog_probes = 0;
session_bus(session_device_id, packet);
g_free(header);
g_free(packet);
{
struct datafeed_packet packet;
- /* QUICK HACK */
+ /* Avoid compiler warnings. */
device_index = device_index;
packet.type = DF_END;
projects / libsigrok.git / blobdiff