X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=6dc9ed87da25ffe21b512ff36a16ad8edff78f6f;hb=0a1f7b09b3fa4cc4da29c7acf53717e14b004b63;hp=9df1546f4bfa9aa1b3377c7020b3cc623fe004c1;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 9df1546f..6dc9ed87 100644
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -22,6 +22,7 @@
  *  @internal
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t scanopts[] = {
@@ -43,7 +44,7 @@ static const uint32_t devopts[] = {
 SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
 SR_PRIV struct sr_dev_driver siemens_b102x_driver_info;
 
-static const char* get_brandstr(struct sr_dev_driver* drv)
+static const char *get_brandstr(struct sr_dev_driver *drv)
 {
 	if (drv == &norma_dmm_driver_info)
 		return "Norma";
@@ -51,9 +52,9 @@ static const char* get_brandstr(struct sr_dev_driver* drv)
 		return "Siemens";
 }
 
-static const char* get_typestr(int type, struct sr_dev_driver* drv)
+static const char *get_typestr(int type, struct sr_dev_driver *drv)
 {
-	static const char* nameref[5][2] = {
+	static const char *nameref[5][2] = {
 		{"DM910", "B1024"},
 		{"DM920", "B1025"},
 		{"DM930", "B1026"},
@@ -71,7 +72,7 @@ static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *scan(struct sr_dev_driver* drv, GSList *options)
+static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 {
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
@@ -86,7 +87,7 @@ static GSList *scan(struct sr_dev_driver* drv, GSList *options)
 	int auxtype;
 
 	devices = NULL;
-	drvc = drv->priv;
+	drvc = drv->context;
 	drvc->instances = NULL;
 	conn = serialcomm = NULL;
 
@@ -113,16 +114,14 @@ 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);
 	g_usleep(150 * 1000); /* Wait a little to allow serial port to settle. */
 	for (cnt = 0; cnt < 7; cnt++) {
-		if (serial_write_blocking(serial, req, strlen(req), 0) < 0) {
+		if (serial_write_blocking(serial, req, strlen(req),
+				serial_timeout(serial, strlen(req))) < 0) {
 			sr_err("Unable to send identification request.");
 			return NULL;
 		}
@@ -178,7 +177,7 @@ static GSList *scan(struct sr_dev_driver* drv, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -219,18 +218,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;
@@ -261,8 +252,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-				    void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
@@ -318,7 +308,7 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };
 
 SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
@@ -337,5 +327,5 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };