#include <sys/time.h>
#include <zip.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
/* size of payloads sent across the session bus */
#define CHUNKSIZE 4096
fd = fd;
revents = revents;
- g_debug("session_driver: feed chunk");
+ sr_dbg("session_driver: feed chunk");
got_data = FALSE;
for (l = device_instances; l; l = l->next) {
packet.length = ret;
packet.unitsize = vdevice->unitsize;
packet.payload = buf;
- session_bus(user_data, &packet);
+ sr_session_bus(user_data, &packet);
} else {
/* done with this capture file */
zip_fclose(vdevice->capfile);
if (!got_data) {
packet.type = SR_DF_END;
packet.length = 0;
- session_bus(user_data, &packet);
+ sr_session_bus(user_data, &packet);
}
return TRUE;
/* driver callbacks */
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
{
sessionfile = g_strdup(deviceinfo);
if (!(vdevice = get_vdevice_by_index(device_index)))
return SR_ERR;
- g_message("session_driver: opening archive %s file %s",
- sessionfile, vdevice->capturefile);
+ sr_info("session_driver: opening archive %s file %s", sessionfile,
+ vdevice->capturefile);
if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) {
- g_warning("Failed to open session file '%s': zip error %d\n",
- sessionfile, err);
+ sr_warn("Failed to open session file '%s': zip error %d\n",
+ sessionfile, err);
return SR_ERR;
}
if (zip_stat(vdevice->archive, vdevice->capturefile, 0, &zs) == -1) {
- g_warning("Failed to check capture file '%s' in session file '%s'.",
- vdevice->capturefile, sessionfile);
+ sr_warn("Failed to check capture file '%s' in session file '%s'.",
+ vdevice->capturefile, sessionfile);
return SR_ERR;
}
if (!(vdevice->capfile = zip_fopen(vdevice->archive, vdevice->capturefile, 0))) {
- g_warning("Failed to open capture file '%s' in session file '%s'.",
- vdevice->capturefile, sessionfile);
+ sr_warn("Failed to open capture file '%s' in session file '%s'.",
+ vdevice->capturefile, sessionfile);
return SR_ERR;
}
/* freewheeling source */
- session_source_add(-1, 0, 0, feed_chunk, session_device_id);
+ sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id);
/* Send header packet to the session bus. */
packet = g_malloc(sizeof(struct sr_datafeed_packet));
header->protocol_id = SR_PROTO_RAW;
header->num_logic_probes = vdevice->num_probes;
header->num_analog_probes = 0;
- session_bus(session_device_id, packet);
+ sr_session_bus(session_device_id, packet);
g_free(header);
g_free(packet);
hw_get_capabilities,
hw_set_configuration,
hw_start_acquisition,
- NULL
+ NULL,
};