X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=932de635683fcf52468334f1bea9e291ab981ee4;hp=acd3acb9db733153bd4ee79257fbd355c65f56c1;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=961009b0c4002717c669a0cdcafb0fcf29f5ea1b diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index acd3acb9..932de635 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 @@ -42,9 +42,9 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info; static struct sr_dev_driver *di = &asix_sigma_driver_info; -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); +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), @@ -55,34 +55,24 @@ static const uint64_t supported_samplerates[] = { SR_MHZ(50), SR_MHZ(100), SR_MHZ(200), - 0, }; /* - * Probe numbers seem to go from 1-16, according to this image: + * Channel numbers seem to go from 1-16, according to this image: * http://tools.asix.net/img/sigma_sigmacab_pins_720.jpg * (the cable has two additional GND pins, and a TI and TO pin) */ -static const char *probe_names[NUM_PROBES + 1] = { +static const char *channel_names[NUM_PROBES + 1] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", NULL, }; -static const struct sr_samplerates samplerates = { - .low = 0, - .high = 0, - .step = 0, - .list = supported_samplerates, -}; - -static const int hwcaps[] = { +static const int32_t hwcaps[] = { SR_CONF_LOGIC_ANALYZER, SR_CONF_SAMPLERATE, SR_CONF_CAPTURE_RATIO, - SR_CONF_LIMIT_MSEC, - 0, }; /* Force the FPGA to reboot. */ @@ -91,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, }; @@ -390,43 +380,29 @@ 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 = di->priv; + devc = 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; + ftdi_deinit(&devc->ftdic); +} - return SR_OK; +static int dev_clear(void) +{ + return std_dev_clear(di, clear_helper); } -static int hw_init(struct sr_context *sr_ctx) +static int init(struct sr_context *sr_ctx) { - return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); + 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; + struct sr_channel *ch; struct drv_context *drvc; struct dev_context *devc; GSList *devices; @@ -441,8 +417,6 @@ static GSList *hw_scan(GSList *options) devices = NULL; - clear_instances(); - if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { sr_err("%s: devc malloc failed", __func__); return NULL; @@ -476,7 +450,7 @@ static GSList *hw_scan(GSList *options) devc->period_ps = 0; devc->limit_msec = 0; devc->cur_firmware = -1; - devc->num_probes = 0; + devc->num_channels = 0; devc->samples_per_event = 0; devc->capture_ratio = 50; devc->use_triggers = 0; @@ -489,11 +463,11 @@ static GSList *hw_scan(GSList *options) } sdi->driver = di; - for (i = 0; probe_names[i]; i++) { - if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, - probe_names[i]))) + for (i = 0; channel_names[i]; i++) { + if (!(ch = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + channel_names[i]))) return NULL; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); } devices = g_slist_append(devices, sdi); @@ -511,7 +485,7 @@ free: return NULL; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { return ((struct drv_context *)(di->priv))->instances; } @@ -553,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); @@ -610,7 +584,7 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) 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; @@ -634,34 +608,36 @@ 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)) { ret = upload_firmware(0, devc); - devc->num_probes = 16; + devc->num_channels = 16; } if (samplerate == SR_MHZ(100)) { ret = upload_firmware(1, devc); - devc->num_probes = 8; + devc->num_channels = 8; } else if (samplerate == SR_MHZ(200)) { ret = upload_firmware(2, devc); - devc->num_probes = 4; + devc->num_channels = 4; } devc->cur_samplerate = samplerate; devc->period_ps = 1000000000000ULL / samplerate; - devc->samples_per_event = 16 / devc->num_probes; + devc->samples_per_event = 16 / devc->num_channels; devc->state.state = SIGMA_IDLE; return ret; @@ -670,26 +646,26 @@ static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) /* * In 100 and 200 MHz mode, only a single pin rising/falling can be * set as trigger. In other modes, two rising/falling triggers can be set, - * in addition to value/mask trigger for any number of probes. + * in addition to value/mask trigger for any number of channels. * * The Sigma supports complex triggers using boolean expressions, but this * has not been implemented yet. */ -static int configure_probes(const struct sr_dev_inst *sdi) +static int configure_channels(const struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - const struct sr_probe *probe; + const struct sr_channel *ch; const GSList *l; int trigger_set = 0; - int probebit; + int channelbit; memset(&devc->trigger, 0, sizeof(struct sigma_trigger)); - for (l = sdi->probes; l; l = l->next) { - probe = (struct sr_probe *)l->data; - probebit = 1 << (probe->index); + for (l = sdi->channels; l; l = l->next) { + ch = (struct sr_channel *)l->data; + channelbit = 1 << (ch->index); - if (!probe->enabled || !probe->trigger) + if (!ch->enabled || !ch->trigger) continue; if (devc->cur_samplerate >= SR_MHZ(100)) { @@ -699,10 +675,10 @@ static int configure_probes(const struct sr_dev_inst *sdi) "200MHz mode is supported."); return SR_ERR; } - if (probe->trigger[0] == 'f') - devc->trigger.fallingmask |= probebit; - else if (probe->trigger[0] == 'r') - devc->trigger.risingmask |= probebit; + if (ch->trigger[0] == 'f') + devc->trigger.fallingmask |= channelbit; + else if (ch->trigger[0] == 'r') + devc->trigger.risingmask |= channelbit; else { sr_err("Only rising/falling trigger in 100 " "and 200MHz mode is supported."); @@ -712,20 +688,20 @@ static int configure_probes(const struct sr_dev_inst *sdi) ++trigger_set; } else { /* Simple trigger support (event). */ - if (probe->trigger[0] == '1') { - devc->trigger.simplevalue |= probebit; - devc->trigger.simplemask |= probebit; + if (ch->trigger[0] == '1') { + devc->trigger.simplevalue |= channelbit; + devc->trigger.simplemask |= channelbit; } - else if (probe->trigger[0] == '0') { - devc->trigger.simplevalue &= ~probebit; - devc->trigger.simplemask |= probebit; + else if (ch->trigger[0] == '0') { + devc->trigger.simplevalue &= ~channelbit; + devc->trigger.simplemask |= channelbit; } - else if (probe->trigger[0] == 'f') { - devc->trigger.fallingmask |= probebit; + else if (ch->trigger[0] == 'f') { + devc->trigger.fallingmask |= channelbit; ++trigger_set; } - else if (probe->trigger[0] == 'r') { - devc->trigger.risingmask |= probebit; + else if (ch->trigger[0] == 'r') { + devc->trigger.risingmask |= channelbit; ++trigger_set; } @@ -748,7 +724,7 @@ 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; @@ -763,80 +739,93 @@ static int hw_dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { - if (!di->priv) - return SR_OK; - - clear_instances(); - - return SR_OK; + return dev_clear(); } -static int config_get(int 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; + (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 config_set(int id, const void *value, const struct sr_dev_inst *sdi) +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 (id == SR_CONF_SAMPLERATE) { - ret = set_samplerate(sdi, *(const uint64_t *)value); + ret = set_samplerate(sdi, g_variant_get_uint64(data)); } else if (id == SR_CONF_LIMIT_MSEC) { - devc->limit_msec = *(const uint64_t *)value; + devc->limit_msec = g_variant_get_uint64(data); if (devc->limit_msec > 0) ret = SR_OK; else ret = SR_ERR; } else if (id == SR_CONF_CAPTURE_RATIO) { - devc->capture_ratio = *(const uint64_t *)value; + 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, const void **data, const struct sr_dev_inst *sdi) +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 = hwcaps; + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); break; case SR_CONF_SAMPLERATE: - *data = &samplerates; + 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 = (char *)TRIGGER_TYPE; + *data = g_variant_new_string(TRIGGER_TYPE); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; @@ -940,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; } @@ -956,8 +945,8 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, for (k = 0; k < devc->samples_per_event; ++k) { cur_sample = 0; - /* For each probe. */ - for (l = 0; l < devc->num_probes; ++l) + /* For each channel. */ + for (l = 0; l < devc->num_channels; ++l) cur_sample |= (!!(event[j] & (1 << (l * devc->samples_per_event + k)))) << l; @@ -983,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; } @@ -991,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); } } @@ -1004,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]; @@ -1044,7 +1033,7 @@ 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); } @@ -1052,7 +1041,7 @@ static int receive_data(int fd, int revents, void *cb_data) 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; @@ -1072,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; } @@ -1110,14 +1099,14 @@ static void build_lut_entry(uint16_t value, uint16_t mask, uint16_t *entry) { int i, j, k, bit; - /* For each quad probe. */ + /* For each quad channel. */ for (i = 0; i < 4; ++i) { entry[i] = 0xffff; /* For each bit in LUT. */ for (j = 0; j < 16; ++j) - /* For each probe in quad. */ + /* For each channel in quad. */ for (k = 0; k < 4; ++k) { bit = 1 << (i * 4 + k); @@ -1262,22 +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 clockselect_50 clockselect; int frac, triggerpin, ret; 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("Failed to configure probes."); + if (configure_channels(sdi) != SR_OK) { + sr_err("Failed to configure channels."); return SR_ERR; } @@ -1330,10 +1319,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, /* Set clock select register. */ if (devc->cur_samplerate == SR_MHZ(200)) - /* Enable 4 probes. */ + /* Enable 4 channels. */ sigma_set_register(WRITE_CLOCK_SELECT, 0xf0, devc); else if (devc->cur_samplerate == SR_MHZ(100)) - /* Enable 8 probes. */ + /* Enable 8 channels. */ sigma_set_register(WRITE_CLOCK_SELECT, 0x00, devc); else { /* @@ -1344,7 +1333,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, clockselect.async = 0; clockselect.fraction = frac; - clockselect.disabled_probes = 0; + clockselect.disabled_channels = 0; sigma_write_register(WRITE_CLOCK_SELECT, (uint8_t *) &clockselect, @@ -1359,37 +1348,20 @@ 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("%s: packet malloc failed.", __func__); - return SR_ERR_MALLOC; - } - - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("%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); + 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(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; @@ -1430,17 +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, + .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 = hw_dev_open, - .dev_close = hw_dev_close, - .dev_acquisition_start = hw_dev_acquisition_start, - .dev_acquisition_stop = hw_dev_acquisition_stop, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };