- added UNIX text program

- in the middle of converting and expanding the UNIX serial code over
  from the sball test program.

Author: jtsiomb

.gitignore

@@ -4,3 +4,4 @@
 libspnavdev.a
 libspnavdev.so*
 libspnavdev.dll
+test

Makefile

@@ -1,14 +1,14 @@
 PREFIX ?= /usr/local
 
-src = src/spnavdev.c
+src = src/spnavdev.c src/serdev.o src/usbdev.o
 obj = $(src:.c=.o)
 dep = $(obj:.o=.d)
 name = spnavdev
 
 so_abi = 0
 so_rev = 1
 
-CFLAGS = -pedantic -Wall -g -MMD
+CFLAGS = -pedantic -Wall -g -MMD $(pic)
 
 alib = lib$(name).a
 

examples/unix/Makefile

@@ -0,0 +1,12 @@
+obj = test.o
+bin = test
+
+CFLAGS = -pedantic -Wall -g -I../../src
+LDFLAGS = ../../libspnavdev.a
+
+$(bin): $(obj)
+	$(CC) -o $@ $(obj) $(LDFLAGS)
+
+.PHONY: clean
+clean:
+	$(RM) $(obj) $(bin)

examples/unix/test.c

@@ -0,0 +1,79 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/select.h>
+#include "spnavdev.h"
+
+#ifdef __FreeBSD__
+#define DEFDEV	"/dev/ttyu0"
+#elif defined(__sgi__)
+#define DEFDEV	"/dev/ttyd1"
+#else
+#define DEFDEV	"/dev/ttyS0"
+#endif
+
+static void sighandler(int s);
+
+static struct spndev *dev;
+static int quit;
+
+int main(int argc, char **argv)
+{
+	int fd;
+	fd_set rdset;
+	union spndev_event ev;
+	const char *s;
+
+	signal(SIGINT, sighandler);
+
+	if(!(dev = spndev_open(argv[1]))) {
+		fprintf(stderr, "Failed to open 6dof device %s\n", argv[1] ? argv[1] : "");
+		return 1;
+	}
+	fd = spndev_fd(dev);
+
+	printf("Monitoring device, ctrl-c to quit\n");
+
+	while(!quit) {
+		FD_ZERO(&rdset);
+		FD_SET(fd, &rdset);
+
+		if(select(fd + 1, &rdset, 0, 0, 0) > 0) {
+			if(FD_ISSET(fd, &rdset)) {
+				if(spndev_process(dev, &ev)) {
+					switch(ev.type) {
+					case SPNDEV_MOTION:
+						printf("motion: T[%+6d %+6d %+6d]  R[%+6d %+6d %+6d]\n",
+								ev.mot.v[0], ev.mot.v[1], ev.mot.v[2], ev.mot.v[3],
+								ev.mot.v[4], ev.mot.v[5]);
+						break;
+
+					case SPNDEV_BUTTON:
+						if((s = spndev_button_name(dev, ev.bn.num))) {
+							printf("button %d (%s) ", ev.bn.num, s);
+						} else {
+							printf("button %d ", ev.bn.num);
+						}
+						puts(ev.bn.press ? "pressed" : "released");
+						break;
+
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+	}
+
+	spndev_close(dev);
+	return 0;
+}
+
+static void sighandler(int s)
+{
+	quit = 1;
+}

src/dev.h

@@ -18,6 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef SPNAVDEV_DEVICE_H_
 #define SPNAVDEV_DEVICE_H_
 
+#include "spnavdev.h"
+
+struct axisprop {
+	char *name;
+	int minval, maxval, deadz;
+};
+
 struct spndev {
 	char *name, *path;
 	int usb_vendor, usb_product;
@@ -26,12 +33,11 @@ struct spndev {
 	void *handle;	/* Win32 handle */
 
 	int num_axes, num_buttons;
-	char **axis_name, **bn_name;
-	int *minval, *maxval;
-	int *deadz;
+	struct axisprop *aprop;
+	char **bn_name;
 	int led;
 
-	void *uptr;
+	void *uptr, *drvdata;
 
 	void (*close)(struct spndev*);
 	int (*read)(struct spndev*, union spndev_event*);
@@ -41,8 +47,8 @@ struct spndev {
 };
 
 
-struct spndev *spndev_usb_open(const char *devstr, int vend, int prod);
-struct spndev *spndev_ser_open(const char *devstr);
+int spndev_usb_open(struct spndev *dev, const char *devstr, int vend, int prod);
+int spndev_ser_open(struct spndev *dev, const char *devstr);
 
 
 #endif	/* SPNAVDEV_DEVICE_H_ */