/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
* Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
{
struct dev_context *devc;
int len, i, offset = 0;
+ struct sr_serial_dev_inst *serial;
devc = sdi->priv;
+ serial = sdi->conn;
/* Try to get as much data as the buffer can hold. */
len = DMM_BUFSIZE - devc->buflen;
- len = serial_read(devc->serial, devc->buf + devc->buflen, len);
+ len = serial_read(serial, devc->buf + devc->buflen, len);
if (len < 1) {
sr_err("Serial port read error: %d.", len);
return;
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
int64_t time;
int ret;
if (!(devc = sdi->priv))
return TRUE;
+ serial = sdi->conn;
+
if (revents == G_IO_IN) {
/* Serial data arrived. */
handle_new_data(sdi, dmm, info);
} else {
/* Timeout, send another packet request (if DMM needs it). */
if (dmms[dmm].packet_request) {
- ret = dmms[dmm].packet_request(devc->serial);
+ ret = dmms[dmm].packet_request(serial);
if (ret < 0) {
sr_err("Failed to request packet: %d.", ret);
return FALSE;
RECEIVE_DATA(PEAKTECH_4370, metex14)
RECEIVE_DATA(PCE_PCE_DM32, fs9721)
RECEIVE_DATA(RADIOSHACK_22_168, metex14)
+RECEIVE_DATA(RADIOSHACK_22_805, metex14)
RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)