build: Portability fixes.

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

diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c
index dd3889395a6cd563b69fef3bce24f2c0419f4948..dc1a683ed37d5453cab9c95cf668dc917dd14dad 100644 (file)
--- a/hardware/gmc-mh-1x-2x/protocol.c
+++ b/hardware/gmc-mh-1x-2x/protocol.c
@@ -132,7 +132,7 @@ static void decode_rs_16(uint8_t rs, struct dev_context *devc)
                if (devc->mq == SR_MQ_VOLTAGE) /* V */
                        devc->scale *= 0.1;
                else if (devc->mq == SR_MQ_CURRENT) /* 000.0 µA */
-            devc->scale *= 0.00001;
+                       devc->scale *= 0.00001;
                else if (devc->mq == SR_MQ_RESISTANCE) {
                        if (devc->buflen >= 10) {
                                /* °C with 10 byte msg type, otherwise GOhm. */
@@ -648,7 +648,7 @@ static void send_value(struct sr_dev_inst *sdi)
        devc = sdi->priv;
 
        memset(&analog, 0, sizeof(analog));
-       analog.probes = sdi->probes;
+       analog.channels = sdi->channels;
        analog.num_samples = 1;
        analog.mq = devc->mq;
        analog.unit = devc->unit;
@@ -1162,7 +1162,7 @@ SR_PRIV int gmc_mh_1x_2x_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1213,7 +1213,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1379,21 +1379,23 @@ SR_PRIV int gmc_decode_model_sm(uint8_t mcode)
                return METRAHIT_16S;
        case 0x06: /* 0110b (undocumented by GMC!) */
                return METRAHIT_16I;
+       case 0x07: /* 0111b (undocumented by GMC!) */
+               return METRAHIT_16T;
        case 0x0D: /* 1101b */
                return METRAHIT_18S;
        case 0x02: /* 0010b */
                return METRAHIT_22SM;
        case 0x03: /* 0011b */
                return METRAHIT_23S;
-       case 0x0f: /* 1111b */
+       case 0x0F: /* 1111b */
                return METRAHIT_24S;
        case 0x05: /* 0101b */
                return METRAHIT_25S;
        case 0x01: /* 0001b */
                return METRAHIT_26SM;
-       case 0x0c: /* 1100b */
+       case 0x0C: /* 1100b */
                return METRAHIT_28S;
-       case 0x0e: /* 1110b */
+       case 0x0E: /* 1110b */
                return METRAHIT_29S;
        default:
                sr_err("Unknown model code %d!", mcode);
@@ -1458,7 +1460,9 @@ SR_PRIV const char *gmc_model_str(enum model mcode)
        case METRAHIT_16S:
                return "METRAHit 16S";
        case METRAHIT_16I:
-               return "METRAHit 16I";
+               return "METRAHit 16I/16L";
+       case METRAHIT_16T:
+               return "METRAHit 16T/16U/KMM2002";
        case METRAHIT_18S:
                return "METRAHit 18S";
        case METRAHIT_22SM:
@@ -1492,13 +1496,13 @@ SR_PRIV const char *gmc_model_str(enum model mcode)
 /** @copydoc sr_dev_driver.config_set
  */
 SR_PRIV int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-                      const struct sr_probe_group *probe_group)
+                      const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        uint8_t params[9];
        uint8_t msg[42];
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -1532,12 +1536,12 @@ SR_PRIV int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                }
                devc->limit_msec = g_variant_get_uint64(data);
                sr_dbg("Setting time limit to %" PRIu64 "ms.",
-                      devc->limit_msec);
+                       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);
+                       devc->limit_samples);
                break;
        default:
                return SR_ERR_NA;