X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=2743c23431547e367dd946cc758570a3c5164c36;hb=c65a021c050b3ef05ccc844cf24ee8e620eb669e;hp=6fe8e39d8b37ae90c7d23c941fe16e0f4ff32f86;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c index 6fe8e39d..2743c234 100644 --- a/src/hardware/norma-dmm/api.c +++ b/src/hardware/norma-dmm/api.c @@ -113,10 +113,7 @@ static GSList *scan(struct sr_dev_driver* drv, GSList *options) serial_flush(serial); - if (!(buf = g_try_malloc(BUF_MAX))) { - sr_err("Serial buffer malloc failed."); - return NULL; - } + buf = g_malloc(BUF_MAX); snprintf(req, sizeof(req), "%s\r\n", nmadmm_requests[NMADMM_REQ_IDN].req_str); @@ -219,18 +216,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_LIMIT_MSEC: - if (g_variant_get_uint64(data) == 0) { - sr_err("LIMIT_MSEC can't be 0."); - return SR_ERR; - } devc->limit_msec = g_variant_get_uint64(data); - sr_dbg("Setting time limit to %" PRIu64 "ms.", - devc->limit_msec); break; case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = g_variant_get_uint64(data); - sr_dbg("Setting sample limit to %" PRIu64 ".", - devc->limit_samples); break; default: return SR_ERR_NA; @@ -321,7 +310,6 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = { .priv = NULL, }; - SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = { .name = "siemens-b102x", .longname = "Siemens B102x DMMs",