X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=6f96d504601c1a65f227b7d63853997dbba40b46;hb=93b118da4fec6976df924eb77121f07b361b8330;hp=4f6c1e562f853c1d47edbc38795bc7ba0897ffd9;hpb=dcd438ee3523098201c7937e75e55775da3b506f;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c
index 4f6c1e56..6f96d504 100644
--- a/src/hardware/gmc-mh-1x-2x/protocol.c
+++ b/src/hardware/gmc-mh-1x-2x/protocol.c
@@ -567,23 +567,28 @@ static void decode_rs_2x_TR2(uint8_t rs, struct dev_context *devc)
 	switch (devc->mq) {
 	case SR_MQ_CURRENT:
 		if (devc->scale1000 == -1) /* mA */
-			switch(range) {
-			case 0: case 1:	/* 100, 300 µA */
+			switch (range) {
+			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 */
+			switch (range) {
+			case 0:
+			case 1:	/* 1, 3 A */
 				devc->scale *= pow(10.0, -5);
 				break;
 			case 2: /* 10 A */
@@ -651,7 +656,7 @@ static void send_value(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	memset(&analog, 0, sizeof(analog));
+	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
 	analog.channels = sdi->channels;
 	analog.num_samples = 1;
 	analog.mq = devc->mq;
@@ -659,7 +664,7 @@ static void send_value(struct sr_dev_inst *sdi)
 	analog.mqflags = devc->mqflags;
 	analog.data = &devc->value;
 
-	memset(&packet, 0, sizeof(packet));
+	memset(&packet, 0, sizeof(struct sr_datafeed_packet));
 	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
 	sr_session_send(devc->cb_data, &packet);
@@ -1370,7 +1375,7 @@ SR_PRIV int gmc_decode_model_sm(uint8_t mcode)
 		return METRAHIT_NONE;
 	}
 
-	switch(mcode) {
+	switch (mcode) {
 	case 0x04: /* 0100b */
 		return METRAHIT_12S;
 	case 0x08: /* 1000b */