X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fchronovu-la8.c;h=8962e01ea9e436508905fe1d925976a9f33f8a7f;hb=4d7b525ae9c0a85097280e77b9c158e9c4c8c6e5;hp=98a732846812a99665c0265b784109f46996601c;hpb=2f5c8c9696f4a4a8ca7e3c7e6e7d2766a4927026;p=libsigrok.git diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c index 98a73284..8962e01e 100644 --- a/hardware/chronovu-la8/chronovu-la8.c +++ b/hardware/chronovu-la8/chronovu-la8.c @@ -19,6 +19,8 @@ */ #include +#include +#include #include #include @@ -49,17 +51,14 @@ struct la8 { /** 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. @@ -83,6 +82,9 @@ struct la8 { /** Time (in seconds) before the trigger times out. */ uint64_t trigger_timeout; + /** Tells us whether an SR_DF_TRIGGER packet was already sent. */ + int trigger_found; + /** TODO */ time_t done; @@ -171,13 +173,13 @@ static int is_valid_samplerate(uint64_t samplerate) 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; } @@ -197,22 +199,22 @@ static int la8_write(struct la8 *la8, uint8_t *buf, int size) 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; } @@ -244,22 +246,22 @@ static int la8_read(struct la8 *la8, uint8_t *buf, int size) 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; } @@ -281,12 +283,12 @@ static int la8_close(struct la8 *la8) 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; } @@ -313,12 +315,12 @@ static int la8_close_usb_reset_sequencer(struct la8 *la8) 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; } @@ -366,12 +368,12 @@ static int la8_reset(struct la8 *la8) 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; } @@ -396,6 +398,63 @@ static int la8_reset(struct la8 *la8) return SR_OK; } +static int configure_probes(struct la8 *la8, GSList *probes) +{ + struct sr_probe *probe; + GSList *l; + uint8_t probe_bit; + char *tc; + + la8->trigger_pattern = 0; + la8->trigger_mask = 0; /* Default to "don't care" for all probes. */ + + for (l = probes; l; l = l->next) { + probe = (struct sr_probe *)l->data; + + if (!probe) { + sr_err("la8: %s: probe was NULL", __func__); + return SR_ERR; + } + + /* Skip disabled probes. */ + if (!probe->enabled) + continue; + + /* Skip (enabled) probes with no configured trigger. */ + if (!probe->trigger) + continue; + + /* Note: Must only be run if probe->trigger != NULL. */ + if (probe->index < 0 || probe->index > 7) { + sr_err("la8: %s: invalid probe index %d, must be " + "between 0 and 7", __func__, probe->index); + return SR_ERR; + } + + probe_bit = (1 << (probe->index - 1)); + + /* Configure the probe's trigger mask and trigger pattern. */ + for (tc = probe->trigger; tc && *tc; tc++) { + la8->trigger_mask |= probe_bit; + + /* Sanity check, LA8 only supports low/high trigger. */ + if (*tc != '0' && *tc != '1') { + sr_err("la8: %s: invalid trigger '%c', only " + "'0'/'1' supported", __func__, *tc); + return SR_ERR; + } + + if (*tc == '1') + la8->trigger_pattern |= probe_bit; + } + } + + sr_dbg("la8: %s: trigger_mask = 0x%x, trigger_pattern = 0x%x", + __func__, la8->trigger_mask, la8->trigger_pattern); + + return SR_OK; +} + static int hw_init(const char *deviceinfo) { int ret; @@ -408,8 +467,8 @@ static int hw_init(const char *deviceinfo) deviceinfo = deviceinfo; /* Allocate memory for our private driver context. */ - if (!(la8 = malloc(sizeof(struct la8)))) { - sr_warn("la8: %s: struct la8 malloc failed", __func__); + if (!(la8 = g_try_malloc(sizeof(struct la8)))) { + sr_err("la8: %s: struct la8 malloc failed", __func__); ret = SR_ERR_MALLOC; goto err_free_nothing; } @@ -419,34 +478,27 @@ static int hw_init(const char *deviceinfo) 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->trigger_timeout = 10; /* Default to 10s trigger timeout. */ + la8->trigger_found = 0; la8->done = 0; 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 = 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 = malloc(SDRAM_SIZE))) { - sr_warn("la8: %s: final_buf malloc failed", __func__); + if (!(la8->final_buf = g_try_malloc(SDRAM_SIZE))) { + 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; } @@ -454,8 +506,8 @@ static int hw_init(const char *deviceinfo) /* 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; @@ -466,7 +518,7 @@ static int hw_init(const char *deviceinfo) 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; } @@ -486,13 +538,11 @@ static int hw_init(const char *deviceinfo) err_close_ftdic: (void) la8_close(la8); /* Log, but ignore errors. */ err_free_ftdic: - free(la8->ftdic); + free(la8->ftdic); /* NOT g_free()! */ err_free_final_buf: - free(la8->final_buf); -err_free_mangled_buf: - free(la8->mangled_buf); + g_free(la8->final_buf); err_free_la8: - free(la8); + g_free(la8); err_free_nothing: // return ret; /* TODO */ return 0; @@ -505,12 +555,12 @@ static int hw_opendev(int device_index) 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? */ } @@ -519,8 +569,8 @@ static int hw_opendev(int device_index) /* 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; } @@ -528,8 +578,8 @@ static int hw_opendev(int device_index) /* 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; } @@ -537,8 +587,8 @@ static int hw_opendev(int device_index) /* 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; } @@ -561,12 +611,12 @@ static int set_samplerate(struct sr_device_instance *sdi, uint64_t samplerate) 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; } @@ -586,26 +636,26 @@ static int set_samplerate(struct sr_device_instance *sdi, uint64_t samplerate) 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: Handle or ignore errors here? */ + /* 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__); @@ -614,8 +664,9 @@ static void hw_closedev(int device_index) 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) @@ -628,13 +679,14 @@ 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. */ @@ -650,12 +702,12 @@ static void *hw_get_device_info(int device_index, int device_info_id) 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; } @@ -678,7 +730,7 @@ static void *hw_get_device_info(int device_index, int device_info_id) 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; } @@ -715,12 +767,12 @@ static int hw_set_configuration(int device_index, int capability, void *value) 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? */ } @@ -731,14 +783,14 @@ static int hw_set_configuration(int device_index, int capability, void *value) sr_dbg("la8: SAMPLERATE = %" PRIu64, la8->cur_samplerate); break; case SR_HWCAP_PROBECONFIG: - /* Nothing to do, but this entry must exist. Fix this. */ - /* TODO? */ - sr_dbg("la8: %s: SR_HWCAP_PROBECONFIG called", __func__); - return SR_OK; + if (configure_probes(la8, (GSList *)value) != SR_OK) { + sr_err("la8: %s: probe config failed", __func__); + return SR_ERR; + } 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; @@ -746,7 +798,7 @@ static int hw_set_configuration(int device_index, int capability, void *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; @@ -754,7 +806,7 @@ static int hw_set_configuration(int device_index, int capability, void *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; } @@ -774,12 +826,12 @@ static int la8_read_block(struct la8 *la8) 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; } @@ -819,11 +871,95 @@ static int la8_read_block(struct la8 *la8) return SR_OK; } +static void send_block_to_session_bus(struct la8 *la8, int block) +{ + int i; + uint8_t sample, expected_sample; + struct sr_datafeed_packet packet; + int trigger_point; /* Relative trigger point (in this block). */ + + /* Note: No sanity checks on la8/block, caller is responsible. */ + + /* Check if we can find the trigger condition in this block. */ + trigger_point = -1; + expected_sample = la8->trigger_pattern & la8->trigger_mask; + for (i = 0; i < 4096; i++) { + /* Don't continue if the trigger was found previously. */ + if (la8->trigger_found) + break; + + sample = *(la8->final_buf + (block * 4096) + i); + + if ((sample & la8->trigger_mask) == expected_sample) { + trigger_point = i; + la8->trigger_found = 1; + break; + } + } + + /* If no trigger was found, send one SR_DF_LOGIC packet. */ + if (trigger_point == -1) { + /* Send a 4096 byte SR_DF_LOGIC packet to the session bus. */ + // sr_dbg("la8: %s: sending SR_DF_LOGIC packet", __func__); + packet.type = SR_DF_LOGIC; + packet.length = 4096; + packet.unitsize = 1; + packet.payload = la8->final_buf + (block * 4096); + sr_session_bus(la8->session_id, &packet); + return; + } + + /* + * We found the trigger, so some special handling is needed. We have + * to send an SR_DF_LOGIC packet with the samples before the trigger + * (if any), then the SD_DF_TRIGGER packet itself, then another + * SR_DF_LOGIC packet with the samples after the trigger (if any). + */ + + /* TODO: Send SR_DF_TRIGGER packet before or after the actual sample? */ + + /* If at least one sample is located before the trigger... */ + if (trigger_point > 0) { + /* Send pre-trigger SR_DF_LOGIC packet to the session bus. */ + sr_dbg("la8: %s: sending pre-trigger SR_DF_LOGIC packet, ", + "start = %" PRIu64 ", length = %d", __func__, + block * 4096, trigger_point); + packet.type = SR_DF_LOGIC; + packet.length = trigger_point; + packet.unitsize = 1; + packet.payload = la8->final_buf + (block * 4096); + sr_session_bus(la8->session_id, &packet); + } + + /* Send the SR_DF_TRIGGER packet to the session bus. */ + sr_dbg("la8: %s: sending SR_DF_TRIGGER packet, sample = %" PRIu64, + __func__, (block * 4096) + trigger_point); + packet.type = SR_DF_TRIGGER; + packet.length = 0; + packet.unitsize = 0; + packet.payload = NULL; + sr_session_bus(la8->session_id, &packet); + + /* If at least one sample is located after the trigger... */ + if (trigger_point < (4096 - 1)) { + /* Send post-trigger SR_DF_LOGIC packet to the session bus. */ + sr_dbg("la8: %s: sending post-trigger SR_DF_LOGIC packet, ", + "start = %" PRIu64 ", length = %d", __func__, + (block * 4096) + trigger_point, + (4096 - 1) - trigger_point); + packet.type = SR_DF_LOGIC; + packet.length = (4096 - 1) - trigger_point; + packet.unitsize = 1; + packet.payload = la8->final_buf + (block * 4096) + + trigger_point; + sr_session_bus(la8->session_id, &packet); + } +} + static int receive_data(int fd, int revents, void *user_data) { int i, ret; struct sr_device_instance *sdi; - struct sr_datafeed_packet packet; struct la8 *la8; /* Avoid compiler errors. */ @@ -831,18 +967,19 @@ static int receive_data(int fd, int revents, void *user_data) 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; } @@ -855,15 +992,8 @@ static int receive_data(int fd, int revents, void *user_data) sr_dbg("la8: sampling finished, sending data to session bus now"); /* All data was received and demangled, send it to the session bus. */ - for (i = 0; i < 2048; i++) { - /* Send a 4096 byte SR_DF_LOGIC packet to the session bus. */ - // sr_dbg("la8: %s: sending SR_DF_LOGIC packet", __func__); - packet.type = SR_DF_LOGIC; - packet.length = 4096; - packet.unitsize = 1; - packet.payload = la8->final_buf + (i * 4096); - sr_session_bus(la8->session_id, &packet); - } + for (i = 0; i < 2048; i++) + send_block_to_session_bus(la8, i); hw_stop_acquisition(sdi->index, user_data); @@ -883,23 +1013,23 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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; } @@ -913,10 +1043,10 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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? */ } @@ -934,7 +1064,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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); @@ -942,6 +1072,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) la8->done = (la8->divcount + 1) * 0.08388608 + time(NULL) + la8->trigger_timeout; la8->block_counter = 0; + la8->trigger_found = 0; /* Hook up a dummy handler to receive data from the LA8. */ sr_source_add(-1, G_IO_IN, 0, receive_data, sdi); @@ -958,18 +1089,15 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) 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; } - /* Reset the LA8 sequencer and close the device. */ - (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */ - /* Send end packet to the session bus. */ sr_dbg("la8: %s: sending SR_DF_END", __func__); packet.type = SR_DF_END; @@ -985,8 +1113,8 @@ struct sr_device_plugin chronovu_la8_plugin_info = { .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,