probe_name_path(addr, path);
status = g_file_get_contents(path->str, &buf, &size, &err);
if (!status) {
- sr_dbg("Name for probe %d can't be read: %s",
- prb_num, err->message);
+ /* Don't log "No such file or directory" messages. */
+ if (err->code != G_FILE_ERROR_NOENT)
+ sr_dbg("Name for probe %d can't be read (%d): %s",
+ prb_num, err->code, err->message);
g_string_free(path, TRUE);
g_error_free(err);
return ret;
static int revB_addr_to_num(unsigned int addr)
{
switch (addr) {
- case 0x44: return 5;
- case 0x45: return 6;
- case 0x42: return 3;
- case 0x43: return 4;
- default: return addr - 0x3f;
+ case 0x44: return 5;
+ case 0x45: return 6;
+ case 0x42: return 3;
+ case 0x43: return 4;
+ default: return addr - 0x3f;
}
}
SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
{
uint64_t nrexpiration;
- struct sr_datafeed_packet packet, framep;
+ struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
* accuracy.
*/
for (i = 0; i < nrexpiration; i++) {
- framep.type = SR_DF_FRAME_BEGIN;
- sr_session_send(sdi, &framep);
+ std_session_send_df_frame_begin(sdi);
/*
* Due to different units used in each channel we're sending
sr_session_send(sdi, &packet);
}
- framep.type = SR_DF_FRAME_END;
- sr_session_send(sdi, &framep);
+ std_session_send_df_frame_end(sdi);
}
sr_sw_limits_update_samples_read(&devc->limits, 1);