/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* 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
/* 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;
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);
}
/* driver callbacks */
-static void hw_cleanup(void);
+static int hw_cleanup(void);
/**
* TODO.
*/
static int hw_init(const char *deviceinfo)
{
-
sessionfile = g_strdup(deviceinfo);
return 0;
* TODO.
*
*/
-static void hw_cleanup(void)
+static int hw_cleanup(void)
{
GSList *l;
+ /* TODO: Error handling. */
+
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,
+ sdi = sr_dev_inst_new(device_index, SR_ST_INITIALIZING,
NULL, NULL, NULL);
if (!sdi)
return SR_ERR;
/* Avoid compiler warnings. */
(void)device_index;
- if (sr_device_list() != NULL)
+ if (sr_dev_list() != NULL)
return SR_OK;
else
return SR_ERR;
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;
}