Add struct sr_session parameter to all session source backends.

[libsigrok.git] / hardware / rigol-ds / api.c

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index 57bfd033a8587a34dc286cb94521d83502aedc46..872531f694159b3c0d57d9ad7f2b5df584efd7de 100644 (file)
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -143,6 +143,11 @@ static const char *trigger_sources[] = {
        "D15",
 };
 
+static const char *trigger_slopes[] = {
+       "r",
+       "f",
+};
+
 static const char *coupling[] = {
        "AC",
        "DC",
@@ -267,10 +272,13 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
        gchar *channel_name, **version;
 
        if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
-               sr_info("Couldn't get IDN response.");
+               sr_info("Couldn't get IDN response, retrying.");
                sr_scpi_close(scpi);
-               sr_scpi_free(scpi);
-               return NULL;
+               sr_scpi_open(scpi);
+               if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+                       sr_info("Couldn't get IDN response.");
+                       return NULL;
+               }
        }
 
        for (i = 0; i < ARRAY_SIZE(supported_models); i++) {
@@ -287,13 +295,9 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                                                  model->name,
                                                  hw_info->firmware_version))) {
                sr_scpi_hw_info_free(hw_info);
-               sr_scpi_close(scpi);
-               sr_scpi_free(scpi);
                return NULL;
        }
 
-       sr_scpi_close(scpi);
-
        sdi->conn = scpi;
 
        sdi->driver = di;
@@ -546,6 +550,15 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
                        tmp_str = devc->trigger_source;
                *data = g_variant_new_string(tmp_str);
                break;
+       case SR_CONF_TRIGGER_SLOPE:
+               if (!strcmp(devc->trigger_slope, "POS"))
+                       tmp_str = "r";
+               else if (!strcmp(devc->trigger_slope, "NEG"))
+                       tmp_str = "f";
+               else
+                       return SR_ERR_NA;
+               *data = g_variant_new_string(tmp_str);
+               break;
        case SR_CONF_TIMEBASE:
                for (i = 0; i < devc->num_timebases; i++) {
                        float tb = (float)devc->timebases[i][0] / devc->timebases[i][1];
@@ -838,6 +851,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
                *data = g_variant_new_strv(trigger_sources,
                                devc->model->has_digital ? ARRAY_SIZE(trigger_sources) : 4);
                break;
+       case SR_CONF_TRIGGER_SLOPE:
+               *data = g_variant_new_strv(trigger_slopes, ARRAY_SIZE(trigger_slopes));
+               break;
        case SR_CONF_DATA_SOURCE:
                if (!devc)
                        /* Can't know this until we have the exact model. */
@@ -931,7 +947,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        switch (devc->model->series->protocol) {
        case PROTOCOL_V2:
-               if (rigol_ds_config_set(sdi, ":ACQ:MDEP LONG") != SR_OK)
+               if (rigol_ds_config_set(sdi, ":ACQ:MEMD LONG") != SR_OK)
                        return SR_ERR;
                break;
        case PROTOCOL_V3:
@@ -954,7 +970,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                if (rigol_ds_config_set(sdi, ":RUN") != SR_OK)
                        return SR_ERR;
 
-       sr_scpi_source_add(scpi, G_IO_IN, 50, rigol_ds_receive, (void *)sdi);
+       sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
+                       rigol_ds_receive, (void *)sdi);
 
        /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
@@ -998,7 +1015,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        devc->enabled_analog_channels = NULL;
        devc->enabled_digital_channels = NULL;
        scpi = sdi->conn;
-       sr_scpi_source_remove(scpi);
+       sr_scpi_source_remove(sdi->session, scpi);
 
        return SR_OK;
 }