X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=7ca8d353a4955de1b30bc5a209a651e918f651cb;hb=b2ff95063a845ec7130d97fc3d8e9c65fe45f902;hp=9ad4fb8ab8678f8a7760f52ff89ddabdd13326eb;hpb=b53738baf76219237e0a6629905981d7a1f2508e;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index 9ad4fb8a..7ca8d353 100644 --- a/session_driver.c +++ b/session_driver.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,16 +23,17 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" /* size of payloads sent across the session bus */ -#define CHUNKSIZE 4096 +#define CHUNKSIZE (512 * 1024) struct session_vdevice { char *capturefile; struct zip *archive; struct zip_file *capfile; + int bytes_read; uint64_t samplerate; int unitsize; int num_probes; @@ -46,32 +47,53 @@ static int capabilities[] = { 0, }; - +/** + * TODO. + * + * @param device_index TODO. + */ static struct session_vdevice *get_vdevice_by_index(int device_index) { struct sr_device_instance *sdi; struct session_vdevice *vdevice; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + /* TODO: Sanity checks on device_index. */ + + if (!(sdi = sr_get_device_instance(device_instances, 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; } -static int feed_chunk(int fd, int revents, void *user_data) +/** + * TODO. + * + * @param fd TODO. + * @param revents TODO. + * @param session_data TODO. + * + * @return TODO. + */ +static int feed_chunk(int fd, int revents, void *session_data) { struct sr_device_instance *sdi; struct session_vdevice *vdevice; struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; GSList *l; void *buf; int ret, got_data; - /* avoid compiler warning */ - fd = fd; - revents = revents; + /* Avoid compiler warnings. */ + (void)fd; + (void)revents; sr_dbg("session_driver: feed chunk"); @@ -85,18 +107,19 @@ static int feed_chunk(int fd, int revents, void *user_data) if (!(buf = g_try_malloc(CHUNKSIZE))) { sr_err("session: %s: buf malloc failed", __func__); - // return SR_ERR_MALLOC; - return FALSE; + return FALSE; /* TODO: SR_ERR_MALLOC */ } ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE); if (ret > 0) { got_data = TRUE; packet.type = SR_DF_LOGIC; - packet.length = ret; - packet.unitsize = vdevice->unitsize; - packet.payload = buf; - sr_session_bus(user_data, &packet); + packet.payload = &logic; + logic.length = ret; + logic.unitsize = vdevice->unitsize; + logic.data = buf; + vdevice->bytes_read += ret; + sr_session_bus(session_data, &packet); } else { /* done with this capture file */ zip_fclose(vdevice->capfile); @@ -108,15 +131,22 @@ static int feed_chunk(int fd, int revents, void *user_data) if (!got_data) { packet.type = SR_DF_END; - packet.length = 0; - sr_session_bus(user_data, &packet); + sr_session_bus(session_data, &packet); } return TRUE; } /* driver callbacks */ +static void hw_cleanup(void); +/** + * TODO. + * + * @param deviceinfo TODO. + * + * @return TODO. + */ static int hw_init(const char *deviceinfo) { @@ -125,6 +155,10 @@ static int hw_init(const char *deviceinfo) return 0; } +/** + * TODO. + * + */ static void hw_cleanup(void) { GSList *l; @@ -132,8 +166,12 @@ static void hw_cleanup(void) for (l = device_instances; l; l = l->next) sr_device_instance_free(l->data); - g_free(sessionfile); + g_slist_free(device_instances); + device_instances = NULL; + + sr_session_source_remove(-1); + g_free(sessionfile); } static int hw_opendev(int device_index) @@ -173,19 +211,23 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { + /* Avoid compiler warnings. */ + (void)device_index; - /* avoid compiler warning */ - device_index = device_index; - - if (devices) + if (sr_device_list() != NULL) return SR_OK; else return SR_ERR; } +/** + * 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; } @@ -201,9 +243,13 @@ static int hw_set_configuration(int device_index, int capability, void *value) case SR_HWCAP_SAMPLERATE: tmp_u64 = value; vdevice->samplerate = *tmp_u64; + sr_info("session driver: setting samplerate to %" PRIu64, + vdevice->samplerate); break; case SR_HWCAP_CAPTUREFILE: vdevice->capturefile = g_strdup(value); + sr_info("session driver: setting capturefile to %s", + vdevice->capturefile); break; case SR_HWCAP_CAPTURE_UNITSIZE: tmp_u64 = value; @@ -214,6 +260,8 @@ static int hw_set_configuration(int device_index, int capability, void *value) vdevice->num_probes = *tmp_u64; break; default: + sr_err("session driver: %s: unknown capability %d requested", + __func__, capability); return SR_ERR; } @@ -228,8 +276,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) struct sr_datafeed_packet *packet; int err; - /* avoid compiler warning */ - session_device_id = session_device_id; + /* Avoid compiler warnings. */ + (void)session_device_id; if (!(vdevice = get_vdevice_by_index(device_index))) return SR_ERR; @@ -238,20 +286,21 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) vdevice->capturefile); if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) { - sr_warn("Failed to open session file '%s': zip error %d\n", - sessionfile, err); + sr_err("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) { - sr_warn("Failed to check capture file '%s' in session file '%s'.", - vdevice->capturefile, sessionfile); + sr_err("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))) { - sr_warn("Failed to open capture file '%s' in session file '%s'.", - vdevice->capturefile, sessionfile); + if (!(vdevice->capfile = zip_fopen(vdevice->archive, + vdevice->capturefile, 0))) { + sr_err("Failed to open capture file '%s' in session file '%s'.", + vdevice->capturefile, sessionfile); return SR_ERR; } @@ -270,14 +319,11 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) /* Send header packet to the session bus. */ packet->type = SR_DF_HEADER; - packet->length = sizeof(struct sr_datafeed_header); packet->payload = (unsigned char *)header; header->feed_version = 1; gettimeofday(&header->starttime, NULL); - header->samplerate = 0; - header->protocol_id = SR_PROTO_RAW; + header->samplerate = vdevice->samplerate; header->num_logic_probes = vdevice->num_probes; - header->num_analog_probes = 0; sr_session_bus(session_device_id, packet); g_free(header); g_free(packet); @@ -285,6 +331,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) return SR_OK; } +/* Not static, it's used elsewhere (via 'extern'). */ struct sr_device_plugin session_driver = { "session", "Session-emulating driver",