#include <config.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
+#include <glib.h>
+#include <glib/gstdio.h>
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
extern SR_PRIV struct sr_input_module input_chronovu_la8;
extern SR_PRIV struct sr_input_module input_csv;
extern SR_PRIV struct sr_input_module input_binary;
+extern SR_PRIV struct sr_input_module input_trace32_ad;
extern SR_PRIV struct sr_input_module input_vcd;
extern SR_PRIV struct sr_input_module input_wav;
+extern SR_PRIV struct sr_input_module input_raw_analog;
+extern SR_PRIV struct sr_input_module input_logicport;
+extern SR_PRIV struct sr_input_module input_null;
/* @endcond */
static const struct sr_input_module *input_module_list[] = {
&input_binary,
&input_chronovu_la8,
&input_csv,
+ &input_trace32_ad,
&input_vcd,
&input_wav,
+ &input_raw_analog,
+ &input_logicport,
+ &input_null,
NULL,
};
GHashTable *options)
{
struct sr_input *in;
- struct sr_option *mod_opts;
+ const struct sr_option *mod_opts;
const GVariantType *gvt;
GHashTable *new_opts;
GHashTableIter iter;
*/
SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
{
+ int64_t filesize;
+ FILE *stream;
const struct sr_input_module *imod;
GHashTable *meta;
- GString *header_buf;
- struct stat st;
- unsigned int midx, m, i;
- int fd, ret;
- ssize_t size;
- uint8_t mitem, avail_metadata[8];
+ GString *header;
+ size_t count;
+ unsigned int midx, i;
+ int ret;
+ uint8_t avail_metadata[8];
+
+ *in = NULL;
if (!filename || !filename[0]) {
sr_err("Invalid filename.");
return SR_ERR_ARG;
}
-
- if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
- sr_err("No such file.");
- return SR_ERR_ARG;
+ stream = g_fopen(filename, "rb");
+ if (!stream) {
+ sr_err("Failed to open %s: %s", filename, g_strerror(errno));
+ return SR_ERR;
}
-
- if (stat(filename, &st) < 0) {
- sr_err("%s", g_strerror(errno));
- return SR_ERR_ARG;
+ filesize = sr_file_get_size(stream);
+ if (filesize < 0) {
+ sr_err("Failed to get size of %s: %s",
+ filename, g_strerror(errno));
+ fclose(stream);
+ return SR_ERR;
}
-
+ /* This actually allocates 256 bytes to allow for NUL termination. */
+ header = g_string_sized_new(255);
+ count = fread(header->str, 1, header->allocated_len - 1, stream);
+
+ if (count != header->allocated_len - 1 && ferror(stream)) {
+ sr_err("Failed to read %s: %s", filename, g_strerror(errno));
+ fclose(stream);
+ g_string_free(header, TRUE);
+ return SR_ERR;
+ }
+ fclose(stream);
+ g_string_set_size(header, count);
+
+ meta = g_hash_table_new(NULL, NULL);
+ g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_FILENAME),
+ (char *)filename);
+ g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_FILESIZE),
+ GSIZE_TO_POINTER(MIN(filesize, G_MAXSSIZE)));
+ g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_HEADER),
+ header);
midx = 0;
avail_metadata[midx++] = SR_INPUT_META_FILENAME;
avail_metadata[midx++] = SR_INPUT_META_FILESIZE;
avail_metadata[midx++] = SR_INPUT_META_HEADER;
+ avail_metadata[midx] = 0;
/* TODO: MIME type */
- *in = NULL;
ret = SR_ERR;
- header_buf = g_string_sized_new(128);
- for (i = 0; input_module_list[i]; i++) {
- g_string_truncate(header_buf, 0);
+ for (i = 0; input_module_list[i]; i++) {
imod = input_module_list[i];
if (!imod->metadata[0]) {
/* Module has no metadata for matching so will take
/* Cannot satisfy this module's requirements. */
continue;
- meta = g_hash_table_new(NULL, NULL);
- for (m = 0; m < sizeof(imod->metadata); m++) {
- mitem = imod->metadata[m] & ~SR_INPUT_META_REQUIRED;
- if (!mitem)
- /* Metadata list is 0-terminated. */
- break;
- if (mitem == SR_INPUT_META_FILENAME) {
- g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
- (gpointer)filename);
- } else if (mitem == SR_INPUT_META_FILESIZE) {
- g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
- GINT_TO_POINTER(st.st_size));
- } else if (mitem == SR_INPUT_META_HEADER) {
- if ((fd = open(filename, O_RDONLY)) < 0) {
- sr_err("%s", g_strerror(errno));
- return SR_ERR;
- }
- size = read(fd, header_buf->str, 128);
- header_buf->len = size;
- close(fd);
- if (size <= 0) {
- g_string_free(header_buf, TRUE);
- sr_err("%s", g_strerror(errno));
- return SR_ERR;
- }
- g_hash_table_insert(meta, GINT_TO_POINTER(mitem), header_buf);
- }
- }
- if (g_hash_table_size(meta) == 0) {
- /* No metadata for this module, so there's no way it
- * can match. */
- g_hash_table_destroy(meta);
- continue;
- }
- sr_spew("Trying module %s.", imod->id);
+ sr_dbg("Trying module %s.", imod->id);
+
ret = imod->format_match(meta);
- g_hash_table_destroy(meta);
- if (ret == SR_ERR_DATA) {
- /* Module recognized this buffer, but cannot handle it. */
- break;
- } else if (ret == SR_ERR) {
+ if (ret == SR_ERR) {
/* Module didn't recognize this buffer. */
continue;
} else if (ret != SR_OK) {
- /* Can be SR_ERR_NA. */
- return ret;
+ /* Module recognized this buffer, but cannot handle it. */
+ break;
}
-
/* Found a matching module. */
- sr_spew("Module %s matched.", imod->id);
+ sr_dbg("Module %s matched.", imod->id);
+
*in = sr_input_new(imod, NULL);
break;
}
- g_string_free(header_buf, TRUE);
+ g_hash_table_destroy(meta);
+ g_string_free(header, TRUE);
return ret;
}
return in->module->end((struct sr_input *)in);
}
+/**
+ * Reset the input module's input handling structures.
+ *
+ * Causes the input module to reset its internal state so that we can re-send
+ * the input data from the beginning without having to re-create the entire
+ * input module.
+ *
+ * @since 0.5.0
+ */
+SR_API int sr_input_reset(const struct sr_input *in)
+{
+ if (!in->module->reset) {
+ sr_spew("Tried to reset %s module but no reset handler found.",
+ in->module->id);
+ return SR_OK;
+ }
+
+ sr_spew("Resetting %s module.", in->module->id);
+ return in->module->reset((struct sr_input *)in);
+}
+
/**
* Free the specified input instance and all associated resources.
*
if (in->module->cleanup)
in->module->cleanup((struct sr_input *)in);
- if (in->sdi)
- sr_dev_inst_free(in->sdi);
+ sr_dev_inst_free(in->sdi);
if (in->buf->len > 64) {
/* That seems more than just some sub-unitsize leftover... */
sr_warn("Found %" G_GSIZE_FORMAT
projects / libsigrok.git / blobdiff