X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=0b8c1ed26cc2833b646708a6ba55c68cfb2e0903;hb=2efc5948b6c2c436e339e333994ec7cc96db62be;hp=9175a1cb3d21462322c6b2a246c853055f3cfd2e;hpb=0abee5076fd7751bd77d0fee940d617a1a40ea34;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index 9175a1cb..0b8c1ed2 100644 --- a/session_driver.c +++ b/session_driver.c @@ -23,13 +23,14 @@ #include #include #include -#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; @@ -39,9 +40,8 @@ struct session_vdev { 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, @@ -77,11 +77,11 @@ static struct session_vdev *get_vdev_by_index(int dev_index) * * @param fd TODO. * @param revents TODO. - * @param session_data TODO. + * @param cb_data TODO. * * @return TODO. */ -static int feed_chunk(int fd, int revents, void *session_data) +static int receive_data(int fd, int revents, void *cb_data) { struct sr_dev_inst *sdi; struct session_vdev *vdev; @@ -120,7 +120,7 @@ static int feed_chunk(int fd, int revents, void *session_data) logic.unitsize = vdev->unitsize; logic.data = buf; vdev->bytes_read += ret; - sr_session_send(session_data, &packet); + sr_session_send(cb_data, &packet); } else { /* done with this capture file */ zip_fclose(vdev->capfile); @@ -132,7 +132,7 @@ static int feed_chunk(int fd, int revents, void *session_data) if (!got_data) { packet.type = SR_DF_END; - sr_session_send(session_data, &packet); + sr_session_send(cb_data, &packet); } return TRUE; @@ -148,11 +148,10 @@ static int hw_cleanup(void); * * @return TODO. */ -static int hw_init(const char *devinfo) +static int hw_init(void) { - sessionfile = g_strdup(devinfo); - return 0; + return SR_OK; } /** @@ -169,8 +168,6 @@ static int hw_cleanup(void) sr_session_source_remove(-1); - g_free(sessionfile); - return SR_OK; } @@ -193,7 +190,7 @@ static int hw_dev_open(int dev_index) 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; @@ -226,15 +223,15 @@ static int hw_dev_status_get(int dev_index) * @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; @@ -246,6 +243,11 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) 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", @@ -268,43 +270,41 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) return SR_OK; } -static int hw_dev_acquisition_start(int dev_index, void *session_dev_id) +static int hw_dev_acquisition_start(int dev_index, void *cb_data) { struct zip_stat zs; struct session_vdev *vdev; struct sr_datafeed_header *header; struct sr_datafeed_packet *packet; - int err; - - /* Avoid compiler warnings. */ - (void)session_dev_id; + 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, &err))) { + if (!(vdev->archive = zip_open(vdev->sessionfile, 0, &ret))) { sr_err("session driver: Failed to open session file '%s': " - "zip error %d\n", sessionfile, err); + "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; } /* freewheeling source */ - sr_session_source_add(-1, 0, 0, feed_chunk, session_dev_id); + sr_session_source_add(-1, 0, 0, receive_data, cb_data); if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { sr_err("session driver: %s: packet malloc failed", __func__); @@ -321,9 +321,15 @@ static int hw_dev_acquisition_start(int dev_index, void *session_dev_id) 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(session_dev_id, packet); + 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);