Changeset 19958

Timestamp:

04/21/07 10:05:42 (2 years ago)

Author:

patrick

Message:

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.

Files:

• juggler/trunk/modules/gadgeteer/drivers/EssentialReality (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/Makefile.in (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/Makefile.in (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5Glove.rc (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5GloveStandalone.cpp (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5GloveStandalone.h (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5GloveWrapper.cpp (added)
• juggler/trunk/modules/gadgeteer/drivers/EssentialReality/P5Glove/P5GloveWrapper.h (added)
• juggler/trunk/modules/gadgeteer/drivers/Makefile.in (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/drivers/configure.ac (modified) (4 diffs)

juggler/trunk/modules/gadgeteer/drivers/Makefile.in

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

juggler/trunk/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
+   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
+
+   _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