Drop unneeded std_session_send_df_header() comments.

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

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 2626de6a6dd3211d4a347513dae07e985eaa827c..59715ec421d0b4e9c9d35b81ae0d4b803255c70f 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -22,6 +22,7 @@
  *  @internal
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t scanopts[] = {
@@ -45,10 +46,7 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info;
 
 static const char *get_brandstr(struct sr_dev_driver *drv)
 {
-       if (drv == &norma_dmm_driver_info)
-               return "Norma";
-       else
-               return "Siemens";
+       return (drv == &norma_dmm_driver_info) ? "Norma" : "Siemens";
 }
 
 static const char *get_typestr(int type, struct sr_dev_driver *drv)
@@ -58,12 +56,13 @@ static const char *get_typestr(int type, struct sr_dev_driver *drv)
                {"DM920", "B1025"},
                {"DM930", "B1026"},
                {"DM940", "B1027"},
-               {"DM950", "B1028"}};
+               {"DM950", "B1028"},
+       };
 
        if ((type < 1) || (type > 5))
                return "Unknown type!";
 
-       return nameref[type-1][(drv == &siemens_b102x_driver_info)];
+       return nameref[type - 1][(drv == &siemens_b102x_driver_info)];
 }
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
@@ -79,11 +78,10 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
        struct sr_config *src;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
-       int len, cnt;
+       int len, cnt, auxtype;
        const char *conn, *serialcomm;
        char *buf;
        char req[10];
-       int auxtype;
 
        devices = NULL;
        drvc = drv->context;
@@ -119,7 +117,8 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
                 nmadmm_requests[NMADMM_REQ_IDN].req_str);
        g_usleep(150 * 1000); /* Wait a little to allow serial port to settle. */
        for (cnt = 0; cnt < 7; cnt++) {
-               if (serial_write_blocking(serial, req, strlen(req), 0) < 0) {
+               if (serial_write_blocking(serial, req, strlen(req),
+                               serial_timeout(serial, strlen(req))) < 0) {
                        sr_err("Unable to send identification request.");
                        return NULL;
                }
@@ -129,7 +128,7 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
                        continue;
                buf[BUF_MAX - 1] = '\0';
 
-               /* Match ID string, e.g. "1834 065 V1.06,IF V1.02" (DM950) */
+               /* Match ID string, e.g. "1834 065 V1.06,IF V1.02" (DM950). */
                if (g_regex_match_simple("^1834 [^,]*,IF V*", (char *)buf, 0, 0)) {
                        auxtype = xgittoint(buf[7]);
                        sr_spew("%s %s DMM %s detected!", get_brandstr(drv), get_typestr(auxtype, drv), buf + 9);
@@ -263,7 +262,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        devc->cb_data = cb_data;
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
        /* Start timer, if required. */