X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=6ba804285b5d0ff8b2815c062cb879a823baad74;hb=d11d606626a2ce9359ed2b5395fe4b998604da92;hp=7f2bf92a1ff13fc6371d2f74f229ff2865e5c389;hpb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index 7f2bf92a..6ba80428 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_vdevice { +struct session_vdev { + char *sessionfile; char *capturefile; struct zip *archive; struct zip_file *capfile; @@ -39,52 +40,17 @@ struct session_vdevice { int num_probes; }; -static char *sessionfile = NULL; static GSList *dev_insts = NULL; -static int capabilities[] = { +static const int hwcaps[] = { SR_HWCAP_CAPTUREFILE, SR_HWCAP_CAPTURE_UNITSIZE, 0, }; -/** - * TODO. - * - * @param device_index TODO. - */ -static struct session_vdevice *get_vdevice_by_index(int device_index) -{ - struct sr_dev_inst *sdi; - struct session_vdevice *vdevice; - - /* TODO: Sanity checks on device_index. */ - - if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { - sr_err("session driver: %s: device instance with device " - "index %d was not found", __func__, device_index); - return NULL; - } - - /* TODO: Is sdi->priv == NULL valid? */ - - vdevice = sdi->priv; - - return vdevice; -} - -/** - * TODO. - * - * @param fd TODO. - * @param revents TODO. - * @param session_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_vdevice *vdevice; + struct session_vdev *vdev; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; GSList *l; @@ -100,39 +66,39 @@ static int feed_chunk(int fd, int revents, void *session_data) got_data = FALSE; for (l = dev_insts; l; l = l->next) { sdi = l->data; - vdevice = sdi->priv; - if (!vdevice) + vdev = sdi->priv; + if (!vdev) /* already done with this instance */ continue; if (!(buf = g_try_malloc(CHUNKSIZE))) { - sr_err("session driver: %s: buf malloc failed", - __func__); - return FALSE; /* TODO: SR_ERR_MALLOC */ + sr_err("session driver: %s: buf malloc failed", __func__); + return FALSE; } - ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE); + ret = zip_fread(vdev->capfile, buf, CHUNKSIZE); if (ret > 0) { got_data = TRUE; packet.type = SR_DF_LOGIC; packet.payload = &logic; logic.length = ret; - logic.unitsize = vdevice->unitsize; + logic.unitsize = vdev->unitsize; logic.data = buf; - vdevice->bytes_read += ret; - sr_session_bus(session_data, &packet); + vdev->bytes_read += ret; + sr_session_send(cb_data, &packet); } else { /* done with this capture file */ - zip_fclose(vdevice->capfile); - g_free(vdevice->capturefile); - g_free(vdevice); + zip_fclose(vdev->capfile); + g_free(vdev->capturefile); + g_free(vdev); sdi->priv = NULL; } } if (!got_data) { packet.type = SR_DF_END; - sr_session_bus(session_data, &packet); + sr_session_send(cb_data, &packet); + sr_session_source_remove(-1); } return TRUE; @@ -141,24 +107,12 @@ static int feed_chunk(int fd, int revents, void *session_data) /* driver callbacks */ static int hw_cleanup(void); -/** - * TODO. - * - * @param deviceinfo TODO. - * - * @return TODO. - */ -static int hw_init(const char *deviceinfo) +static int hw_init(void) { - sessionfile = g_strdup(deviceinfo); - return 0; + return SR_OK; } -/** - * TODO. - * - */ static int hw_cleanup(void) { GSList *l; @@ -168,23 +122,13 @@ static int hw_cleanup(void) g_slist_free(dev_insts); dev_insts = NULL; - sr_session_source_remove(-1); - - g_free(sessionfile); - return SR_OK; } -static int hw_opendev(int device_index) +static int hw_dev_open(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - - sdi = sr_dev_inst_new(device_index, SR_ST_INITIALIZING, - NULL, NULL, NULL); - if (!sdi) - return SR_ERR; - if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdevice)))) { + if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdev)))) { sr_err("session driver: %s: sdi->priv malloc failed", __func__); return SR_ERR_MALLOC; } @@ -194,119 +138,106 @@ static int hw_opendev(int device_index) return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static int hw_info_get(int info_id, const void **data, + const struct sr_dev_inst *sdi) { - struct session_vdevice *vdevice; - void *info; + struct session_vdev *vdev; - if (device_info_id != SR_DI_CUR_SAMPLERATE) - return NULL; - - if (!(vdevice = get_vdevice_by_index(device_index))) - return NULL; - - info = &vdevice->samplerate; - - return info; -} - -static int hw_get_status(int device_index) -{ - /* Avoid compiler warnings. */ - (void)device_index; - - if (sr_dev_list() != NULL) - return SR_OK; - else - return SR_ERR; -} + switch (info_id) { + case SR_DI_HWCAPS: + *data = hwcaps; + break; + case SR_DI_CUR_SAMPLERATE: + if (sdi) { + vdev = sdi->priv; + *data = &vdev->samplerate; + } else + return SR_ERR; + break; + default: + return SR_ERR_ARG; + } -/** - * Get the list of hardware capabilities. - * - * @return A pointer to the (hardware) capabilities of this virtual session - * driver. This could be NULL, if no such capabilities exist. - */ -static int *hw_get_capabilities(void) -{ - return capabilities; + return SR_OK; } -static int hw_set_configuration(int device_index, int capability, void *value) +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const void *value) { - struct session_vdevice *vdevice; - uint64_t *tmp_u64; + struct session_vdev *vdev; + const uint64_t *tmp_u64; - if (!(vdevice = get_vdevice_by_index(device_index))) - return SR_ERR; + vdev = sdi->priv; - switch (capability) { + switch (hwcap) { case SR_HWCAP_SAMPLERATE: tmp_u64 = value; - vdevice->samplerate = *tmp_u64; + vdev->samplerate = *tmp_u64; sr_info("session driver: setting samplerate to %" PRIu64, - vdevice->samplerate); + 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: - vdevice->capturefile = g_strdup(value); + vdev->capturefile = g_strdup(value); sr_info("session driver: setting capturefile to %s", - vdevice->capturefile); + vdev->capturefile); break; case SR_HWCAP_CAPTURE_UNITSIZE: tmp_u64 = value; - vdevice->unitsize = *tmp_u64; + vdev->unitsize = *tmp_u64; break; case SR_HWCAP_CAPTURE_NUM_PROBES: tmp_u64 = value; - vdevice->num_probes = *tmp_u64; + vdev->num_probes = *tmp_u64; break; default: sr_err("session driver: %s: unknown capability %d requested", - __func__, capability); + __func__, hwcap); return SR_ERR; } return SR_OK; } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) { struct zip_stat zs; - struct session_vdevice *vdevice; + struct session_vdev *vdev; struct sr_datafeed_header *header; struct sr_datafeed_packet *packet; - int err; - - /* Avoid compiler warnings. */ - (void)session_device_id; + struct sr_datafeed_meta_logic meta; + int ret; - if (!(vdevice = get_vdevice_by_index(device_index))) - return SR_ERR; + vdev = sdi->priv; - sr_info("session_driver: opening archive %s file %s", sessionfile, - vdevice->capturefile); + sr_info("session_driver: opening archive %s file %s", vdev->sessionfile, + vdev->capturefile); - if (!(vdevice->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(vdevice->archive, vdevice->capturefile, 0, &zs) == -1) { + if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) == -1) { sr_err("session driver: Failed to check capture file '%s' in " - "session file '%s'.", vdevice->capturefile, sessionfile); + "session file '%s'.", vdev->capturefile, vdev->sessionfile); return SR_ERR; } - if (!(vdevice->capfile = zip_fopen(vdevice->archive, - vdevice->capturefile, 0))) { + if (!(vdev->capfile = zip_fopen(vdev->archive, vdev->capturefile, 0))) { sr_err("session driver: Failed to open capture file '%s' in " - "session file '%s'.", vdevice->capturefile, sessionfile); + "session file '%s'.", vdev->capturefile, vdev->sessionfile); return SR_ERR; } /* freewheeling source */ - sr_session_source_add(-1, 0, 0, feed_chunk, session_device_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__); @@ -323,27 +254,31 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) packet->payload = (unsigned char *)header; header->feed_version = 1; gettimeofday(&header->starttime, NULL); - header->samplerate = vdevice->samplerate; - header->num_logic_probes = vdevice->num_probes; - sr_session_bus(session_device_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); return SR_OK; } -SR_PRIV struct sr_device_plugin session_driver = { - "session", - "Session-emulating driver", - 1, - hw_init, - hw_cleanup, - hw_opendev, - NULL, - hw_get_device_info, - hw_get_status, - hw_get_capabilities, - hw_set_configuration, - hw_start_acquisition, - NULL, +SR_PRIV struct sr_dev_driver session_driver = { + .name = "session", + .longname = "Session-emulating driver", + .api_version = 1, + .init = hw_init, + .cleanup = hw_cleanup, + .dev_open = hw_dev_open, + .dev_close = NULL, + .info_get = hw_info_get, + .dev_config_set = hw_dev_config_set, + .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_stop = NULL, };