Mercurial > sdl-ios-xcode

changeset 1305:babc963b6f8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverted in favor of this one: https://bugzilla.libsdl.org/attachment.cgi?id=3
author Sam Lantinga <slouken@libsdl.org>
date Tue, 31 Jan 2006 18:08:33 +0000
parents 0175d3eeae89
children 0c105755b110
files src/joystick/linux/SDL_sysjoystick.c
diffstat 1 files changed, 3 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/joystick/linux/SDL_sysjoystick.c	Tue Jan 31 17:56:44 2006 +0000
+++ b/src/joystick/linux/SDL_sysjoystick.c	Tue Jan 31 18:08:33 2006 +0000
@@ -88,21 +88,7 @@
    {0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11},
    {1,0},{1,1},{1,2},{1,3},{1,4},{1,5},{1,6},{1,7},{1,8},{1,9},{1,10},{1,11},
    {2,0},{2,1},{2,2},{2,3},{2,4},{2,5},{2,6},{2,7},{2,8},{2,9},{2,10},{2,11},
-   {3,0},{3,1},{3,2},{3,3},{3,4},{3,5},{3,6},{3,7},{3,8},{3,9},{3,10},{3,11},
-
-/* +71 */
-   /* MP-8866 axes map - map to {logical joystick #, logical axis#} */
-   {0,0},{0,1},{0,2},{0,3},
-   {1,0},{1,1},{1,2},{1,3},
-
-/* +79 */
-   /* MP-8866 hat map - map to {logical joystick #, logical hat #} */
-   {0,0},{1,0},
-
-/* +81 */
-   /* MP-8866 button map - map to {logical joystick #, logical button #} */
-   {0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11},
-   {1,0},{1,1},{1,2},{1,3},{1,4},{1,5},{1,6},{1,7},{1,8},{1,9},{1,10},{1,11}
+   {3,0},{3,1},{3,2},{3,3},{3,4},{3,5},{3,6},{3,7},{3,8},{3,9},{3,10},{3,11}
 };
 
 static struct joystick_logical_layout {
@@ -111,19 +97,13 @@
         int nballs;
         int nbuttons;
 } joystick_logical_layout[] = {
-/* +0 */
         /* MP-8800 logical layout */
         {5, 1, 0, 12},
         {5, 1, 0, 12},
         {5, 1, 0, 12},
-        {4, 1, 0, 12},
-/* +4 */
-	/* MP-8866 logical layout */
-	{4, 1, 0, 12},
-	{4, 1, 0, 12}
+        {4, 1, 0, 12}
 };
 
-
 /*
    Some USB HIDs show up as a single joystick even though they actually
    control 2 or more joysticks.  This array sets up a means of mapping
@@ -150,12 +130,7 @@
 } joystick_logicalmap[] = {
         {"WiseGroup.,Ltd MP-8800 Quad USB Joypad", 4, joystick_logical_layout,
          joystick_logical_values, joystick_logical_values+19, NULL,
-         joystick_logical_values+23},
-	/* WiseGroup MP-8866 Dual USB Joypad */
-	{"0925:8866", 2, joystick_logical_layout+4,
-	 joystick_logical_values+71, joystick_logical_values+79, NULL,
-	 joystick_logical_values+81}
-
+         joystick_logical_values+23}
 };
 
 /* find the head of a linked list, given a point in it