X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=719a225f30b3f550563df3dfde5d6a112b557e39;hb=b1f8310376265f622c6f7d81c0cc0580598ea973;hp=e7d7fc8852c559afb00712ce16b5cc137bcbc34f;hpb=d0148a506ed1007518704d72c0410d4361668fa4;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c
index e7d7fc88..719a225f 100644
--- a/src/hardware/gmc-mh-1x-2x/protocol.c
+++ b/src/hardware/gmc-mh-1x-2x/protocol.c
@@ -257,7 +257,7 @@ static void decode_ctmv_18(uint8_t ctmv, struct dev_context *devc)
 /**
  * Decode range/sign/acdc byte special chars, Metrahit 18.
  *
- * @param[in] rs Rance/sign byte.
+ * @param[in] rs Range/sign byte.
  */
 static void decode_rs_18(uint8_t rs, struct dev_context *devc)
 {
@@ -568,22 +568,27 @@ static void decode_rs_2x_TR2(uint8_t rs, struct dev_context *devc)
 	case SR_MQ_CURRENT:
 		if (devc->scale1000 == -1) /* mA */
 			switch (range) {
-			case 0: case 1:	/* 100, 300 µA */
+			case 0:
+			case 1:	/* 100, 300 µA */
 				devc->scale *= pow(10.0, -6);
 				break;
-			case 2: case 3:	/* 1, 3 mA */
+			case 2:
+			case 3:	/* 1, 3 mA */
 				devc->scale *= pow(10.0, -5);
 				break;
-			case 4: case 5:	/* 10, 30 mA */
+			case 4:
+			case 5:	/* 10, 30 mA */
 				devc->scale *= pow(10.0, -4);
 				break;
-			case 6: case 7:	/* 100, 300 mA */
+			case 6:
+			case 7:	/* 100, 300 mA */
 				devc->scale *= pow(10.0, -3);
 				break;
 			}
 		else /* A */
 			switch (range) {
-			case 0: case 1:	/* 1, 3 A */
+			case 0:
+			case 1:	/* 1, 3 A */
 				devc->scale *= pow(10.0, -5);
 				break;
 			case 2: /* 10 A */
@@ -1231,7 +1236,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data)
 	if (sdi->status == SR_ST_ACTIVE) {
 		if (devc->response_pending) {
 			gint64 elapsed_us = g_get_monotonic_time() - devc->req_sent_at;
-			if (elapsed_us > 1*1000*1000) /* Timeout! */
+			if (elapsed_us > (1 * 1000 * 1000)) /* Timeout! */
 				devc->response_pending = FALSE;
 		}
 		if (!devc->response_pending) {
@@ -1337,13 +1342,13 @@ int req_stat14(const struct sr_dev_inst *sdi, gboolean power_on)
 		sr_info("Write some data and wait 3s to turn on powered off device...");
 		if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
 			return SR_ERR;
-		g_usleep(1*1000*1000);
+		g_usleep(1 * 1000 * 1000);
 		if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
 			return SR_ERR;
-		g_usleep(1*1000*1000);
+		g_usleep(1 * 1000 * 1000);
 		if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
 			return SR_ERR;
-		g_usleep(1*1000*1000);
+		g_usleep(1 * 1000 * 1000);
 		serial_flush(serial);
 	}
 
@@ -1529,7 +1534,7 @@ SR_PRIV int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *s
 		if (serial_write_blocking(sdi->conn, msg, sizeof(msg), 0) < 0)
 			return SR_ERR;
 		else
-			g_usleep(2000000); /* Wait to ensure transfer before interface switched off. */
+			g_usleep(2 * 1000 * 1000); /* Wait to ensure transfer before interface switched off. */
 		break;
 	case SR_CONF_LIMIT_MSEC:
 		devc->limit_msec = g_variant_get_uint64(data);