From: Uwe Hermann Date: Wed, 18 Dec 2013 23:31:26 +0000 (+0100) Subject: bbcgm-m2110: Minor cosmetics. X-Git-Tag: libsigrok-0.3.0~424 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=95ecc765463462938200cf5cbcffba663f893c29;p=libsigrok.git bbcgm-m2110: Minor cosmetics. --- diff --git a/hardware/common/dmm/m2110.c b/hardware/common/dmm/m2110.c index 1461f627..9184ab4f 100644 --- a/hardware/common/dmm/m2110.c +++ b/hardware/common/dmm/m2110.c @@ -17,20 +17,20 @@ * along with this program. If not, see . */ -/** \file - * BBC Goerz Metrawatt M2110 ASCII protocol parser. +/** + * @file * - * Most probably the simplest multimeter protocol ever ;-) . + * BBC Goerz Metrawatt M2110 ASCII protocol parser. + * + * Most probably the simplest multimeter protocol ever ;-) . */ - #include #include #include #include "libsigrok.h" #include "libsigrok-internal.h" - /* Message logging helpers with subsystem-specific prefix string. */ #define LOG_PREFIX "bbcgm-m2110: " #define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) @@ -47,10 +47,10 @@ SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf) if ((buf[7] != '\r') || (buf[8] != '\n')) return FALSE; - if (!strncmp((const char*)buf, "OVERRNG", 7)) + if (!strncmp((const char *)buf, "OVERRNG", 7)) return TRUE; - if (sscanf((const char*)buf, "%f", &val) == 1) + if (sscanf((const char *)buf, "%f", &val) == 1) return TRUE; else return FALSE; @@ -63,14 +63,14 @@ SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval, (void)info; - analog->mq = SR_MQ_GAIN; /* We don't know the unit, so that's the best we can do.*/ + /* We don't know the unit, so that's the best we can do. */ + analog->mq = SR_MQ_GAIN; analog->unit = SR_UNIT_UNITLESS; analog->mqflags = 0; - if (!strncmp((const char*)buf, "OVERRNG", 7)) { + if (!strncmp((const char *)buf, "OVERRNG", 7)) *floatval = INFINITY; - } - else if (sscanf((const char*)buf, "%f", &val) == 1) + else if (sscanf((const char *)buf, "%f", &val) == 1) *floatval = val; return SR_OK; diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h index e24c8ab4..57d5ea19 100644 --- a/hardware/serial-dmm/protocol.h +++ b/hardware/serial-dmm/protocol.h @@ -61,15 +61,15 @@ enum { #define DMM_COUNT 25 struct dmm_info { - /** Manufacturer/brand */ + /** Manufacturer/brand. */ char *vendor; - /** Model */ + /** Model. */ char *device; - /** serialconn string */ + /** serialconn string. */ char *conn; - /** Baud rate */ + /** Baud rate. */ uint32_t baudrate; - /** Packet size [bytes]. */ + /** Packet size in bytes. */ int packet_size; /** Packet request function. */ int (*packet_request)(struct sr_serial_dev_inst *);