X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fapi.c;h=66cbdb6ecdfa83393d409b55dc222f945ccdd5e3;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=5b82c3ab9d28eb495f46f6e0c6603db879aba37a;hpb=d67b663e21de64261847c7e68de3ba37883c48b7;p=libsigrok.git diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c index 5b82c3ab..66cbdb6e 100644 --- a/hardware/chronovu-la8/api.c +++ b/hardware/chronovu-la8/api.c @@ -23,9 +23,10 @@ #include #include "libsigrok.h" #include "libsigrok-internal.h" -#include "driver.h" +#include "protocol.h" -static GSList *dev_insts = NULL; +SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; +static struct sr_dev_driver *di = &chronovu_la8_driver_info; /* * The ChronoVu LA8 can have multiple PIDs. Older versions shipped with @@ -37,147 +38,191 @@ static const uint16_t usb_pids[] = { }; /* Function prototypes. */ -static int hw_dev_acquisition_stop(int dev_index, void *cb_data); +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static int hw_init(const char *devinfo) +static int clear_instances(void) +{ + GSList *l; + struct sr_dev_inst *sdi; + struct drv_context *drvc; + struct dev_context *devc; + + drvc = di->priv; + + /* Properly close all devices. */ + for (l = drvc->instances; l; l = l->next) { + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("%s: sdi was NULL, continuing.", __func__); + continue; + } + if (sdi->priv) { + devc = sdi->priv; + ftdi_free(devc->ftdic); + } + sr_dev_inst_free(sdi); + } + g_slist_free(drvc->instances); + drvc->instances = NULL; + + return SR_OK; +} + +static int hw_init(struct sr_context *sr_ctx) +{ + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); +} + +static GSList *hw_scan(GSList *options) { - int ret; struct sr_dev_inst *sdi; - struct context *ctx; + struct sr_probe *probe; + struct drv_context *drvc; + struct dev_context *devc; + GSList *devices; unsigned int i; + int ret; - /* Avoid compiler errors. */ - (void)devinfo; + (void)options; - /* Allocate memory for our private driver context. */ - if (!(ctx = g_try_malloc(sizeof(struct context)))) { - sr_err("la8: %s: struct context malloc failed", __func__); + drvc = di->priv; + + devices = NULL; + + /* Allocate memory for our private device context. */ + if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); goto err_free_nothing; } /* Set some sane defaults. */ - ctx->ftdic = NULL; - ctx->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */ - ctx->limit_msec = 0; - ctx->limit_samples = 0; - ctx->session_dev_id = NULL; - memset(ctx->mangled_buf, 0, BS); - ctx->final_buf = NULL; - ctx->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */ - ctx->trigger_mask = 0x00; /* All probes are "don't care". */ - ctx->trigger_timeout = 10; /* Default to 10s trigger timeout. */ - ctx->trigger_found = 0; - ctx->done = 0; - ctx->block_counter = 0; - ctx->divcount = 0; /* 10ns sample period == 100MHz samplerate */ - ctx->usb_pid = 0; + devc->ftdic = NULL; + devc->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */ + devc->limit_msec = 0; + devc->limit_samples = 0; + devc->session_dev_id = NULL; + memset(devc->mangled_buf, 0, BS); + devc->final_buf = NULL; + devc->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */ + devc->trigger_mask = 0x00; /* All probes are "don't care". */ + devc->trigger_timeout = 10; /* Default to 10s trigger timeout. */ + devc->trigger_found = 0; + devc->done = 0; + devc->block_counter = 0; + devc->divcount = 0; /* 10ns sample period == 100MHz samplerate */ + devc->usb_pid = 0; /* Allocate memory where we'll store the de-mangled data. */ - if (!(ctx->final_buf = g_try_malloc(SDRAM_SIZE))) { - sr_err("la8: %s: final_buf malloc failed", __func__); - goto err_free_ctx; + if (!(devc->final_buf = g_try_malloc(SDRAM_SIZE))) { + sr_err("final_buf malloc failed."); + goto err_free_devc; } /* Allocate memory for the FTDI context (ftdic) and initialize it. */ - if (!(ctx->ftdic = ftdi_new())) { - sr_err("la8: %s: ftdi_new failed", __func__); + if (!(devc->ftdic = ftdi_new())) { + sr_err("%s: ftdi_new failed.", __func__); goto err_free_final_buf; } /* Check for the device and temporarily open it. */ for (i = 0; i < ARRAY_SIZE(usb_pids); i++) { - sr_dbg("la8: Probing for VID/PID %04x:%04x.", USB_VENDOR_ID, + sr_dbg("Probing for VID/PID %04x:%04x.", USB_VENDOR_ID, usb_pids[i]); - ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID, + ret = ftdi_usb_open_desc(devc->ftdic, USB_VENDOR_ID, usb_pids[i], USB_DESCRIPTION, NULL); if (ret == 0) { - sr_dbg("la8: Found LA8 device (%04x:%04x).", + sr_dbg("Found LA8 device (%04x:%04x).", USB_VENDOR_ID, usb_pids[i]); - ctx->usb_pid = usb_pids[i]; + devc->usb_pid = usb_pids[i]; } } - if (ctx->usb_pid == 0) + if (devc->usb_pid == 0) goto err_free_ftdic; /* Register the device with libsigrok. */ sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING, USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); if (!sdi) { - sr_err("la8: %s: sr_dev_inst_new failed", __func__); + sr_err("%s: sr_dev_inst_new failed.", __func__); goto err_close_ftdic; } + sdi->driver = di; + sdi->priv = devc; - sdi->priv = ctx; - - dev_insts = g_slist_append(dev_insts, sdi); + for (i = 0; probe_names[i]; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + probe_names[i]))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + } - sr_spew("la8: Device init successful."); + devices = g_slist_append(devices, sdi); + drvc->instances = g_slist_append(drvc->instances, sdi); /* Close device. We'll reopen it again when we need it. */ - (void) la8_close(ctx); /* Log, but ignore errors. */ + (void) la8_close(devc); /* Log, but ignore errors. */ - return 1; + return devices; err_close_ftdic: - (void) la8_close(ctx); /* Log, but ignore errors. */ + (void) la8_close(devc); /* Log, but ignore errors. */ err_free_ftdic: - free(ctx->ftdic); /* NOT g_free()! */ + ftdi_free(devc->ftdic); /* NOT free() or g_free()! */ err_free_final_buf: - g_free(ctx->final_buf); -err_free_ctx: - g_free(ctx); + g_free(devc->final_buf); +err_free_devc: + g_free(devc); err_free_nothing: - return 0; + return NULL; } -static int hw_dev_open(int dev_index) +static GSList *hw_dev_list(void) { - int ret; - struct sr_dev_inst *sdi; - struct context *ctx; + return ((struct drv_context *)(di->priv))->instances; +} - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } +static int hw_dev_open(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + int ret; - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); + if (!(devc = sdi->priv)) { + sr_err("%s: sdi->priv was NULL.", __func__); return SR_ERR_BUG; } - sr_dbg("la8: Opening LA8 device (%04x:%04x).", USB_VENDOR_ID, - ctx->usb_pid); + sr_dbg("Opening LA8 device (%04x:%04x).", USB_VENDOR_ID, + devc->usb_pid); /* Open the device. */ - if ((ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID, - ctx->usb_pid, USB_DESCRIPTION, NULL)) < 0) { - sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s", - __func__, ret, ftdi_get_error_string(ctx->ftdic)); - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + if ((ret = ftdi_usb_open_desc(devc->ftdic, USB_VENDOR_ID, + devc->usb_pid, USB_DESCRIPTION, NULL)) < 0) { + sr_err("%s: ftdi_usb_open_desc: (%d) %s", + __func__, ret, ftdi_get_error_string(devc->ftdic)); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ return SR_ERR; } - sr_dbg("la8: Device opened successfully."); + sr_dbg("Device opened successfully."); /* Purge RX/TX buffers in the FTDI chip. */ - if ((ret = ftdi_usb_purge_buffers(ctx->ftdic)) < 0) { - sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s", - __func__, ret, ftdi_get_error_string(ctx->ftdic)); - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0) { + sr_err("%s: ftdi_usb_purge_buffers: (%d) %s", + __func__, ret, ftdi_get_error_string(devc->ftdic)); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ goto err_dev_open_close_ftdic; } - sr_dbg("la8: FTDI buffers purged successfully."); + sr_dbg("FTDI buffers purged successfully."); /* Enable flow control in the FTDI chip. */ - if ((ret = ftdi_setflowctrl(ctx->ftdic, SIO_RTS_CTS_HS)) < 0) { - sr_err("la8: %s: ftdi_setflowcontrol: (%d) %s", - __func__, ret, ftdi_get_error_string(ctx->ftdic)); - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + if ((ret = ftdi_setflowctrl(devc->ftdic, SIO_RTS_CTS_HS)) < 0) { + sr_err("%s: ftdi_setflowcontrol: (%d) %s", + __func__, ret, ftdi_get_error_string(devc->ftdic)); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ goto err_dev_open_close_ftdic; } - sr_dbg("la8: FTDI flow control enabled successfully."); + sr_dbg("FTDI flow control enabled successfully."); /* Wait 100ms. */ g_usleep(100 * 1000); @@ -187,194 +232,98 @@ static int hw_dev_open(int dev_index) return SR_OK; err_dev_open_close_ftdic: - (void) la8_close(ctx); /* Log, but ignore errors. */ + (void) la8_close(devc); /* Log, but ignore errors. */ return SR_ERR; } -static int hw_dev_close(int dev_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - struct context *ctx; - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); - return SR_ERR_BUG; - } + struct dev_context *devc; - sr_dbg("la8: Closing device."); + devc = sdi->priv; if (sdi->status == SR_ST_ACTIVE) { - sr_dbg("la8: Status ACTIVE, closing device."); - /* TODO: Really ignore errors here, or return SR_ERR? */ - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + sr_dbg("Status ACTIVE, closing device."); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ } else { - sr_spew("la8: Status not ACTIVE, nothing to do."); + sr_spew("Status not ACTIVE, nothing to do."); } sdi->status = SR_ST_INACTIVE; - sr_dbg("la8: Freeing sample buffer."); - g_free(ctx->final_buf); + g_free(devc->final_buf); return SR_OK; } static int hw_cleanup(void) { - GSList *l; - struct sr_dev_inst *sdi; - int ret = SR_OK; + if (!di->priv) + /* Can get called on an unused driver, doesn't matter. */ + return SR_OK; - /* Properly close all devices. */ - for (l = dev_insts; l; l = l->next) { - if (!(sdi = l->data)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("la8: %s: sdi was NULL, continuing", __func__); - ret = SR_ERR_BUG; - continue; - } - sr_dev_inst_free(sdi); /* Returns void. */ - } - g_slist_free(dev_insts); /* Returns void. */ - dev_insts = NULL; + clear_instances(); - return ret; + return SR_OK; } -static const void *hw_dev_info_get(int dev_index, int dev_info_id) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - struct context *ctx; - const void *info; - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return NULL; - } - - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); - return NULL; - } - - sr_spew("la8: %s: dev_index %d, dev_info_id %d.", __func__, - dev_index, dev_info_id); - - switch (dev_info_id) { - case SR_DI_INST: - info = sdi; - sr_spew("la8: %s: Returning sdi.", __func__); - break; - case SR_DI_NUM_PROBES: - info = GINT_TO_POINTER(NUM_PROBES); - sr_spew("la8: %s: Returning number of probes: %d.", __func__, - NUM_PROBES); - break; - case SR_DI_PROBE_NAMES: - info = probe_names; - sr_spew("la8: %s: Returning probenames.", __func__); - break; - case SR_DI_SAMPLERATES: - fill_supported_samplerates_if_needed(); - info = &samplerates; - sr_spew("la8: %s: Returning samplerates.", __func__); - break; - case SR_DI_TRIGGER_TYPES: - info = TRIGGER_TYPES; - sr_spew("la8: %s: Returning trigger types: %s.", __func__, - TRIGGER_TYPES); - break; - case SR_DI_CUR_SAMPLERATE: - info = &ctx->cur_samplerate; - sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.", - __func__, ctx->cur_samplerate); + struct dev_context *devc; + + switch (id) { + case SR_CONF_SAMPLERATE: + if (sdi) { + devc = sdi->priv; + *data = &devc->cur_samplerate; + sr_spew("%s: Returning samplerate: %" PRIu64 "Hz.", + __func__, devc->cur_samplerate); + } else + return SR_ERR; break; default: - /* Unknown device info ID, return NULL. */ - sr_err("la8: %s: Unknown device info ID", __func__); - info = NULL; - break; + return SR_ERR_ARG; } - return info; -} - -static int hw_dev_status_get(int dev_index) -{ - struct sr_dev_inst *sdi; - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL, device not found", __func__); - return SR_ST_NOT_FOUND; - } - - sr_dbg("la8: Returning status: %d.", sdi->status); - - return sdi->status; + return SR_OK; } -static const int *hw_hwcap_get_all(void) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { - sr_spew("la8: Returning list of device capabilities."); + struct dev_context *devc; - return hwcaps; -} - -static int hw_dev_config_set(int dev_index, int hwcap, const void *value) -{ - struct sr_dev_inst *sdi; - struct context *ctx; - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); + if (!(devc = sdi->priv)) { + sr_err("%s: sdi->priv was NULL.", __func__); return SR_ERR_BUG; } - sr_spew("la8: %s: dev_index %d, hwcap %d", __func__, dev_index, hwcap); - - switch (hwcap) { - case SR_HWCAP_SAMPLERATE: + switch (id) { + case SR_CONF_SAMPLERATE: if (set_samplerate(sdi, *(const uint64_t *)value) == SR_ERR) { - sr_err("la8: %s: setting samplerate failed.", __func__); - return SR_ERR; - } - sr_dbg("la8: SAMPLERATE = %" PRIu64, ctx->cur_samplerate); - break; - case SR_HWCAP_PROBECONFIG: - if (configure_probes(ctx, (const GSList *)value) != SR_OK) { - sr_err("la8: %s: probe config failed.", __func__); + sr_err("%s: setting samplerate failed.", __func__); return SR_ERR; } + sr_dbg("SAMPLERATE = %" PRIu64, devc->cur_samplerate); break; - case SR_HWCAP_LIMIT_MSEC: + case SR_CONF_LIMIT_MSEC: if (*(const uint64_t *)value == 0) { - sr_err("la8: %s: LIMIT_MSEC can't be 0.", __func__); + sr_err("%s: LIMIT_MSEC can't be 0.", __func__); return SR_ERR; } - ctx->limit_msec = *(const uint64_t *)value; - sr_dbg("la8: LIMIT_MSEC = %" PRIu64, ctx->limit_msec); + devc->limit_msec = *(const uint64_t *)value; + sr_dbg("LIMIT_MSEC = %" PRIu64, devc->limit_msec); break; - case SR_HWCAP_LIMIT_SAMPLES: + case SR_CONF_LIMIT_SAMPLES: if (*(const uint64_t *)value < MIN_NUM_SAMPLES) { - sr_err("la8: %s: LIMIT_SAMPLES too small.", __func__); + sr_err("%s: LIMIT_SAMPLES too small.", __func__); return SR_ERR; } - ctx->limit_samples = *(const uint64_t *)value; - sr_dbg("la8: LIMIT_SAMPLES = %" PRIu64, ctx->limit_samples); + devc->limit_samples = *(const uint64_t *)value; + sr_dbg("LIMIT_SAMPLES = %" PRIu64, devc->limit_samples); break; default: /* Unknown capability, return SR_ERR. */ - sr_err("la8: %s: Unknown capability.", __func__); + sr_err("%s: Unknown capability: %d.", __func__, id); return SR_ERR; break; } @@ -382,157 +331,152 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value) return SR_OK; } +static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; + case SR_CONF_SAMPLERATE: + fill_supported_samplerates_if_needed(); + *data = &samplerates; + break; + case SR_CONF_TRIGGER_TYPE: + *data = (char *)TRIGGER_TYPE; + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static int receive_data(int fd, int revents, void *cb_data) { int i, ret; struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; - /* Avoid compiler errors. */ (void)fd; (void)revents; if (!(sdi = cb_data)) { - sr_err("la8: %s: cb_data was NULL", __func__); + sr_err("%s: cb_data was NULL.", __func__); return FALSE; } - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); + if (!(devc = sdi->priv)) { + sr_err("%s: sdi->priv was NULL.", __func__); return FALSE; } - if (!ctx->ftdic) { - sr_err("la8: %s: ctx->ftdic was NULL", __func__); + if (!devc->ftdic) { + sr_err("%s: devc->ftdic was NULL.", __func__); return FALSE; } /* Get one block of data. */ - if ((ret = la8_read_block(ctx)) < 0) { - sr_err("la8: %s: la8_read_block error: %d", __func__, ret); - hw_dev_acquisition_stop(sdi->index, sdi); + if ((ret = la8_read_block(devc)) < 0) { + sr_err("%s: la8_read_block error: %d.", __func__, ret); + hw_dev_acquisition_stop(sdi, sdi); return FALSE; } /* We need to get exactly NUM_BLOCKS blocks (i.e. 8MB) of data. */ - if (ctx->block_counter != (NUM_BLOCKS - 1)) { - ctx->block_counter++; + if (devc->block_counter != (NUM_BLOCKS - 1)) { + devc->block_counter++; return TRUE; } - sr_dbg("la8: Sampling finished, sending data to session bus now."); + sr_dbg("Sampling finished, sending data to session bus now."); /* All data was received and demangled, send it to the session bus. */ for (i = 0; i < NUM_BLOCKS; i++) - send_block_to_session_bus(ctx, i); + send_block_to_session_bus(devc, i); - hw_dev_acquisition_stop(sdi->index, sdi); + hw_dev_acquisition_stop(sdi, sdi); - // return FALSE; /* FIXME? */ return TRUE; } -static int hw_dev_acquisition_start(int dev_index, void *cb_data) +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) { - struct sr_dev_inst *sdi; - struct context *ctx; - struct sr_datafeed_packet packet; - struct sr_datafeed_header header; - struct sr_datafeed_meta_logic meta; + struct dev_context *devc; uint8_t buf[4]; int bytes_written; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); + if (!(devc = sdi->priv)) { + sr_err("%s: sdi->priv was NULL.", __func__); return SR_ERR_BUG; } - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); + if (!devc->ftdic) { + sr_err("%s: devc->ftdic was NULL.", __func__); return SR_ERR_BUG; } - if (!ctx->ftdic) { - sr_err("la8: %s: ctx->ftdic was NULL", __func__); - return SR_ERR_BUG; + devc->divcount = samplerate_to_divcount(devc->cur_samplerate); + if (devc->divcount == 0xff) { + sr_err("%s: Invalid divcount/samplerate.", __func__); + return SR_ERR; } - ctx->divcount = samplerate_to_divcount(ctx->cur_samplerate); - if (ctx->divcount == 0xff) { - sr_err("la8: %s: invalid divcount/samplerate", __func__); + if (configure_probes(sdi) != SR_OK) { + sr_err("Failed to configure probes."); return SR_ERR; } - sr_dbg("la8: Starting acquisition."); - /* Fill acquisition parameters into buf[]. */ - buf[0] = ctx->divcount; + buf[0] = devc->divcount; buf[1] = 0xff; /* This byte must always be 0xff. */ - buf[2] = ctx->trigger_pattern; - buf[3] = ctx->trigger_mask; + buf[2] = devc->trigger_pattern; + buf[3] = devc->trigger_mask; /* Start acquisition. */ - bytes_written = la8_write(ctx, buf, 4); + bytes_written = la8_write(devc, buf, 4); if (bytes_written < 0) { - sr_err("la8: Acquisition failed to start."); + sr_err("Acquisition failed to start: %d.", bytes_written); return SR_ERR; } else if (bytes_written != 4) { - sr_err("la8: Acquisition failed to start."); - return SR_ERR; /* TODO: Other error and return code? */ + sr_err("Acquisition failed to start: %d.", bytes_written); + return SR_ERR; } - sr_dbg("la8: Acquisition started successfully."); + sr_dbg("Hardware acquisition started successfully."); - ctx->session_dev_id = cb_data; + devc->session_dev_id = cb_data; /* Send header packet to the session bus. */ - sr_dbg("la8: Sending SR_DF_HEADER."); - packet.type = SR_DF_HEADER; - packet.payload = &header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - sr_session_send(ctx->session_dev_id, &packet); - - /* Send metadata about the SR_DF_LOGIC packets to come. */ - packet.type = SR_DF_META_LOGIC; - packet.payload = &meta; - meta.samplerate = ctx->cur_samplerate; - meta.num_probes = NUM_PROBES; - sr_session_send(ctx->session_dev_id, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); /* Time when we should be done (for detecting trigger timeouts). */ - ctx->done = (ctx->divcount + 1) * 0.08388608 + time(NULL) - + ctx->trigger_timeout; - ctx->block_counter = 0; - ctx->trigger_found = 0; + devc->done = (devc->divcount + 1) * 0.08388608 + time(NULL) + + devc->trigger_timeout; + devc->block_counter = 0; + devc->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); + sr_source_add(-1, G_IO_IN, 0, receive_data, (void *)sdi); return SR_OK; } -static int hw_dev_acquisition_stop(int dev_index, void *cb_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - struct sr_dev_inst *sdi; - struct context *ctx; struct sr_datafeed_packet packet; - sr_dbg("la8: Stopping acquisition."); - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } + (void)sdi; - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); - return SR_ERR_BUG; - } + sr_dbg("Stopping acquisition."); + sr_source_remove(-1); /* Send end packet to the session bus. */ - sr_dbg("la8: Sending SR_DF_END."); + sr_dbg("Sending SR_DF_END."); packet.type = SR_DF_END; sr_session_send(cb_data, &packet); @@ -545,12 +489,15 @@ SR_PRIV struct sr_dev_driver chronovu_la8_driver_info = { .api_version = 1, .init = hw_init, .cleanup = hw_cleanup, + .scan = hw_scan, + .dev_list = hw_dev_list, + .dev_clear = clear_instances, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .dev_info_get = hw_dev_info_get, - .dev_status_get = hw_dev_status_get, - .hwcap_get_all = hw_hwcap_get_all, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, + .priv = NULL, };