Consistency and whitespace fixes for switch statements.

[libsigrok.git] / src / hardware / gmc-mh-1x-2x / protocol.c

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c
index ffa3a2d87bde02d61b28b3dd065a252052ad6269..6f96d504601c1a65f227b7d63853997dbba40b46 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/protocol.c
+++ b/src/hardware/gmc-mh-1x-2x/protocol.c
@@ -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 */
@@ -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);