Fix two compiler warnings.

[libsigrok.git] / src / hardware / hameg-hmo / protocol.c

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 28d8412d950d739c9da5591ace10739f46d13fb9..a073d0de60bea7f71f421cc070b7c2263cbdd802 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -78,6 +78,7 @@ static const char *hmo_coupling_options[] = {
 static const char *scope_trigger_slopes[] = {
        "POS",
        "NEG",
+       "EITH",
        NULL,
 };
 
@@ -203,7 +204,7 @@ static const char *scope_digital_channel_names[] = {
 static const struct scope_config scope_models[] = {
        {
                /* HMO2522/3032/3042/3052 support 16 digital channels but they're not supported yet. */
-               .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522",
+               .name = {"HMO1002", "HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522",
                                "HMO3032", "HMO3042", "HMO3052", NULL},
                .analog_channels = 2,
                .digital_channels = 8,
@@ -355,7 +356,8 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 static int array_float_get(gchar *value, const uint64_t array[][2],
                int array_len, unsigned int *result)
 {
-       int i;
+       int i, e;
+       size_t pos;
        uint64_t f;
        float s;
        unsigned int s_int;
@@ -364,16 +366,19 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
        memset(ss, 0, sizeof(ss));
        memset(es, 0, sizeof(es));
 
-       strncpy(ss, value, 5);
-       strncpy(es, &(value[6]), 3);
+       /* Get index of the separating 'E' character and break up the string. */
+       pos = strcspn(value, "E");
+
+       strncpy(ss, value, pos);
+       strncpy(es, &(value[pos+1]), 3);
 
        if (sr_atof_ascii(ss, &s) != SR_OK)
                return SR_ERR;
-       if (sr_atoi(es, &i) != SR_OK)
+       if (sr_atoi(es, &e) != SR_OK)
                return SR_ERR;
 
        /* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */
-       f = pow(10, abs(i));
+       f = pow(10, abs(e));
 
        /*
         * Adjust the significand/factor pair to make sure
@@ -381,7 +386,11 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
         */
        while ((int)fmod(log10(f), 3) > 0) {
                s *= 10;
-               f *= 10;
+
+               if (e < 0)
+                       f *= 10;
+               else
+                       f /= 10;
        }
 
        /* Truncate s to circumvent rounding errors. */
@@ -550,6 +559,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
        const struct scope_config *config;
        float tmp_float;
        unsigned int i;
+       char *tmp_str;
 
        devc = sdi->priv;
        config = devc->model_config;
@@ -568,18 +578,20 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
                        &tmp_float) != SR_OK)
                return SR_ERR;
 
-       for (i = 0; i < config->num_timebases; i++) {
-               if (tmp_float == ((float) (*config->timebases)[i][0] /
-                                 (*config->timebases)[i][1])) {
-                       state->timebase = i;
-                       break;
-               }
-       }
-       if (i == config->num_timebases) {
+       if (sr_scpi_get_string(sdi->conn,
+                       (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
+                       &tmp_str) != SR_OK)
+               return SR_ERR;
+
+       if (array_float_get(tmp_str, hmo_timebases, ARRAY_SIZE(hmo_timebases),
+                       &i) != SR_OK) {
+               g_free(tmp_str);
                sr_err("Could not determine array index for time base.");
                return SR_ERR;
        }
 
+       state->timebase = i;
+
        if (sr_scpi_get_float(sdi->conn,
                        (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
                        &tmp_float) != SR_OK)
@@ -722,6 +734,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
        struct sr_datafeed_logic logic;
 
        (void)fd;
+       (void)revents;
 
        data = NULL;
 
@@ -731,8 +744,12 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
        if (!(devc = sdi->priv))
                return TRUE;
 
+       /* Although this is correct in general, the USBTMC libusb implementation
+        * currently does not generate an event prior to the first read. Often
+        * it is ok to start reading just after the 50ms timeout. See bug #785.
        if (revents != G_IO_IN)
                return TRUE;
+       */
 
        ch = devc->current_channel->data;