X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fhameg-hmo%2Fapi.c;h=3200d64c3b03fddae333f234a82109517466f9ad;hb=53b4680fceab9351fc87b8c5b34854733f5fdac0;hp=bd97af8865e75cf17b4a76ba7d607e4217c6b78e;hpb=23e1ea7a7d862a8f5173dd12c62d6a4b2e7e9015;p=libsigrok.git diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c index bd97af88..3200d64c 100644 --- a/hardware/hameg-hmo/api.c +++ b/hardware/hameg-hmo/api.c @@ -18,7 +18,6 @@ */ #include -#include #include "protocol.h" #define SERIALCOMM "115200/8n1/flow=1" @@ -35,16 +34,6 @@ static const int32_t hwopts[] = { SR_CONF_SERIALCOMM, }; -struct usb_id_info { - uint16_t vendor_id; - uint16_t product_id; -}; - -static struct usb_id_info ho_models[] = { - { 0x0403, 0xed72 }, /* HO720 */ - { 0x0403, 0xed73 }, /* HO730 */ -}; - enum { PG_INVALID = -1, PG_NONE, @@ -57,142 +46,6 @@ static int init(struct sr_context *sr_ctx) return std_init(sr_ctx, di, LOG_PREFIX); } -/** - * Find USB serial devices via the USB vendor ID and product ID. - * - * @param vendor_id Vendor ID of the USB device. - * @param product_id Product ID of the USB device. - * - * @return A GSList of strings containing the path of the serial device or - * NULL if no serial device is found. The returned list must be freed - * by the caller. - */ -static GSList *auto_find_usb(uint16_t vendor_id, uint16_t product_id) -{ -#ifdef __linux__ - const gchar *usb_dev; - const char device_tree[] = "/sys/bus/usb/devices/"; - GDir *devices_dir, *device_dir; - GSList *l = NULL; - GSList *tty_devs; - GSList *matched_paths; - FILE *fd; - char tmp[5]; - gchar *vendor_path, *product_path, *path_copy; - gchar *prefix, *subdir_path, *device_path, *tty_path; - unsigned long read_vendor_id, read_product_id; - const char *file; - - l = NULL; - tty_devs = NULL; - matched_paths = NULL; - - if (!(devices_dir = g_dir_open(device_tree, 0, NULL))) - return NULL; - - /* - * Find potential candidates using the vendor ID and product ID - * and store them in matched_paths. - */ - while ((usb_dev = g_dir_read_name(devices_dir))) { - vendor_path = g_strconcat(device_tree, - usb_dev, "/idVendor", NULL); - product_path = g_strconcat(device_tree, - usb_dev, "/idProduct", NULL); - - if (!g_file_test(vendor_path, G_FILE_TEST_EXISTS) || - !g_file_test(product_path, G_FILE_TEST_EXISTS)) - goto skip_device; - - if ((fd = g_fopen(vendor_path, "r")) == NULL) - goto skip_device; - - if (fgets(tmp, sizeof(tmp), fd) == NULL) { - fclose(fd); - goto skip_device; - } - read_vendor_id = strtoul(tmp, NULL, 16); - - fclose(fd); - - if ((fd = g_fopen(product_path, "r")) == NULL) - goto skip_device; - - if (fgets(tmp, sizeof(tmp), fd) == NULL) { - fclose(fd); - goto skip_device; - } - read_product_id = strtoul(tmp, NULL, 16); - - fclose(fd); - - if (vendor_id == read_vendor_id && - product_id == read_product_id) { - path_copy = g_strdup(usb_dev); - matched_paths = g_slist_prepend(matched_paths, - path_copy); - } - -skip_device: - g_free(vendor_path); - g_free(product_path); - } - g_dir_close(devices_dir); - - /* For every matched device try to find a ttyUSBX subfolder. */ - for (l = matched_paths; l; l = l->next) { - subdir_path = NULL; - - device_path = g_strconcat(device_tree, l->data, NULL); - - if (!(device_dir = g_dir_open(device_path, 0, NULL))) { - g_free(device_path); - continue; - } - - prefix = g_strconcat(l->data, ":", NULL); - - while ((file = g_dir_read_name(device_dir))) { - if (g_str_has_prefix(file, prefix)) { - subdir_path = g_strconcat(device_path, - "/", file, NULL); - break; - } - } - g_dir_close(device_dir); - - g_free(prefix); - g_free(device_path); - - if (subdir_path) { - if (!(device_dir = g_dir_open(subdir_path, 0, NULL))) { - g_free(subdir_path); - continue; - } - g_free(subdir_path); - - while ((file = g_dir_read_name(device_dir))) { - if (g_str_has_prefix(file, "ttyUSB")) { - tty_path = g_strconcat("/dev/", - file, NULL); - sr_dbg("Found USB device %04x:%04x attached to %s.", - vendor_id, product_id, tty_path); - tty_devs = g_slist_prepend(tty_devs, - tty_path); - break; - } - } - g_dir_close(device_dir); - } - } - g_slist_free_full(matched_paths, g_free); - - return tty_devs; -#else - return NULL; -#endif -} - static int check_manufacturer(const char *manufacturer) { unsigned int i; @@ -204,26 +57,16 @@ static int check_manufacturer(const char *manufacturer) return SR_ERR; } -static struct sr_dev_inst *hmo_probe_serial_device(const char *serial_device, - const char *serial_options) +static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi) { struct sr_dev_inst *sdi; struct dev_context *devc; struct sr_scpi_hw_info *hw_info; - struct sr_scpi_dev_inst *scpi; sdi = NULL; devc = NULL; - scpi = NULL; hw_info = NULL; - if (!(scpi = scpi_dev_inst_new(serial_device, serial_options))) - goto fail; - - sr_info("Probing %s.", serial_device); - if (sr_scpi_open(scpi) != SR_OK) - goto fail; - if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) { sr_info("Couldn't get IDN response."); goto fail; @@ -260,8 +103,6 @@ static struct sr_dev_inst *hmo_probe_serial_device(const char *serial_device, fail: if (hw_info) sr_scpi_hw_info_free(hw_info); - if (scpi) - sr_scpi_free(scpi); if (sdi) sr_dev_inst_free(sdi); if (devc) @@ -272,49 +113,7 @@ fail: static GSList *scan(GSList *options) { - GSList *devices; - struct drv_context *drvc; - struct sr_dev_inst *sdi; - const char *serial_device, *serial_options; - GSList *l, *tty_devs; - unsigned int i; - - serial_device = NULL; - serial_options = SERIALCOMM; - sdi = NULL; - devices = NULL; - drvc = di->priv; - drvc->instances = NULL; - - if (sr_serial_extract_options(options, &serial_device, - &serial_options) == SR_OK) { - sdi = hmo_probe_serial_device(serial_device, serial_options); - if (sdi != NULL) { - devices = g_slist_append(devices, sdi); - drvc->instances = g_slist_append(drvc->instances, sdi); - } - } else { - tty_devs = NULL; - - for (i = 0; i < ARRAY_SIZE(ho_models); i++) { - if ((l = auto_find_usb(ho_models[i].vendor_id, - ho_models[i].product_id)) == NULL) - continue; - tty_devs = g_slist_concat(tty_devs, l); - } - - for (l = tty_devs; l; l = l->next) { - sdi = hmo_probe_serial_device(l->data, serial_options); - if (sdi != NULL) { - devices = g_slist_append(devices, sdi); - drvc->instances = g_slist_append(drvc->instances, sdi); - } - } - - g_slist_free_full(tty_devs, g_free); - } - - return devices; + return sr_scpi_scan(di->priv, options, hmo_probe_serial_device); } static GSList *dev_list(void) @@ -334,10 +133,10 @@ static void clear_helper(void *priv) hmo_scope_state_free(devc->model_state); for (i = 0; i < model->analog_channels; ++i) - g_slist_free(devc->analog_groups[i].probes); + g_slist_free(devc->analog_groups[i].channels); for (i = 0; i < model->digital_pods; ++i) { - g_slist_free(devc->digital_groups[i].probes); + g_slist_free(devc->digital_groups[i].channels); g_free(devc->digital_groups[i].name); } @@ -384,32 +183,32 @@ static int cleanup(void) return SR_OK; } -static int check_probe_group(struct dev_context *devc, - const struct sr_probe_group *probe_group) +static int check_channel_group(struct dev_context *devc, + const struct sr_channel_group *cg) { unsigned int i; struct scope_config *model; model = devc->model_config; - if (!probe_group) + if (!cg) return PG_NONE; for (i = 0; i < model->analog_channels; ++i) - if (probe_group == &devc->analog_groups[i]) + if (cg == &devc->analog_groups[i]) return PG_ANALOG; for (i = 0; i < model->digital_pods; ++i) - if (probe_group == &devc->digital_groups[i]) + if (cg == &devc->digital_groups[i]) return PG_DIGITAL; - sr_err("Invalid probe group specified."); + sr_err("Invalid channel group specified."); return PG_INVALID; } static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { int ret, pg_type; unsigned int i; @@ -420,7 +219,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID) + if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID) return SR_ERR; ret = SR_ERR_NA; @@ -432,7 +231,29 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_int32(model->num_xdivs); ret = SR_OK; break; + case SR_CONF_TIMEBASE: + *data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0], + (*model->timebases)[state->timebase][1]); + ret = SR_OK; + break; case SR_CONF_NUM_VDIV: + if (pg_type == PG_NONE) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; + } else if (pg_type == PG_ANALOG) { + for (i = 0; i < model->analog_channels; ++i) { + if (cg != &devc->analog_groups[i]) + continue; + *data = g_variant_new_int32(model->num_ydivs); + ret = SR_OK; + break; + } + + } else { + ret = SR_ERR_NA; + } + break; + case SR_CONF_VDIV: if (pg_type == PG_NONE) { sr_err("No probe group specified."); return SR_ERR_PROBE_GROUP; @@ -440,7 +261,38 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, for (i = 0; i < model->analog_channels; ++i) { if (probe_group != &devc->analog_groups[i]) continue; - *data = g_variant_new_int32(model->num_ydivs); + *data = g_variant_new("(tt)", + (*model->vdivs)[state->analog_channels[i].vdiv][0], + (*model->vdivs)[state->analog_channels[i].vdiv][1]); + ret = SR_OK; + break; + } + + } else { + ret = SR_ERR_NA; + } + break; + case SR_CONF_TRIGGER_SOURCE: + *data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]); + ret = SR_OK; + break; + case SR_CONF_TRIGGER_SLOPE: + *data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]); + ret = SR_OK; + break; + case SR_CONF_HORIZ_TRIGGERPOS: + *data = g_variant_new_double(state->horiz_triggerpos); + ret = SR_OK; + break; + case SR_CONF_COUPLING: + if (pg_type == PG_NONE) { + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; + } else if (pg_type == PG_ANALOG) { + for (i = 0; i < model->analog_channels; ++i) { + if (cg != &devc->analog_groups[i]) + continue; + *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]); ret = SR_OK; break; } @@ -480,7 +332,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n) } static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { int ret, pg_type; unsigned int i, j; @@ -489,14 +341,14 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, struct scope_config *model; struct scope_state *state; const char *tmp; - uint64_t p, q, tmp_u64; + uint64_t p, q; double tmp_d; gboolean update_sample_rate; if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID) + if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID) return SR_ERR; model = devc->model_config; @@ -526,8 +378,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, break; case SR_CONF_VDIV: if (pg_type == PG_NONE) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } g_variant_get(data, "(tt)", &p, &q); @@ -537,7 +389,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, q != (*model->vdivs)[i][1]) continue; for (j = 1; j <= model->analog_channels; ++j) { - if (probe_group != &devc->analog_groups[j - 1]) + if (cg != &devc->analog_groups[j - 1]) continue; state->analog_channels[j - 1].vdiv = i; g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q); @@ -580,31 +432,37 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, if (tmp_d < 0.0 || tmp_d > 1.0) return SR_ERR; - state->horiz_triggerpos = -(tmp_d - 0.5) * state->timebase * model->num_xdivs; + state->horiz_triggerpos = tmp_d; + tmp_d = -(tmp_d - 0.5) * + ((double) (*model->timebases)[state->timebase][0] / + (*model->timebases)[state->timebase][1]) + * model->num_xdivs; + + g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d); g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS], - state->horiz_triggerpos); + float_str); ret = sr_scpi_send(sdi->conn, command); break; case SR_CONF_TRIGGER_SLOPE: - tmp_u64 = g_variant_get_uint64(data); + tmp = g_variant_get_string(data, NULL); - if (tmp_u64 != 0 && tmp_u64 != 1) - return SR_ERR; + if (!tmp || !(tmp[0] == 'f' || tmp[0] == 'r')) + return SR_ERR_ARG; - state->trigger_slope = tmp_u64; + state->trigger_slope = (tmp[0] == 'r') ? 0 : 1; g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE], - tmp_u64 ? "POS" : "NEG"); + (state->trigger_slope == 0) ? "POS" : "NEG"); ret = sr_scpi_send(sdi->conn, command); break; case SR_CONF_COUPLING: if (pg_type == PG_NONE) { - sr_err("No probe group specified."); - return SR_ERR_PROBE_GROUP; + sr_err("No channel group specified."); + return SR_ERR_CHANNEL_GROUP; } tmp = g_variant_get_string(data, NULL); @@ -613,7 +471,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, if (strcmp(tmp, (*model->coupling_options)[i]) != 0) continue; for (j = 1; j <= model->analog_channels; ++j) { - if (probe_group != &devc->analog_groups[j - 1]) + if (cg != &devc->analog_groups[j - 1]) continue; state->analog_channels[j-1].coupling = i; @@ -646,7 +504,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { int pg_type; struct dev_context *devc; @@ -655,7 +513,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; - if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID) + if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID) return SR_ERR; model = devc->model_config; @@ -677,7 +535,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, break; case SR_CONF_COUPLING: if (pg_type == PG_NONE) - return SR_ERR_PROBE_GROUP; + return SR_ERR_CHANNEL_GROUP; *data = g_variant_new_strv(*model->coupling_options, g_strv_length((char **)*model->coupling_options)); break; @@ -685,12 +543,16 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_strv(*model->trigger_sources, g_strv_length((char **)*model->trigger_sources)); break; + case SR_CONF_TRIGGER_SLOPE: + *data = g_variant_new_strv(*model->trigger_slopes, + g_strv_length((char **)*model->trigger_slopes)); + break; case SR_CONF_TIMEBASE: *data = build_tuples(model->timebases, model->num_timebases); break; case SR_CONF_VDIV: if (pg_type == PG_NONE) - return SR_ERR_PROBE_GROUP; + return SR_ERR_CHANNEL_GROUP; *data = build_tuples(model->vdivs, model->num_vdivs); break; default: @@ -914,6 +776,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) devc = sdi->priv; + devc->num_frames = 0; g_slist_free(devc->enabled_probes); devc->enabled_probes = NULL; scpi = sdi->conn;