From 7b41268068d7588f8187881802388e42151979b1 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sat, 11 Jun 2005 14:29:44 +0000
Subject: [PATCH] joysticks.xml isn't needed any more; all js config files in
 $FG_ROOT/Input/Joysticks are automatcally read in

---
 joysticks.xml   | 59 -------------------------------------------------
 preferences.xml |  3 ---
 2 files changed, 62 deletions(-)
 delete mode 100644 joysticks.xml

diff --git a/joysticks.xml b/joysticks.xml
deleted file mode 100644
index 51bd6efa8..000000000
--- a/joysticks.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Joystick binding definitions.
--->
-
-<PropertyList>
-
- <!-- Default device -->
- <js n="0" include="Input/Joysticks/Default/joystick.xml"/>
-
- <!-- Analog 4-axis 4-button joystick -->
- <js-named include="Input/Joysticks/Default/four-axis-joystick.xml"/>
-
- <!-- FIXME: dummy placeholder to force a high starting index -->
- <js-named n="999"/>
-
- <!-- CH devices -->
- <js-named include="Input/Joysticks/CH/pro-pedals-usb.xml"/>
- <js-named include="Input/Joysticks/CH/pro-yoke-usb.xml"/>
-
- <!-- Logitech devices -->
- <js-named include="Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml"/>
- <js-named include="Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml"/>
- <js-named include="Input/Joysticks/Logitech/wingman-force.xml"/>
- <js-named include="Input/Joysticks/Logitech/wingman-force-3d.xml"/>
- <js-named include="Input/Joysticks/Logitech/wingman-rumblepad-usb.xml"/>
- <js-named include="Input/Joysticks/Logitech/extreme-3d-win.xml"/>
- <js-named include="Input/Joysticks/Logitech/extreme-3d-pro.xml"/>
- 
- <!-- Microsoft devices -->
- <js-named include="Input/Joysticks/Microsoft/sidewinder.xml"/>
- <js-named include="Input/Joysticks/Microsoft/sidewinder-force-feed.xml"/>
- <js-named include="Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml"/>
- <js-named include="Input/Joysticks/Microsoft/sidewinder-precision-pro.xml"/>
- <js-named include="Input/Joysticks/Microsoft/sidewinder-3d-pro.xml"/>
-
- <!-- Saitek devices -->
- <js-named include="Input/Joysticks/Saitek/X45.xml"/>
- <js-named include="Input/Joysticks/Saitek/X8-30.xml"/>
- <js-named include="Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml"/>
- <js-named include="Input/Joysticks/Saitek/Cyborg-Evo.xml"/>
- <js-named include="Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml"/>
-
- <!-- ThrustMaster devices -->
- <js-named include="Input/Joysticks/ThrustMaster/FCS.xml"/>
- <js-named include="Input/Joysticks/ThrustMaster/Attack-Throttle.xml"/>
- <js-named include="Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml"/>
- <js-named include="Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml"/>
-
- <!-- Lew Engineering RCJOY device for various RC transmitters.  http://www.leweng.com -->
- <js-named include="Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml"/>
-
- <!-- Macally devices -->
- <js-named include="Input/Joysticks/Macally/istick-usb.xml"/>
-
-</PropertyList>
-
-<!-- end of joysticks.xml -->
diff --git a/preferences.xml b/preferences.xml
index 6e6526d88..c7f027ed0 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -578,9 +578,6 @@ Started September 2000 by David Megginson, david@megginson.com
   <!-- included externally -->
   <keyboard include="keyboard.xml"/>
 
-  <!-- included externally -->
-  <joysticks include="joysticks.xml"/>
-
   <!-- included externally -->
   <mice include="mice.xml"/>