X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=f1b28e93bca7313a1145dc89d7b2a24606bbf151;hp=9e599c61efbf88c906b7cbbf42cf773c7c406733;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=5a24e89ca463ba7acb465f4bc9953e2da9c09e45 diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c index 9e599c61..f1b28e93 100644 --- a/hardware/link-mso19/api.c +++ b/hardware/link-mso19/api.c @@ -1,7 +1,9 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2011 Daniel Ribeiro + * Copyright (C) 2012 Renato Caldas + * Copyright (C) 2013 Lior Elazary * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,93 +21,124 @@ #include "protocol.h" -static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_SAMPLERATE, -// SR_HWCAP_CAPTURE_RATIO, - SR_HWCAP_LIMIT_SAMPLES, -// SR_HWCAP_RLE, - 0, +static const int32_t hwcaps[] = { + SR_CONF_OSCILLOSCOPE, + SR_CONF_LOGIC_ANALYZER, + SR_CONF_SAMPLERATE, + SR_CONF_TRIGGER_SLOPE, + SR_CONF_HORIZ_TRIGGERPOS, +// SR_CONF_CAPTURE_RATIO, + SR_CONF_LIMIT_SAMPLES, +// SR_CONF_RLE, }; /* - * 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] = { - "0", "1", "2", "3", "4", "5", "6", "7", NULL +SR_PRIV const char *mso19_channel_names[NUM_PROBES + 1] = { + /* Note: DSO needs to be first. */ + "DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL, }; -/*supported samplerates */ -static const struct sr_samplerates samplerates = { +static const uint64_t samplerates[] = { SR_HZ(100), SR_MHZ(200), SR_HZ(100), - NULL, }; 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) { + GSList *l; + struct sr_dev_inst *sdi; struct drv_context *drvc; + struct dev_context *devc; + int ret = SR_OK; - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; + 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); } - drvc->sr_ctx = sr_ctx; - di->priv = drvc; + g_slist_free(drvc->instances); + drvc->instances = NULL; - return SR_OK; + return ret; } -static GSList *hw_scan(GSList *options) +static int init(struct sr_context *sr_ctx) { - int i; + return std_init(sr_ctx, di, LOG_PREFIX); +} - (void)options; +static GSList *scan(GSList *options) +{ + int i; GSList *devices = NULL; + const char *conn = NULL; + const char *serialcomm = NULL; + GSList *l; + struct sr_config *src; + struct udev *udev; + int ptype; - const char* conn = NULL; - const char* serialcomm = NULL; - GSList *l; for (l = options; l; l = l->next) { - struct sr_hwopt* opt = l->data; - switch (opt->hwopt) { - case SR_HWOPT_CONN: - conn = opt->value; + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); break; - case SR_HWOPT_SERIALCOMM: - serialcomm = opt->value; + case SR_CONF_SERIALCOMM: + serialcomm = g_variant_get_string(src->data, NULL); break; } } if (!conn) - conn = SERIALCONN; + conn = SERIALCONN; if (serialcomm == NULL) serialcomm = SERIALCOMM; - struct udev *udev = udev_new(); + udev = udev_new(); if (!udev) { sr_err("Failed to initialize udev."); } + struct udev_enumerate *enumerate = udev_enumerate_new(udev); udev_enumerate_add_match_subsystem(enumerate, "usb-serial"); udev_enumerate_scan_devices(enumerate); struct udev_list_entry *devs = udev_enumerate_get_list_entry(enumerate); struct udev_list_entry *dev_list_entry; - for (dev_list_entry = devs; - dev_list_entry != NULL; - dev_list_entry = udev_list_entry_get_next(dev_list_entry)) - { + for (dev_list_entry = devs; + dev_list_entry != NULL; + dev_list_entry = udev_list_entry_get_next(dev_list_entry)) { const char *syspath = udev_list_entry_get_name(dev_list_entry); - struct udev_device *dev = udev_device_new_from_syspath(udev, syspath); + struct udev_device *dev = + udev_device_new_from_syspath(udev, syspath); const char *sysname = udev_device_get_sysname(dev); - struct udev_device *parent = udev_device_get_parent_with_subsystem_devtype( - dev, "usb", "usb_device"); + struct udev_device *parent = + udev_device_get_parent_with_subsystem_devtype(dev, "usb", + "usb_device"); if (!parent) { sr_err("Unable to find parent usb device for %s", @@ -113,101 +146,102 @@ static GSList *hw_scan(GSList *options) continue; } - const char *idVendor = udev_device_get_sysattr_value(parent, "idVendor"); - const char *idProduct = udev_device_get_sysattr_value(parent, "idProduct"); + const char *idVendor = + udev_device_get_sysattr_value(parent, "idVendor"); + const char *idProduct = + udev_device_get_sysattr_value(parent, "idProduct"); if (strcmp(USB_VENDOR, idVendor) - || strcmp(USB_PRODUCT, idProduct)) + || strcmp(USB_PRODUCT, idProduct)) continue; - const char* iSerial = udev_device_get_sysattr_value(parent, "serial"); - const char* iProduct = udev_device_get_sysattr_value(parent, "product"); + const char *iSerial = + udev_device_get_sysattr_value(parent, "serial"); + const char *iProduct = + udev_device_get_sysattr_value(parent, "product"); - char path[32]; + char path[32]; snprintf(path, sizeof(path), "/dev/%s", sysname); - conn = path; + conn = path; size_t s = strcspn(iProduct, " "); - char product[32]; - char manufacturer[32]; + char product[32]; + char manufacturer[32]; if (s > sizeof(product) || - strlen(iProduct) - s > sizeof(manufacturer)) { - sr_err("Could not parse iProduct: %s.", iProduct); + strlen(iProduct) - s > sizeof(manufacturer)) { + sr_err("Could not parse iProduct: %s.", iProduct); continue; } strncpy(product, iProduct, s); product[s] = 0; strcpy(manufacturer, iProduct + s + 1); - - //Create the device context and set its params - struct dev_context *devc; - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - return devices; - } - - if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) { - sr_err("Invalid iSerial: %s.", iSerial); - g_free(devc); - return devices; - } - - char hwrev[32]; - sprintf(hwrev, "r%d", devc->hwrev); - devc->ctlbase1 = 0; - devc->protocol_trigger.spimode = 0; - for (i = 0; i < 4; i++) { - devc->protocol_trigger.word[i] = 0; - devc->protocol_trigger.mask[i] = 0xff; - } - - if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) - { - g_free(devc); - return devices; - } - - struct sr_dev_inst *sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, - manufacturer, product, hwrev); - - if (!sdi) { - sr_err("Unable to create device instance for %s", - sysname); - sr_dev_inst_free(sdi); - g_free(devc); - return devices; - } - - sdi->driver = di; - sdi->priv = devc; - - for (i = 0; i < NUM_PROBES; i++) { - struct sr_probe *probe; - if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, - mso19_probe_names[i]))) - return 0; - sdi->probes = g_slist_append(sdi->probes, probe); - } - - //Add the driver - struct drv_context *drvc = di->priv; - drvc->instances = g_slist_append(drvc->instances, sdi); - devices = g_slist_append(devices, sdi); - } + + //Create the device context and set its params + struct dev_context *devc; + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); + return devices; + } + + if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) { + sr_err("Invalid iSerial: %s.", iSerial); + g_free(devc); + return devices; + } + + char hwrev[32]; + sprintf(hwrev, "r%d", devc->hwrev); + devc->ctlbase1 = 0; + devc->protocol_trigger.spimode = 0; + for (i = 0; i < 4; i++) { + devc->protocol_trigger.word[i] = 0; + devc->protocol_trigger.mask[i] = 0xff; + } + + if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) { + g_free(devc); + return devices; + } + + struct sr_dev_inst *sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, + manufacturer, product, hwrev); + + if (!sdi) { + sr_err("Unable to create device instance for %s", + sysname); + sr_dev_inst_free(sdi); + g_free(devc); + return devices; + } + + sdi->driver = di; + sdi->priv = devc; + + for (i = 0; i < NUM_PROBES; i++) { + struct sr_channel *ch; + ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC; + if (!(ch = sr_probe_new(i, ptype, TRUE, + mso19_channel_names[i]))) + return 0; + sdi->channels = g_slist_append(sdi->channels, ch); + } + + //Add the driver + struct drv_context *drvc = di->priv; + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); + } return devices; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + 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; devc = sdi->priv; @@ -221,260 +255,219 @@ static int hw_dev_open(struct sr_dev_inst *sdi) mso_check_trigger(devc->serial, &devc->trigger_state); sr_dbg("Trigger state: 0x%x.", devc->trigger_state); - int ret = mso_reset_adc(sdi); + ret = mso_reset_adc(sdi); if (ret != SR_OK) return ret; mso_check_trigger(devc->serial, &devc->trigger_state); sr_dbg("Trigger state: 0x%x.", devc->trigger_state); - // ret = mso_reset_fsm(sdi); - // if (ret != SR_OK) - // return ret; - // return SR_ERR; + // ret = mso_reset_fsm(sdi); + // if (ret != SR_OK) + // return ret; + // return SR_ERR; return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int cleanup(void) { - printf("dev close\n"); - 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; + (void)cg; - /* 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); + switch (id) { + case SR_CONF_SAMPLERATE: + if (sdi) { + devc = sdi->priv; + *data = g_variant_new_uint64(devc->cur_rate); + } else + return SR_ERR; + break; + default: + return SR_ERR_NA; } - g_slist_free(drvc->instances); - drvc->instances = NULL; - return ret; + return SR_OK; } -static int hw_info_get(int info_id, const void **data, - 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; + const char *slope; + int trigger_pos; + double pos; + + (void)cg; + devc = sdi->priv; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; + switch (id) { + case SR_CONF_SAMPLERATE: + // FIXME + return mso_configure_rate(sdi, g_variant_get_uint64(data)); + ret = SR_OK; break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(1); + case SR_CONF_LIMIT_SAMPLES: + num_samples = g_variant_get_uint64(data); + if (num_samples != 1024) { + sr_err("Only 1024 samples are supported."); + ret = SR_ERR_ARG; + } else { + devc->limit_samples = num_samples; + sr_dbg("setting limit_samples to %i\n", + num_samples); + ret = SR_OK; + } break; - case SR_DI_PROBE_NAMES: - *data = mso19_probe_names; + case SR_CONF_CAPTURE_RATIO: + ret = SR_OK; break; - case SR_DI_SAMPLERATES: - *data = &samplerates; + case SR_CONF_TRIGGER_SLOPE: + 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[0] == 'r') + ? SLOPE_POSITIVE : SLOPE_NEGATIVE; + ret = SR_OK; + } break; - case SR_DI_TRIGGER_TYPES: - *data = (char *)TRIGGER_TYPES; + case SR_CONF_HORIZ_TRIGGERPOS: + 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; + } else { + trigger_pos = (int)pos; + devc->trigger_holdoff[0] = trigger_pos & 0xff; + ret = SR_OK; + } break; - case SR_DI_CUR_SAMPLERATE: - if (sdi) { - devc = sdi->priv; - *data = &devc->cur_rate; - } else - return SR_ERR; + case SR_CONF_RLE: + ret = SR_OK; break; default: - return SR_ERR_ARG; + ret = SR_ERR_NA; + break; } - return SR_OK; + return ret; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { - int ret; + GVariant *gvar; + GVariantBuilder gvb; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + (void)cg; + (void)sdi; - switch (hwcap) { - case SR_HWCAP_SAMPLERATE: - return mso_configure_rate(sdi, *(const uint64_t *) value); - ret = SR_OK; - break; - case SR_HWCAP_LIMIT_SAMPLES: - ret = SR_OK; + 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_HWCAP_CAPTURE_RATIO: - ret = SR_OK; + 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}", "samplerate-steps", gvar); + *data = g_variant_builder_end(&gvb); break; - case SR_HWCAP_RLE: - ret = SR_OK; + case SR_CONF_TRIGGER_TYPE: + *data = g_variant_new_string(TRIGGER_TYPE); break; default: - ret = SR_ERR; + return SR_ERR_NA; } - return ret; + 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 sr_datafeed_packet *packet; - struct sr_datafeed_header *header; - struct sr_datafeed_meta_logic meta; struct dev_context *devc; int ret = SR_ERR; - - - printf("Accquistion start\n"); - 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; } - /* - * Enable/disable channel groups in the flag register according to the - * probe mask. Calculate this here, because num_channels is needed - * to limit readcount. - */ - //changrp_mask = 0; - //num_channels = 0; - //for (i = 0; i < 4; i++) { - // if (devc->probe_mask & (0xff << (i * 8))) { - // changrp_mask |= (1 << i); - // num_channels++; - // } - //} - /* FIXME: No need to do full reconfigure every time */ -// ret = mso_reset_fsm(sdi); -// if (ret != SR_OK) -// return ret; +// ret = mso_reset_fsm(sdi); +// if (ret != SR_OK) +// return ret; /* FIXME: ACDC Mode */ devc->ctlbase1 &= 0x7f; -// devc->ctlbase1 |= devc->acdcmode; +// devc->ctlbase1 |= devc->acdcmode; - printf("Configure rate\n"); ret = mso_configure_rate(sdi, devc->cur_rate); if (ret != SR_OK) return ret; /* set dac offset */ - printf("Configure dac\n"); ret = mso_dac_out(sdi, devc->dac_offset); if (ret != SR_OK) return ret; - printf("Configure threshold level\n"); ret = mso_configure_threshold_level(sdi); if (ret != SR_OK) return ret; - printf("Configure trigger\n"); ret = mso_configure_trigger(sdi); if (ret != SR_OK) return ret; - /* FIXME: trigger_position */ - - /* END of config hardware part */ - - /* with trigger */ - printf("arm\n"); ret = mso_arm(sdi); if (ret != SR_OK) return ret; - /* without trigger */ -// ret = mso_force_capture(sdi); -// if (ret != SR_OK) -// return ret; - /* Start acquisition on the device. */ - printf("Check trigger\n"); mso_check_trigger(devc->serial, &devc->trigger_state); ret = mso_check_trigger(devc->serial, NULL); if (ret != SR_OK) return ret; - printf("Source add\n"); - sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data); + /* Reset trigger state. */ + devc->trigger_state = 0x00; - printf("Create packet\n"); - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("Datafeed packet malloc failed."); - return SR_ERR_MALLOC; - } + /* Send header packet to the session bus. */ + std_session_send_df_header(cb_data, LOG_PREFIX); - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("Datafeed header malloc failed."); - g_free(packet); - return SR_ERR_MALLOC; - } + /* Our first channel is analog, the other 8 are of type 'logic'. */ + /* TODO. */ - packet->type = SR_DF_HEADER; - packet->payload = (unsigned char *)header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - sr_session_send(cb_data, packet); - - packet->type = SR_DF_META_LOGIC; - packet->payload = &meta; - meta.samplerate = devc->cur_rate; - meta.num_probes = NUM_PROBES; - sr_session_send(cb_data, packet); - - g_free(header); - g_free(packet); + serial_source_add(devc->serial, G_IO_IN, -1, mso_receive_data, cb_data); return SR_OK; } -/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +/* This stops acquisition on ALL devices, ignoring dev_index. */ +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - /* Avoid compiler warnings. */ (void)cb_data; stop_acquisition(sdi); @@ -486,16 +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, - .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 = std_serial_dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };