serial: flush() after open() in the serial core.

[libsigrok.git] / src / hardware / gwinstek-gpd / api.c

diff --git a/src/hardware/gwinstek-gpd/api.c b/src/hardware/gwinstek-gpd/api.c
index 06e3d60d69c23e85860abe89bfac56d2595e9fec..7406460623fe4d55d53542106c60f68629398e6d 100644 (file)
--- a/src/hardware/gwinstek-gpd/api.c
+++ b/src/hardware/gwinstek-gpd/api.c
@@ -107,7 +107,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       serial_flush(serial);
        gpd_send_cmd(serial, "*IDN?\n");
        if (gpd_receive_reply(serial, reply, sizeof(reply)) != SR_OK) {
                sr_err("Device did not reply.");
@@ -220,14 +219,9 @@ error:
 static int config_get(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       int ret, channel;
+       int channel;
        const struct dev_context *devc;
        const struct sr_channel *ch;
-       const struct sr_key_info *ki;
-
-       ki = sr_key_info_get(SR_KEY_CONFIG, key);
-
-       sr_info("%s(%d, %s)", __func__, key, (ki != NULL) ? ki->name : NULL);
 
        if (!sdi)
                return SR_ERR_ARG;
@@ -249,9 +243,6 @@ static int config_get(uint32_t key, GVariant **data,
        } else {
                ch = cg->channels->data;
                channel = ch->index;
-               sr_info("%s(%d, %s, %d)", __func__, key,
-                       (ki != NULL) ? ki->name : NULL, channel);
-               ret = SR_OK;
                switch (key) {
                case SR_CONF_VOLTAGE:
                        *data = g_variant_new_double(
@@ -274,7 +265,7 @@ static int config_get(uint32_t key, GVariant **data,
                }
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_set(uint32_t key, GVariant *data,
@@ -287,7 +278,6 @@ static int config_set(uint32_t key, GVariant *data,
        struct dev_context *devc;
 
        devc = sdi->priv;
-       sr_info("%s(%d)", __func__, key);
 
        ret = SR_OK;
 
@@ -378,7 +368,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       sr_info("%s()", __func__);
        devc = sdi->priv;
 
        sr_sw_limits_acquisition_start(&devc->limits);
@@ -393,7 +382,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV const struct sr_dev_driver gwinstek_gpd_driver_info = {
+static struct sr_dev_driver gwinstek_gpd_driver_info = {
        .name = "gwinstek-gpd",
        .longname = "GW Instek GPD",
        .api_version = 1,