* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include "protocol.h"
static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
float floatval;
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
devc = sdi->priv;
if (analog.mq != -1) {
/* Got a measurement. */
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
sr_session_send(devc->cb_data, &packet);
devc->num_samples++;
{
int64_t start, time, byte_delay_us;
size_t ibuf, i, maxlen;
- int status, len, packet_len, stream_len;
+ ssize_t len, stream_len;
+ int packet_len;
+ int status;
maxlen = *buflen;
"ms, baudrate = %d).", serial->port, timeout_ms, baudrate);
/* Assume 8n1 transmission. That is 10 bits for every byte. */
- byte_delay_us = 10 * (1000000 / baudrate);
+ byte_delay_us = 10 * ((1000 * 1000) / baudrate);
start = g_get_monotonic_time();
packet_len = i = ibuf = len = 0;
len = serial_read_nonblocking(serial, &buf[ibuf], maxlen - ibuf);
if (len > 0) {
ibuf += len;
- sr_spew("Read %d bytes.", len);
+ sr_spew("Read %zd bytes.", len);
}
time = g_get_monotonic_time() - start;
/* How large of a packet are we expecting? */
packet_len = stream_len;
status = get_packet_size(&buf[i], &packet_len);
- switch(status) {
+ switch (status) {
case PACKET_HEADER_OK:
/* We know how much data we need to wait for. */
break;
if (time >= (int64_t)timeout_ms) {
/* Timeout */
- sr_dbg("Detection timed out after %dms.", time);
+ sr_dbg("Detection timed out after %" PRIi64 "ms.", time);
break;
}
g_usleep(byte_delay_us);
}
*buflen = ibuf;
- sr_err("Didn't find a valid packet (read %d bytes).", ibuf);
+ sr_err("Didn't find a valid packet (read %zu bytes).", ibuf);
return SR_ERR;
}