* @internal
*/
+#include <config.h>
#include <errno.h>
#include <string.h>
#include "protocol.h"
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
int i;
float data[MAX_CHANNELS];
devc = sdi->priv;
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
analog.channels = sdi->channels;
analog.num_samples = 1;
case AQ_I2:
if (sr_atod(devc->buf, &dbl) != SR_OK) {
sr_err("Failed to convert '%s' to double, errno=%d %s",
- devc->buf, errno, strerror(errno));
+ devc->buf, errno, g_strerror(errno));
dbl = 0.0;
}
break;
case AQ_STATUS:
if (sr_atoi(devc->buf, &auxint) != SR_OK) {
sr_err("Failed to convert '%s' to int, errno=%d %s",
- devc->buf, errno, strerror(errno));
+ devc->buf, errno, g_strerror(errno));
auxint = 0;
}
break;
return TRUE;
if (devc->acq_req_pending) {
- gint64 elapsed_us = g_get_monotonic_time() - devc->req_sent_at;
+ int64_t elapsed_us = g_get_monotonic_time() - devc->req_sent_at;
if (elapsed_us > (REQ_TIMEOUT_MS * 1000)) {
- sr_spew("Request timeout: req=%d t=%lldus", (int)devc->acq_req, elapsed_us);
+ sr_spew("Request timeout: req=%d t=%" PRIi64 "us",
+ (int)devc->acq_req, elapsed_us);
devc->acq_req_pending = 0;
}
}