X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=01870c01735993ea0a78bd7edb21d5f04ba88997;hb=44dae539254e324e0330e194f9c775be3d761503;hp=fd5b11fc55cab186aa6e6d3ccd034811e2e4c965;hpb=276585ff209d02ea058f09820881ed536e48e3bb;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index fd5b11fc..01870c01 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) 2010-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,20 +47,40 @@ 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_dev_inst_get(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; } +/** + * 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; @@ -85,21 +106,20 @@ static int feed_chunk(int fd, int revents, void *session_data) continue; if (!(buf = g_try_malloc(CHUNKSIZE))) { - sr_err("session: %s: buf malloc failed", __func__); - // return SR_ERR_MALLOC; - return FALSE; + sr_err("session driver: %s: buf malloc failed", + __func__); + 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.timeoffset = 0; - packet.duration = 0; 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 */ @@ -119,24 +139,32 @@ static int feed_chunk(int fd, int revents, void *session_data) } /* driver callbacks */ -static void hw_cleanup(void); +static int hw_cleanup(void); +/** + * TODO. + * + * @param deviceinfo TODO. + * + * @return TODO. + */ static int hw_init(const char *deviceinfo) { - hw_cleanup(); - sessionfile = g_strdup(deviceinfo); return 0; } -static void hw_cleanup(void) +/** + * TODO. + * + */ +static int hw_cleanup(void) { GSList *l; for (l = device_instances; l; l = l->next) - sr_device_instance_free(l->data); - + sr_dev_inst_free(l->data); g_slist_free(device_instances); device_instances = NULL; @@ -144,19 +172,20 @@ static void hw_cleanup(void) g_free(sessionfile); + return SR_OK; } static int hw_opendev(int device_index) { struct sr_device_instance *sdi; - sdi = sr_device_instance_new(device_index, SR_ST_INITIALIZING, - NULL, NULL, NULL); + 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)))) { - sr_err("session: %s: sdi->priv malloc failed", __func__); + sr_err("session driver: %s: sdi->priv malloc failed", __func__); return SR_ERR_MALLOC; } @@ -186,15 +215,20 @@ static int hw_get_status(int device_index) /* Avoid compiler warnings. */ (void)device_index; - if (devices) + if (sr_dev_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; } @@ -210,9 +244,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; @@ -223,6 +261,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; } @@ -247,20 +287,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("session driver: 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("session driver: 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("session driver: Failed to open capture file '%s' in " + "session file '%s'.", vdevice->capturefile, sessionfile); return SR_ERR; } @@ -268,12 +309,12 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id); if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("session: %s: packet malloc failed", __func__); + sr_err("session driver: %s: packet malloc failed", __func__); return SR_ERR_MALLOC; } if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("session: %s: header malloc failed", __func__); + sr_err("session driver: %s: header malloc failed", __func__); return SR_ERR_MALLOC; } @@ -284,7 +325,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) gettimeofday(&header->starttime, NULL); 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); @@ -292,7 +332,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) return SR_OK; } -struct sr_device_plugin session_driver = { +SR_PRIV struct sr_device_plugin session_driver = { "session", "Session-emulating driver", 1,