X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=b6c468e3e32ae811463cb6cae1674c6fa9671a03;hb=87dc5410273abf9307dc25a2528a6aa98a8ae44b;hp=f6f0ce8a6d7c756e993470fadda51c40c974208e;hpb=00ed77f27c85462cae238ee433dbf0f606eaaf84;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index f6f0ce8a..b6c468e3 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -215,7 +215,6 @@ static int config_get(uint32_t key, GVariant **data, break; case SR_CONF_NUM_VDIV: if (cg_type == CG_NONE) { - sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } else if (cg_type == CG_ANALOG) { *data = g_variant_new_int32(model->num_ydivs); @@ -228,7 +227,6 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_VDIV: ret = SR_ERR_NA; if (cg_type == CG_NONE) { - sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } else if (cg_type != CG_ANALOG) break; @@ -258,7 +256,6 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_COUPLING: ret = SR_ERR_NA; if (cg_type == CG_NONE) { - sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } else if (cg_type != CG_ANALOG) break; @@ -325,10 +322,8 @@ static int config_set(uint32_t key, GVariant *data, } break; case SR_CONF_VDIV: - if (cg_type == CG_NONE) { - sr_err("No channel group specified."); + if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; - } g_variant_get(data, "(tt)", &p, &q); @@ -397,10 +392,8 @@ static int config_set(uint32_t key, GVariant *data, ret = dlm_trigger_slope_set(sdi->conn, state->trigger_slope); break; case SR_CONF_COUPLING: - if (cg_type == CG_NONE) { - sr_err("No channel group specified."); + if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; - } tmp = g_variant_get_string(data, NULL);