X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=cde523ecf6569e2ee4bbeb6c7189e1cd8ab054bc;hb=dd96ea98793ed089f1b0a7dd31f417774f14ad80;hp=3534ef609c0abdd2ea46b300cf9856a2f4601509;hpb=087a9161fffa0cabe8aa37cf3358d88bcd72fb21;p=libsigrok.git diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c index 3534ef60..cde523ec 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. * - * 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 @@ -20,13 +22,13 @@ #include "protocol.h" static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_SAMPLERATE, - SR_HWCAP_TRIGGER_SLOPE, - SR_HWCAP_HORIZ_TRIGGERPOS, -// SR_HWCAP_CAPTURE_RATIO, - SR_HWCAP_LIMIT_SAMPLES, -// SR_HWCAP_RLE, + 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, 0, }; @@ -58,6 +60,7 @@ static int hw_init(struct sr_context *sr_ctx) sr_err("Driver context malloc failed."); return SR_ERR_MALLOC; } + drvc->sr_ctx = sr_ctx; di->priv = drvc; @@ -66,48 +69,52 @@ static int hw_init(struct sr_context *sr_ctx) static GSList *hw_scan(GSList *options) { - int i; + int i; + GSList *devices = NULL; + const char *conn = NULL; + const char *serialcomm = NULL; + GSList *l; + struct sr_config *src; + struct udev *udev; (void)options; - GSList *devices = NULL; - 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 = src->value; break; - case SR_HWOPT_SERIALCOMM: - serialcomm = opt->value; + case SR_CONF_SERIALCOMM: + serialcomm = src->value; 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", @@ -115,86 +122,89 @@ 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_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); + } return devices; } @@ -210,6 +220,7 @@ static GSList *hw_dev_list(void) static int hw_dev_open(struct sr_dev_inst *sdi) { + int ret; struct dev_context *devc; devc = sdi->priv; @@ -223,24 +234,23 @@ 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) { - printf("dev close\n"); struct dev_context *devc; devc = sdi->priv; @@ -288,28 +298,18 @@ static int hw_cleanup(void) return ret; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { struct dev_context *devc; - switch (info_id) { + switch (id) { case SR_DI_HWCAPS: *data = hwcaps; break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(1); - break; - case SR_DI_PROBE_NAMES: - *data = mso19_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: + case SR_CONF_SAMPLERATE: if (sdi) { devc = sdi->priv; *data = &devc->cur_rate; @@ -323,77 +323,96 @@ static int hw_info_get(int info_id, const void **data, 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, const void *value, const struct sr_dev_inst *sdi) { int ret; - struct dev_context *devc; - devc = sdi->priv; + uint64_t num_samples, slope; + int trigger_pos; + float pos; + + devc = sdi->priv; if (sdi->status != SR_ST_ACTIVE) return SR_ERR; - switch (hwcap) { - case SR_HWCAP_SAMPLERATE: - return mso_configure_rate(sdi, *(const uint64_t *) value); + switch (id) { + case SR_CONF_SAMPLERATE: + // FIXME + return mso_configure_rate(sdi, *(const uint64_t *)value); ret = SR_OK; break; - case SR_HWCAP_LIMIT_SAMPLES: + case SR_CONF_LIMIT_SAMPLES: + num_samples = *(uint64_t *)value; + if (num_samples < 1024) { + sr_err("minimum of 1024 samples required"); + 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_CONF_CAPTURE_RATIO: ret = SR_OK; break; - case SR_HWCAP_CAPTURE_RATIO: - ret = SR_OK; + case SR_CONF_TRIGGER_SLOPE: + slope = *(uint64_t *)value; + if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) { + sr_err("Invalid trigger slope"); + ret = SR_ERR_ARG; + } else { + devc->trigger_slope = slope; + ret = SR_OK; + } + break; + case SR_CONF_HORIZ_TRIGGERPOS: + pos = *(float *)value; + 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_HWCAP_TRIGGER_SLOPE: - { - uint64_t slope = *(const uint64_t *)value; - if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) - { - sr_err("Invalid trigger slope"); - ret = SR_ERR_ARG; - } else { - devc->trigger_slope = slope; - ret = SR_OK; - } - } - break; - case SR_HWCAP_HORIZ_TRIGGERPOS: - { - float pos = *(const float *)value; - if (pos < 0 || pos > 255) { - sr_err("Trigger position (%f) should be between 0 and 255.", pos); - ret = SR_ERR_ARG; - } else { - int trigger_pos = (int)pos; - printf("Set trigger posion to %X\n", trigger_pos&0xff); - devc->trigger_holdoff[0] = trigger_pos&0xff; - ret = SR_OK; - } - } - break; - - case SR_HWCAP_RLE: - ret = SR_OK; + case SR_CONF_RLE: + ret = SR_OK; break; default: ret = SR_ERR; + break; } return ret; } +static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_SAMPLERATE: + *data = &samplerates; + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) + 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) @@ -405,53 +424,44 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, } /* 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; - /* END of config hardware part */ - ret = mso_arm(sdi); - if (ret != SR_OK) - return ret; + ret = mso_arm(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); + sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data); - printf("Create packet\n"); if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { sr_err("Datafeed packet malloc failed."); return SR_ERR_MALLOC; @@ -469,12 +479,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, 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); @@ -484,7 +488,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, /* This stops acquisition on ALL devices, ignoring dev_index. */ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - /* Avoid compiler warnings. */ (void)cb_data; stop_acquisition(sdi); @@ -501,10 +504,11 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = hw_cleanup, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, .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, .priv = NULL,