X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=6dc9ed87da25ffe21b512ff36a16ad8edff78f6f;hb=b11afbb142a9ddc3fd2c99f3d3be39683cdec4ac;hp=fca56b363eb34321f66125fe5f4ba41390131f93;hpb=338143ea0371133c2b3f56bb2cc5e8726c0141d8;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index fca56b36..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;
@@ -119,7 +120,8 @@ static GSList *scan(struct sr_dev_driver* drv, GSList *options)
 		 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;
 		}
@@ -250,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;