BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Coding style fixes, aided by 'indent'. 

The following shell alias can be used:

  alias INDENT='indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs'
This commit is contained in:
Uwe Hermann 2010-04-09 19:04:36 +02:00
parent d02a535e05
commit 6f5f21f996
1 changed files with 265 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

413
hardware/saleae-logic/saleae-logic.c
View File

@ -42,26 +42,26 @@
/* delay in ms */ /* delay in ms */
#define FIRMWARE_RENUM_DELAY 2000 #define FIRMWARE_RENUM_DELAY 2000
#define NUM_SIMUL_TRANSFERS 10 #define NUM_SIMUL_TRANSFERS 10
#define MAX_EMPTY_TRANSFERS NUM_SIMUL_TRANSFERS * 2 #define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)
/* software trigger implementation: positive values indicate trigger stage */ /* 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: */
/* there is only one model Saleae Logic, and this is what it supports */
static int capabilities[] = { static int capabilities[] = {
HWCAP_LOGIC_ANALYZER, HWCAP_LOGIC_ANALYZER,
HWCAP_SAMPLERATE, HWCAP_SAMPLERATE,
/* these are really implemented in the driver, not the hardware */ /* These are really implemented in the driver, not the hardware. */
HWCAP_LIMIT_SAMPLES, HWCAP_LIMIT_SAMPLES,
0 0,
}; };
/* list of struct sigrok_device_instance, maintained by opendev() and closedev() */ /* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
static GSList *device_instances = NULL; static GSList *device_instances = NULL;
/* since we can't keep track of a Saleae Logic device after upgrading the /*
* 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 * 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 * upgrade -- this is like a global lock. No device will open until a proper
* delay after the last device was upgraded. * delay after the last device was upgraded.
@ -81,87 +81,84 @@ static uint64_t supported_samplerates[] = {
MHZ(12), MHZ(12),
MHZ(16), MHZ(16),
MHZ(24), MHZ(24),
0 0,
}; };
static struct samplerates samplerates = { static struct samplerates samplerates = {
KHZ(200), KHZ(200),
MHZ(24), MHZ(24),
0, 0,
supported_samplerates supported_samplerates,
}; };
/* TODO: all of these should go in a device-specific struct */ /* TODO: All of these should go in a device-specific struct. */
static uint64_t cur_samplerate = 0; static uint64_t cur_samplerate = 0;
static uint64_t limit_samples = 0; static uint64_t limit_samples = 0;
static uint8_t probe_mask = 0, \ static uint8_t probe_mask = 0;
trigger_mask[NUM_TRIGGER_STAGES] = {0}, \ static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 };
trigger_value[NUM_TRIGGER_STAGES] = {0}, \ static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 };
trigger_buffer[NUM_TRIGGER_STAGES] = {0};; static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 };
int trigger_stage = TRIGGER_FIRED; int trigger_stage = TRIGGER_FIRED;
static int hw_set_configuration(int device_index, int capability, void *value); static int hw_set_configuration(int device_index, int capability, void *value);
/* returns 1 if the device's configuration profile match the Logic firmware's /* returns 1 if the device's configuration profile match the Logic firmware's
* configuration, 0 otherwise * configuration, 0 otherwise
*/ */
int check_conf_profile(libusb_device *dev) int check_conf_profile(libusb_device *dev)
{ {
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
struct libusb_config_descriptor *conf_dsc; struct libusb_config_descriptor *conf_dsc = NULL;
const struct libusb_interface_descriptor *intf_dsc; const struct libusb_interface_descriptor *intf_dsc;
int ret; int ret = -1;
ret = -1; while (ret == -1) {
conf_dsc = NULL; /* Assume it's not a Saleae Logic unless proven wrong. */
while(ret == -1)
{
/* assume it's not a Saleae Logic unless proven wrong */
ret = 0; ret = 0;
if (libusb_get_device_descriptor(dev, &des) != 0) if (libusb_get_device_descriptor(dev, &des) != 0)
break; break;
if (des.bNumConfigurations != 1) if (des.bNumConfigurations != 1)
/* need exactly 1 configuration */ /* Need exactly 1 configuration. */
break; break;
if (libusb_get_config_descriptor(dev, 0, &conf_dsc) != 0) if (libusb_get_config_descriptor(dev, 0, &conf_dsc) != 0)
break; break;
if (conf_dsc->bNumInterfaces != 1) if (conf_dsc->bNumInterfaces != 1)
/* need exactly 1 interface */ /* Need exactly 1 interface. */
break; break;
if (conf_dsc->interface[0].num_altsetting != 1) if (conf_dsc->interface[0].num_altsetting != 1)
/* need just one alternate setting */ /* Need just one alternate setting. */
break; break;
intf_dsc = &(conf_dsc->interface[0].altsetting[0]); intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
if (intf_dsc->bNumEndpoints != 2) if (intf_dsc->bNumEndpoints != 2)
/* need 2 endpoints */ /* Need 2 endpoints. */
break; break;
if((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) != (1 | LIBUSB_ENDPOINT_OUT)) if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
/* first endpoint should be 1 (outbound) */ (1 | LIBUSB_ENDPOINT_OUT))
/* First endpoint should be 1 (outbound). */
break; break;
if((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) != (2 | LIBUSB_ENDPOINT_IN)) if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) !=
/* first endpoint should be 2 (inbound) */ (2 | LIBUSB_ENDPOINT_IN))
/* First endpoint should be 2 (inbound). */
break; break;
/* if we made it here, it must be a Saleae Logic */ /* If we made it here, it must be a Saleae Logic. */
ret = 1; ret = 1;
} }
if (conf_dsc) if (conf_dsc)
libusb_free_config_descriptor(conf_dsc); libusb_free_config_descriptor(conf_dsc);
return ret; return ret;
} }
struct sigrok_device_instance *sl_open_device(int device_index) struct sigrok_device_instance *sl_open_device(int device_index)
{ {
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
@ -173,86 +170,91 @@ struct sigrok_device_instance *sl_open_device(int device_index)
return NULL; return NULL;
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(usb_context, &devlist);
if(sdi->status == ST_INITIALIZING) if (sdi->status == ST_INITIALIZING) {
{ /*
/* this device was renumerating last time we touched it. opendev() guarantees we've * This device was renumerating last time we touched it.
* waited long enough for it to have booted properly, so now we need to find it on * 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. * the bus and record its new address.
*/ */
skip = 0; skip = 0;
for(i = 0; devlist[i]; i++) for (i = 0; devlist[i]; i++) {
{ if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
if( (err = libusb_get_device_descriptor(devlist[i], &des)) ) g_warning("failed to get device descriptor: %d",
{ err);
g_warning("failed to get device descriptor: %d", err);
continue; continue;
} }
if(des.idVendor == USB_VENDOR && des.idProduct == USB_PRODUCT) if (des.idVendor == USB_VENDOR
{ && des.idProduct == USB_PRODUCT) {
if(skip != device_index) if (skip != device_index) {
{ /*
/* skip past devices of this type that aren't the one we want */ * Skip past devices of this type that
* aren't the one we want.
*/
skip++; skip++;
continue; continue;
} }
/* 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? * 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(devlist[i],
if( !(err = libusb_open(devlist[i], &(sdi->usb->devhdl))) ) &(sdi->usb->devhdl)))) {
{
sdi->usb->address = libusb_get_device_address(devlist [i]); sdi->usb->address = libusb_get_device_address(devlist [i]);
sdi->status = ST_ACTIVE; sdi->status = ST_ACTIVE;
g_message("opened device %d on %d.%d interface %d", sdi->index, sdi->usb->bus, g_message("opened device %d on %d.%d "
"interface %d",
sdi->index, sdi->usb->bus,
sdi->usb->address, USB_INTERFACE); sdi->usb->address, USB_INTERFACE);
} } else {
else g_warning("failed to open device: %d",
{ err);
g_warning("failed to open device: %d", err);
sdi = NULL; sdi = NULL;
} }
} }
} }
} } else if (sdi->status == ST_INACTIVE) {
else if(sdi->status == ST_INACTIVE) /*
{ * This device is fully enumerated, so we need to find this
/* this device is fully enumerated, so we need to find this device by * device by vendor, product, bus and address.
* vendor, product, bus and address */ */
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(usb_context, &devlist);
for(i = 0; devlist[i]; i++) for (i = 0; devlist[i]; i++) {
{ if ((err =
if( (err = libusb_get_device_descriptor(devlist[i], &des)) ) libusb_get_device_descriptor(devlist[i], &des))) {
{ g_warning("failed to get device descriptor: %d",
g_warning("failed to get device descriptor: %d", err); err);
continue; continue;
} }
if(des.idVendor == USB_VENDOR && des.idProduct == USB_PRODUCT) if (des.idVendor == USB_VENDOR
{ && des.idProduct == USB_PRODUCT) {
if(libusb_get_bus_number(devlist[i]) == sdi->usb->bus && if (libusb_get_bus_number(devlist[i]) ==
libusb_get_device_address(devlist[i]) == sdi->usb->address) sdi->usb->bus
{ && libusb_get_device_address(devlist[i]) ==
/* found it */ sdi->usb->address) {
if( !(err = libusb_open(devlist[i], &(sdi->usb->devhdl))) ) /* Found it. */
{ if (!(err = libusb_open(devlist[i],
&(sdi->usb->devhdl)))) {
sdi->status = ST_ACTIVE; sdi->status = ST_ACTIVE;
g_message("opened device %d on %d.%d interface %d", sdi->index, sdi->usb->bus, g_message("opened device %d on "
sdi->usb->address, USB_INTERFACE); "%d.%d interface %d",
} sdi->index, sdi->usb->bus,
else sdi->usb->address,
{ USB_INTERFACE);
} else {
g_warning("failed to open device: %d", err); g_warning("failed to open device: %d", err);
sdi = NULL; sdi = NULL;
} }
} }
} }
} }
} } else {
else /* Status must be ST_ACTIVE, i.e. already in use... */
{
/* status must be ST_ACTIVE, i.e. already in use... */
sdi = NULL; sdi = NULL;
} }
libusb_free_device_list(devlist, 1); libusb_free_device_list(devlist, 1);
@ -263,7 +265,6 @@ struct sigrok_device_instance *sl_open_device(int device_index)
return sdi; return sdi;
} }
int upload_firmware(libusb_device *dev) int upload_firmware(libusb_device *dev)
{ {
struct libusb_device_handle *hdl; struct libusb_device_handle *hdl;
@ -273,15 +274,13 @@ int upload_firmware(libusb_device *dev)
libusb_get_bus_number(dev), libusb_get_device_address(dev)); libusb_get_bus_number(dev), libusb_get_device_address(dev));
err = libusb_open(dev, &hdl); err = libusb_open(dev, &hdl);
if(err != 0) if (err != 0) {
{
g_warning("failed to open device: %d", err); g_warning("failed to open device: %d", err);
return 1; return 1;
} }
err = libusb_set_configuration(hdl, USB_CONFIGURATION); err = libusb_set_configuration(hdl, USB_CONFIGURATION);
if(err != 0) if (err != 0) {
{
g_warning("Unable to set configuration: %d", err); g_warning("Unable to set configuration: %d", err);
return 1; return 1;
} }
@ -297,29 +296,24 @@ int upload_firmware(libusb_device *dev)
libusb_close(hdl); libusb_close(hdl);
/* remember when the last firmware update was done */ /* Remember when the last firmware update was done. */
g_get_current_time(&firmware_updated); g_get_current_time(&firmware_updated);
return 0; return 0;
} }
static void close_device(struct sigrok_device_instance *sdi) static void close_device(struct sigrok_device_instance *sdi)
{ {
if (sdi->usb->devhdl) {
if(sdi->usb->devhdl) g_message("closing device %d on %d.%d interface %d", sdi->index,
{ sdi->usb->bus, sdi->usb->address, USB_INTERFACE);
g_message("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_release_interface(sdi->usb->devhdl, USB_INTERFACE);
libusb_close(sdi->usb->devhdl); libusb_close(sdi->usb->devhdl);
sdi->usb->devhdl = NULL; sdi->usb->devhdl = NULL;
sdi->status = ST_INACTIVE; sdi->status = ST_INACTIVE;
} }
} }
static int configure_probes(GSList * probes) static int configure_probes(GSList * probes)
{ {
struct probe *probe; struct probe *probe;
@ -328,25 +322,21 @@ static int configure_probes(GSList *probes)
char *tc; char *tc;
probe_mask = 0; probe_mask = 0;
for(i = 0; i < NUM_TRIGGER_STAGES; i++) for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
{
trigger_mask[i] = 0; trigger_mask[i] = 0;
trigger_value[i] = 0; trigger_value[i] = 0;
} }
stage = -1; stage = -1;
for(l = probes; l; l = l->next) for (l = probes; l; l = l->next) {
{
probe = (struct probe *)l->data; probe = (struct probe *)l->data;
if (probe->enabled == FALSE) if (probe->enabled == FALSE)
continue; continue;
probe_bit = 1 << (probe->index - 1); probe_bit = 1 << (probe->index - 1);
probe_mask |= probe_bit; probe_mask |= probe_bit;
if(probe->trigger) if (probe->trigger) {
{
stage = 0; stage = 0;
for(tc = probe->trigger; *tc; tc++) for (tc = probe->trigger; *tc; tc++) {
{
trigger_mask[stage] |= probe_bit; trigger_mask[stage] |= probe_bit;
if (*tc == '1') if (*tc == '1')
trigger_value[stage] |= probe_bit; trigger_value[stage] |= probe_bit;
@ -358,7 +348,10 @@ static int configure_probes(GSList *probes)
} }
if (stage == -1) if (stage == -1)
/* we didn't configure any triggers, make sure acquisition doesn't wait for any */ /*
* We didn't configure any triggers, make sure acquisition
* doesn't wait for any.
*/
trigger_stage = TRIGGER_FIRED; trigger_stage = TRIGGER_FIRED;
else else
trigger_stage = 0; trigger_stage = 0;
@ -366,8 +359,6 @@ static int configure_probes(GSList *probes)
return SIGROK_OK; return SIGROK_OK;
} }
/* /*
* API callbacks * API callbacks
*/ */
@ -385,7 +376,7 @@ static int hw_init(char *deviceinfo)
} }
libusb_set_debug(usb_context, 3); libusb_set_debug(usb_context, 3);
/* find all Saleae Logic devices and upload firmware to all of them */ /* Find all Saleae Logic devices and upload firmware to all of them. */
devcnt = 0; devcnt = 0;
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) { for (i = 0; devlist[i]; i++) {
@ -396,27 +387,37 @@ static int hw_init(char *deviceinfo)
} }
if (des.idVendor == USB_VENDOR && des.idProduct == USB_PRODUCT) { if (des.idVendor == USB_VENDOR && des.idProduct == USB_PRODUCT) {
/* definitely a Saleae Logic */ /* Definitely a Saleae Logic... */
sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING, sdi = sigrok_device_instance_new(devcnt,
USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); ST_INITIALIZING, USB_VENDOR_NAME,
USB_MODEL_NAME, USB_MODEL_VERSION);
if (!sdi) if (!sdi)
return 0; return 0;
device_instances = g_slist_append(device_instances, sdi); device_instances =
g_slist_append(device_instances, sdi);
if(check_conf_profile(devlist[i]) == 0) if (check_conf_profile(devlist[i]) == 0) {
{
if (upload_firmware(devlist[i]) > 0) if (upload_firmware(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... */ * 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.
*/
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 = usb_device_instance_new
} (libusb_get_bus_number(devlist[i]), 0, NULL);
else { } else {
/* already has the firmware on it, so fix the new address */ /*
sdi->usb = usb_device_instance_new(libusb_get_bus_number(devlist[i]), * Already has the firmware on it, so fix the
libusb_get_device_address(devlist[i]), NULL); * new address.
*/
sdi->usb = usb_device_instance_new
(libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]),
NULL);
} }
devcnt++; devcnt++;
} }
@ -426,7 +427,6 @@ static int hw_init(char *deviceinfo)
return devcnt; return devcnt;
} }
static int hw_opendev(int device_index) static int hw_opendev(int device_index)
{ {
GTimeVal cur_time; GTimeVal cur_time;
@ -435,14 +435,16 @@ static int hw_opendev(int device_index)
unsigned int cur, upd; unsigned int cur, upd;
if (firmware_updated.tv_sec > 0) { if (firmware_updated.tv_sec > 0) {
/* firmware was recently uploaded */ /* Firmware was recently uploaded. */
g_get_current_time(&cur_time); g_get_current_time(&cur_time);
cur = cur_time.tv_sec * 1000 + cur_time.tv_usec / 1000; cur = cur_time.tv_sec * 1000 + cur_time.tv_usec / 1000;
upd = firmware_updated.tv_sec * 1000 + firmware_updated.tv_usec / 1000; upd = firmware_updated.tv_sec * 1000 +
firmware_updated.tv_usec / 1000;
timediff = cur - upd; timediff = cur - upd;
if (timediff < FIRMWARE_RENUM_DELAY) { if (timediff < FIRMWARE_RENUM_DELAY) {
timediff = FIRMWARE_RENUM_DELAY - timediff; timediff = FIRMWARE_RENUM_DELAY - timediff;
g_message("waiting %d ms for device to reset", timediff); g_message("waiting %d ms for device to reset",
timediff);
g_usleep(timediff * 1000); g_usleep(timediff * 1000);
firmware_updated.tv_sec = 0; firmware_updated.tv_sec = 0;
} }
@ -460,34 +462,32 @@ static int hw_opendev(int device_index)
} }
if (cur_samplerate == 0) { if (cur_samplerate == 0) {
/* sample rate hasn't been set; default to the slowest it has */ /* Samplerate hasn't been set; default to the slowest one. */
if(hw_set_configuration(device_index, HWCAP_SAMPLERATE, &supported_samplerates[0]) == SIGROK_ERR) if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
&supported_samplerates[0]) == SIGROK_ERR)
return SIGROK_ERR; return SIGROK_ERR;
} }
return SIGROK_OK; return SIGROK_OK;
} }
static void hw_closedev(int device_index) static void hw_closedev(int device_index)
{ {
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
if ((sdi = get_sigrok_device_instance(device_instances, device_index))) if ((sdi = get_sigrok_device_instance(device_instances, device_index)))
close_device(sdi); close_device(sdi);
} }
static void hw_cleanup(void) static void hw_cleanup(void)
{ {
GSList *l; GSList *l;
/* properly close all devices */ /* Properly close all devices... */
for (l = device_instances; l; l = l->next) for (l = device_instances; l; l = l->next)
close_device((struct sigrok_device_instance *)l->data); close_device((struct sigrok_device_instance *)l->data);
/* and free all their memory */ /* ...and free all their memory. */
for (l = device_instances; l; l = l->next) for (l = device_instances; l; l = l->next)
g_free(l->data); g_free(l->data);
g_slist_free(device_instances); g_slist_free(device_instances);
@ -496,21 +496,17 @@ static void hw_cleanup(void)
if (usb_context) if (usb_context)
libusb_exit(usb_context); libusb_exit(usb_context);
usb_context = NULL; usb_context = NULL;
} }
static void *hw_get_device_info(int device_index, int device_info_id) static void *hw_get_device_info(int device_index, int device_info_id)
{ {
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
void *info; void *info = NULL;
if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
return NULL; return NULL;
info = NULL; switch (device_info_id) {
switch(device_info_id)
{
case DI_INSTANCE: case DI_INSTANCE:
info = sdi; info = sdi;
break; break;
@ -531,7 +527,6 @@ static void *hw_get_device_info(int device_index, int device_info_id)
return info; return info;
} }
static int hw_get_status(int device_index) static int hw_get_status(int device_index)
{ {
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
@ -543,15 +538,13 @@ static int hw_get_status(int device_index)
return ST_NOT_FOUND; return ST_NOT_FOUND;
} }
static int *hw_get_capabilities(void) static int *hw_get_capabilities(void)
{ {
return capabilities; return capabilities;
} }
static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
static int set_configuration_samplerate(struct sigrok_device_instance *sdi, uint64_t samplerate) uint64_t samplerate)
{ {
uint8_t divider; uint8_t divider;
int ret, result, i; int ret, result, i;
@ -566,10 +559,12 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, uint
divider = (uint8_t) (48 / (float)(samplerate / 1000000)) - 1; divider = (uint8_t) (48 / (float)(samplerate / 1000000)) - 1;
g_message("setting samplerate to %"PRIu64" Hz (divider %d)", samplerate, divider); g_message("setting samplerate to %" PRIu64 " Hz (divider %d)",
samplerate, divider);
buf[0] = 0x01; buf[0] = 0x01;
buf[1] = divider; buf[1] = divider;
ret = libusb_bulk_transfer(sdi->usb->devhdl, 1 | LIBUSB_ENDPOINT_OUT, buf, 2, &result, 500); ret = libusb_bulk_transfer(sdi->usb->devhdl, 1 | LIBUSB_ENDPOINT_OUT,
buf, 2, &result, 500);
if (ret != 0) { if (ret != 0) {
g_warning("failed to set samplerate: %d", ret); g_warning("failed to set samplerate: %d", ret);
return SIGROK_ERR; return SIGROK_ERR;
@ -579,7 +574,6 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, uint
return SIGROK_OK; return SIGROK_OK;
} }
static int hw_set_configuration(int device_index, int capability, void *value) static int hw_set_configuration(int device_index, int capability, void *value)
{ {
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
@ -592,20 +586,18 @@ static int hw_set_configuration(int device_index, int capability, void *value)
if (capability == HWCAP_SAMPLERATE) { if (capability == HWCAP_SAMPLERATE) {
tmp_u64 = value; tmp_u64 = value;
ret = set_configuration_samplerate(sdi, *tmp_u64); ret = set_configuration_samplerate(sdi, *tmp_u64);
} } else if (capability == HWCAP_PROBECONFIG) {
else if(capability == HWCAP_PROBECONFIG)
ret = configure_probes((GSList *) value); ret = configure_probes((GSList *) value);
else if(capability == HWCAP_LIMIT_SAMPLES) { } else if (capability == HWCAP_LIMIT_SAMPLES) {
limit_samples = strtoull(value, NULL, 10); limit_samples = strtoull(value, NULL, 10);
ret = SIGROK_OK; ret = SIGROK_OK;
} } else {
else
ret = SIGROK_ERR; ret = SIGROK_ERR;
}
return ret; return ret;
} }
static int receive_data(int fd, int revents, void *user_data) static int receive_data(int fd, int revents, void *user_data)
{ {
struct timeval tv; struct timeval tv;
@ -616,81 +608,80 @@ static int receive_data(int fd, int revents, void *user_data)
return TRUE; return TRUE;
} }
void receive_transfer(struct libusb_transfer *transfer) void receive_transfer(struct libusb_transfer *transfer)
{ {
static int num_samples = 0; static int num_samples = 0;
static int empty_transfer_count = 0; static int empty_transfer_count = 0;
struct datafeed_packet packet; struct datafeed_packet packet;
void *user_data; void *user_data;
int cur_buflen, trigger_offset, i; int cur_buflen, trigger_offset, i;
unsigned char *cur_buf, *new_buf; unsigned char *cur_buf, *new_buf;
if (transfer == NULL) { if (transfer == NULL) {
/* hw_stop_acquisition() telling us to stop */ /* hw_stop_acquisition() is telling us to stop. */
num_samples = -1; num_samples = -1;
} }
if (num_samples == -1) { if (num_samples == -1) {
/* acquisition has already ended, just free any queued up transfer that come in */ /*
* Acquisition has already ended, just free any queued up
* transfer that come in.
*/
libusb_free_transfer(transfer); libusb_free_transfer(transfer);
} } else {
else { g_message("receive_transfer(): status %d received %d bytes",
g_message("receive_transfer(): status %d received %d bytes", transfer->status, transfer->actual_length); transfer->status, transfer->actual_length);
/* save the incoming transfer before reusing the transfer struct */ /* Save incoming transfer before reusing the transfer struct. */
cur_buf = transfer->buffer; cur_buf = transfer->buffer;
cur_buflen = transfer->actual_length; cur_buflen = transfer->actual_length;
user_data = transfer->user_data; user_data = transfer->user_data;
/* fire off a new request */ /* Fire off a new request. */
new_buf = g_malloc(4096); new_buf = g_malloc(4096);
transfer->buffer = new_buf; transfer->buffer = new_buf;
transfer->length = 4096; transfer->length = 4096;
if (libusb_submit_transfer(transfer) != 0) { if (libusb_submit_transfer(transfer) != 0) {
/* TODO: stop session? */ /* TODO: Stop session? */
g_warning("eek"); g_warning("eek");
} }
if (cur_buflen == 0) { if (cur_buflen == 0) {
empty_transfer_count++; empty_transfer_count++;
if (empty_transfer_count > MAX_EMPTY_TRANSFERS) { if (empty_transfer_count > MAX_EMPTY_TRANSFERS) {
/* the FX2 gave up... end the acquisition, the frontend will work /* The FX2 gave up. End the acquisition, the
* out that the samplecount is short * frontend will work out that the samplecount
* is short.
*/ */
packet.type = DF_END; packet.type = DF_END;
session_bus(user_data, &packet); session_bus(user_data, &packet);
num_samples = -1; num_samples = -1;
} }
return; return;
} } else {
else
empty_transfer_count = 0; empty_transfer_count = 0;
}
trigger_offset = 0; trigger_offset = 0;
if(trigger_stage >= 0) if (trigger_stage >= 0) {
{ for (i = 0; i < cur_buflen; i++) {
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] =
/* match on this trigger stage */ cur_buf[i];
trigger_buffer[trigger_stage] = cur_buf[i];
trigger_stage++; trigger_stage++;
if(trigger_stage == NUM_TRIGGER_STAGES || trigger_mask[trigger_stage] == 0) if (trigger_stage == NUM_TRIGGER_STAGES
{ || trigger_mask[trigger_stage] == 0) {
/* match on all trigger stages, we're done */ /* Match on all trigger stages, we're done */
trigger_offset = i + 1; trigger_offset = i + 1;
/* TODO: send pre-trigger buffer to session bus */ /* TODO: Send pre-trigger buffer to session bus. Tell the frontend we hit the trigger here. */
/* tell the frontend we hit the trigger here */
packet.type = DF_TRIGGER; packet.type = DF_TRIGGER;
packet.length = 0; packet.length = 0;
session_bus(user_data, &packet); session_bus(user_data, &packet);
/* send the samples that triggered it, since we're skipping past them */ /* Send the samples that triggered it, since we're skipping past them. */
packet.type = DF_LOGIC8; packet.type = DF_LOGIC8;
packet.length = trigger_stage; packet.length = trigger_stage;
packet.payload = trigger_buffer; packet.payload = trigger_buffer;
@ -699,10 +690,9 @@ void receive_transfer(struct libusb_transfer *transfer)
trigger_stage = TRIGGER_FIRED; trigger_stage = TRIGGER_FIRED;
} }
} } else if (trigger_stage > 0) {
else if(trigger_stage > 0) /*
{ * We had a match before, but not in the next sample. However, we may
/* 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 * 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 * 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 * the next sample from the one that matched originally, which the
@ -710,17 +700,16 @@ void receive_transfer(struct libusb_transfer *transfer)
*/ */
i -= trigger_stage; i -= trigger_stage;
if (i < -1) if (i < -1)
/* oops, went back past this buffer */ /* Oops, went back past this buffer. */
i = -1; i = -1;
/* reset trigger stage */ /* Reset trigger stage. */
trigger_stage = 0; trigger_stage = 0;
} }
} }
} }
if(trigger_stage == TRIGGER_FIRED) if (trigger_stage == TRIGGER_FIRED) {
{ /* Send the incoming transfer to the session bus. */
/* send the incoming transfer to the session bus */
packet.type = DF_LOGIC8; packet.type = DF_LOGIC8;
packet.length = cur_buflen - trigger_offset; packet.length = cur_buflen - trigger_offset;
packet.payload = cur_buf + trigger_offset; packet.payload = cur_buf + trigger_offset;
@ -728,24 +717,21 @@ void receive_transfer(struct libusb_transfer *transfer)
g_free(cur_buf); g_free(cur_buf);
num_samples += cur_buflen; num_samples += cur_buflen;
if(num_samples > limit_samples) if (num_samples > limit_samples) {
{ /* End the acquisition. */
/* end the acquisition */
packet.type = DF_END; packet.type = DF_END;
session_bus(user_data, &packet); session_bus(user_data, &packet);
num_samples = -1; num_samples = -1;
} }
} } else {
else /*
{ * TODO: Buffer pre-trigger data in capture
/* TODO: buffer pre-trigger data in capture ratio-sized buffer */ * ratio-sized buffer.
*/
} }
} }
} }
static int hw_start_acquisition(int device_index, gpointer session_device_id) static int hw_start_acquisition(int device_index, gpointer session_device_id)
{ {
struct sigrok_device_instance *sdi; struct sigrok_device_instance *sdi;
@ -764,15 +750,16 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
if (!packet || !header) if (!packet || !header)
return SIGROK_ERR; return SIGROK_ERR;
/* start with 2K transfer, subsequently increased to 4K */ /* Start with 2K transfer, subsequently increased to 4K. */
size = 2048; size = 2048;
for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) { for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) {
buf = g_malloc(size); buf = g_malloc(size);
transfer = libusb_alloc_transfer(0); transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, sdi->usb->devhdl, 2 | LIBUSB_ENDPOINT_IN, buf, size, libusb_fill_bulk_transfer(transfer, sdi->usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, size,
receive_transfer, session_device_id, 40); receive_transfer, session_device_id, 40);
if (libusb_submit_transfer(transfer) != 0) { if (libusb_submit_transfer(transfer) != 0) {
/* TODO: free them all */ /* TODO: Free them all. */
libusb_free_transfer(transfer); libusb_free_transfer(transfer);
g_free(buf); g_free(buf);
return SIGROK_ERR; return SIGROK_ERR;
@ -782,7 +769,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
lupfd = libusb_get_pollfds(usb_context); lupfd = libusb_get_pollfds(usb_context);
for (i = 0; lupfd[i]; i++) for (i = 0; lupfd[i]; i++)
source_add(lupfd[i]->fd, lupfd[i]->events, -1, receive_data, NULL); source_add(lupfd[i]->fd, lupfd[i]->events, -1, receive_data,
NULL);
free(lupfd); free(lupfd);
packet->type = DF_HEADER; packet->type = DF_HEADER;
@ -800,8 +788,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
return SIGROK_OK; return SIGROK_OK;
} }
/* This stops acquisition on ALL devices, ignoring device_index. */
/* this stops acquisition on ALL devices, ignoring device_index */
static void hw_stop_acquisition(int device_index, gpointer session_device_id) static void hw_stop_acquisition(int device_index, gpointer session_device_id)
{ {
struct datafeed_packet packet; struct datafeed_packet packet;
@ -811,12 +798,9 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
receive_transfer(NULL); receive_transfer(NULL);
/* TODO: need to cancel and free any queued up transfers */ /* TODO: Need to cancel and free any queued up transfers. */
} }
struct device_plugin saleae_logic_plugin_info = { struct device_plugin saleae_logic_plugin_info = {
"saleae-logic", "saleae-logic",
1, 1,
@ -830,6 +814,5 @@ struct device_plugin saleae_logic_plugin_info = {
hw_get_capabilities, hw_get_capabilities,
hw_set_configuration, hw_set_configuration,
hw_start_acquisition, hw_start_acquisition,
hw_stop_acquisition hw_stop_acquisition,
}; };