X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=80f48f413814a71e504af7f99549e4c3b33bba19;hp=94ef39fd49741eb21ea9b67e26db3e739ec597cf;hb=fca75cbb741ae756bf50eaf1cdc6d4d53fcc60cd;hpb=365f04d61f54908013021be83450d38fff67964f diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c index 94ef39fd..80f48f41 100644 --- a/hardware/link-mso19/api.c +++ b/hardware/link-mso19/api.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2011 Daniel Ribeiro * Copyright (C) 2012 Renato Caldas @@ -21,7 +21,7 @@ #include "protocol.h" -static const int hwcaps[] = { +static const int32_t hwcaps[] = { SR_CONF_OSCILLOSCOPE, SR_CONF_LOGIC_ANALYZER, SR_CONF_SAMPLERATE, @@ -30,35 +30,69 @@ static const int hwcaps[] = { // SR_CONF_CAPTURE_RATIO, SR_CONF_LIMIT_SAMPLES, // SR_CONF_RLE, - 0, }; /* - * Probes are numbered 0 to 7. + * Channels are numbered 0 to 7. * * See also: http://www.linkinstruments.com/images/mso19_1113.gif */ -SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = { +SR_PRIV const char *mso19_channel_names[NUM_CHANNELS + 1] = { /* Note: DSO needs to be first. */ "DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL, }; -static const struct sr_samplerates samplerates = { - .low = SR_HZ(100), - .high = SR_MHZ(200), - .step = SR_HZ(100), - .list = NULL, +static const uint64_t samplerates[] = { + SR_HZ(100), + SR_MHZ(200), + SR_HZ(100), }; SR_PRIV struct sr_dev_driver link_mso19_driver_info; static struct sr_dev_driver *di = &link_mso19_driver_info; -static int hw_init(struct sr_context *sr_ctx) +/* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */ +static int dev_clear(void) { - return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); + GSList *l; + struct sr_dev_inst *sdi; + struct drv_context *drvc; + struct dev_context *devc; + int ret = SR_OK; + + if (!(drvc = di->priv)) + return SR_OK; + + /* Properly close and free 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__); + ret = SR_ERR_BUG; + continue; + } + if (!(devc = sdi->priv)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("%s: sdi->priv was NULL, continuing", __func__); + ret = SR_ERR_BUG; + continue; + } + std_serial_dev_close(sdi); + sr_serial_dev_inst_free(devc->serial); + sr_dev_inst_free(sdi); + } + g_slist_free(drvc->instances); + drvc->instances = NULL; + + return ret; } -static GSList *hw_scan(GSList *options) +static int init(struct sr_context *sr_ctx) +{ + return std_init(sr_ctx, di, LOG_PREFIX); +} + +static GSList *scan(GSList *options) { int i; GSList *devices = NULL; @@ -67,18 +101,16 @@ static GSList *hw_scan(GSList *options) GSList *l; struct sr_config *src; struct udev *udev; - int ptype; - - (void)options; + int chtype; for (l = options; l; l = l->next) { src = l->data; switch (src->key) { case SR_CONF_CONN: - conn = src->value; + conn = g_variant_get_string(src->data, NULL); break; case SR_CONF_SERIALCOMM: - serialcomm = src->value; + serialcomm = g_variant_get_string(src->data, NULL); break; } } @@ -184,13 +216,13 @@ static GSList *hw_scan(GSList *options) sdi->driver = di; sdi->priv = devc; - for (i = 0; i < NUM_PROBES; i++) { - struct sr_probe *probe; - ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC; - if (!(probe = sr_probe_new(i, ptype, TRUE, - mso19_probe_names[i]))) + for (i = 0; i < NUM_CHANNELS; i++) { + struct sr_channel *ch; + chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC; + if (!(ch = sr_channel_new(i, chtype, TRUE, + mso19_channel_names[i]))) return 0; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); } //Add the driver @@ -202,12 +234,12 @@ static GSList *hw_scan(GSList *options) return devices; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { return ((struct drv_context *)(di->priv))->instances; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { int ret; struct dev_context *devc; @@ -238,95 +270,57 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int cleanup(void) { - struct dev_context *devc; - - devc = sdi->priv; - - if (devc->serial && devc->serial->fd != -1) { - serial_close(devc->serial); - sdi->status = SR_ST_INACTIVE; - } - - return SR_OK; + return dev_clear(); } -static int hw_cleanup(void) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { - GSList *l; - struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; - int ret = SR_OK; - - if (!(drvc = di->priv)) - return SR_OK; - - /* Properly close and free 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__); - ret = SR_ERR_BUG; - continue; - } - if (!(devc = sdi->priv)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("%s: sdi->priv was NULL, continuing", __func__); - ret = SR_ERR_BUG; - continue; - } - hw_dev_close(sdi); - sr_serial_dev_inst_free(devc->serial); - sr_dev_inst_free(sdi); - } - g_slist_free(drvc->instances); - drvc->instances = NULL; - - return ret; -} -static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) -{ - struct dev_context *devc; + (void)cg; switch (id) { case SR_CONF_SAMPLERATE: if (sdi) { devc = sdi->priv; - *data = &devc->cur_rate; + *data = g_variant_new_uint64(devc->cur_rate); } 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) { int ret; struct dev_context *devc; - uint64_t num_samples, slope; + uint64_t num_samples; + const char *slope; int trigger_pos; - float pos; + double pos; + (void)cg; devc = sdi->priv; if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + return SR_ERR_DEV_CLOSED; switch (id) { case SR_CONF_SAMPLERATE: // FIXME - return mso_configure_rate(sdi, *(const uint64_t *)value); + return mso_configure_rate(sdi, g_variant_get_uint64(data)); ret = SR_OK; break; case SR_CONF_LIMIT_SAMPLES: - num_samples = *(uint64_t *)value; + num_samples = g_variant_get_uint64(data); if (num_samples != 1024) { sr_err("Only 1024 samples are supported."); ret = SR_ERR_ARG; @@ -341,17 +335,19 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) ret = SR_OK; break; case SR_CONF_TRIGGER_SLOPE: - slope = *(uint64_t *)value; - if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) { + slope = g_variant_get_string(data, NULL); + + if (!slope || !(slope[0] == 'f' || slope[0] == 'r')) sr_err("Invalid trigger slope"); ret = SR_ERR_ARG; } else { - devc->trigger_slope = slope; + devc->trigger_slope = (slope[0] == 'r') + ? SLOPE_POSITIVE : SLOPE_NEGATIVE; ret = SR_OK; } break; case SR_CONF_HORIZ_TRIGGERPOS: - pos = *(float *)value; + pos = g_variant_get_double(data); if (pos < 0 || pos > 255) { sr_err("Trigger position (%f) should be between 0 and 255.", pos); ret = SR_ERR_ARG; @@ -365,48 +361,56 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) ret = SR_OK; break; default: - ret = SR_ERR; + ret = SR_ERR_NA; break; } 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)cg; (void)sdi; 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}", "samplerate-steps", 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; } -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; int ret = SR_ERR; - devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + return SR_ERR_DEV_CLOSED; + + devc = sdi->priv; - if (mso_configure_probes(sdi) != SR_OK) { - sr_err("Failed to configure probes."); + if (mso_configure_channels(sdi) != SR_OK) { + sr_err("Failed to configure channels."); return SR_ERR; } @@ -451,18 +455,18 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->trigger_state = 0x00; /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + std_session_send_df_header(cb_data, LOG_PREFIX); - /* Our first probe is analog, the other 8 are of type 'logic'. */ + /* Our first channel is analog, the other 8 are of type 'logic'. */ /* TODO. */ - sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data); + serial_source_add(devc->serial, G_IO_IN, -1, mso_receive_data, cb_data); return SR_OK; } /* This stops acquisition on ALL devices, ignoring dev_index. */ -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) { (void)cb_data; @@ -475,17 +479,17 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = { .name = "link-mso19", .longname = "Link Instruments MSO-19", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = hw_cleanup, + .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 = std_serial_dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };