X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=01870c01735993ea0a78bd7edb21d5f04ba88997;hb=44dae539254e324e0330e194f9c775be3d761503;hp=27e8cdc92ba9534203c28fbc79d7aa6aa585fdd4;hpb=9f45fb3aea9aa628ec2323bac8f2c354f5f3983c;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index 27e8cdc9..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 @@ -27,7 +27,7 @@ #include "sigrok-internal.h" /* size of payloads sent across the session bus */ -#define CHUNKSIZE 4096 +#define CHUNKSIZE (512 * 1024) struct session_vdevice { char *capturefile; @@ -59,7 +59,7 @@ static struct session_vdevice *get_vdevice_by_index(int device_index) /* TODO: Sanity checks on device_index. */ - if (!(sdi = sr_get_device_instance(device_instances, 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; @@ -87,7 +87,6 @@ static int feed_chunk(int fd, int revents, void *session_data) struct session_vdevice *vdevice; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - uint64_t sample_period_ps; GSList *l; void *buf; int ret, got_data; @@ -107,18 +106,15 @@ 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; - sample_period_ps = 1000000000000 / vdevice->samplerate; - packet.timeoffset = sample_period_ps * (vdevice->bytes_read / vdevice->unitsize); - packet.duration = sample_period_ps * (ret / vdevice->unitsize); packet.payload = &logic; logic.length = ret; logic.unitsize = vdevice->unitsize; @@ -143,7 +139,7 @@ static int feed_chunk(int fd, int revents, void *session_data) } /* driver callbacks */ -static void hw_cleanup(void); +static int hw_cleanup(void); /** * TODO. @@ -154,8 +150,6 @@ static void hw_cleanup(void); */ static int hw_init(const char *deviceinfo) { - hw_cleanup(); - sessionfile = g_strdup(deviceinfo); return 0; @@ -165,32 +159,33 @@ static int hw_init(const char *deviceinfo) * TODO. * */ -static void hw_cleanup(void) +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; sr_session_source_remove(-1); 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; } @@ -220,7 +215,7 @@ static int hw_get_status(int device_index) /* Avoid compiler warnings. */ (void)device_index; - if (sr_device_list() != NULL) + if (sr_dev_list() != NULL) return SR_OK; else return SR_ERR; @@ -292,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; } @@ -313,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; } @@ -329,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); @@ -337,8 +332,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 = { +SR_PRIV struct sr_device_plugin session_driver = { "session", "Session-emulating driver", 1,