Return SR_ERR_MALLOC upon allocation errors.

[libsigrok.git] / hardware / radioshack-dmm / api.c

diff --git a/hardware/radioshack-dmm/api.c b/hardware/radioshack-dmm/api.c
index 62b3c0d11308631d56a679f4e0d3ea284f2e956c..4eb5cbfa0ee995df59957768df6aa58009aadcd2 100644 (file)
--- a/hardware/radioshack-dmm/api.c
+++ b/hardware/radioshack-dmm/api.c
@@ -19,15 +19,14 @@
  */
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "config.h"
-#include "radioshack-dmm.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "radioshack-dmm.h"
 
 static const int hwopts[] = {
        SR_HWOPT_CONN,
@@ -54,7 +53,6 @@ static const struct radioshackdmm_profile supported_radioshackdmm[] = {
        { RADIOSHACK_22_812, "22-812", 100 },
 };
 
-
 /* Properly close and free all devices. */
 static int clear_instances(void)
 {
@@ -86,8 +84,8 @@ static int hw_init(void)
        struct drv_context *drvc;
 
        if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-               sr_err("radioshack-dmm: driver context malloc failed.");
-               return SR_ERR;
+               sr_err("Driver context malloc failed.");
+               return SR_ERR_MALLOC;
        }
 
        di->priv = drvc;
@@ -95,40 +93,6 @@ static int hw_init(void)
        return SR_OK;
 }
 
-static int serial_readline(int fd, char **buf, size_t *buflen,
-                          uint64_t timeout_ms)
-{
-       uint64_t start;
-       int maxlen, len;
-
-       timeout_ms *= 1000;
-       start = g_get_monotonic_time();
-
-       maxlen = *buflen;
-       *buflen = len = 0;
-       while(1) {
-               len = maxlen - *buflen - 1;
-               if (len < 1)
-                       break;
-               len = serial_read(fd, *buf + *buflen, 1);
-               if (len > 0) {
-                       *buflen += len;
-                       *(*buf + *buflen) = '\0';
-                       if (*buflen > 0 && *(*buf + *buflen - 1) == '\r') {
-                               /* Strip LF and terminate. */
-                               *(*buf + --*buflen) = '\0';
-                               break;
-                       }
-               }
-               if (g_get_monotonic_time() - start > timeout_ms)
-                       /* Timeout */
-                       break;
-               g_usleep(2000);
-       }
-
-       return SR_OK;
-}
-
 static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
 {
        struct sr_dev_inst *sdi;
@@ -141,16 +105,15 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
        char buf[128], *b;
 
        if ((fd = serial_open(conn, O_RDONLY|O_NONBLOCK)) == -1) {
-               sr_err("radioshack-dmm: unable to open %s: %s",
-                      conn, strerror(errno));
+               sr_err("Unable to open %s: %s.", conn, strerror(errno));
                return NULL;
        }
        if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
-               sr_err("radioshack-dmm: unable to set serial parameters");
+               sr_err("Unable to set serial parameters.");
                return NULL;
        }
 
-       sr_info("radioshack-dmm: probing port %s readonly", conn);
+       sr_info("Probing port %s readonly.", conn);
 
        drvc = di->priv;
        b = buf;
@@ -198,13 +161,13 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
                if (good_packets == 0)
                        continue;
 
-               sr_info("radioshack-dmm: found RS 22-812 on port %s", conn);
+               sr_info("Found RS 22-812 on port %s.", conn);
 
-               if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Radioshack",
+               if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "RadioShack",
                                            "22-812", "")))
                        return NULL;
                if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-                       sr_dbg("radioshack-dmm: failed to malloc devc");
+                       sr_err("Device context malloc failed.");
                        return NULL;
                }
 
@@ -220,7 +183,6 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
                drvc->instances = g_slist_append(drvc->instances, sdi);
                devices = g_slist_append(devices, sdi);
                break;
-
        }
        serial_close(fd);
 
@@ -273,18 +235,18 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        if (!(devc = sdi->priv)) {
-               sr_err("radioshack-dmm: sdi->priv was NULL.");
+               sr_err("sdi->priv was NULL.");
                return SR_ERR_BUG;
        }
 
        devc->serial->fd = serial_open(devc->serial->port, O_RDONLY);
        if (devc->serial->fd == -1) {
-               sr_err("radioshack-dmm: Couldn't open serial port '%s'.",
+               sr_err("Couldn't open serial port '%s'.",
                       devc->serial->port);
                return SR_ERR;
        }
        if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) {
-               sr_err("radioshack-dmm: unable to set serial parameters");
+               sr_err("Unable to set serial parameters.");
                return SR_ERR;
        }
        sdi->status = SR_ST_ACTIVE;
@@ -297,7 +259,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        if (!(devc = sdi->priv)) {
-               sr_err("radioshack-dmm: sdi->priv was NULL.");
+               sr_err("sdi->priv was NULL.");
                return SR_ERR_BUG;
        }
 
@@ -351,18 +313,18 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                return SR_ERR;
 
        if (!(devc = sdi->priv)) {
-               sr_err("radioshack-dmm: sdi->priv was NULL.");
+               sr_err("sdi->priv was NULL.");
                return SR_ERR_BUG;
        }
 
        switch (hwcap) {
        case SR_HWCAP_LIMIT_SAMPLES:
                devc->limit_samples = *(const uint64_t *)value;
-               sr_dbg("radioshack-dmm: Setting sample limit to %" PRIu64 ".",
+               sr_dbg("Setting sample limit to %" PRIu64 ".",
                       devc->limit_samples);
                break;
        default:
-               sr_err("radioshack-dmm: Unknown capability: %d.", hwcap);
+               sr_err("Unknown capability: %d.", hwcap);
                return SR_ERR;
                break;
        }
@@ -379,11 +341,11 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        struct dev_context *devc;
 
        if (!(devc = sdi->priv)) {
-               sr_err("radioshack-dmm: sdi->priv was NULL.");
+               sr_err("sdi->priv was NULL.");
                return SR_ERR_BUG;
        }
 
-       sr_dbg("radioshack-dmm: Starting acquisition.");
+       sr_dbg("Starting acquisition.");
 
        devc->cb_data = cb_data;
 
@@ -393,7 +355,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc->num_samples = 0;
 
        /* Send header packet to the session bus. */
-       sr_dbg("radioshack-dmm: Sending SR_DF_HEADER.");
+       sr_dbg("Sending SR_DF_HEADER.");
        packet.type = SR_DF_HEADER;
        packet.payload = (uint8_t *)&header;
        header.feed_version = 1;
@@ -401,7 +363,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        sr_session_send(devc->cb_data, &packet);
 
        /* Send metadata about the SR_DF_ANALOG packets to come. */
-       sr_dbg("radioshack-dmm: Sending SR_DF_META_ANALOG.");
+       sr_dbg("Sending SR_DF_META_ANALOG.");
        packet.type = SR_DF_META_ANALOG;
        packet.payload = &meta;
        meta.num_probes = 1;
@@ -424,17 +386,17 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
                return SR_ERR;
 
        if (!(devc = sdi->priv)) {
-               sr_err("radioshack-dmm: sdi->priv was NULL.");
+               sr_err("sdi->priv was NULL.");
                return SR_ERR_BUG;
        }
 
-       sr_dbg("radioshack-dmm: Stopping acquisition.");
+       sr_dbg("Stopping acquisition.");
 
        sr_source_remove(devc->serial->fd);
        hw_dev_close((struct sr_dev_inst *)sdi);
 
        /* Send end packet to the session bus. */
-       sr_dbg("radioshack-dmm: Sending SR_DF_END.");
+       sr_dbg("Sending SR_DF_END.");
        packet.type = SR_DF_END;
        sr_session_send(cb_data, &packet);