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

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 1a74faed01743477c1c54e4cce186368eff901e9..972a8e9ffa68cb9c921d0e24f8760f59547664a2 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -178,6 +178,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
        /* {{{ es519xx */
+       DMM(
+               "tenma-72-7750", es519xx,
+               /* The baudrate is actually 19230, see "Note 1" below. */
+               "Tenma", "72-7750", 19200,
+               ES519XX_11B_PACKET_SIZE,
+               sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
+               NULL
+       ),
        DMM(
                "uni-t-ut60g", es519xx,
                /* The baudrate is actually 19230, see "Note 1" below. */
@@ -194,14 +202,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
                NULL
        ),
-       DMM(
-               "tenma-72-7750", es519xx,
-               /* The baudrate is actually 19230, see "Note 1" below. */
-               "Tenma", "72-7750", 19200,
-               ES519XX_11B_PACKET_SIZE,
-               sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
-               NULL
-       ),
        /* }}} */
        /* {{{ fs9721 */
        DMM(
@@ -211,6 +211,13 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_00_temp_c
        ),
+       DMM(
+               "tenma-72-7745", fs9721,
+               "Tenma", "72-7745", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
        DMM(
                "uni-t-ut60a", fs9721,
                "UNI-T", "UT60A", 2400,
@@ -239,13 +246,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_00_temp_c
        ),
-       DMM(
-               "tenma-72-7745", fs9721,
-               "Tenma", "72-7745", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c
-       ),
        /* }}} */
        /* {{{ fs9922 */
        DMM(
@@ -292,6 +292,24 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
        ),
        /* }}} */
        /* {{{ ut71x */
+       DMM(
+               "tenma-72-7730", ut71x,
+               "Tenma", "72-7730", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-7732", ut71x,
+               "Tenma", "72-7732", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-9380a", ut71x,
+               "Tenma", "72-9380A", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
        DMM(
                "uni-t-ut71a", ut71x,
                "UNI-T", "UT71A", 2400, UT71X_PACKET_SIZE,
@@ -337,24 +355,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                "Voltcraft", "VC-960", 2400, UT71X_PACKET_SIZE,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
-       DMM(
-               "tenma-72-7730", ut71x,
-               "Tenma", "72-7730", 2400,
-               UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
-       ),
-       DMM(
-               "tenma-72-7732", ut71x,
-               "Tenma", "72-7732", 2400,
-               UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
-       ),
-       DMM(
-               "tenma-72-9380a", ut71x,
-               "Tenma", "72-9380A", 2400,
-               UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
-       ),
        /* }}} */
        /* {{{ vc870 */
        DMM(