struct sr_probe *probe;
struct sr_serial_dev_inst *serial;
GSList *devices;
- int i, len, retry, good_packets = 0, dropped;
- uint8_t buf[128], *b;
+ int dropped, ret;
+ size_t len;
+ uint8_t buf[128];
if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
return NULL;
- if (serial_open(serial, O_RDONLY|O_NONBLOCK) != SR_OK)
+ if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
return NULL;
sr_info("Probing port %s readonly.", conn);
drvc = di->priv;
- b = buf;
- retry = 0;
devices = NULL;
serial_flush(serial);
* periodically, so the best we can do is check if the packets match
* the expected format.
*/
- while (!devices && retry < 3) {
- retry++;
-
- /* Let's get a bit of data and see if we can find a packet. */
- len = sizeof(buf);
- serial_readline(serial, (char **)&b, &len, 500);
- if ((len == 0) || (len < FS9721_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 - FS9721_PACKET_SIZE + 1;) {
- if (!sr_fs9721_packet_valid(&buf[i])) {
- i++;
- continue;
- }
- good_packets++;
- i += FS9721_PACKET_SIZE;
- }
+ /* Let's get a bit of data and see if we can find a packet. */
+ len = sizeof(buf);
- /*
- * If we dropped more than two packets worth of data,
- * something is wrong.
- */
- dropped = len - (good_packets * FS9721_PACKET_SIZE);
- if (dropped > 2 * FS9721_PACKET_SIZE)
- continue;
+ ret = serial_stream_detect(serial, buf, &len, FS9721_PACKET_SIZE,
+ sr_fs9721_packet_valid, 1000, 2400);
+ if (ret != SR_OK)
+ goto scan_cleanup;
- /* Let's see if we have anything good. */
- if (good_packets == 0)
- continue;
-
- sr_info("Found device on port %s.", conn);
+ /*
+ * If we dropped more than two packets worth of data, something is
+ * wrong. We shouldn't quit however, since the dropped bytes might be
+ * just zeroes at the beginning of the stream. Those can occur as a
+ * combination of the nonstandard cable that ships with this device and
+ * the serial port or USB to serial adapter.
+ */
+ dropped = len - FS9721_PACKET_SIZE;
+ if (dropped > 2 * FS9721_PACKET_SIZE)
+ sr_warn("Had to drop too much data.");
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "TekPower",
- "TP4000ZC", "")))
- return NULL;
- if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_err("Device context malloc failed.");
- return NULL;
- }
+ sr_info("Found device on port %s.", conn);
- devc->serial = serial;
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "TekPower",
+ "TP4000ZC", "")))
+ goto scan_cleanup;
- sdi->priv = devc;
- sdi->driver = di;
- if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
- return NULL;
- sdi->probes = g_slist_append(sdi->probes, probe);
- drvc->instances = g_slist_append(drvc->instances, sdi);
- devices = g_slist_append(devices, sdi);
- break;
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("Device context malloc failed.");
+ goto scan_cleanup;
}
+ devc->serial = serial;
+
+ sdi->priv = devc;
+ sdi->driver = di;
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ drvc->instances = g_slist_append(drvc->instances, sdi);
+ devices = g_slist_append(devices, sdi);
+
+scan_cleanup:
serial_close(serial);
+
return devices;
}
return SR_ERR_BUG;
}
- if (serial_open(devc->serial, O_RDONLY) != SR_OK)
+ if (serial_open(devc->serial, SERIAL_RDONLY) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;