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

fx2lafw: use driver-private storage for instances and libusb_context

This commit is contained in:
Bert Vermeulen 2012-08-01 00:42:19 +02:00
parent 269971ddce
commit dc9dbe949a
2 changed files with 186 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

332
hardware/fx2lafw/fx2lafw.c
View File

@ -139,8 +139,6 @@ static const struct sr_samplerates samplerates = {
supported_samplerates, supported_samplerates,
}; };
static libusb_context *usb_context = NULL;
SR_PRIV struct sr_dev_driver fx2lafw_driver_info; SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
static struct sr_dev_driver *fdi = &fx2lafw_driver_info; static struct sr_dev_driver *fdi = &fx2lafw_driver_info;
static int hw_dev_close(struct sr_dev_inst *sdi); static int hw_dev_close(struct sr_dev_inst *sdi);
@ -197,19 +195,21 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
{ {
libusb_device **devlist; libusb_device **devlist;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
struct version_info vi; struct version_info vi;
int ret, skip, i; int ret, skip, i;
uint8_t revid; uint8_t revid;
ctx = sdi->priv; drvc = fdi->priv;
devc = sdi->priv;
if (sdi->status == SR_ST_ACTIVE) if (sdi->status == SR_ST_ACTIVE)
/* already in use */ /* already in use */
return SR_ERR; return SR_ERR;
skip = 0; skip = 0;
const int device_count = libusb_get_device_list(usb_context, &devlist); const int device_count = libusb_get_device_list(drvc->usb_context, &devlist);
if (device_count < 0) { if (device_count < 0) {
sr_err("fx2lafw: Failed to retrieve device list (%d)", sr_err("fx2lafw: Failed to retrieve device list (%d)",
device_count); device_count);
@ -223,8 +223,8 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
continue; continue;
} }
if (des.idVendor != ctx->profile->vid if (des.idVendor != devc->profile->vid
|| des.idProduct != ctx->profile->pid) || des.idProduct != devc->profile->pid)
continue; continue;
if (sdi->status == SR_ST_INITIALIZING) { if (sdi->status == SR_ST_INITIALIZING) {
@ -238,32 +238,32 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
* This device is fully enumerated, so we need to find * This device is fully enumerated, so we need to find
* this device by vendor, product, bus and address. * this device by vendor, product, bus and address.
*/ */
if (libusb_get_bus_number(devlist[i]) != ctx->usb->bus if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
|| libusb_get_device_address(devlist[i]) != ctx->usb->address) || libusb_get_device_address(devlist[i]) != devc->usb->address)
/* this is not the one */ /* this is not the one */
continue; continue;
} }
if (!(ret = libusb_open(devlist[i], &ctx->usb->devhdl))) { if (!(ret = libusb_open(devlist[i], &devc->usb->devhdl))) {
if (ctx->usb->address == 0xff) if (devc->usb->address == 0xff)
/* /*
* first time we touch this device after firmware upload, * first time we touch this device after firmware upload,
* so we don't know the address yet. * so we don't know the address yet.
*/ */
ctx->usb->address = libusb_get_device_address(devlist[i]); devc->usb->address = libusb_get_device_address(devlist[i]);
} else { } else {
sr_err("fx2lafw: Failed to open device: %d.", ret); sr_err("fx2lafw: Failed to open device: %d.", ret);
break; break;
} }
ret = command_get_fw_version(ctx->usb->devhdl, &vi); ret = command_get_fw_version(devc->usb->devhdl, &vi);
if (ret != SR_OK) { if (ret != SR_OK) {
sr_err("fx2lafw: Failed to retrieve " sr_err("fx2lafw: Failed to retrieve "
"firmware version information."); "firmware version information.");
break; break;
} }
ret = command_get_revid_version(ctx->usb->devhdl, &revid); ret = command_get_revid_version(devc->usb->devhdl, &revid);
if (ret != SR_OK) { if (ret != SR_OK) {
sr_err("fx2lafw: Failed to retrieve REVID."); sr_err("fx2lafw: Failed to retrieve REVID.");
break; break;
@ -284,7 +284,7 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
sdi->status = SR_ST_ACTIVE; sdi->status = SR_ST_ACTIVE;
sr_info("fx2lafw: Opened device %d on %d.%d " sr_info("fx2lafw: Opened device %d on %d.%d "
"interface %d, firmware %d.%d, REVID %d.", "interface %d, firmware %d.%d, REVID %d.",
sdi->index, ctx->usb->bus, ctx->usb->address, sdi->index, devc->usb->bus, devc->usb->address,
USB_INTERFACE, vi.major, vi.minor, revid); USB_INTERFACE, vi.major, vi.minor, revid);
break; break;
@ -297,7 +297,7 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
return SR_OK; return SR_OK;
} }
static int configure_probes(struct context *ctx, GSList *probes) static int configure_probes(struct dev_context *devc, GSList *probes)
{ {
struct sr_probe *probe; struct sr_probe *probe;
GSList *l; GSList *l;
@ -305,8 +305,8 @@ static int configure_probes(struct context *ctx, GSList *probes)
char *tc; char *tc;
for (i = 0; i < NUM_TRIGGER_STAGES; i++) { for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
ctx->trigger_mask[i] = 0; devc->trigger_mask[i] = 0;
ctx->trigger_value[i] = 0; devc->trigger_value[i] = 0;
} }
stage = -1; stage = -1;
@ -316,7 +316,7 @@ static int configure_probes(struct context *ctx, GSList *probes)
continue; continue;
if (probe->index > 7) if (probe->index > 7)
ctx->sample_wide = TRUE; devc->sample_wide = TRUE;
probe_bit = 1 << (probe->index); probe_bit = 1 << (probe->index);
if (!(probe->trigger)) if (!(probe->trigger))
@ -324,9 +324,9 @@ static int configure_probes(struct context *ctx, GSList *probes)
stage = 0; stage = 0;
for (tc = probe->trigger; *tc; tc++) { for (tc = probe->trigger; *tc; tc++) {
ctx->trigger_mask[stage] |= probe_bit; devc->trigger_mask[stage] |= probe_bit;
if (*tc == '1') if (*tc == '1')
ctx->trigger_value[stage] |= probe_bit; devc->trigger_value[stage] |= probe_bit;
stage++; stage++;
if (stage > NUM_TRIGGER_STAGES) if (stage > NUM_TRIGGER_STAGES)
return SR_ERR; return SR_ERR;
@ -338,36 +338,38 @@ static int configure_probes(struct context *ctx, GSList *probes)
* We didn't configure any triggers, make sure acquisition * We didn't configure any triggers, make sure acquisition
* doesn't wait for any. * doesn't wait for any.
*/ */
ctx->trigger_stage = TRIGGER_FIRED; devc->trigger_stage = TRIGGER_FIRED;
else else
ctx->trigger_stage = 0; devc->trigger_stage = 0;
return SR_OK; return SR_OK;
} }
static struct context *fx2lafw_dev_new(void) static struct dev_context *fx2lafw_dev_new(void)
{ {
struct context *ctx; struct dev_context *devc;
if (!(ctx = g_try_malloc0(sizeof(struct context)))) { if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
sr_err("fx2lafw: %s: ctx malloc failed.", __func__); sr_err("fx2lafw: %s: devc malloc failed.", __func__);
return NULL; return NULL;
} }
ctx->trigger_stage = TRIGGER_FIRED; devc->trigger_stage = TRIGGER_FIRED;
return ctx; return devc;
} }
static int clear_instances(void) static int clear_instances(void)
{ {
GSList *l; GSList *l;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
int ret; int ret;
drvc = fdi->priv;
ret = SR_OK; ret = SR_OK;
for (l = fdi->instances; l; l = l->next) { for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data)) { if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */ /* Log error, but continue cleaning up the rest. */
sr_err("fx2lafw: %s: sdi was NULL, continuing.", sr_err("fx2lafw: %s: sdi was NULL, continuing.",
@ -375,7 +377,7 @@ static int clear_instances(void)
ret = SR_ERR_BUG; ret = SR_ERR_BUG;
continue; continue;
} }
if (!(ctx = sdi->priv)) { if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */ /* Log error, but continue cleaning up the rest. */
sr_err("fx2lafw: %s: sdi->priv was NULL, continuing", sr_err("fx2lafw: %s: sdi->priv was NULL, continuing",
__func__); __func__);
@ -387,8 +389,8 @@ static int clear_instances(void)
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
} }
g_slist_free(fdi->instances); g_slist_free(drvc->instances);
fdi->instances = NULL; drvc->instances = NULL;
return ret; return ret;
} }
@ -400,12 +402,21 @@ static int clear_instances(void)
static int hw_init(void) static int hw_init(void)
{ {
struct drv_context *drvc;
if (libusb_init(&usb_context) != 0) { if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
sr_err("fx2lafw: driver context malloc failed.");
return SR_ERR;
}
if (libusb_init(&drvc->usb_context) != 0) {
g_free(drvc);
sr_warn("fx2lafw: Failed to initialize libusb."); sr_warn("fx2lafw: Failed to initialize libusb.");
return SR_ERR; return SR_ERR;
} }
fdi->priv = drvc;
return SR_OK; return SR_OK;
} }
@ -415,20 +426,22 @@ static GSList *hw_scan(GSList *options)
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
const struct fx2lafw_profile *prof; const struct fx2lafw_profile *prof;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
struct sr_probe *probe; struct sr_probe *probe;
libusb_device **devlist; libusb_device **devlist;
int devcnt, num_logic_probes, ret, i, j; int devcnt, num_logic_probes, ret, i, j;
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
(void)options; (void)options;
drvc = fdi->priv;
/* This scan always invalidates any previous scans. */ /* This scan always invalidates any previous scans. */
clear_instances(); clear_instances();
/* Find all fx2lafw compatible devices and upload firmware to them. */ /* Find all fx2lafw compatible devices and upload firmware to them. */
devices = NULL; devices = NULL;
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(drvc->usb_context, &devlist);
for (i = 0; devlist[i]; i++) { for (i = 0; devlist[i]; i++) {
if ((ret = libusb_get_device_descriptor( if ((ret = libusb_get_device_descriptor(
@ -449,7 +462,7 @@ static GSList *hw_scan(GSList *options)
if (!prof) if (!prof)
continue; continue;
devcnt = g_slist_length(fdi->instances); devcnt = g_slist_length(drvc->instances);
sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING, sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
prof->vendor, prof->model, prof->model_version); prof->vendor, prof->model, prof->model_version);
if (!sdi) if (!sdi)
@ -465,28 +478,28 @@ static GSList *hw_scan(GSList *options)
sdi->probes = g_slist_append(sdi->probes, probe); sdi->probes = g_slist_append(sdi->probes, probe);
} }
ctx = fx2lafw_dev_new(); devc = fx2lafw_dev_new();
ctx->profile = prof; devc->profile = prof;
sdi->priv = ctx; sdi->priv = devc;
fdi->instances = g_slist_append(fdi->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
if (check_conf_profile(devlist[i])) { if (check_conf_profile(devlist[i])) {
/* Already has the firmware, so fix the new address. */ /* Already has the firmware, so fix the new address. */
sr_dbg("fx2lafw: Found an fx2lafw device."); sr_dbg("fx2lafw: Found an fx2lafw device.");
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
ctx->usb = sr_usb_dev_inst_new devc->usb = sr_usb_dev_inst_new
(libusb_get_bus_number(devlist[i]), (libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL); libusb_get_device_address(devlist[i]), NULL);
} else { } else {
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
prof->firmware) == SR_OK) prof->firmware) == SR_OK)
/* Remember when the firmware on this device was updated */ /* Remember when the firmware on this device was updated */
ctx->fw_updated = g_get_monotonic_time(); devc->fw_updated = g_get_monotonic_time();
else else
sr_err("fx2lafw: Firmware upload failed for " sr_err("fx2lafw: Firmware upload failed for "
"device %d.", devcnt); "device %d.", devcnt);
ctx->usb = sr_usb_dev_inst_new devc->usb = sr_usb_dev_inst_new
(libusb_get_bus_number(devlist[i]), 0xff, NULL); (libusb_get_bus_number(devlist[i]), 0xff, NULL);
} }
} }
@ -497,18 +510,18 @@ static GSList *hw_scan(GSList *options)
static int hw_dev_open(struct sr_dev_inst *sdi) static int hw_dev_open(struct sr_dev_inst *sdi)
{ {
struct context *ctx; struct dev_context *devc;
int ret; int ret;
int64_t timediff_us, timediff_ms; int64_t timediff_us, timediff_ms;
ctx = sdi->priv; devc = sdi->priv;
/* /*
* If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
* milliseconds for the FX2 to renumerate. * milliseconds for the FX2 to renumerate.
*/ */
ret = SR_ERR; ret = SR_ERR;
if (ctx->fw_updated > 0) { if (devc->fw_updated > 0) {
sr_info("fx2lafw: Waiting for device to reset."); sr_info("fx2lafw: Waiting for device to reset.");
/* takes at least 300ms for the FX2 to be gone from the USB bus */ /* takes at least 300ms for the FX2 to be gone from the USB bus */
g_usleep(300 * 1000); g_usleep(300 * 1000);
@ -518,7 +531,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
break; break;
g_usleep(100 * 1000); g_usleep(100 * 1000);
timediff_us = g_get_monotonic_time() - ctx->fw_updated; timediff_us = g_get_monotonic_time() - devc->fw_updated;
timediff_ms = timediff_us / 1000; timediff_ms = timediff_us / 1000;
sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms); sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms);
} }
@ -531,9 +544,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
sr_err("fx2lafw: Unable to open device."); sr_err("fx2lafw: Unable to open device.");
return SR_ERR; return SR_ERR;
} }
ctx = sdi->priv; devc = sdi->priv;
ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE); ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
if (ret != 0) { if (ret != 0) {
switch(ret) { switch(ret) {
case LIBUSB_ERROR_BUSY: case LIBUSB_ERROR_BUSY:
@ -553,7 +566,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
} }
if (ctx->cur_samplerate == 0) { if (devc->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */ /* Samplerate hasn't been set; default to the slowest one. */
if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE, if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
&supported_samplerates[0]) == SR_ERR) &supported_samplerates[0]) == SR_ERR)
@ -565,17 +578,17 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
static int hw_dev_close(struct sr_dev_inst *sdi) static int hw_dev_close(struct sr_dev_inst *sdi)
{ {
struct context *ctx; struct dev_context *devc;
ctx = sdi->priv; devc = sdi->priv;
if (ctx->usb->devhdl == NULL) if (devc->usb->devhdl == NULL)
return SR_ERR; return SR_ERR;
sr_info("fx2lafw: Closing device %d on %d.%d interface %d.", sr_info("fx2lafw: Closing device %d on %d.%d interface %d.",
sdi->index, ctx->usb->bus, ctx->usb->address, USB_INTERFACE); sdi->index, devc->usb->bus, devc->usb->address, USB_INTERFACE);
libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE); libusb_release_interface(devc->usb->devhdl, USB_INTERFACE);
libusb_close(ctx->usb->devhdl); libusb_close(devc->usb->devhdl);
ctx->usb->devhdl = NULL; devc->usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
return SR_OK; return SR_OK;
@ -583,13 +596,21 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
static int hw_cleanup(void) static int hw_cleanup(void)
{ {
struct drv_context *drvc;
int ret; int ret;
if (!(drvc = fdi->priv))
return SR_OK;
drvc = fdi->priv;
ret = clear_instances(); ret = clear_instances();
if (usb_context) if (drvc->usb_context)
libusb_exit(usb_context); libusb_exit(drvc->usb_context);
usb_context = NULL; drvc->usb_context = NULL;
g_free(drvc);
fdi->priv = NULL;
return ret; return ret;
} }
@ -597,7 +618,7 @@ static int hw_cleanup(void)
static int hw_info_get(int info_id, const void **data, static int hw_info_get(int info_id, const void **data,
const struct sr_dev_inst *sdi) const struct sr_dev_inst *sdi)
{ {
struct context *ctx; struct dev_context *devc;
switch (info_id) { switch (info_id) {
case SR_DI_HWCAPS: case SR_DI_HWCAPS:
@ -605,9 +626,9 @@ static int hw_info_get(int info_id, const void **data,
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:
if (sdi) { if (sdi) {
ctx = sdi->priv; devc = sdi->priv;
*data = GINT_TO_POINTER( *data = GINT_TO_POINTER(
(ctx->profile->dev_caps & DEV_CAPS_16BIT) ? (devc->profile->dev_caps & DEV_CAPS_16BIT) ?
16 : 8); 16 : 8);
} else } else
return SR_ERR; return SR_ERR;
@ -623,8 +644,8 @@ static int hw_info_get(int info_id, const void **data,
break; break;
case SR_DI_CUR_SAMPLERATE: case SR_DI_CUR_SAMPLERATE:
if (sdi) { if (sdi) {
ctx = sdi->priv; devc = sdi->priv;
*data = &ctx->cur_samplerate; *data = &devc->cur_samplerate;
} else } else
return SR_ERR; return SR_ERR;
break; break;
@ -638,18 +659,18 @@ static int hw_info_get(int info_id, const void **data,
static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
const void *value) const void *value)
{ {
struct context *ctx; struct dev_context *devc;
int ret; int ret;
ctx = sdi->priv; devc = sdi->priv;
if (hwcap == SR_HWCAP_SAMPLERATE) { if (hwcap == SR_HWCAP_SAMPLERATE) {
ctx->cur_samplerate = *(const uint64_t *)value; devc->cur_samplerate = *(const uint64_t *)value;
ret = SR_OK; ret = SR_OK;
} else if (hwcap == SR_HWCAP_PROBECONFIG) { } else if (hwcap == SR_HWCAP_PROBECONFIG) {
ret = configure_probes(ctx, (GSList *) value); ret = configure_probes(devc, (GSList *) value);
} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
ctx->limit_samples = *(const uint64_t *)value; devc->limit_samples = *(const uint64_t *)value;
ret = SR_OK; ret = SR_OK;
} else { } else {
ret = SR_ERR; ret = SR_ERR;
@ -660,6 +681,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
static int receive_data(int fd, int revents, void *cb_data) static int receive_data(int fd, int revents, void *cb_data)
{ {
struct drv_context *drvc;
struct timeval tv; struct timeval tv;
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
@ -667,63 +689,67 @@ static int receive_data(int fd, int revents, void *cb_data)
(void)revents; (void)revents;
(void)cb_data; (void)cb_data;
drvc = fdi->priv;
tv.tv_sec = tv.tv_usec = 0; tv.tv_sec = tv.tv_usec = 0;
libusb_handle_events_timeout(usb_context, &tv); libusb_handle_events_timeout(drvc->usb_context, &tv);
return TRUE; return TRUE;
} }
static void abort_acquisition(struct context *ctx) static void abort_acquisition(struct dev_context *devc)
{ {
int i; int i;
ctx->num_samples = -1; devc->num_samples = -1;
for (i = ctx->num_transfers - 1; i >= 0; i--) { for (i = devc->num_transfers - 1; i >= 0; i--) {
if (ctx->transfers[i]) if (devc->transfers[i])
libusb_cancel_transfer(ctx->transfers[i]); libusb_cancel_transfer(devc->transfers[i]);
} }
} }
static void finish_acquisition(struct context *ctx) static void finish_acquisition(struct dev_context *devc)
{ {
struct drv_context *drvc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
int i; int i;
drvc = fdi->priv;
/* Terminate session */ /* Terminate session */
packet.type = SR_DF_END; packet.type = SR_DF_END;
sr_session_send(ctx->session_dev_id, &packet); sr_session_send(devc->session_dev_id, &packet);
/* Remove fds from polling */ /* Remove fds from polling */
const struct libusb_pollfd **const lupfd = const struct libusb_pollfd **const lupfd =
libusb_get_pollfds(usb_context); libusb_get_pollfds(drvc->usb_context);
for (i = 0; lupfd[i]; i++) for (i = 0; lupfd[i]; i++)
sr_source_remove(lupfd[i]->fd); sr_source_remove(lupfd[i]->fd);
free(lupfd); /* NOT g_free()! */ free(lupfd); /* NOT g_free()! */
ctx->num_transfers = 0; devc->num_transfers = 0;
g_free(ctx->transfers); g_free(devc->transfers);
} }
static void free_transfer(struct libusb_transfer *transfer) static void free_transfer(struct libusb_transfer *transfer)
{ {
struct context *ctx = transfer->user_data; struct dev_context *devc = transfer->user_data;
unsigned int i; unsigned int i;
g_free(transfer->buffer); g_free(transfer->buffer);
transfer->buffer = NULL; transfer->buffer = NULL;
libusb_free_transfer(transfer); libusb_free_transfer(transfer);
for (i = 0; i < ctx->num_transfers; i++) { for (i = 0; i < devc->num_transfers; i++) {
if (ctx->transfers[i] == transfer) { if (devc->transfers[i] == transfer) {
ctx->transfers[i] = NULL; devc->transfers[i] = NULL;
break; break;
} }
} }
ctx->submitted_transfers--; devc->submitted_transfers--;
if (ctx->submitted_transfers == 0) if (devc->submitted_transfers == 0)
finish_acquisition(ctx); finish_acquisition(devc);
} }
@ -742,14 +768,14 @@ static void receive_transfer(struct libusb_transfer *transfer)
gboolean packet_has_error = FALSE; gboolean packet_has_error = FALSE;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic; struct sr_datafeed_logic logic;
struct context *ctx = transfer->user_data; struct dev_context *devc = transfer->user_data;
int trigger_offset, i; int trigger_offset, i;
/* /*
* If acquisition has already ended, just free any queued up * If acquisition has already ended, just free any queued up
* transfer that come in. * transfer that come in.
*/ */
if (ctx->num_samples == -1) { if (devc->num_samples == -1) {
free_transfer(transfer); free_transfer(transfer);
return; return;
} }
@ -759,12 +785,12 @@ static void receive_transfer(struct libusb_transfer *transfer)
/* Save incoming transfer before reusing the transfer struct. */ /* Save incoming transfer before reusing the transfer struct. */
uint8_t *const cur_buf = transfer->buffer; uint8_t *const cur_buf = transfer->buffer;
const int sample_width = ctx->sample_wide ? 2 : 1; const int sample_width = devc->sample_wide ? 2 : 1;
const int cur_sample_count = transfer->actual_length / sample_width; const int cur_sample_count = transfer->actual_length / sample_width;
switch (transfer->status) { switch (transfer->status) {
case LIBUSB_TRANSFER_NO_DEVICE: case LIBUSB_TRANSFER_NO_DEVICE:
abort_acquisition(ctx); abort_acquisition(devc);
free_transfer(transfer); free_transfer(transfer);
return; return;
case LIBUSB_TRANSFER_COMPLETED: case LIBUSB_TRANSFER_COMPLETED:
@ -776,38 +802,38 @@ static void receive_transfer(struct libusb_transfer *transfer)
} }
if (transfer->actual_length == 0 || packet_has_error) { if (transfer->actual_length == 0 || packet_has_error) {
ctx->empty_transfer_count++; devc->empty_transfer_count++;
if (ctx->empty_transfer_count > MAX_EMPTY_TRANSFERS) { if (devc->empty_transfer_count > MAX_EMPTY_TRANSFERS) {
/* /*
* The FX2 gave up. End the acquisition, the frontend * The FX2 gave up. End the acquisition, the frontend
* will work out that the samplecount is short. * will work out that the samplecount is short.
*/ */
abort_acquisition(ctx); abort_acquisition(devc);
free_transfer(transfer); free_transfer(transfer);
} else { } else {
resubmit_transfer(transfer); resubmit_transfer(transfer);
} }
return; return;
} else { } else {
ctx->empty_transfer_count = 0; devc->empty_transfer_count = 0;
} }
trigger_offset = 0; trigger_offset = 0;
if (ctx->trigger_stage >= 0) { if (devc->trigger_stage >= 0) {
for (i = 0; i < cur_sample_count; i++) { for (i = 0; i < cur_sample_count; i++) {
const uint16_t cur_sample = ctx->sample_wide ? const uint16_t cur_sample = devc->sample_wide ?
*((const uint16_t*)cur_buf + i) : *((const uint16_t*)cur_buf + i) :
*((const uint8_t*)cur_buf + i); *((const uint8_t*)cur_buf + i);
if ((cur_sample & ctx->trigger_mask[ctx->trigger_stage]) == if ((cur_sample & devc->trigger_mask[devc->trigger_stage]) ==
ctx->trigger_value[ctx->trigger_stage]) { devc->trigger_value[devc->trigger_stage]) {
/* Match on this trigger stage. */ /* Match on this trigger stage. */
ctx->trigger_buffer[ctx->trigger_stage] = cur_sample; devc->trigger_buffer[devc->trigger_stage] = cur_sample;
ctx->trigger_stage++; devc->trigger_stage++;
if (ctx->trigger_stage == NUM_TRIGGER_STAGES || if (devc->trigger_stage == NUM_TRIGGER_STAGES ||
ctx->trigger_mask[ctx->trigger_stage] == 0) { devc->trigger_mask[devc->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;
@ -817,7 +843,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
*/ */
packet.type = SR_DF_TRIGGER; packet.type = SR_DF_TRIGGER;
packet.payload = NULL; packet.payload = NULL;
sr_session_send(ctx->session_dev_id, &packet); sr_session_send(devc->session_dev_id, &packet);
/* /*
* Send the samples that triggered it, since we're * Send the samples that triggered it, since we're
@ -825,15 +851,15 @@ static void receive_transfer(struct libusb_transfer *transfer)
*/ */
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
packet.payload = &logic; packet.payload = &logic;
logic.unitsize = sizeof(*ctx->trigger_buffer); logic.unitsize = sizeof(*devc->trigger_buffer);
logic.length = ctx->trigger_stage * logic.unitsize; logic.length = devc->trigger_stage * logic.unitsize;
logic.data = ctx->trigger_buffer; logic.data = devc->trigger_buffer;
sr_session_send(ctx->session_dev_id, &packet); sr_session_send(devc->session_dev_id, &packet);
ctx->trigger_stage = TRIGGER_FIRED; devc->trigger_stage = TRIGGER_FIRED;
break; break;
} }
} else if (ctx->trigger_stage > 0) { } else if (devc->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
@ -841,16 +867,16 @@ static void receive_transfer(struct libusb_transfer *transfer)
* the next sample from the one that matched originally, which the * the next sample from the one that matched originally, which the
* counter increment at the end of the loop takes care of. * counter increment at the end of the loop takes care of.
*/ */
i -= ctx->trigger_stage; i -= devc->trigger_stage;
if (i < -1) if (i < -1)
i = -1; /* Oops, went back past this buffer. */ i = -1; /* Oops, went back past this buffer. */
/* Reset trigger stage. */ /* Reset trigger stage. */
ctx->trigger_stage = 0; devc->trigger_stage = 0;
} }
} }
} }
if (ctx->trigger_stage == TRIGGER_FIRED) { if (devc->trigger_stage == TRIGGER_FIRED) {
/* Send the incoming transfer to the session bus. */ /* Send the incoming transfer to the session bus. */
const int trigger_offset_bytes = trigger_offset * sample_width; const int trigger_offset_bytes = trigger_offset * sample_width;
packet.type = SR_DF_LOGIC; packet.type = SR_DF_LOGIC;
@ -858,12 +884,12 @@ static void receive_transfer(struct libusb_transfer *transfer)
logic.length = transfer->actual_length - trigger_offset_bytes; logic.length = transfer->actual_length - trigger_offset_bytes;
logic.unitsize = sample_width; logic.unitsize = sample_width;
logic.data = cur_buf + trigger_offset_bytes; logic.data = cur_buf + trigger_offset_bytes;
sr_session_send(ctx->session_dev_id, &packet); sr_session_send(devc->session_dev_id, &packet);
ctx->num_samples += cur_sample_count; devc->num_samples += cur_sample_count;
if (ctx->limit_samples && if (devc->limit_samples &&
(unsigned int)ctx->num_samples > ctx->limit_samples) { (unsigned int)devc->num_samples > devc->limit_samples) {
abort_acquisition(ctx); abort_acquisition(devc);
free_transfer(transfer); free_transfer(transfer);
return; return;
} }
@ -882,22 +908,22 @@ static unsigned int to_bytes_per_ms(unsigned int samplerate)
return samplerate / 1000; return samplerate / 1000;
} }
static size_t get_buffer_size(struct context *ctx) static size_t get_buffer_size(struct dev_context *devc)
{ {
size_t s; size_t s;
/* The buffer should be large enough to hold 10ms of data and a multiple /* The buffer should be large enough to hold 10ms of data and a multiple
* of 512. */ * of 512. */
s = 10 * to_bytes_per_ms(ctx->cur_samplerate); s = 10 * to_bytes_per_ms(devc->cur_samplerate);
return (s + 511) & ~511; return (s + 511) & ~511;
} }
static unsigned int get_number_of_transfers(struct context *ctx) static unsigned int get_number_of_transfers(struct dev_context *devc)
{ {
unsigned int n; unsigned int n;
/* Total buffer size should be able to hold about 500ms of data */ /* Total buffer size should be able to hold about 500ms of data */
n = 500 * to_bytes_per_ms(ctx->cur_samplerate) / get_buffer_size(ctx); n = 500 * to_bytes_per_ms(devc->cur_samplerate) / get_buffer_size(devc);
if (n > NUM_SIMUL_TRANSFERS) if (n > NUM_SIMUL_TRANSFERS)
return NUM_SIMUL_TRANSFERS; return NUM_SIMUL_TRANSFERS;
@ -905,13 +931,13 @@ static unsigned int get_number_of_transfers(struct context *ctx)
return n; return n;
} }
static unsigned int get_timeout(struct context *ctx) static unsigned int get_timeout(struct dev_context *devc)
{ {
size_t total_size; size_t total_size;
unsigned int timeout; unsigned int timeout;
total_size = get_buffer_size(ctx) * get_number_of_transfers(ctx); total_size = get_buffer_size(devc) * get_number_of_transfers(devc);
timeout = total_size / to_bytes_per_ms(ctx->cur_samplerate); timeout = total_size / to_bytes_per_ms(devc->cur_samplerate);
return timeout + timeout / 4; /* Leave a headroom of 25% percent */ return timeout + timeout / 4; /* Leave a headroom of 25% percent */
} }
@ -921,30 +947,32 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_header header; struct sr_datafeed_header header;
struct sr_datafeed_meta_logic meta; struct sr_datafeed_meta_logic meta;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
struct libusb_transfer *transfer; struct libusb_transfer *transfer;
const struct libusb_pollfd **lupfd; const struct libusb_pollfd **lupfd;
unsigned int i; unsigned int i;
int ret; int ret;
unsigned char *buf; unsigned char *buf;
ctx = sdi->priv; drvc = fdi->priv;
if (ctx->submitted_transfers != 0) devc = sdi->priv;
if (devc->submitted_transfers != 0)
return SR_ERR; return SR_ERR;
ctx->session_dev_id = cb_data; devc->session_dev_id = cb_data;
ctx->num_samples = 0; devc->num_samples = 0;
ctx->empty_transfer_count = 0; devc->empty_transfer_count = 0;
const unsigned int timeout = get_timeout(ctx); const unsigned int timeout = get_timeout(devc);
const unsigned int num_transfers = get_number_of_transfers(ctx); const unsigned int num_transfers = get_number_of_transfers(devc);
const size_t size = get_buffer_size(ctx); const size_t size = get_buffer_size(devc);
ctx->transfers = g_try_malloc0(sizeof(*ctx->transfers) * num_transfers); devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers);
if (!ctx->transfers) if (!devc->transfers)
return SR_ERR; return SR_ERR;
ctx->num_transfers = num_transfers; devc->num_transfers = num_transfers;
for (i = 0; i < num_transfers; i++) { for (i = 0; i < num_transfers; i++) {
if (!(buf = g_try_malloc(size))) { if (!(buf = g_try_malloc(size))) {
@ -952,20 +980,20 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
transfer = libusb_alloc_transfer(0); transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, ctx->usb->devhdl, libusb_fill_bulk_transfer(transfer, devc->usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, size, 2 | LIBUSB_ENDPOINT_IN, buf, size,
receive_transfer, ctx, timeout); receive_transfer, devc, timeout);
if (libusb_submit_transfer(transfer) != 0) { if (libusb_submit_transfer(transfer) != 0) {
libusb_free_transfer(transfer); libusb_free_transfer(transfer);
g_free(buf); g_free(buf);
abort_acquisition(ctx); abort_acquisition(devc);
return SR_ERR; return SR_ERR;
} }
ctx->transfers[i] = transfer; devc->transfers[i] = transfer;
ctx->submitted_transfers++; devc->submitted_transfers++;
} }
lupfd = libusb_get_pollfds(usb_context); lupfd = libusb_get_pollfds(drvc->usb_context);
for (i = 0; lupfd[i]; i++) for (i = 0; lupfd[i]; i++)
sr_source_add(lupfd[i]->fd, lupfd[i]->events, sr_source_add(lupfd[i]->fd, lupfd[i]->events,
timeout, receive_data, NULL); timeout, receive_data, NULL);
@ -980,13 +1008,13 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
/* Send metadata about the SR_DF_LOGIC packets to come. */ /* Send metadata about the SR_DF_LOGIC packets to come. */
packet.type = SR_DF_META_LOGIC; packet.type = SR_DF_META_LOGIC;
packet.payload = &meta; packet.payload = &meta;
meta.samplerate = ctx->cur_samplerate; meta.samplerate = devc->cur_samplerate;
meta.num_probes = ctx->sample_wide ? 16 : 8; meta.num_probes = devc->sample_wide ? 16 : 8;
sr_session_send(cb_data, &packet); sr_session_send(cb_data, &packet);
if ((ret = command_start_acquisition (ctx->usb->devhdl, if ((ret = command_start_acquisition (devc->usb->devhdl,
ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) { devc->cur_samplerate, devc->sample_wide)) != SR_OK) {
abort_acquisition(ctx); abort_acquisition(devc);
return ret; return ret;
} }
@ -1019,5 +1047,5 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
.dev_config_set = hw_dev_config_set, .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop, .dev_acquisition_stop = hw_dev_acquisition_stop,
.instances = NULL, .priv = NULL,
}; };

7
hardware/fx2lafw/fx2lafw.h
View File

@ -60,7 +60,12 @@ struct fx2lafw_profile {
uint32_t dev_caps; uint32_t dev_caps;
}; };
struct context { struct drv_context {
libusb_context *usb_context;
GSList *instances;
};
struct dev_context {
const struct fx2lafw_profile *profile; const struct fx2lafw_profile *profile;
/* /*