* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include <string.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#include "protocol.h"
devc->num_samples++;
}
-int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
+SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
buf[2] = 0x0d;
sr_spew("Sending init command: %02x %02x %02x.",
buf[0], buf[1], buf[2]);
- if ((ret = serial_write(serial, buf, 3)) < 0) {
+ if ((ret = serial_write_blocking(serial, buf, 3,
+ serial_timeout(serial, 3))) < 0) {
sr_err("Error sending init command: %d.", ret);
return FALSE;
}
devc->state = GET_INIT_REPLY;
} else if (devc->state == GET_INIT_REPLY) {
/* If we just sent the "init" command, get its reply. */
- if ((ret = serial_read(serial, buf, 2)) < 0) {
+ if ((ret = serial_read_blocking(serial, buf, 2, 0)) < 0) {
sr_err("Error reading init reply: %d.", ret);
return FALSE;
}
buf[2] = 0x0d;
sr_spew("Sending data request command: %02x %02x %02x.",
buf[0], buf[1], buf[2]);
- if ((ret = serial_write(serial, buf, 3)) < 0) {
+ if ((ret = serial_write_blocking(serial, buf, 3,
+ serial_timeout(serial, 3))) < 0) {
sr_err("Error sending request command: %d.", ret);
return FALSE;
}
devc->state = GET_PACKET;
} else if (devc->state == GET_PACKET) {
/* Read a packet from the device. */
- ret = serial_read(serial, devc->buf + devc->buflen,
+ ret = serial_read_nonblocking(serial, devc->buf + devc->buflen,
4 - devc->buflen);
if (ret < 0) {
sr_err("Error reading packet: %d.", ret);