output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / dmm / vc870.c

diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index 43be935e3bdebaff92777a04f550607784e3d936..d9c3d5ac77199b8897958933053a403e090e0f8b 100644 (file)
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -167,7 +166,7 @@ static int parse_range(uint8_t b, float *floatval, int *exponent,
 
 static void parse_flags(const uint8_t *buf, struct vc870_info *info)
 {
-       /* Bytes 0/1: Function / function select  */
+       /* Bytes 0/1: Function / function select */
        /* Note: Some of these mappings are fixed up later. */
        switch (buf[0]) {
        case 0x30: /* DCV / ACV */
@@ -361,7 +360,7 @@ static void handle_flags(struct sr_datafeed_analog *analog,
        if (info->is_auto)
                analog->meaning->mqflags |= SR_MQFLAG_AUTORANGE;
        if (info->is_diode)
-               analog->meaning->mqflags |= SR_MQFLAG_DIODE;
+               analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
        if (info->is_hold)
                /*
                 * Note: HOLD only affects the number displayed on the LCD,
@@ -411,7 +410,7 @@ SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval,
        int ret, exponent = 0;
        struct vc870_info *info_local;
 
-       info_local = (struct vc870_info *)info;
+       info_local = info;
        memset(info_local, 0, sizeof(struct vc870_info));
 
        if (!sr_vc870_packet_valid(buf))
@@ -429,7 +428,7 @@ SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval,
 
        handle_flags(analog, floatval, info_local);
 
-       analog->encoding->digits  = -exponent;
+       analog->encoding->digits = -exponent;
        analog->spec->spec_digits = -exponent;
 
        return SR_OK;