X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=5b39f0a25a27c9f18f3b7fb6e122eee4c0238048;hb=53b4680fceab9351fc87b8c5b34854733f5fdac0;hp=ed32e6a5ae93516f2350ffb32883c74031eaee67;hpb=811deee4af9f600ae0c457a74d3877c4f68f2f37;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index ed32e6a5..5b39f0a2 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010-2012 Håvard Espeland , * Copyright (C) 2010 Martin Stensgård @@ -37,13 +37,14 @@ #define USB_VENDOR_NAME "ASIX" #define USB_MODEL_NAME "SIGMA" #define USB_MODEL_VERSION "" -#define TRIGGER_TYPES "rf10" +#define TRIGGER_TYPE "rf10" #define NUM_PROBES 16 SR_PRIV struct sr_dev_driver asix_sigma_driver_info; -static struct sr_dev_driver *adi = &asix_sigma_driver_info; +static struct sr_dev_driver *di = &asix_sigma_driver_info; +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static const uint64_t supported_samplerates[] = { +static const uint64_t samplerates[] = { SR_KHZ(200), SR_KHZ(250), SR_KHZ(500), @@ -54,7 +55,6 @@ static const uint64_t supported_samplerates[] = { SR_MHZ(50), SR_MHZ(100), SR_MHZ(200), - 0, }; /* @@ -63,39 +63,16 @@ static const uint64_t supported_samplerates[] = { * (the cable has two additional GND pins, and a TI and TO pin) */ static const char *probe_names[NUM_PROBES + 1] = { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "15", - "16", + "1", "2", "3", "4", "5", "6", "7", "8", + "9", "10", "11", "12", "13", "14", "15", "16", NULL, }; -static const struct sr_samplerates samplerates = { - 0, - 0, - 0, - supported_samplerates, -}; - -static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_SAMPLERATE, - SR_HWCAP_CAPTURE_RATIO, - - SR_HWCAP_LIMIT_MSEC, - 0, +static const int32_t hwcaps[] = { + SR_CONF_LOGIC_ANALYZER, + SR_CONF_SAMPLERATE, + SR_CONF_CAPTURE_RATIO, + SR_CONF_LIMIT_MSEC, }; /* Force the FPGA to reboot. */ @@ -104,7 +81,7 @@ static uint8_t suicide[] = { }; /* Prepare to upload firmware (FPGA specific). */ -static uint8_t init[] = { +static uint8_t init_array[] = { 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, }; @@ -122,16 +99,13 @@ static const char *firmware_files[] = { "asix-sigma-phasor.fw", /* Frequency counter */ }; -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data); - static int sigma_read(void *buf, size_t size, struct dev_context *devc) { int ret; ret = ftdi_read_data(&devc->ftdic, (unsigned char *)buf, size); if (ret < 0) { - sr_err("sigma: ftdi_read_data failed: %s", + sr_err("ftdi_read_data failed: %s", ftdi_get_error_string(&devc->ftdic)); } @@ -144,10 +118,10 @@ static int sigma_write(void *buf, size_t size, struct dev_context *devc) ret = ftdi_write_data(&devc->ftdic, (unsigned char *)buf, size); if (ret < 0) { - sr_err("sigma: ftdi_write_data failed: %s", + sr_err("ftdi_write_data failed: %s", ftdi_get_error_string(&devc->ftdic)); } else if ((size_t) ret != size) { - sr_err("sigma: ftdi_write_data did not complete write."); + sr_err("ftdi_write_data did not complete write."); } return ret; @@ -195,7 +169,7 @@ static uint8_t sigma_get_register(uint8_t reg, struct dev_context *devc) uint8_t value; if (1 != sigma_read_register(reg, &value, 1, devc)) { - sr_err("sigma: sigma_get_register: 1 byte expected"); + sr_err("sigma_get_register: 1 byte expected"); return 0; } @@ -342,12 +316,12 @@ static int bin2bitbang(const char *filename, f = g_fopen(filename, "rb"); if (!f) { - sr_err("sigma: g_fopen(\"%s\", \"rb\")", filename); + sr_err("g_fopen(\"%s\", \"rb\")", filename); return SR_ERR; } if (-1 == fseek(f, 0, SEEK_END)) { - sr_err("sigma: fseek on %s failed", filename); + sr_err("fseek on %s failed", filename); fclose(f); return SR_ERR; } @@ -357,7 +331,7 @@ static int bin2bitbang(const char *filename, fseek(f, 0, SEEK_SET); if (!(firmware = g_try_malloc(buffer_size))) { - sr_err("sigma: %s: firmware malloc failed", __func__); + sr_err("%s: firmware malloc failed", __func__); fclose(f); return SR_ERR_MALLOC; } @@ -369,7 +343,7 @@ static int bin2bitbang(const char *filename, fclose(f); if(fwsize != file_size) { - sr_err("sigma: %s: Error reading firmware", filename); + sr_err("%s: Error reading firmware", filename); fclose(f); g_free(firmware); return SR_ERR; @@ -379,7 +353,7 @@ static int bin2bitbang(const char *filename, *buf = p = (unsigned char *)g_try_malloc(*buf_size); if (!p) { - sr_err("sigma: %s: buf/p malloc failed", __func__); + sr_err("%s: buf/p malloc failed", __func__); g_free(firmware); return SR_ERR_MALLOC; } @@ -396,7 +370,7 @@ static int bin2bitbang(const char *filename, if (offset != *buf_size) { g_free(*buf); - sr_err("sigma: Error reading firmware %s " + sr_err("Error reading firmware %s " "offset=%ld, file_size=%ld, buf_size=%zd.", filename, offset, file_size, *buf_size); @@ -406,48 +380,26 @@ static int bin2bitbang(const char *filename, return SR_OK; } -static int clear_instances(void) +static void clear_helper(void *priv) { - GSList *l; - struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; - drvc = adi->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("sigma: %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; + devc = priv; - return SR_OK; + ftdi_deinit(&devc->ftdic); } -static int hw_init(void) +static int dev_clear(void) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("asix-sigma: driver context malloc failed."); - return SR_ERR; - } - adi->priv = drvc; + return std_dev_clear(di, clear_helper); +} - return SR_OK; +static int init(struct sr_context *sr_ctx) +{ + return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { struct sr_dev_inst *sdi; struct sr_probe *probe; @@ -460,12 +412,13 @@ static GSList *hw_scan(GSList *options) int ret, i; (void)options; - drvc = adi->priv; + + drvc = di->priv; + devices = NULL; - clear_instances(); if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { - sr_err("sigma: %s: devc malloc failed", __func__); + sr_err("%s: devc malloc failed", __func__); return NULL; } @@ -486,8 +439,8 @@ static GSList *hw_scan(GSList *options) sscanf(serial_txt, "%x", &serial); if (serial < 0xa6010000 || serial > 0xa602ffff) { - sr_err("sigma: Only SIGMA and SIGMA2 are supported " - "in this version of sigrok."); + sr_err("Only SIGMA and SIGMA2 are supported " + "in this version of libsigrok."); goto free; } @@ -505,13 +458,13 @@ static GSList *hw_scan(GSList *options) /* Register SIGMA device. */ if (!(sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING, USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION))) { - sr_err("sigma: %s: sdi was NULL", __func__); + sr_err("%s: sdi was NULL", __func__); goto free; } - sdi->driver = adi; + sdi->driver = di; for (i = 0; probe_names[i]; i++) { - if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, probe_names[i]))) return NULL; sdi->probes = g_slist_append(sdi->probes, probe); @@ -532,13 +485,9 @@ free: return NULL; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = adi->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int upload_firmware(int firmware_idx, struct dev_context *devc) @@ -553,20 +502,20 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) /* Make sure it's an ASIX SIGMA. */ if ((ret = ftdi_usb_open_desc(&devc->ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { - sr_err("sigma: ftdi_usb_open failed: %s", + sr_err("ftdi_usb_open failed: %s", ftdi_get_error_string(&devc->ftdic)); return 0; } if ((ret = ftdi_set_bitmode(&devc->ftdic, 0xdf, BITMODE_BITBANG)) < 0) { - sr_err("sigma: ftdi_set_bitmode failed: %s", + sr_err("ftdi_set_bitmode failed: %s", ftdi_get_error_string(&devc->ftdic)); return 0; } /* Four times the speed of sigmalogan - Works well. */ if ((ret = ftdi_set_baudrate(&devc->ftdic, 750000)) < 0) { - sr_err("sigma: ftdi_set_baudrate failed: %s", + sr_err("ftdi_set_baudrate failed: %s", ftdi_get_error_string(&devc->ftdic)); return 0; } @@ -578,7 +527,7 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) sigma_write(suicide, sizeof(suicide), devc); /* Prepare to upload firmware (FPGA specific). */ - sigma_write(init, sizeof(init), devc); + sigma_write(init_array, sizeof(init_array), devc); ftdi_usb_purge_buffers(&devc->ftdic); @@ -594,19 +543,19 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) firmware_files[firmware_idx]); if ((ret = bin2bitbang(firmware_path, &buf, &buf_size)) != SR_OK) { - sr_err("sigma: An error occured while reading the firmware: %s", + sr_err("An error occured while reading the firmware: %s", firmware_path); return ret; } /* Upload firmare. */ - sr_info("sigma: Uploading firmware %s", firmware_files[firmware_idx]); + sr_info("Uploading firmware file '%s'.", firmware_files[firmware_idx]); sigma_write(buf, buf_size, devc); g_free(buf); if ((ret = ftdi_set_bitmode(&devc->ftdic, 0x00, BITMODE_RESET)) < 0) { - sr_err("sigma: ftdi_set_bitmode failed: %s", + sr_err("ftdi_set_bitmode failed: %s", ftdi_get_error_string(&devc->ftdic)); return SR_ERR; } @@ -624,18 +573,18 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) ret = sigma_read(result, 3, devc); if (ret != 3 || result[0] != 0xa6 || result[1] != 0x55 || result[2] != 0xaa) { - sr_err("sigma: Configuration failed. Invalid reply received."); + sr_err("Configuration failed. Invalid reply received."); return SR_ERR; } devc->cur_firmware = firmware_idx; - sr_info("sigma: Firmware uploaded"); + sr_info("Firmware uploaded."); return SR_OK; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; int ret; @@ -646,7 +595,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi) if ((ret = ftdi_usb_open_desc(&devc->ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { - sr_err("sigma: ftdi_usb_open failed: %s", + sr_err("ftdi_usb_open failed: %s", ftdi_get_error_string(&devc->ftdic)); return 0; @@ -659,14 +608,18 @@ static int hw_dev_open(struct sr_dev_inst *sdi) static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) { - int i, ret; - struct dev_context *devc = sdi->priv; + struct dev_context *devc; + unsigned int i; + int ret; + + devc = sdi->priv; + ret = SR_OK; - for (i = 0; supported_samplerates[i]; i++) { - if (supported_samplerates[i] == samplerate) + for (i = 0; i < ARRAY_SIZE(samplerates); i++) { + if (samplerates[i] == samplerate) break; } - if (supported_samplerates[i] == 0) + if (samplerates[i] == 0) return SR_ERR_SAMPLERATE; if (samplerate <= SR_MHZ(50)) { @@ -683,7 +636,7 @@ static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) } devc->cur_samplerate = samplerate; - devc->period_ps = 1000000000000 / samplerate; + devc->period_ps = 1000000000000ULL / samplerate; devc->samples_per_event = 16 / devc->num_probes; devc->state.state = SIGMA_IDLE; @@ -718,8 +671,8 @@ static int configure_probes(const struct sr_dev_inst *sdi) if (devc->cur_samplerate >= SR_MHZ(100)) { /* Fast trigger support. */ if (trigger_set) { - sr_err("sigma: ASIX SIGMA only supports a single " - "pin trigger in 100 and 200MHz mode."); + sr_err("Only a single pin trigger in 100 and " + "200MHz mode is supported."); return SR_ERR; } if (probe->trigger[0] == 'f') @@ -727,9 +680,8 @@ static int configure_probes(const struct sr_dev_inst *sdi) else if (probe->trigger[0] == 'r') devc->trigger.risingmask |= probebit; else { - sr_err("sigma: ASIX SIGMA only supports " - "rising/falling trigger in 100 " - "and 200MHz mode."); + sr_err("Only rising/falling trigger in 100 " + "and 200MHz mode is supported."); return SR_ERR; } @@ -759,8 +711,8 @@ static int configure_probes(const struct sr_dev_inst *sdi) * does not permit ORed triggers. */ if (trigger_set > 1) { - sr_err("sigma: ASIX SIGMA only supports 1 " - "rising/falling triggers."); + sr_err("Only 1 rising/falling trigger " + "is supported."); return SR_ERR; } } @@ -772,14 +724,11 @@ static int configure_probes(const struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc; - if (!(devc = sdi->priv)) { - sr_err("sigma: %s: sdi->priv was NULL", __func__); - return SR_ERR_BUG; - } + devc = sdi->priv; /* TODO */ if (sdi->status == SR_ST_ACTIVE) @@ -790,81 +739,98 @@ static int hw_dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { - - if (!adi->priv) - return SR_OK; - - clear_instances(); - - return SR_OK; + return dev_clear(); } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(NUM_PROBES); - break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - case SR_DI_SAMPLERATES: - *data = &samplerates; - break; - case SR_DI_TRIGGER_TYPES: - *data = (char *)TRIGGER_TYPES; - break; - case SR_DI_CUR_SAMPLERATE: + (void)cg; + + switch (id) { + case SR_CONF_SAMPLERATE: if (sdi) { devc = sdi->priv; - *data = &devc->cur_samplerate; + *data = g_variant_new_uint64(devc->cur_samplerate); } else return SR_ERR; break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; int ret; + (void)cg; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + devc = sdi->priv; - if (hwcap == SR_HWCAP_SAMPLERATE) { - ret = set_samplerate(sdi, *(const uint64_t *)value); - } else if (hwcap == SR_HWCAP_LIMIT_MSEC) { - devc->limit_msec = *(const uint64_t *)value; + if (id == SR_CONF_SAMPLERATE) { + ret = set_samplerate(sdi, g_variant_get_uint64(data)); + } else if (id == SR_CONF_LIMIT_MSEC) { + devc->limit_msec = g_variant_get_uint64(data); if (devc->limit_msec > 0) ret = SR_OK; else ret = SR_ERR; - } else if (hwcap == SR_HWCAP_CAPTURE_RATIO) { - devc->capture_ratio = *(const uint64_t *)value; + } else if (id == SR_CONF_CAPTURE_RATIO) { + devc->capture_ratio = g_variant_get_uint64(data); if (devc->capture_ratio < 0 || devc->capture_ratio > 100) ret = SR_ERR; else ret = SR_OK; } else { - ret = SR_ERR; + ret = SR_ERR_NA; } return ret; } +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) +{ + GVariant *gvar; + GVariantBuilder gvb; + + (void)sdi; + (void)cg; + + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + break; + case SR_CONF_SAMPLERATE: + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); + gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, + ARRAY_SIZE(samplerates), sizeof(uint64_t)); + g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); + *data = g_variant_builder_end(&gvb); + break; + case SR_CONF_TRIGGER_TYPE: + *data = g_variant_new_string(TRIGGER_TYPE); + break; + default: + return SR_ERR_NA; + } + + return SR_OK; +} + /* Software trigger to determine exact trigger position. */ static int get_trigger_offset(uint16_t *samples, uint16_t last_sample, struct sigma_trigger *t) @@ -963,7 +929,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, logic.length = tosend * sizeof(uint16_t); logic.unitsize = 2; logic.data = samples + sent; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); sent += tosend; } @@ -1006,7 +972,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, logic.length = tosend * sizeof(uint16_t); logic.unitsize = 2; logic.data = samples; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); sent += tosend; } @@ -1014,7 +980,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, /* Only send trigger if explicitly enabled. */ if (devc->use_triggers) { packet.type = SR_DF_TRIGGER; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); } } @@ -1027,7 +993,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, logic.length = tosend * sizeof(uint16_t); logic.unitsize = 2; logic.data = samples + sent; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); } *lastsample = samples[n - 1]; @@ -1047,7 +1013,6 @@ static int receive_data(int fd, int revents, void *cb_data) uint64_t running_msec; struct timeval tv; - /* Avoid compiler warnings. */ (void)fd; (void)revents; @@ -1068,13 +1033,15 @@ static int receive_data(int fd, int revents, void *cb_data) if (running_msec < devc->limit_msec && numchunks < 32767) return TRUE; /* While capturing... */ else - hw_dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi, sdi); + + } - } else if (devc->state.state == SIGMA_DOWNLOAD) { + if (devc->state.state == SIGMA_DOWNLOAD) { if (devc->state.chunks_downloaded >= numchunks) { /* End of samples. */ packet.type = SR_DF_END; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); devc->state.state = SIGMA_IDLE; @@ -1084,7 +1051,7 @@ static int receive_data(int fd, int revents, void *cb_data) newchunks = MIN(chunks_per_read, numchunks - devc->state.chunks_downloaded); - sr_info("sigma: Downloading sample data: %.0f %%", + sr_info("Downloading sample data: %.0f %%.", 100.0 * devc->state.chunks_downloaded / numchunks); bufsz = sigma_read_dram(devc->state.chunks_downloaded, @@ -1094,7 +1061,7 @@ static int receive_data(int fd, int revents, void *cb_data) /* Find first ts. */ if (devc->state.chunks_downloaded == 0) { - devc->state.lastts = *(uint16_t *) buf - 1; + devc->state.lastts = RL16(buf) - 1; devc->state.lastsample = 0; } @@ -1284,23 +1251,22 @@ static int build_basic_trigger(struct triggerlut *lut, struct dev_context *devc) return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; - struct sr_datafeed_packet *packet; - struct sr_datafeed_header *header; - struct sr_datafeed_meta_logic meta; struct clockselect_50 clockselect; int frac, triggerpin, ret; - uint8_t triggerselect; + uint8_t triggerselect = 0; struct triggerinout triggerinout_conf; struct triggerlut lut; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + devc = sdi->priv; if (configure_probes(sdi) != SR_OK) { - sr_err("asix-sigma: failed to configured probes"); + sr_err("Failed to configure probes."); return SR_ERR; } @@ -1382,56 +1348,30 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, gettimeofday(&devc->start_tv, 0); sigma_set_register(WRITE_MODE, 0x0d, devc); - devc->session_dev_id = cb_data; - - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("sigma: %s: packet malloc failed.", __func__); - return SR_ERR_MALLOC; - } - - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("sigma: %s: header malloc failed.", __func__); - return SR_ERR_MALLOC; - } + devc->cb_data = cb_data; /* Send header packet to the session bus. */ - packet->type = SR_DF_HEADER; - packet->payload = header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - sr_session_send(devc->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 = devc->cur_samplerate; - meta.num_probes = devc->num_probes; - sr_session_send(devc->session_dev_id, packet); + std_session_send_df_header(cb_data, LOG_PREFIX); /* Add capture source. */ sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi); - g_free(header); - g_free(packet); - devc->state.state = SIGMA_CAPTURE; return SR_OK; } -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; uint8_t modestatus; - /* Avoid compiler warnings. */ (void)cb_data; sr_source_remove(0); if (!(devc = sdi->priv)) { - sr_err("sigma: %s: sdi->priv was NULL", __func__); + sr_err("%s: sdi->priv was NULL", __func__); return SR_ERR_BUG; } @@ -1462,16 +1402,17 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { .name = "asix-sigma", .longname = "ASIX SIGMA/SIGMA2", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = clear_instances, - .dev_open = hw_dev_open, - .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, - .dev_acquisition_start = hw_dev_acquisition_start, - .dev_acquisition_stop = hw_dev_acquisition_stop, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };