struct lcr_parse_info *info;
uint64_t freq;
const char *model;
- struct sr_datafeed_packet packet;
devc = sdi->priv;
info = &devc->parse_info;
}
/* Data is about to get sent. Start a new frame. */
- packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(sdi, &packet);
-}
-
-static void send_frame_end(struct sr_dev_inst *sdi)
-{
- struct sr_datafeed_packet packet;
-
- packet.type = SR_DF_FRAME_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_frame_begin(sdi);
}
static int handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
g_slist_free(analog.meaning->channels);
}
if (frame) {
- send_frame_end(sdi);
+ std_session_send_df_frame_end(sdi);
sr_sw_limits_update_frames_read(&devc->limits, 1);
}
return SR_OK;
}
+static int handle_timeout(struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ const struct lcr_info *lcr;
+ struct sr_serial_dev_inst *serial;
+ int64_t now;
+ int ret;
+
+ devc = sdi->priv;
+ lcr = devc->lcr_info;
+
+ if (!lcr->packet_request)
+ return SR_OK;
+
+ now = g_get_monotonic_time();
+ if (devc->req_next_at && now < devc->req_next_at)
+ return SR_OK;
+
+ serial = sdi->conn;
+ ret = lcr->packet_request(serial);
+ if (ret < 0) {
+ sr_err("Failed to request packet: %d.", ret);
+ return ret;
+ }
+
+ if (lcr->req_timeout_ms)
+ devc->req_next_at = now + lcr->req_timeout_ms * 1000;
+
+ return SR_OK;
+}
+
SR_PRIV int lcr_receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ int ret;
(void)fd;
return TRUE;
if (revents == G_IO_IN)
- handle_new_data(sdi);
-
+ ret = handle_new_data(sdi);
+ else
+ ret = handle_timeout(sdi);
if (sr_sw_limits_check(&devc->limits))
sr_dev_acquisition_stop(sdi);
+ if (ret != SR_OK)
+ return FALSE;
return TRUE;
}