libsigrok.h: Add Joule, Coulomb, and Ah units.

[libsigrok.git] / src / analog.c

diff --git a/src/analog.c b/src/analog.c
index 9bc88b310efd8aeb42333575562ce557d79c1fae..2a8e8d9054cfdd8bc691bb2e5e95534a0c50c0c7 100644 (file)
--- a/src/analog.c
+++ b/src/analog.c
@@ -88,6 +88,9 @@ static struct unit_mq_string unit_strings[] = {
        { SR_UNIT_MOMME, "momme" },
        { SR_UNIT_TOLA, "tola" },
        { SR_UNIT_PIECE, "pcs" },
+       { SR_UNIT_JOULE, "J" },
+       { SR_UNIT_COULOMB, "C" },
+       { SR_UNIT_AMPERE_HOUR, "Ah" },
        ALL_ZERO
 };
 
@@ -119,6 +122,7 @@ static struct unit_mq_string mq_strings[] = {
        ALL_ZERO
 };
 
+/** @private */
 SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog,
                struct sr_analog_encoding *encoding,
                struct sr_analog_meaning *meaning,
@@ -173,8 +177,7 @@ SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog,
 SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog,
                float *outbuf)
 {
-       float offset;
-       unsigned int b, i, count;
+       unsigned int b, count;
        gboolean bigendian;
 
        if (!analog || !(analog->data) || !(analog->meaning)
@@ -274,7 +277,7 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog,
                /* The data is already in the right format. */
                memcpy(outbuf, analog->data, count * sizeof(float));
        } else {
-               for (i = 0; i < count; i += analog->encoding->unitsize) {
+               for (unsigned int i = 0; i < count; i += analog->encoding->unitsize) {
                        for (b = 0; b < analog->encoding->unitsize; b++) {
                                if (analog->encoding->is_bigendian == bigendian)
                                        ((uint8_t *)outbuf)[i + b] =
@@ -286,7 +289,7 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog,
                        if (analog->encoding->scale.p != 1
                                        || analog->encoding->scale.q != 1)
                                outbuf[i] = (outbuf[i] * analog->encoding->scale.p) / analog->encoding->scale.q;
-                       offset = ((float)analog->encoding->offset.p / (float)analog->encoding->offset.q);
+                       float offset = ((float)analog->encoding->offset.p / (float)analog->encoding->offset.q);
                        outbuf[i] += offset;
                }
        }
@@ -306,8 +309,10 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog,
  */
 SR_API const char *sr_analog_si_prefix(float *value, int *digits)
 {
-#define NEG_PREFIX_COUNT 5  /* number of prefixes below unity */
+/** @cond PRIVATE */
+#define NEG_PREFIX_COUNT 5 /* number of prefixes below unity */
 #define POS_PREFIX_COUNT (int)(ARRAY_SIZE(prefixes) - NEG_PREFIX_COUNT - 1)
+/** @endcond */
        static const char *prefixes[] = { "f", "p", "n", "µ", "m", "", "k", "M", "G", "T" };
 
        if (!value || !digits || isnan(*value))
@@ -363,12 +368,9 @@ SR_API gboolean sr_analog_si_prefix_friendly(enum sr_unit unit)
 
        for (i = 0; i < ARRAY_SIZE(prefix_friendly_units); i++)
                if (unit == prefix_friendly_units[i])
-                       break;
+                       return TRUE;
 
-       if (unit != prefix_friendly_units[i])
-               return FALSE;
-
-       return TRUE;
+       return FALSE;
 }
 
 /**
@@ -552,8 +554,8 @@ SR_API int sr_rational_mult(struct sr_rational *res, const struct sr_rational *a
                return SR_ERR_ARG;
        }
 
-       res->p = (int64_t)(p);
-       res->q = (uint64_t)(q);
+       res->p = (int64_t)p;
+       res->q = (uint64_t)q;
 
        return SR_OK;
 
@@ -603,9 +605,8 @@ SR_API int sr_rational_mult(struct sr_rational *res, const struct sr_rational *a
  * @param[out] res Result.
  *
  * @retval SR_OK Success.
- * @retval SR_ERR_ARG Division by zero.
- * @retval SR_ERR_ARG Denominator of divisor too large.
- * @retval SR_ERR_ARG Resulting value too large.
+ * @retval SR_ERR_ARG Division by zero, denominator of divisor too large,
+ *                    or resulting value too large.
  *
  * @since 0.5.0
  */