#include <ftdi.h>
#include <glib.h>
+#include <string.h>
#include <sigrok.h>
#include <sigrok-internal.h>
/** The current sampling limit (in number of samples). */
uint64_t limit_samples;
- /** The number of probes. */
- int num_probes;
-
/** TODO */
gpointer session_id;
/**
- * An 8MB buffer containing the (mangled) samples from the device.
+ * An 4KB buffer containing some (mangled) samples from the device.
* Format: Pretty mangled-up (due to hardware reasons), see code.
*/
- uint8_t *mangled_buf;
+ uint8_t mangled_buf[4096];
/**
* An 8MB buffer where we'll store the de-mangled samples.
static uint8_t samplerate_to_divcount(uint64_t samplerate)
{
if (samplerate == 0) {
- sr_warn("la8: %s: samplerate was 0", __func__);
+ sr_err("la8: %s: samplerate was 0", __func__);
return 0xff;
}
if (!is_valid_samplerate(samplerate)) {
- sr_warn("la8: %s: can't get divcount, samplerate invalid",
- __func__);
+ sr_err("la8: %s: can't get divcount, samplerate invalid",
+ __func__);
return 0xff;
}
int bytes_written;
if (!la8) {
- sr_warn("la8: %s: la8 was NULL", __func__);
+ sr_err("la8: %s: la8 was NULL", __func__);
return SR_ERR_ARG;
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
if (!buf) {
- sr_warn("la8: %s: buf was NULL", __func__);
+ sr_err("la8: %s: buf was NULL", __func__);
return SR_ERR_ARG;
}
if (size < 0) {
- sr_warn("la8: %s: size was < 0", __func__);
+ sr_err("la8: %s: size was < 0", __func__);
return SR_ERR_ARG;
}
int bytes_read;
if (!la8) {
- sr_warn("la8: %s: la8 was NULL", __func__);
+ sr_err("la8: %s: la8 was NULL", __func__);
return SR_ERR_ARG;
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
if (!buf) {
- sr_warn("la8: %s: buf was NULL", __func__);
+ sr_err("la8: %s: buf was NULL", __func__);
return SR_ERR_ARG;
}
if (size <= 0) {
- sr_warn("la8: %s: size was <= 0", __func__);
+ sr_err("la8: %s: size was <= 0", __func__);
return SR_ERR_ARG;
}
int ret;
if (!la8) {
- sr_warn("la8: %s: la8 was NULL", __func__);
+ sr_err("la8: %s: la8 was NULL", __func__);
return SR_ERR_ARG;
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
sr_dbg("la8: entering %s", __func__);
if (!la8) {
- sr_warn("la8: %s: la8 was NULL", __func__);
+ sr_err("la8: %s: la8 was NULL", __func__);
return SR_ERR_ARG;
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
int bytes_read;
if (!la8) {
- sr_warn("la8: %s: la8 was NULL", __func__);
+ sr_err("la8: %s: la8 was NULL", __func__);
return SR_ERR_ARG;
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
/* Allocate memory for our private driver context. */
if (!(la8 = g_try_malloc(sizeof(struct la8)))) {
- sr_warn("la8: %s: struct la8 malloc failed", __func__);
+ sr_err("la8: %s: struct la8 malloc failed", __func__);
ret = SR_ERR_MALLOC;
goto err_free_nothing;
}
la8->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */
la8->limit_msec = 0;
la8->limit_samples = 0;
- la8->num_probes = NUM_PROBES;
la8->session_id = NULL;
- la8->mangled_buf = NULL;
+ memset(la8->mangled_buf, 0, 4096);
la8->final_buf = NULL;
la8->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */
la8->trigger_mask = 0x00; /* All probes are "don't care". */
la8->block_counter = 0;
la8->divcount = 0; /* 10ns sample period == 100MHz samplerate */
- /* Allocate memory for the raw (mangled) data from the LA8. */
- if (!(la8->mangled_buf = g_try_malloc(SDRAM_SIZE))) {
- sr_warn("la8: %s: mangled_buf malloc failed", __func__);
- ret = SR_ERR_MALLOC;
- goto err_free_la8;
- }
-
/* Allocate memory where we'll store the de-mangled data. */
if (!(la8->final_buf = g_try_malloc(SDRAM_SIZE))) {
- sr_warn("la8: %s: final_buf malloc failed", __func__);
+ sr_err("la8: %s: final_buf malloc failed", __func__);
ret = SR_ERR_MALLOC;
- goto err_free_mangled_buf;
+ goto err_free_la8;
}
/* Allocate memory for the FTDI context (ftdic) and initialize it. */
if (!(la8->ftdic = ftdi_new())) {
- sr_warn("la8: %s: ftdi_new failed", __func__);
+ sr_err("la8: %s: ftdi_new failed", __func__);
ret = SR_ERR; /* TODO: More specific error? */
goto err_free_final_buf;
}
/* Check for the device and temporarily open it. */
if ((ret = ftdi_usb_open_desc(la8->ftdic, USB_VENDOR_ID,
USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
- sr_warn("la8: %s: ftdi_usb_open_desc: (%d) %s",
- __func__, ret, ftdi_get_error_string(la8->ftdic));
+ sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s",
+ __func__, ret, ftdi_get_error_string(la8->ftdic));
(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
ret = SR_ERR; /* TODO: More specific error? */
goto err_free_ftdic;
sdi = sr_device_instance_new(0, SR_ST_INITIALIZING,
USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
if (!sdi) {
- sr_warn("la8: %s: sr_device_instance_new failed", __func__);
+ sr_err("la8: %s: sr_device_instance_new failed", __func__);
ret = SR_ERR; /* TODO: More specific error? */
goto err_close_ftdic;
}
free(la8->ftdic); /* NOT g_free()! */
err_free_final_buf:
g_free(la8->final_buf);
-err_free_mangled_buf:
- g_free(la8->mangled_buf);
err_free_la8:
g_free(la8);
err_free_nothing:
struct la8 *la8;
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_err("la8: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
/* Open the device. */
if ((ret = ftdi_usb_open_desc(la8->ftdic, USB_VENDOR_ID,
USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
- sr_warn("la8: %s: ftdi_usb_open_desc: (%d) %s",
- __func__, ret, ftdi_get_error_string(la8->ftdic));
+ sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s",
+ __func__, ret, ftdi_get_error_string(la8->ftdic));
(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
return SR_ERR;
}
/* Purge RX/TX buffers in the FTDI chip. */
if ((ret = ftdi_usb_purge_buffers(la8->ftdic)) < 0) {
- sr_warn("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
- __func__, ret, ftdi_get_error_string(la8->ftdic));
+ sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
+ __func__, ret, ftdi_get_error_string(la8->ftdic));
(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
goto err_opendev_close_ftdic;
}
/* Enable flow control in the FTDI chip. */
if ((ret = ftdi_setflowctrl(la8->ftdic, SIO_RTS_CTS_HS)) < 0) {
- sr_warn("la8: %s: ftdi_setflowcontrol: (%d) %s",
- __func__, ret, ftdi_get_error_string(la8->ftdic));
+ sr_err("la8: %s: ftdi_setflowcontrol: (%d) %s",
+ __func__, ret, ftdi_get_error_string(la8->ftdic));
(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
goto err_opendev_close_ftdic;
}
struct la8 *la8;
if (!sdi) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_err("la8: %s: sdi was NULL", __func__);
return SR_ERR_ARG;
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
return SR_OK;
}
-static void hw_closedev(int device_index)
+static int hw_closedev(int device_index)
{
struct sr_device_instance *sdi;
struct la8 *la8;
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_warn("la8: %s: sdi was NULL", __func__);
- return;
+ sr_err("la8: %s: sdi was NULL", __func__);
+ return SR_ERR; /* TODO: SR_ERR_ARG? */
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
- return;
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
+ return SR_ERR; /* TODO: SR_ERR_ARG? */
}
sr_dbg("la8: closing device");
if (sdi->status == SR_ST_ACTIVE) {
sr_dbg("la8: %s: status ACTIVE, closing device", __func__);
+ /* TODO: Really ignore errors here, or return SR_ERR? */
(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
} else {
sr_dbg("la8: %s: status not ACTIVE, nothing to do", __func__);
sdi->status = SR_ST_INACTIVE;
sr_dbg("la8: %s: freeing sample buffers", __func__);
- free(la8->mangled_buf);
- free(la8->final_buf);
+ g_free(la8->final_buf);
+
+ return SR_OK;
}
static void hw_cleanup(void)
/* Properly close all devices. */
for (l = device_instances; l; l = l->next) {
if ((sdi = l->data) == NULL) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_warn("la8: %s: sdi was NULL, continuing", __func__);
continue;
}
if (sdi->priv != NULL)
free(sdi->priv);
else
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_warn("la8: %s: sdi->priv was NULL, nothing "
+ "to do", __func__);
sr_device_instance_free(sdi); /* Returns void. */
}
g_slist_free(device_instances); /* Returns void. */
sr_dbg("la8: entering %s", __func__);
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_err("la8: %s: sdi was NULL", __func__);
return NULL;
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return NULL;
}
break;
default:
/* Unknown device info ID, return NULL. */
- sr_warn("la8: %s: Unknown device info ID", __func__);
+ sr_err("la8: %s: Unknown device info ID", __func__);
info = NULL;
break;
}
sr_dbg("la8: entering %s", __func__);
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_err("la8: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
break;
case SR_HWCAP_LIMIT_MSEC:
if (*(uint64_t *)value == 0) {
- sr_warn("la8: %s: LIMIT_MSEC can't be 0", __func__);
+ sr_err("la8: %s: LIMIT_MSEC can't be 0", __func__);
return SR_ERR;
}
la8->limit_msec = *(uint64_t *)value;
break;
case SR_HWCAP_LIMIT_SAMPLES:
if (*(uint64_t *)value < MIN_NUM_SAMPLES) {
- sr_warn("la8: %s: LIMIT_SAMPLES too small", __func__);
+ sr_err("la8: %s: LIMIT_SAMPLES too small", __func__);
return SR_ERR;
}
la8->limit_samples = *(uint64_t *)value;
break;
default:
/* Unknown capability, return SR_ERR. */
- sr_warn("la8: %s: Unknown capability", __func__);
+ sr_err("la8: %s: Unknown capability", __func__);
return SR_ERR;
break;
}
time_t now;
if (!la8) {
- sr_warn("la8: %s: la8 was NULL", __func__);
+ sr_err("la8: %s: la8 was NULL", __func__);
return SR_ERR_ARG;
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
revents = revents;
if (!(sdi = user_data)) {
- sr_warn("la8: %s: user_data was NULL", __func__);
+ sr_err("la8: %s: user_data was NULL", __func__);
return FALSE;
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return FALSE;
}
/* Get one block of data (4096 bytes). */
if ((ret = la8_read_block(la8)) < 0) {
- sr_warn("la8: %s: la8_read_block error: %d", __func__, ret);
+ sr_err("la8: %s: la8_read_block error: %d", __func__, ret);
hw_stop_acquisition(sdi->index, user_data);
return FALSE;
}
sr_dbg("la8: entering %s", __func__);
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_err("la8: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
if (!la8->ftdic) {
- sr_warn("la8: %s: la8->ftdic was NULL", __func__);
+ sr_err("la8: %s: la8->ftdic was NULL", __func__);
return SR_ERR_ARG;
}
la8->divcount = samplerate_to_divcount(la8->cur_samplerate);
if (la8->divcount == 0xff) {
- sr_warn("la8: %s: invalid divcount/samplerate", __func__);
+ sr_err("la8: %s: invalid divcount/samplerate", __func__);
return SR_ERR;
}
bytes_written = la8_write(la8, buf, 4);
if (bytes_written < 0) {
- sr_warn("la8: acquisition failed to start");
+ sr_err("la8: acquisition failed to start");
return SR_ERR;
} else if (bytes_written != 4) {
- sr_warn("la8: acquisition failed to start");
+ sr_err("la8: acquisition failed to start");
return SR_ERR; /* TODO: Other error and return code? */
}
gettimeofday(&header.starttime, NULL);
header.samplerate = la8->cur_samplerate;
header.protocol_id = SR_PROTO_RAW;
- header.num_logic_probes = la8->num_probes;
+ header.num_logic_probes = NUM_PROBES;
header.num_analog_probes = 0;
sr_session_bus(session_device_id, &packet);
sr_dbg("la8: stopping acquisition");
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_warn("la8: %s: sdi was NULL", __func__);
+ sr_err("la8: %s: sdi was NULL", __func__);
return;
}
if (!(la8 = sdi->priv)) {
- sr_warn("la8: %s: sdi->priv was NULL", __func__);
+ sr_err("la8: %s: sdi->priv was NULL", __func__);
return;
}
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
- .open = hw_opendev,
- .close = hw_closedev,
+ .opendev = hw_opendev,
+ .closedev = hw_closedev,
.get_device_info = hw_get_device_info,
.get_status = hw_get_status,
.get_capabilities = hw_get_capabilities,
projects / libsigrok.git / blobdiff