X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=ce5d57c57ac1db34cccd30e6de0c2465f56f4381;hb=3d3a601e803d4fe10e2f633b5f0e06104dcf9017;hp=ae5a781d1d48bae64ae8511e97776e2cd43338fc;hpb=9bd4c95606668bdc58a6df3c30bcd91f288a4ea9;p=libsigrok.git diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c index ae5a781d..ce5d57c5 100644 --- a/hardware/rigol-ds1xx2/api.c +++ b/hardware/rigol-ds1xx2/api.c @@ -133,49 +133,53 @@ static const char *coupling[] = { static const char *supported_models[] = { "DS1052E", "DS1102E", + "DS1152E", "DS1052D", "DS1102D", + "DS1152D", }; SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info; static struct sr_dev_driver *di = &rigol_ds1xx2_driver_info; -/* Properly close and free all devices. */ -static int clear_instances(void) +static void clear_helper(void *priv) { - struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; - GSList *l; - - if (!(drvc = di->priv)) - return SR_OK; for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) continue; - if (sdi->conn) { - serial_close(sdi->conn); + if (sdi->conn) sr_serial_dev_inst_free(sdi->conn); - } - if ((devc = sdi->priv)) { - g_free(devc->device); - g_free(devc->coupling[0]); - g_free(devc->coupling[1]); - g_free(devc->trigger_source); - g_free(devc->trigger_slope); - } + g_slist_free(sdi->probe_groups); + + if (!(devc = sdi->priv)) + continue; + + g_free(devc->device); + g_free(devc->coupling[0]); + g_free(devc->coupling[1]); + g_free(devc->trigger_source); + g_free(devc->trigger_slope); + g_slist_free(devc->analog_groups[0].probes); + g_slist_free(devc->analog_groups[1].probes); + g_slist_free(devc->digital_group.probes); + close(devc->fd); sr_dev_inst_free(sdi); } - g_slist_free(drvc->instances); - drvc->instances = NULL; + g_free(devc->coupling[0]); + g_free(devc->coupling[1]); + g_free(devc->trigger_source); + g_free(devc->trigger_slope); +} - return SR_OK; +static int dev_clear(void) +{ + return std_dev_clear(di, clear_helper); } static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...) @@ -197,34 +201,31 @@ static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...) return SR_OK; } -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 int probe_device(struct drv_context *drvc, const char *device) +static int probe_port(const char *port, GSList **devices) { + struct dev_context *devc; + struct sr_dev_inst *sdi; struct sr_serial_dev_inst *serial; - const gchar *idn_query = "*IDN?"; + struct sr_probe *probe; unsigned int i; int len, num_tokens; - const gchar *delimiter = ","; - gchar **tokens; + gboolean matched, has_digital; const char *manufacturer, *model, *version; - gboolean matched = FALSE; - struct sr_dev_inst *sdi; - struct dev_context *devc; - gboolean has_digital = FALSE; char buf[256]; - gchar *channel_name; - struct sr_probe *probe; + gchar **tokens, *channel_name; - if (!(serial = sr_serial_dev_inst_new(device, NULL))) + *devices = NULL; + if (!(serial = sr_serial_dev_inst_new(port, NULL))) return SR_ERR_MALLOC; if (serial_open(serial, SERIAL_RDWR) != SR_OK) return SR_ERR; - len = serial_write(serial, idn_query, strlen(idn_query)); + len = serial_write(serial, "*IDN?", 5); len = serial_read(serial, buf, sizeof(buf)); if (serial_close(serial) != SR_OK) return SR_ERR; @@ -235,8 +236,8 @@ static int probe_device(struct drv_context *drvc, const char *device) return SR_ERR_NA; buf[len] = 0; - tokens = g_strsplit(buf, delimiter, 0); - sr_dbg("response: %s %d [%s]", device, len, buf); + tokens = g_strsplit(buf, ",", 0); + sr_dbg("response: %s [%s]", port, buf); for (num_tokens = 0; tokens[num_tokens] != NULL; num_tokens++); @@ -254,9 +255,10 @@ static int probe_device(struct drv_context *drvc, const char *device) return SR_ERR_NA; } + matched = has_digital = FALSE; for (i = 0; i < ARRAY_SIZE(supported_models); i++) { if (!strcmp(model, supported_models[i])) { - matched = 1; + matched = TRUE; has_digital = g_str_has_suffix(model, "D"); break; } @@ -270,22 +272,25 @@ static int probe_device(struct drv_context *drvc, const char *device) g_strfreev(tokens); - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) + if (!(sdi->conn = sr_serial_dev_inst_new(port, NULL))) return SR_ERR_MALLOC; + sdi->driver = di; + sdi->inst_type = SR_INST_SERIAL; - devc->limit_frames = 0; - if (!(devc->device = g_strdup(device))) + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) return SR_ERR_MALLOC; + devc->limit_frames = 0; devc->has_digital = has_digital; - sdi->priv = devc; - sdi->driver = di; - drvc->instances = g_slist_append(drvc->instances, sdi); for (i = 0; i < 2; i++) { - if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, - i == 0 ? "CH1" : "CH2"))) + channel_name = (i == 0 ? "CH1" : "CH2"); + if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel_name))) return SR_ERR_MALLOC; sdi->probes = g_slist_append(sdi->probes, probe); + devc->analog_groups[i].name = channel_name; + devc->analog_groups[i].probes = g_slist_append(NULL, probe); + sdi->probe_groups = g_slist_append(sdi->probe_groups, + &devc->analog_groups[i]); } if (devc->has_digital) { @@ -297,110 +302,112 @@ static int probe_device(struct drv_context *drvc, const char *device) if (!probe) return SR_ERR_MALLOC; sdi->probes = g_slist_append(sdi->probes, probe); + devc->digital_group.probes = g_slist_append( + devc->digital_group.probes, probe); + devc->digital_group.name = "LA"; + sdi->probe_groups = g_slist_append(sdi->probe_groups, + &devc->digital_group); } } + sdi->priv = devc; + + *devices = g_slist_append(NULL, sdi); return SR_OK; } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { struct drv_context *drvc; - GSList *l, *devices; struct sr_config *src; + GSList *l, *devices; GDir *dir; - const gchar *dev_name; - const gchar *dev_dir = "/dev/"; - const gchar *prefix = "usbtmc"; - gchar *device = NULL; int ret; + const gchar *dev_name; + gchar *port = NULL; drvc = di->priv; - drvc->instances = NULL; for (l = options; l; l = l->next) { src = l->data; if (src->key == SR_CONF_CONN) { - device = g_variant_get_string(src->data, NULL); + port = (char *)g_variant_get_string(src->data, NULL); break; } } - if (device) { - ret = probe_device(drvc, device); - if (ret == SR_ERR_MALLOC) { - clear_instances(); + devices = NULL; + if (port) { + if (probe_port(port, &devices) == SR_ERR_MALLOC) return NULL; - } } else { - if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL))) - return NULL; + if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL))) + if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL))) + return NULL; while ((dev_name = g_dir_read_name(dir))) { - if (strncmp(dev_name, prefix, strlen(prefix))) + if (strncmp(dev_name, "usbtmc", 6)) continue; - device = g_strconcat(dev_dir, dev_name, NULL); - ret = probe_device(drvc, device); - g_free(device); + port = g_strconcat("/dev/", dev_name, NULL); + ret = probe_port(port, &devices); + g_free(port); if (ret == SR_ERR_MALLOC) { g_dir_close(dir); - clear_instances(); return NULL; } } - g_dir_close(dir); } - devices = g_slist_copy(drvc->instances); + /* Tack a copy of the newly found devices onto the driver list. */ + l = g_slist_copy(devices); + drvc->instances = g_slist_concat(drvc->instances, l); + 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) { - struct dev_context *devc; - - devc = sdi->priv; - - if (!(sdi->conn = sr_serial_dev_inst_new(devc->device, NULL))) - return SR_ERR; if (serial_open(sdi->conn, SERIAL_RDWR) != SR_OK) return SR_ERR; if (rigol_ds1xx2_get_dev_cfg(sdi) != SR_OK) - /* TODO: force configuration? */ return SR_ERR; + sdi->status = SR_ST_ACTIVE; + return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_close(struct sr_dev_inst *sdi) { - if (serial_close(sdi->conn) != SR_OK) - return SR_ERR; + struct sr_serial_dev_inst *serial; - sr_serial_dev_inst_free(sdi->conn); - sdi->conn = NULL; + serial = sdi->conn; + if (serial && serial->fd != -1) { + serial_close(serial); + sdi->status = SR_ST_INACTIVE; + } return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { - clear_instances(); - - return SR_OK; + return dev_clear(); } -static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { (void)sdi; + (void)probe_group; switch (id) { case SR_CONF_NUM_TIMEBASE: @@ -416,7 +423,8 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) return SR_OK; } -static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { struct dev_context *devc; uint64_t tmp_u64, p, q; @@ -425,12 +433,12 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) int ret; const char *tmp_str; + (void)probe_group; + devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't set config options."); - return SR_ERR; - } + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; ret = SR_OK; switch (id) { @@ -526,13 +534,16 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) return ret; } -static int config_list(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) { GVariant *tuple, *rational[2]; GVariantBuilder gvb; unsigned int i; struct dev_context *devc; + (void)probe_group; + switch (key) { case SR_CONF_SCAN_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, @@ -588,7 +599,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) GSList *l; char cmd[256]; - (void)cb_data; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; serial = sdi->conn; devc = sdi->priv; @@ -626,7 +638,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) sr_source_add(serial->fd, G_IO_IN, 50, rigol_ds1xx2_receive, (void *)sdi); /* 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); /* Fetch the first frame. */ if (devc->enabled_analog_probes) { @@ -648,6 +660,7 @@ static int dev_acquisition_start(const 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; + struct sr_serial_dev_inst *serial; (void)cb_data; @@ -662,7 +675,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) g_slist_free(devc->enabled_digital_probes); devc->enabled_analog_probes = NULL; devc->enabled_digital_probes = NULL; - sr_source_remove(devc->fd); + serial = sdi->conn; + sr_source_remove(serial->fd); return SR_OK; } @@ -671,16 +685,16 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = { .name = "rigol-ds1xx2", .longname = "Rigol DS1xx2", .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_open = dev_open, + .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL,