sdbfs/userspace: added sdb-read and made minor fixes to gensdbfs

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

sdbfs/userspace/.gitignore

-gensdbfs
+gensdbfs
\ No newline at end of file
+sdb-read

sdbfs/userspace/Makefile

@@ -9,10 +9,18 @@ STRIP           = $(CROSS_COMPILE)strip
 OBJCOPY         = $(CROSS_COMPILE)objcopy
 OBJDUMP         = $(CROSS_COMPILE)objdump
 
-CFLAGS = -I../lib -I../include -Wall -ggdb
+CFLAGS = -Wall -ggdb
+CFLAGS += -I../lib -I../include -I../include/linux
 LDFLAGS = -L../lib -lsdbfs
 
-all: gensdbfs
+PROG = gensdbfs sdb-read
 
-%: %.o
-	$(CC) -o $@ $^ $(LDFLAGS)
+all: $(PROG)
+
\ No newline at end of file
+%: %.c
+	$(CC) $(CFLAGS) -o $@ $*.c $(LDFLAGS)
+
+$(PROG): ../lib/libsdbfs.a
+
+clean:
+	rm -f $(PROG) *.o *~ core

sdbfs/userspace/gensdbfs.c

@@ -19,7 +19,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
-#include <linux/sdb.h>
+
+#include <sdb.h>
 #include "gensdbfs.h"
 
 /*
@@ -95,7 +96,6 @@ static int __fill_file(struct sdbf *f, char *dir, char *fname)
 	if (f->stbuf.st_mode & S_IROTH) flags |= SDB_DATA_READ;
 	if (f->stbuf.st_mode & S_IWOTH) flags |= SDB_DATA_WRITE;
 	if (f->stbuf.st_mode & S_IXOTH) flags |= SDB_DATA_EXEC;
-	printf("%s: was %x is %x\n", f->fullname, d->bus_specific, flags);
 	d->bus_specific = htonl(flags);
 	/* c->addr_first/last to be filled later */
 	p->vendor_id = htonll(0x46696c6544617461LL); /* "FileData" */

sdbfs/userspace/sdb-read.c

+/*
+ * Copyright (C) 2012 CERN (www.cern.ch)
+ * Author: Alessandro Rubini <rubini@gnudd.com>
+ *
+ * Released according to the GNU GPL, version 2 or any later version.
+ *
+ * This work is part of the White Rabbit project, a research effort led
+ * by CERN, the European Institute for Nuclear Research.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <getopt.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "libsdbfs.h"
+
+char *prgname;
+
+int opt_long, opt_verbose, opt_read, opt_entry;
+
+/*
+ * This read method is not really needed, but it's there
+ * to exercise the library procedures
+ */
+static int do_read(struct sdbfs *fs, int offset, void *buf, int count)
+{
+	if (opt_verbose)
+		fprintf(stderr, "%s @ 0x%08x - size 0x%x (%i)\n", __func__,
+			offset, count, count);
+	memcpy(buf, fs->drvdata + offset, count);
+	return count;
+}
+
+/* Boring ascii representation of a device */
+static void list_device(struct sdb_device *d)
+{
+	struct sdb_product *p;
+	struct sdb_component *c;
+	c = &d->sdb_component;
+	p = &c->product;
+	static int warned;
+
+	if (!opt_long) {
+		printf("%.19s\n", p->name);
+		return;
+	}
+
+	if (!warned) {
+		fprintf(stderr, "%s: listing format is to be defined\n",
+			prgname);
+		warned = 1;
+	}
+
+	printf("%016llx:%08x @ %08llx-%08llx %.19s\n",
+	       ntohll(p->vendor_id), ntohl(p->device_id),
+	       ntohll(c->addr_first), ntohll(c->addr_last),
+	       p->name);
+}
+
+/* The following three function perform the real work, main() is just glue */
+static void do_list(struct sdbfs *fs)
+{
+	struct sdb_device *d;
+	int new = 1;
+
+	while ( (d = sdbfs_scan(fs, new)) != NULL) {
+		list_device(d);
+		new = 0;
+	}
+}
+
+static void do_cat_name(struct sdbfs *fs, char *name)
+{
+	char buf[4096];
+	int i;
+
+	i = sdbfs_open_name(fs, name);
+	if (i < 0) {
+		fprintf(stderr, "%s: %s: %s\n", prgname, name, strerror(-i));
+		exit(1);
+	}
+	while ( (i = sdbfs_fread(fs, -1, buf, sizeof(buf))) > 0)
+		fwrite(buf, 1, i, stdout);
+	sdbfs_close(fs);
+}
+
+static void do_cat_id(struct sdbfs *fs, uint64_t vendor, uint32_t dev)
+{
+	char buf[4096];
+	int i;
+
+	i = sdbfs_open_id(fs, htonll(vendor), htonl(dev));
+	if (i < 0) {
+		fprintf(stderr, "%s: %016llx-%08x: %s\n", prgname, vendor,
+			dev, strerror(-i));
+		exit(1);
+	}
+	while ( (i = sdbfs_fread(fs, -1, buf, sizeof(buf))) > 0)
+		fwrite(buf, 1, i, stdout);
+	sdbfs_close(fs);
+}
+
+/* As promised, here's the user-interface glue (and initialization, I admit) */
+int main(int argc, char **argv)
+{
+	int c, err;
+	FILE *f;
+	struct sdbfs _fs;
+	struct sdbfs *fs = &_fs; /* I like to type "fs->" */
+	struct stat stbuf;
+	void *mapaddr;
+	char *fsname;
+	char *filearg = NULL;
+	unsigned long int32;
+	unsigned long long int64;
+	int pagesize = getpagesize();
+
+	prgname = argv[0];
+
+	while ( (c = getopt(argc, argv, "lvre:")) != -1) {
+		switch (c) {
+		case 'l':
+			opt_long = 1;
+			break;
+		case 'v':
+			opt_verbose = 1;
+			break;
+		case 'r':
+			opt_read = 1;
+			break;
+		case 'e':
+			if (sscanf(optarg, "%i", &opt_entry) != 1) {
+				fprintf(stderr, "%s: not a number \"%s\"\n",
+					prgname, optarg);
+				exit(1);
+			}
+			break;
+		}
+	}
+	if (optind < argc - 2 || optind > argc - 1) {
+		fprintf(stderr, "%s: Use: \"%s [-l|-v] <image-file> [<file>]\n",
+			prgname, prgname);
+		exit(1);
+	}
+	fsname = argv[optind];
+	if (optind + 1 < argc)
+		filearg = argv[optind + 1];
+	if ( !(f = fopen(fsname, "r")) || fstat(fileno(f), &stbuf) < 0) {
+		fprintf(stderr, "%s: %s: %s\n", prgname, fsname,
+			strerror(errno));
+		exit(1);
+	}
+
+	stbuf.st_size += pagesize - 1;
+	stbuf.st_size &= ~(pagesize - 1);
+	mapaddr = mmap(0, stbuf.st_size, PROT_READ, MAP_PRIVATE, fileno(f), 0);
+	if (mapaddr == MAP_FAILED) {
+		fprintf(stderr, "%s: mmap(%s): %s\n", prgname, fsname,
+			strerror(errno));
+		exit(1);
+	}
+
+	/* So, describe the filesystem instance and give it to the library */
+	memset(fs, 0, sizeof(*fs));
+
+	fs->name = fsname; /* not mandatory */
+	fs->blocksize = 256; /* only used for writing, actually */
+	fs->entrypoint = opt_entry;
+	if (opt_read) {
+		fs->drvdata = mapaddr;
+		fs->read = do_read;
+	} else {
+		fs->data = mapaddr;
+	}
+
+	err = sdbfs_dev_create(fs, opt_verbose);
+	if (err) {
+		fprintf(stderr, "%s: sdbfs_dev_create(): %s\n", prgname,
+			strerror(-err));
+		fprintf(stderr, "\t(wrong entry point 0x%08lx?)\n",
+			fs->entrypoint);
+		exit(1);
+	}
+	/* Now use the thing: either scan, or look for name, or look for id */
+	if (!filearg)
+		do_list(fs);
+	else if (sscanf(filearg, "%llx:%lx", &int64, &int32) != 2)
+		do_cat_name(fs, filearg);
+	else
+		do_cat_id(fs, int64, int32);
+
+	sdbfs_dev_destroy(fs);
+	return 0;
+}