Changeset 20088

Timestamp:

05/01/07 21:25:11 (2 years ago)

Author:

patrick

Message:

Merges from the trunk:

r19958: Added a driver for the USB P5 Glove from Essential Reality. This

was originally submitted by Damien Touraine. I made many
modifications to the code before committing it in this form
(including adding Mac OS X support), but the basic functionality is
the same as what Damien submitted.

r19959: Bring libp5glove 0.3 onto the main branch. This is needed to

compile the new P5 Glove driver.

r19960: Added the config definition for the Essential Reality P5 Glove

driver.

r19962: The path for the libp5glove source changed between when I was

getting it incorporated and when I copied the source from its
vendor branch.

r19963: Explain the how and the what of libp5glove's vendor branch and

its use here.

r19964: Use exception handling to determine if the thread spawned

successfully. Moved debug output about the process of connecting
to the hardware from vprDBG_CONFIG_LVL to vprDBG_STATE_LVL.

r19965: If the connection to the hardware fails, do not spawn a sampling

thread.

r19967: Set the EOL style to native. No content changes.

r19970: This [config.h] is a dummy file that I have added to allow

usb_hid_libusb.c to compile without being modified relative to its
vendor branch version.

r19972: Always test for the availability of libusb-config. I think that it

is a fairly common thing to have on Linux distributions.

r19988: Explain the purpose of this file [config.h].

r20020: Fixed a typo so that we only run libusb-config when it is

available.

Files:

• juggler/branches/2.2/modules/gadgeteer/drivers/EssentialReality (copied) (copied from juggler/trunk/modules/gadgeteer/drivers/EssentialReality)
• juggler/branches/2.2/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5Glove.rc (modified) (1 prop)
• juggler/branches/2.2/modules/gadgeteer/drivers/EssentialReality/P5Glove/libp5glove/src/config.h (copied) (copied from juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/libp5glove/src/config.h) (1 diff)
• juggler/branches/2.2/modules/gadgeteer/drivers/Makefile.in (modified) (1 diff)
• juggler/branches/2.2/modules/gadgeteer/drivers/configure.ac (modified) (4 diffs)
• juggler/branches/2.2/modules/vrjuggler/data/definitions/p5_glove.jdef (copied) (copied from juggler/trunk/modules/vrjuggler/data/definitions/p5_glove.jdef) (1 prop)

juggler/branches/2.2/modules/gadgeteer/drivers/EssentialReality/P5Glove/libp5glove/src/config.h

@@ +1 @@
+/*
+ * This file exists so that usb_hid_libusb.c can be compiled without
+ * modifications relative to the libp5glvoe vendor branch. At some point,
+ * this file might also be used to set preprocessor symbols needed by
+ * usb_hid_libusb.c and/or p5glove.c, but so far, that has not been
+ * necessary.
+ */
+
+#ifndef P5GLOVE_CONFIG_H
+#define P5GLOVE_CONFIG_H
+
+
+#endif /* P5GLOVE_CONFIG_H */

juggler/branches/2.2/modules/gadgeteer/drivers/Makefile.in

@@ -136 +136 @@
-        Ascension/Wanda                 \
-        Elexol/Ether24                  \
+        EssentialReality/P5Glove        \
-        Fakespace/PinchGlove            \
-        Immersion/IBox                  \

juggler/branches/2.2/modules/gadgeteer/drivers/configure.ac

@@ -78 +78 @@
-AC_ARG_WITH(vrpn, [  --with-vrpn=<PATH>      VRPN installation],
-            _with_vrpn="$withval", _with_vrpn='no')
+
+# Build with libusb path. Then, include the P5Gove drivers ...
+# There is default path.
+AC_ARG_WITH(libusb, [  --with-libusb=<PATH>    libusb installation],
+            _with_libusb="$withval", _with_libusb='no')
-
-# Define the binary format.
@@ -465 +470 @@
-fi
-
+# -----------------------------------------------------------------------------
+# libusb
+# -----------------------------------------------------------------------------
+
+# Test for the libusb library
+if test "x${_with_libusb}" != "xno" ; then
+   AC_PATH_PROG([LIBUSB_CONFIG], [libusb-config], [no],
+                [${_with_libusb}/bin])
+else
+   AC_PATH_PROG([LIBUSB_CONFIG], [libusb-config], [no])
+fi
+
+if test "x$LIBUSB_CONFIG" != "xno" ; then
+   _gadget_save_CFLAGS="$CFLAGS"
+   _gadget_save_CPPFLAGS="$CPPFLAGS"
+   _gadget_save_LDFLAGS="$LDFLAGS"
+   _gadget_save_LIBS="$LIBS"
+
+   LIBUSB_CFLAGS=`$LIBUSB_CONFIG --cflags`
+   LIBUSB_LIBS=`$LIBUSB_CONFIG --libs`
+
+   CPPFLAGS="$LIBUSB_CFLAGS $CPPFLAGS"
+   LDFLAGS="$LIBUSB_LIBS $LDFLAGS"
+
+   gadget_have_libusb='no'
+
+   DPP_LANG_SAVE
+   DPP_LANG_C
+
+   AC_CHECK_LIB(usb, usb_init,
+                [AC_CHECK_HEADER([usb.h], [gadget_have_libusb='yes'],
+                                 [gadget_have_libusb='no'])],
+                [gadget_have_libusb='no'])
+
+   DPP_LANG_RESTORE
+
+   if test "x$gadget_have_libusb" = "xyes" ; then
+      HAVE_LIBUSB='Y'
+   else
+      HAVE_LIBUSB='N'
+      AC_MSG_WARN([*** Did not find libusb ***])
+   fi
+
+   CFLAGS="${_gadget_save_CFLAGS}"
+   CPPFLAGS="${_gadget_save_CPPFLAGS}"
+   LDFLAGS="${_gadget_save_LDFLAGS}"
+   LIBS="${_gadget_save_LIBS}"
+fi
-
-# -----------------------------------------------------------------------------
@@ -613 +666 @@
-AC_SUBST(VRPNROOT)
-AC_SUBST(VRPN_LDFLAGS)
+
+AC_SUBST(HAVE_LIBUSB)
+AC_SUBST(LIBUSB_CFLAGS)
+AC_SUBST(LIBUSB_LIBS)
-
-AC_SUBST(DSO_DRIVER_DEPS)
@@ -643 +700 @@
-   Elexol/Makefile
-   Elexol/Ether24/Makefile
+   EssentialReality/Makefile
+   EssentialReality/P5Glove/Makefile
-   Fakespace/Makefile
-   Fakespace/PinchGlove/Makefile