agilent-dmm: fix support for Agilent/Keysight U1252A

[libsigrok.git] / src / hardware / hp-3478a / api.c

diff --git a/src/hardware/hp-3478a/api.c b/src/hardware/hp-3478a/api.c
index 84db3180d9400d3717eadacaa5b6401c16c06b72..5174ee1474a07155a9b2710120fe2d52008ad7d6 100644 (file)
--- a/src/hardware/hp-3478a/api.c
+++ b/src/hardware/hp-3478a/api.c
@@ -54,7 +54,7 @@ static const struct {
        {SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE | SR_MQFLAG_AUTORANGE},
 };
 
-SR_PRIV struct sr_dev_driver hp_3478a_driver_info;
+static struct sr_dev_driver hp_3478a_driver_info;
 
 static int create_front_channel(struct sr_dev_inst *sdi, int chan_idx)
 {
@@ -104,25 +104,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-       struct sr_scpi_dev_inst *scpi;
-
-       scpi = sdi->conn;
-
-       if (sr_scpi_open(scpi) != SR_OK)
-               return SR_ERR;
-
-       return SR_OK;
+       return sr_scpi_open(sdi->conn);
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       struct sr_scpi_dev_inst *scpi;
-
-       scpi = sdi->conn;
-
-       sr_scpi_close(scpi);
-
-       return SR_OK;
+       return sr_scpi_close(sdi->conn);
 }
 
 static int config_get(uint32_t key, GVariant **data,
@@ -219,7 +206,6 @@ static int config_list(uint32_t key, GVariant **data,
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-       int ret;
        struct sr_scpi_dev_inst *scpi;
        struct dev_context *devc;
 
@@ -241,12 +227,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        /* Get device status. */
        hp_3478a_get_status_bytes(sdi);
 
-       ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 100,
+       return sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 100,
                        hp_3478a_receive_data, (void *)sdi);
-       if (ret != SR_OK)
-               return ret;
-
-       return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
@@ -266,7 +248,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver hp_3478a_driver_info = {
+static struct sr_dev_driver hp_3478a_driver_info = {
        .name = "hp-3478a",
        .longname = "HP 3478A",
        .api_version = 1,
@@ -284,5 +266,4 @@ SR_PRIV struct sr_dev_driver hp_3478a_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(hp_3478a_driver_info);