sdl-ios-xcode: src/joystick/linux/SDL_sysjoystick.c comparison

comparison src/joystick/linux/SDL_sysjoystick.c @ 1551:02e19471a694

Fixed bug #4 [Note: I'm applying this patch since it's a cleaner version of what's already implemented, and supports this controller on older kernels. I'll ask to make sure this doesn't break on the new kernels where it's no longer necessary] Date: Mon, 21 Mar 2005 09:41:11 -0500 From: Chris Nelson Subject: SDL Patch Hey, Ryan. I submitted the following patch about a year ago. It's just a simple patch for the linux port, to make multiple joysticks each appear to SDL as their own device, if they are on the same USB port (specifically, these guys <http://www.consoleplus.co.uk/product_info.php?pName=super-joybox-5-quad-joypad-converter>, which allow 4 Playstation2 controllers to be accessed via a single USB port). Without this patch, SDL pretty much drops the ball, and reports that there are 4 joysticks available when less than that number are plugged in. My work built upon the work of another person with the same device. When I submitted the patch to the list, he tested it, but it didn't work for him, so the patch was never accepted. Maybe about 3 times in the past year, I've tried to email the guy, to see if he couldn't run my new version, complete with debug code to diagnose the problem he was having. He never got back to me. So, I'm attaching the patch. I wish I knew why it didn't work for him, but I've been using it for the last year with no problems. Let me know if you need any more information, or have any ideas as to how I could test it. I'd like to see it in the tree, but I want to make sure it works. -Chris

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 19 Mar 2006 06:31:34 +0000
parents	d910939febfa
children	92947e3a18db

comparison

equal deleted inserted replaced

-:31c2b8e4885e
+:02e19471a694
 	{ "Saitek Saitek X45", 6, 1, 0 }
 };
 #ifndef NO_LOGICAL_JOYSTICKS
-static struct joystick_logical_values {
+/*
+Some USB HIDs show up as a single joystick even though they actually
+control 2 or more joysticks.
+*/
+/*
+This code handles the MP-8800 (Quad) and MP-8866 (Dual), which can
+be identified by their transparent blue design. It's quite trivial
+to add other joysticks with similar quirky behavior.
+-id
+*/
+struct joystick_logical_mapping {
 int njoy;
 int nthing;
-} joystick_logical_values[] = {
+};
-/* +0 */
+/*
-/* MP-8800 axes map - map to {logical joystick #, logical axis #} */
+{logical joy, logical axis},
-{0,0},{0,1},{0,2},{1,0},{1,1},{0,3},{1,2},{1,3},{2,0},{2,1},{2,2},{2,3},
+{logical joy, logical hat},
-{3,0},{3,1},{3,2},{3,3},{0,4},{1,4},{2,4},
+{logical joy, logical ball},
+{logical joy, logical button}
-/* +19 */
+*/
-/* MP-8800 hat map - map to {logical joystick #, logical hat #} */
-{0,0},{1,0},{2,0},{3,0},
+static struct joystick_logical_mapping mp88xx_1_logical_axismap[] = {
+{0,0},{0,1},{0,2},{0,3},{0,4},{0,5}
-/* +23 */
+};
-/* MP-8800 button map - map to {logical joystick #, logical button #} */
+static struct joystick_logical_mapping mp88xx_1_logical_buttonmap[] = {
+{0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11}
+};
+static struct joystick_logical_mapping mp88xx_2_logical_axismap[] = {
+{0,0},{0,1},{0,2},{1,0},{1,1},{0,3},
+{1,2},{1,3},{0,4},{0,5},{1,4},{1,5}
+};
+static struct joystick_logical_mapping mp88xx_2_logical_buttonmap[] = {
+{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}
+};
+static struct joystick_logical_mapping mp88xx_3_logical_axismap[] = {
+{0,0},{0,1},{0,2},{1,0},{1,1},{0,3},
+{1,2},{1,3},{2,0},{2,1},{2,2},{2,3},
+{0,4},{0,5},{1,4},{1,5},{2,4},{2,5}
+};
+static struct joystick_logical_mapping mp88xx_3_logical_buttonmap[] = {
+{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}
+};
+static struct joystick_logical_mapping mp88xx_4_logical_axismap[] = {
+{0,0},{0,1},{0,2},{1,0},{1,1},{0,3},
+{1,2},{1,3},{2,0},{2,1},{2,2},{2,3},
+{3,0},{3,1},{3,2},{3,3},{0,4},{0,5},
+{1,4},{1,5},{2,4},{2,5},{3,4},{3,5}
+};
+static struct joystick_logical_mapping mp88xx_4_logical_buttonmap[] = {
 {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}
 };
-static struct joystick_logical_layout {
+struct joystick_logical_layout {
 int naxes;
 int nhats;
 int nballs;
 int nbuttons;
-} joystick_logical_layout[] = {
+};
-/* MP-8800 logical layout */
-{5, 1, 0, 12},
+static struct joystick_logical_layout mp88xx_1_logical_layout[] = {
-{5, 1, 0, 12},
+{6, 0, 0, 12}
-{5, 1, 0, 12},
+};
-{4, 1, 0, 12}
+static struct joystick_logical_layout mp88xx_2_logical_layout[] = {
+{6, 0, 0, 12},
+{6, 0, 0, 12}
+};
+static struct joystick_logical_layout mp88xx_3_logical_layout[] = {
+{6, 0, 0, 12},
+{6, 0, 0, 12},
+{6, 0, 0, 12}
+};
+static struct joystick_logical_layout mp88xx_4_logical_layout[] = {
+{6, 0, 0, 12},
+{6, 0, 0, 12},
+{6, 0, 0, 12},
+{6, 0, 0, 12}
 };
 /*
-Some USB HIDs show up as a single joystick even though they actually
+This array sets up a means of mapping a single physical joystick to
-control 2 or more joysticks.  This array sets up a means of mapping
+multiple logical joysticks. (djm)
-a single physical joystick to multiple logical joysticks. (djm)
 njoys
 the number of logical joysticks
 layouts
 an array of layout structures, one to describe each logical joystick
 axes, hats, balls, buttons
 arrays that map a physical thingy to a logical thingy
 */
-static struct joystick_logicalmap {
+struct joystick_logicalmap {
 const char *name;
+	int nbuttons;
 int njoys;
-struct joystick_logical_layout *layouts;
+struct joystick_logical_layout *layout;
-struct joystick_logical_values *axes;
+struct joystick_logical_mapping *axismap;
-struct joystick_logical_values *hats;
+struct joystick_logical_mapping *hatmap;
-struct joystick_logical_values *balls;
+struct joystick_logical_mapping *ballmap;
-struct joystick_logical_values *buttons;
+struct joystick_logical_mapping *buttonmap;
+};
-} joystick_logicalmap[] = {
-{"WiseGroup.,Ltd MP-8800 Quad USB Joypad", 4, joystick_logical_layout,
+static struct joystick_logicalmap joystick_logicalmap[] = {
-joystick_logical_values, joystick_logical_values+19, NULL,
+{
-joystick_logical_values+23}
+		"WiseGroup.,Ltd MP-8866 Dual USB Joypad",
+		12,
+		1,
+		mp88xx_1_logical_layout,
+	mp88xx_1_logical_axismap,
+		NULL,
+		NULL,
+	mp88xx_1_logical_buttonmap
+	},
+{
+		"WiseGroup.,Ltd MP-8866 Dual USB Joypad",
+		24,
+		2,
+		mp88xx_2_logical_layout,
+	mp88xx_2_logical_axismap,
+		NULL,
+		NULL,
+	mp88xx_2_logical_buttonmap
+	},
+{
+		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
+		12,
+		1,
+		mp88xx_1_logical_layout,
+	mp88xx_1_logical_axismap,
+		NULL,
+		NULL,
+	mp88xx_1_logical_buttonmap
+	},
+{
+		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
+		24,
+		2,
+		mp88xx_2_logical_layout,
+	mp88xx_2_logical_axismap,
+		NULL,
+		NULL,
+	mp88xx_2_logical_buttonmap
+	},
+{
+		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
+		36,
+		3,
+		mp88xx_3_logical_layout,
+	mp88xx_3_logical_axismap,
+		NULL,
+		NULL,
+	mp88xx_3_logical_buttonmap
+	},
+{
+		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
+		48,
+		4,
+		mp88xx_4_logical_layout,
+	mp88xx_4_logical_axismap,
+		NULL,
+		NULL,
+	mp88xx_4_logical_buttonmap
+	}
 };
 /* find the head of a linked list, given a point in it
 */
 #define SDL_joylist_head(i, start)\
 static int CountLogicalJoysticks(int max)
 {
 register int i, j, k, ret, prev;
 const char* name;
+int nbuttons, fd;
+unsigned char n;
 ret = 0;
 for(i = 0; i < max; i++) {
 name = SDL_SYS_JoystickName(i);
+fd = open(SDL_joylist[i].fname, O_RDONLY, 0);
+if ( fd >= 0 ) {
+	 if ( ioctl(fd, JSIOCGBUTTONS, &n) < 0 ) {
+	    nbuttons = -1;
+	 } else {
+nbuttons = n;
+	 }
+	 close(fd);
+}
+else {
+	 nbuttons=-1;
+}
 if (name) {
 for(j = 0; j < SDL_arraysize(joystick_logicalmap); j++) {
-if (!SDL_strcmp(name, joystick_logicalmap[j].name)) {
+if (!SDL_strcmp(name, joystick_logicalmap[j].name) && (nbuttons==-1 || nbuttons==joystick_logicalmap[j].nbuttons)) {
 prev = i;
-SDL_joylist[prev].map = joystick_logicalmap+j;
+SDL_joylist[prev].map = &(joystick_logicalmap[j]);
 for(k = 1; k < joystick_logicalmap[j].njoys; k++) {
 SDL_joylist[prev].next = max + ret;
+SDL_joylist[max+ret].prev = prev;
-if (prev != i)
-SDL_joylist[max+ret].prev = prev;
 prev = max + ret;
 SDL_joylist[prev].logicalno = k;
-SDL_joylist[prev].map = joystick_logicalmap+j;
+SDL_joylist[prev].map = &(joystick_logicalmap[j]);
 ret++;
 }
 break;
 }
 register int slen;
 const static char suffixs[] =
 "01020304050607080910111213141516171819"
 "20212223242526272829303132";
 const char* suffix;
 slen = SDL_strlen(namebuf);
 suffix = NULL;
 if (logicalno*2<sizeof(suffixs))
 suffix = suffixs + (logicalno*2);
 		} else {
 			name = namebuf;
 		}
 		close(fd);
-#ifndef NO_LOGICAL_JOYSTICKS
-		if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next)
+#ifndef NO_LOGICAL_JOYSTICKS
+		if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || index!=oindex)
+		{
 		   LogicalSuffix(SDL_joylist[oindex].logicalno, namebuf, 128);
+		}
 #endif
 	}
 	return name;
 }
 #ifndef NO_LOGICAL_JOYSTICKS
 static void ConfigLogicalJoystick(SDL_Joystick *joystick)
 {
 struct joystick_logical_layout* layout;
-layout = SDL_joylist[joystick->index].map->layouts +
+layout = SDL_joylist[joystick->index].map->layout +
 SDL_joylist[joystick->index].logicalno;
 joystick->nbuttons = layout->nbuttons;
 joystick->nhats = layout->nhats;
 joystick->naxes = layout->naxes;
 }
 #ifndef NO_LOGICAL_JOYSTICKS
 static SDL_Joystick* FindLogicalJoystick(
-SDL_Joystick *joystick, struct joystick_logical_values* v)
+SDL_Joystick *joystick, struct joystick_logical_mapping* v)
 {
 SDL_Joystick *logicaljoy;
 register int i;
 i = joystick->index;
 return logicaljoy;
 }
 static int LogicalJoystickButton(
 SDL_Joystick *joystick, Uint8 button, Uint8 state){
-struct joystick_logical_values* buttons;
+struct joystick_logical_mapping* buttons;
 SDL_Joystick *logicaljoy = NULL;
 /* if there's no map then this is just a regular joystick
 */
 if (SDL_joylist[joystick->index].map == NULL)
 return 0;
 /* get the logical joystick that will receive the event
 */
-buttons = SDL_joylist[joystick->index].map->buttons+button;
+buttons = SDL_joylist[joystick->index].map->buttonmap+button;
 logicaljoy = FindLogicalJoystick(joystick, buttons);
 if (logicaljoy == NULL)
 return 1;
 }
 static int LogicalJoystickAxis(
 	SDL_Joystick *joystick, Uint8 axis, Sint16 value)
 {
-struct joystick_logical_values* axes;
+struct joystick_logical_mapping* axes;
 SDL_Joystick *logicaljoy = NULL;
 /* if there's no map then this is just a regular joystick
 */
 if (SDL_joylist[joystick->index].map == NULL)
 return 0;
 /* get the logical joystick that will receive the event
 */
-axes = SDL_joylist[joystick->index].map->axes+axis;
+axes = SDL_joylist[joystick->index].map->axismap+axis;
 logicaljoy = FindLogicalJoystick(joystick, axes);
 if (logicaljoy == NULL)
 return 1;
 		{ SDL_HAT_LEFTUP, SDL_HAT_UP, SDL_HAT_RIGHTUP },
 		{ SDL_HAT_LEFT, SDL_HAT_CENTERED, SDL_HAT_RIGHT },
 		{ SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN }
 	};
 	SDL_logical_joydecl(SDL_Joystick *logicaljoy = NULL);
-	SDL_logical_joydecl(struct joystick_logical_values* hats = NULL);
+	SDL_logical_joydecl(struct joystick_logical_mapping* hats = NULL);
 	the_hat = &stick->hwdata->hats[hat];
 	if ( value < 0 ) {
 		value = 0;
 	} else
 		*/
 		if (SDL_joylist[stick->index].map != NULL) {
 			/* get the fake joystick that will receive the event
 			*/
-			hats = SDL_joylist[stick->index].map->hats+hat;
+			hats = SDL_joylist[stick->index].map->hatmap+hat;
 			logicaljoy = FindLogicalJoystick(stick, hats);
 		}
 		if (logicaljoy) {
 			stick = logicaljoy;

Mercurial > sdl-ios-xcode

comparison src/joystick/linux/SDL_sysjoystick.c @ 1551:02e19471a694