X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fradioshack-dmm%2Fapi.c;h=c32ffbe6e1d62ed55440045e4060fc543800ebe4;hb=ac913e5c3522fcf5a5633eaa8e19f6579dda554c;hp=4eb5cbfa0ee995df59957768df6aa58009aadcd2;hpb=886a52b6fbffb0fd06849c928cf9fd31a0d4657b;p=libsigrok.git diff --git a/hardware/radioshack-dmm/api.c b/hardware/radioshack-dmm/api.c index 4eb5cbfa..c32ffbe6 100644 --- a/hardware/radioshack-dmm/api.c +++ b/hardware/radioshack-dmm/api.c @@ -26,7 +26,9 @@ #include #include "libsigrok.h" #include "libsigrok-internal.h" -#include "radioshack-dmm.h" +#include "protocol.h" + +#define SERIALCOMM "4800/8n1" static const int hwopts[] = { SR_HWOPT_CONN, @@ -49,10 +51,6 @@ static const char *probe_names[] = { SR_PRIV struct sr_dev_driver radioshackdmm_driver_info; static struct sr_dev_driver *di = &radioshackdmm_driver_info; -static const struct radioshackdmm_profile supported_radioshackdmm[] = { - { RADIOSHACK_22_812, "22-812", 100 }, -}; - /* Properly close and free all devices. */ static int clear_instances(void) { @@ -99,51 +97,48 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm) struct drv_context *drvc; struct dev_context *devc; struct sr_probe *probe; + struct sr_serial_dev_inst *serial; GSList *devices; - int fd, retry; - size_t len; + int retry; + size_t len, i, good_packets, dropped; char buf[128], *b; + const struct rs_22_812_packet *rs_packet; - if ((fd = serial_open(conn, O_RDONLY|O_NONBLOCK)) == -1) { - sr_err("Unable to open %s: %s.", conn, strerror(errno)); + if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - } - if (serial_set_paramstr(fd, serialcomm) != SR_OK) { - sr_err("Unable to set serial parameters."); + + if (serial_open(serial, O_RDONLY|O_NONBLOCK) != SR_OK) return NULL; - } - sr_info("Probing port %s readonly.", conn); + sr_info("Probing port '%s' readonly.", conn); drvc = di->priv; b = buf; retry = 0; devices = NULL; - /* There's no way to get an ID from the multimeter. It just sends data - * periodically, so the best we can do is check if the packets match the - * expected format. */ - while (!devices && retry < 3) - { - size_t i; - size_t good_packets = 0; + + /* + * There's no way to get an ID from the multimeter. It just sends data + * periodically, so the best we can do is check if the packets match + * the expected format. + */ + while (!devices && retry < 3) { + good_packets = 0; retry++; - serial_flush(fd); + serial_flush(serial); - /* Let's get a bit of data and see if we can find a packet */ + /* Let's get a bit of data and see if we can find a packet. */ len = sizeof(buf); - serial_readline(fd, &b, &len, 250); - if( (len == 0) || (len < RS_22_812_PACKET_SIZE) ) { - /* Not enough data received, is the DMM connected ? */ + serial_readline(serial, &b, &len, 250); + if ((len == 0) || (len < RS_22_812_PACKET_SIZE)) { + /* Not enough data received, is the DMM connected? */ continue; } - /* Let's treat our buffer like a stream, and find any - * valid packets */ - for( i = 0; i < len - RS_22_812_PACKET_SIZE + 1; - /* don't increment i here */ ) - { - const rs_22_812_packet *packet = (void *)(&buf[i]); - if( !rs_22_812_is_packet_valid(packet) ){ + /* Treat our buffer as stream, and find any valid packets. */ + for (i = 0; i < len - RS_22_812_PACKET_SIZE + 1;) { + rs_packet = (void *)(&buf[i]); + if (!rs_22_812_packet_valid(rs_packet)) { i++; continue; } @@ -151,29 +146,27 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm) i += RS_22_812_PACKET_SIZE; } - /* If we dropped more than two packets worth of data, something - * is wrong */ - size_t dropped = len - (good_packets * RS_22_812_PACKET_SIZE); - if(dropped > 2 * RS_22_812_PACKET_SIZE) + /* If we dropped more than two packets, something is wrong. */ + dropped = len - (good_packets * RS_22_812_PACKET_SIZE); + if (dropped > 2 * RS_22_812_PACKET_SIZE) continue; - /* Let's see if we have anything good */ + /* Let's see if we have anything good. */ if (good_packets == 0) continue; - sr_info("Found RS 22-812 on port %s.", conn); + sr_info("Found RadioShack 22-812 on port '%s'.", conn); 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_err("Device context malloc failed."); return NULL; } - /* devc->profile = RADIOSHACK_22_812; */ - devc->serial = sr_serial_dev_inst_new(conn, -1); - devc->serialcomm = g_strdup(serialcomm); + devc->serial = serial; sdi->priv = devc; sdi->driver = di; @@ -184,12 +177,12 @@ static GSList *rs_22_812_scan(const char *conn, const char *serialcomm) devices = g_slist_append(devices, sdi); break; } - serial_close(fd); + serial_close(serial); return devices; } -static GSList *hw_scan(GSList *options) +static GSList *hw_scan(GSList * options) { struct sr_hwopt *opt; GSList *l, *devices; @@ -210,13 +203,12 @@ static GSList *hw_scan(GSList *options) if (!conn) return NULL; - if (serialcomm) { + if (serialcomm) /* Use the provided comm specs. */ devices = rs_22_812_scan(conn, serialcomm); - } else { - /* Then try the default 4800 8n1 */ - devices = rs_22_812_scan(conn, "4800/8n1"); - } + else + /* Try the default. */ + devices = rs_22_812_scan(conn, SERIALCOMM); return devices; } @@ -239,16 +231,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_ERR_BUG; } - devc->serial->fd = serial_open(devc->serial->port, O_RDONLY); - if (devc->serial->fd == -1) { - 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("Unable to set serial parameters."); + if (serial_open(devc->serial, O_RDONLY) != SR_OK) return SR_ERR; - } + sdi->status = SR_ST_ACTIVE; return SR_OK; @@ -264,8 +249,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi) } if (devc->serial && devc->serial->fd != -1) { - serial_close(devc->serial->fd); - devc->serial->fd = -1; + serial_close(devc->serial); sdi->status = SR_ST_INACTIVE; } @@ -280,9 +264,9 @@ static int hw_cleanup(void) } static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) + const struct sr_dev_inst *sdi) { - (void)sdi; /* Does nothing. prevents "unused parameter" warning */ + (void)sdi; switch (info_id) { case SR_DI_HWOPTS: @@ -298,6 +282,7 @@ static int hw_info_get(int info_id, const void **data, *data = probe_names; break; default: + sr_err("Unknown info_id: %d.", info_id); return SR_ERR_ARG; } @@ -305,7 +290,7 @@ static int hw_info_get(int info_id, const void **data, } static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) + const void *value) { struct dev_context *devc; @@ -325,7 +310,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, break; default: sr_err("Unknown capability: %d.", hwcap); - return SR_ERR; + return SR_ERR_ARG; break; } @@ -333,7 +318,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, } static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) + void *cb_data) { struct sr_datafeed_packet packet; struct sr_datafeed_header header; @@ -349,15 +334,17 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->cb_data = cb_data; - /* Reset the number of samples to take. If we've already collected our + /* + * Reset the number of samples to take. If we've already collected our * quota, but we start a new session, and don't reset this, we'll just - * quit without aquiring any new samples */ + * quit without aquiring any new samples. + */ devc->num_samples = 0; /* Send header packet to the session bus. */ sr_dbg("Sending SR_DF_HEADER."); packet.type = SR_DF_HEADER; - packet.payload = (uint8_t *)&header; + packet.payload = (uint8_t *) & header; header.feed_version = 1; gettimeofday(&header.starttime, NULL); sr_session_send(devc->cb_data, &packet); @@ -369,15 +356,14 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, meta.num_probes = 1; sr_session_send(devc->cb_data, &packet); - /* Poll every 100ms, or whenever some data comes in. */ + /* Poll every 50ms, or whenever some data comes in. */ sr_source_add(devc->serial->fd, G_IO_IN, 50, - radioshack_receive_data, (void *)sdi ); + radioshack_dmm_receive_data, (void *)sdi); return SR_OK; } -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { struct sr_datafeed_packet packet; struct dev_context *devc; @@ -405,7 +391,7 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, SR_PRIV struct sr_dev_driver radioshackdmm_driver_info = { .name = "radioshack-dmm", - .longname = "Radioshack 22-812/22-039 DMMs", + .longname = "RadioShack 22-812/22-039 DMMs", .api_version = 1, .init = hw_init, .cleanup = hw_cleanup,