Minor cosmetics and consistency fixes.

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index dbc66fddf5d209a8310f221e7b0cf5a50a50664f..d75debb84420510dafdd0dda68e52941eff2e81f 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -268,14 +268,14 @@ static int cleanup(const struct sr_dev_driver *di)
        return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
        (void)cg;
 
-       switch (id) {
+       switch (key) {
        case SR_CONF_SAMPLERATE:
                if (sdi) {
                        devc = sdi->priv;
@@ -290,7 +290,7 @@ 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 key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
        int ret;
@@ -306,7 +306,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       switch (id) {
+       switch (key) {
        case SR_CONF_SAMPLERATE:
                // FIXME
                return mso_configure_rate(sdi, g_variant_get_uint64(data));

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 3fbf3d721d1dd7220ae9edbf0fec54c9af11a726..fd2293e8ab800785f0f6cacb4d197d3a30bd582e 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -415,8 +415,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 
        sr_dbg("Starting reading data from channel %d", ch->index + 1);
 
-       switch (devc->model->series->protocol)
-       {
+       switch (devc->model->series->protocol) {
        case PROTOCOL_V1:
        case PROTOCOL_V2:
                if (ch->type == SR_CHANNEL_LOGIC) {