BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

radioshack-dmm: Use message logging helpers.

This commit is contained in:
Uwe Hermann 2012-10-30 18:52:20 +01:00
parent 38d326e879
commit dccbd0ede0
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hardware/radioshack-dmm/api.c
View File

@ -53,7 +53,6 @@ static const struct radioshackdmm_profile supported_radioshackdmm[] = {
{ RADIOSHACK_22_812, "22-812", 100 }, { RADIOSHACK_22_812, "22-812", 100 },
}; };
/* Properly close and free all devices. */ /* Properly close and free all devices. */
static int clear_instances(void) static int clear_instances(void)
{ {
@ -85,7 +84,7 @@ static int hw_init(void)
struct drv_context *drvc; struct drv_context *drvc;
if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
sr_err("radioshack-dmm: driver context malloc failed."); sr_err("Driver context malloc failed.");
return SR_ERR; return SR_ERR;
} }
@ -140,16 +139,15 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
char buf[128], *b; char buf[128], *b;
if ((fd = serial_open(conn, O_RDONLY|O_NONBLOCK)) == -1) { if ((fd = serial_open(conn, O_RDONLY|O_NONBLOCK)) == -1) {
sr_err("radioshack-dmm: unable to open %s: %s", sr_err("Unable to open %s: %s.", conn, strerror(errno));
conn, strerror(errno));
return NULL; return NULL;
} }
if (serial_set_paramstr(fd, serialcomm) != SR_OK) { 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; return NULL;
} }
sr_info("radioshack-dmm: probing port %s readonly", conn); sr_info("Probing port %s readonly.", conn);
drvc = di->priv; drvc = di->priv;
b = buf; b = buf;
@ -197,13 +195,13 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
if (good_packets == 0) if (good_packets == 0)
continue; 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", ""))) "22-812", "")))
return NULL; return NULL;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { 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; return NULL;
} }
@ -219,7 +217,6 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm)
drvc->instances = g_slist_append(drvc->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
break; break;
} }
serial_close(fd); serial_close(fd);
@ -272,18 +269,18 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
struct dev_context *devc; struct dev_context *devc;
if (!(devc = sdi->priv)) { if (!(devc = sdi->priv)) {
sr_err("radioshack-dmm: sdi->priv was NULL."); sr_err("sdi->priv was NULL.");
return SR_ERR_BUG; return SR_ERR_BUG;
} }
devc->serial->fd = serial_open(devc->serial->port, O_RDONLY); devc->serial->fd = serial_open(devc->serial->port, O_RDONLY);
if (devc->serial->fd == -1) { 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); devc->serial->port);
return SR_ERR; return SR_ERR;
} }
if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) { 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; return SR_ERR;
} }
sdi->status = SR_ST_ACTIVE; sdi->status = SR_ST_ACTIVE;
@ -296,7 +293,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
struct dev_context *devc; struct dev_context *devc;
if (!(devc = sdi->priv)) { if (!(devc = sdi->priv)) {
sr_err("radioshack-dmm: sdi->priv was NULL."); sr_err("sdi->priv was NULL.");
return SR_ERR_BUG; return SR_ERR_BUG;
} }
@ -350,18 +347,18 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
return SR_ERR; return SR_ERR;
if (!(devc = sdi->priv)) { if (!(devc = sdi->priv)) {
sr_err("radioshack-dmm: sdi->priv was NULL."); sr_err("sdi->priv was NULL.");
return SR_ERR_BUG; return SR_ERR_BUG;
} }
switch (hwcap) { switch (hwcap) {
case SR_HWCAP_LIMIT_SAMPLES: case SR_HWCAP_LIMIT_SAMPLES:
devc->limit_samples = *(const uint64_t *)value; 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); devc->limit_samples);
break; break;
default: default:
sr_err("radioshack-dmm: Unknown capability: %d.", hwcap); sr_err("Unknown capability: %d.", hwcap);
return SR_ERR; return SR_ERR;
break; break;
} }
@ -378,11 +375,11 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
struct dev_context *devc; struct dev_context *devc;
if (!(devc = sdi->priv)) { if (!(devc = sdi->priv)) {
sr_err("radioshack-dmm: sdi->priv was NULL."); sr_err("sdi->priv was NULL.");
return SR_ERR_BUG; return SR_ERR_BUG;
} }
sr_dbg("radioshack-dmm: Starting acquisition."); sr_dbg("Starting acquisition.");
devc->cb_data = cb_data; devc->cb_data = cb_data;
@ -392,7 +389,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
devc->num_samples = 0; devc->num_samples = 0;
/* Send header packet to the session bus. */ /* 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.type = SR_DF_HEADER;
packet.payload = (uint8_t *)&header; packet.payload = (uint8_t *)&header;
header.feed_version = 1; header.feed_version = 1;
@ -400,7 +397,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
/* Send metadata about the SR_DF_ANALOG packets to come. */ /* 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.type = SR_DF_META_ANALOG;
packet.payload = &meta; packet.payload = &meta;
meta.num_probes = 1; meta.num_probes = 1;
@ -423,17 +420,17 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
return SR_ERR; return SR_ERR;
if (!(devc = sdi->priv)) { if (!(devc = sdi->priv)) {
sr_err("radioshack-dmm: sdi->priv was NULL."); sr_err("sdi->priv was NULL.");
return SR_ERR_BUG; return SR_ERR_BUG;
} }
sr_dbg("radioshack-dmm: Stopping acquisition."); sr_dbg("Stopping acquisition.");
sr_source_remove(devc->serial->fd); sr_source_remove(devc->serial->fd);
hw_dev_close((struct sr_dev_inst *)sdi); hw_dev_close((struct sr_dev_inst *)sdi);
/* Send end packet to the session bus. */ /* 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; packet.type = SR_DF_END;
sr_session_send(cb_data, &packet); sr_session_send(cb_data, &packet);

9
hardware/radioshack-dmm/radioshack-dmm.h
View File

@ -21,6 +21,15 @@
#ifndef LIBSIGROK_RADIOSHACK_DMM_H #ifndef LIBSIGROK_RADIOSHACK_DMM_H
#define LIBSIGROK_RADIOSHACK_DMM_H #define LIBSIGROK_RADIOSHACK_DMM_H
/* Message logging helpers with driver-specific prefix string. */
#define DRIVER_LOG_DOMAIN "radioshack-dmm: "
#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
#define RS_DMM_BUFSIZE 256 #define RS_DMM_BUFSIZE 256
/* Byte 1 of the packet, and the modes it represents */ /* Byte 1 of the packet, and the modes it represents */

8
hardware/radioshack-dmm/radioshack.c
View File

@ -27,7 +27,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
static gboolean rs_22_812_is_checksum_valid(const rs_22_812_packet *data) static gboolean rs_22_812_is_checksum_valid(const rs_22_812_packet *data)
{ {
uint8_t *raw = (void *) data; uint8_t *raw = (void *) data;
@ -326,7 +325,7 @@ static void rs_22_812_handle_packet(rs_22_812_packet *rs_packet,
analog->mqflags |= SR_MQFLAG_AC; analog->mqflags |= SR_MQFLAG_AC;
break; break;
default: default:
sr_warn("radioshack-dmm: unkown mode: %d", rs_packet->mode); sr_warn("Unknown mode: %d.", rs_packet->mode);
break; break;
} }
@ -345,7 +344,7 @@ static void rs_22_812_handle_packet(rs_22_812_packet *rs_packet,
if (analog->mq != -1) { if (analog->mq != -1) {
/* Got a measurement. */ /* Got a measurement. */
sr_spew("radioshack-dmm: val %f", rawval); sr_spew("Value: %f.", rawval);
packet.type = SR_DF_ANALOG; packet.type = SR_DF_ANALOG;
packet.payload = analog; packet.payload = analog;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
@ -364,7 +363,7 @@ static void handle_new_data(rs_dev_ctx *devc, int fd)
len = RS_DMM_BUFSIZE - devc->buflen; len = RS_DMM_BUFSIZE - devc->buflen;
len = serial_read(fd, devc->buf + devc->buflen, len); len = serial_read(fd, devc->buf + devc->buflen, len);
if (len < 1) { if (len < 1) {
sr_err("radioshack-dmm: serial port read error!"); sr_err("Serial port read error!");
return; return;
} }
devc->buflen += len; devc->buflen += len;
@ -412,4 +411,3 @@ SR_PRIV int radioshack_receive_data(int fd, int revents, void *cb_data)
return TRUE; return TRUE;
} }