#include <unistd.h>
#include <sys/time.h>
#include <zip.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
/* size of payloads sent across the session bus */
#define CHUNKSIZE (512 * 1024)
struct session_vdev {
+ char *sessionfile;
char *capturefile;
struct zip *archive;
struct zip_file *capfile;
int num_probes;
};
-static char *sessionfile = NULL;
static GSList *dev_insts = NULL;
-static int hwcaps[] = {
+static const int hwcaps[] = {
SR_HWCAP_CAPTUREFILE,
SR_HWCAP_CAPTURE_UNITSIZE,
0,
*
* @return TODO.
*/
-static int hw_init(const char *devinfo)
+static int hw_init(void)
{
- sessionfile = g_strdup(devinfo);
- return 0;
+ return SR_OK;
}
/**
sr_session_source_remove(-1);
- g_free(sessionfile);
-
return SR_OK;
}
return SR_OK;
}
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{
struct session_vdev *vdev;
void *info;
* @return A pointer to the (hardware) capabilities of this virtual session
* driver. This could be NULL, if no such capabilities exist.
*/
-static int *hw_hwcap_get_all(void)
+static const int *hw_hwcap_get_all(void)
{
return hwcaps;
}
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
{
struct session_vdev *vdev;
- uint64_t *tmp_u64;
+ const uint64_t *tmp_u64;
if (!(vdev = get_vdev_by_index(dev_index)))
return SR_ERR;
sr_info("session driver: setting samplerate to %" PRIu64,
vdev->samplerate);
break;
+ case SR_HWCAP_SESSIONFILE:
+ vdev->sessionfile = g_strdup(value);
+ sr_info("session driver: setting sessionfile to %s",
+ vdev->sessionfile);
+ break;
case SR_HWCAP_CAPTUREFILE:
vdev->capturefile = g_strdup(value);
sr_info("session driver: setting capturefile to %s",
struct session_vdev *vdev;
struct sr_datafeed_header *header;
struct sr_datafeed_packet *packet;
+ struct sr_datafeed_meta_logic meta;
int ret;
if (!(vdev = get_vdev_by_index(dev_index)))
return SR_ERR;
- sr_info("session_driver: opening archive %s file %s", sessionfile,
+ sr_info("session_driver: opening archive %s file %s", vdev->sessionfile,
vdev->capturefile);
- if (!(vdev->archive = zip_open(sessionfile, 0, &ret))) {
+ if (!(vdev->archive = zip_open(vdev->sessionfile, 0, &ret))) {
sr_err("session driver: Failed to open session file '%s': "
- "zip error %d\n", sessionfile, ret);
+ "zip error %d\n", vdev->sessionfile, ret);
return SR_ERR;
}
if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) == -1) {
sr_err("session driver: Failed to check capture file '%s' in "
- "session file '%s'.", vdev->capturefile, sessionfile);
+ "session file '%s'.", vdev->capturefile, vdev->sessionfile);
return SR_ERR;
}
if (!(vdev->capfile = zip_fopen(vdev->archive, vdev->capturefile, 0))) {
sr_err("session driver: Failed to open capture file '%s' in "
- "session file '%s'.", vdev->capturefile, sessionfile);
+ "session file '%s'.", vdev->capturefile, vdev->sessionfile);
return SR_ERR;
}
packet->payload = (unsigned char *)header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
- header->samplerate = vdev->samplerate;
- header->num_logic_probes = vdev->num_probes;
sr_session_send(cb_data, packet);
+
+ /* Send metadata about the SR_DF_LOGIC packets to come. */
+ packet->type = SR_DF_META_LOGIC;
+ packet->payload = &meta;
+ meta.samplerate = vdev->samplerate;
+ meta.num_probes = vdev->num_probes;
+ sr_session_send(cb_data, packet);
+
g_free(header);
g_free(packet);