From 2a87f7afd6536dd4ac35954aff7eb321f3897900 Mon Sep 17 00:00:00 2001
From: Edgar Simo <bobbens@gmail.com>
Date: Sun, 1 Jun 2008 18:46:51 +0000
Subject: [PATCH] Properly quit the SDL_haptic subsystem. Added SDL_Haptic
 dummy driver.

---
 configure.in                     |  5 +++
 src/haptic/SDL_haptic.c          | 13 ++++++
 src/haptic/SDL_haptic_c.h        |  1 +
 src/haptic/dummy/SDL_syshaptic.c | 69 ++++++++++++++++++++++++++++++++
 src/haptic/linux/SDL_syshaptic.c | 13 ++++++
 5 files changed, 101 insertions(+)
 create mode 100644 src/haptic/dummy/SDL_syshaptic.c

diff --git a/configure.in b/configure.in
index 1bb975eb4..de917ba8d 100644
--- a/configure.in
+++ b/configure.in
@@ -2580,6 +2580,11 @@ if test x$enable_joystick = xyes; then
     SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
   fi
 fi
+if test x$enable_haptic = xyes; then
+  if test x$have_haptic != xyes; then
+    SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
+  fi
+fi
 if test x$have_cdrom != xyes; then
     if test x$enable_cdrom = xyes; then
         AC_DEFINE(SDL_CDROM_DISABLED)
diff --git a/src/haptic/SDL_haptic.c b/src/haptic/SDL_haptic.c
index 040182c75..a09209148 100644
--- a/src/haptic/SDL_haptic.c
+++ b/src/haptic/SDL_haptic.c
@@ -125,3 +125,16 @@ SDL_HapticOpen(int device_index)
    }
    return haptic;
 }
+
+
+void
+SDL_HapticQuit(void)
+{
+   SDL_numhaptics = 0;
+
+   SDL_SYS_HapticQuit();
+   if (SDL_haptics != NULL) {
+      SDL_free(SDL_haptics);
+      SDL_haptics = NULL;
+   }
+}
diff --git a/src/haptic/SDL_haptic_c.h b/src/haptic/SDL_haptic_c.h
index fd8d9d140..645407b25 100644
--- a/src/haptic/SDL_haptic_c.h
+++ b/src/haptic/SDL_haptic_c.h
@@ -31,3 +31,4 @@ extern struct _SDL_Haptic * SDL_HapticOpen(int device_index);
 extern int SDL_HapticOpened(int device_index);
 extern int SDL_HapticIndex(struct _SDL_Haptic *haptic);
 extern void SDL_HapticClose(struct _SDL_Haptic *haptic);
+extern void SDL_HapticQuit(void);
diff --git a/src/haptic/dummy/SDL_syshaptic.c b/src/haptic/dummy/SDL_syshaptic.c
new file mode 100644
index 000000000..1dbaeea82
--- /dev/null
+++ b/src/haptic/dummy/SDL_syshaptic.c
@@ -0,0 +1,69 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 2008 Edgar Simo
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifdef defined(SDL_HAPTIC_DUMMY) || defined(SDL_HAPTIC_DISABLED)
+
+#include "SDL_haptic.h"
+#include "../SDL_haptic_c.h"
+#include "../SDL_syshaptic.h"
+
+
+int
+SDL_SYS_HapticInit(void)
+{
+   SDL_numhaptics = 0;
+   return (0);
+}
+
+
+const char *
+SDL_SYS_HapticName(int index)
+{
+   SDL_SetError("Logic error: No haptic (force feedback) devices available");
+   return (NULL);
+}
+
+
+int
+SDL_SYS_HapticOpen(SDL_Haptic * haptic)
+{
+   SDL_SetError("Logic error: No joysticks available");
+   return (-1);
+}
+
+
+void
+SDL_SYS_HapticClose(SDL_Haptic * haptic)
+{
+   return;
+}
+
+
+void
+SDL_SYS_HapticQuit(void)
+{
+   return;
+}
+
+
+#endif /* SDL_HAPTIC_DUMMY || SDL_HAPTIC_DISABLED */
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index 345fda74b..1d78ccfbb 100644
--- a/src/haptic/linux/SDL_syshaptic.c
+++ b/src/haptic/linux/SDL_syshaptic.c
@@ -182,4 +182,17 @@ SDL_SYS_HapticOpen(SDL_Haptic * haptic)
 }
 
 
+/* Clean up after system specific haptic stuff */
+void
+SDL_SYS_HapticQuit(void)
+{
+   int i;
+
+   for (i=0; SDL_hapticlist[i].fname != NULL; i++) {
+      SDL_free(SDL_hapticlist[i].fname);
+   }
+   SDL_hapticlist[0].fname = NULL;
+}
+
+
 #endif /* SDL_HAPTIC_LINUX */