Factor out std_session_send_df_end() helper.

[libsigrok.git] / src / hardware / yokogawa-dlm / api.c

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index e72138eb3e0b99304ecdb70f3e9accb1cf49eefc..2a3d2e55f00a6a39eb6385d199a128a3a236caea 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -18,7 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
+#include "scpi.h"
 #include "protocol.h"
 
 SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info;
@@ -90,7 +92,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
                goto fail;
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
-       sdi->status = SR_ST_ACTIVE;
        sdi->vendor = g_strdup(MANUFACTURER_NAME);
        sdi->model = g_strdup(model_name);
        sdi->version = g_strdup(hw_info->firmware_version);
@@ -110,9 +111,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
        if (dlm_device_init(sdi, model_index) != SR_OK)
                goto fail;
 
-       sr_scpi_close(sdi->conn);
-
-       sdi->status = SR_ST_INACTIVE;
        return sdi;
 
 fail:
@@ -127,12 +125,12 @@ fail:
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       return sr_scpi_scan(di->priv, options, probe_usbtmc_device);
+       return sr_scpi_scan(di->context, options, probe_usbtmc_device);
 }
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static void clear_helper(void *priv)
@@ -189,10 +187,10 @@ static int cleanup(const struct sr_dev_driver *di)
  * Check which category a given channel group belongs to.
  *
  * @param devc Our internal device context.
- * @param cg   The channel group to check.
+ * @param cg The channel group to check.
  *
- * @retval CG_NONE    cg is NULL
- * @retval CG_ANALOG  cg is an analog group
+ * @retval CG_NONE cg is NULL
+ * @retval CG_ANALOG cg is an analog group
  * @retval CG_DIGITAL cg is a digital group
  * @retval CG_INVALID cg is something else
  */
@@ -207,11 +205,11 @@ static int check_channel_group(struct dev_context *devc,
        if (!cg)
                return CG_NONE;
 
-       for (i = 0; i < model->analog_channels; ++i)
+       for (i = 0; i < model->analog_channels; i++)
                if (cg == devc->analog_groups[i])
                        return CG_ANALOG;
 
-       for (i = 0; i < model->pods; ++i)
+       for (i = 0; i < model->pods; i++)
                if (cg == devc->digital_groups[i])
                        return CG_DIGITAL;
 
@@ -234,7 +232,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
                return SR_ERR;
 
-       ret = SR_ERR_NA;
        model = devc->model_config;
        state = devc->model_state;
 
@@ -269,7 +266,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                } else if (cg_type != CG_ANALOG)
                        break;
 
-               for (i = 0; i < model->analog_channels; ++i) {
+               for (i = 0; i < model->analog_channels; i++) {
                        if (cg != devc->analog_groups[i])
                                continue;
                        *data = g_variant_new("(tt)",
@@ -299,7 +296,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                } else if (cg_type != CG_ANALOG)
                        break;
 
-               for (i = 0; i < model->analog_channels; ++i) {
+               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_states[i].coupling]);
@@ -391,7 +388,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        if (p != dlm_vdivs[i][0] ||
                                        q != dlm_vdivs[i][1])
                                continue;
-                       for (j = 1; j <= model->analog_channels; ++j) {
+                       for (j = 1; j <= model->analog_channels; j++) {
                                if (cg != devc->analog_groups[j - 1])
                                        continue;
                                state->analog_states[j - 1].vdiv = i;
@@ -462,7 +459,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                for (i = 0; (*model->coupling_options)[i]; i++) {
                        if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
                                continue;
-                       for (j = 1; j <= model->analog_channels; ++j) {
+                       for (j = 1; j <= model->analog_channels; j++) {
                                if (cg != devc->analog_groups[j - 1])
                                        continue;
                                state->analog_states[j-1].coupling = i;
@@ -494,7 +491,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_channel_set(const struct sr_dev_inst *sdi,
                        struct sr_channel *ch, unsigned int changes)
 {
-       /* Curretly we only handle SR_CHANNEL_SET_ENABLED. */
+       /* Currently we only handle SR_CHANNEL_SET_ENABLED. */
        if (changes != SR_CHANNEL_SET_ENABLED)
                return SR_ERR_NA;
 
@@ -528,8 +525,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        devc = sdi->priv;
        model = devc->model_config;
 
-       /* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
-        * specific to a probe group must be returned. */
+       /*
+        * If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
+        * specific to a probe group must be returned.
+        */
        if (!cg) {
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
@@ -677,13 +676,10 @@ 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_datafeed_packet packet;
 
        (void)cb_data;
 
-       packet.type = SR_DF_END;
-       packet.payload = NULL;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -716,5 +712,5 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };